Skip to content

bconsole: enable app icon on windows#2105

Merged
BareosBot merged 10 commits intobareos:masterfrom
pstorz:dev/pstorz/master/fix-bconsole-icon
Jan 24, 2025
Merged

bconsole: enable app icon on windows#2105
BareosBot merged 10 commits intobareos:masterfrom
pstorz:dev/pstorz/master/fix-bconsole-icon

Conversation

@pstorz
Copy link
Member

@pstorz pstorz commented Jan 7, 2025

Thank you for contributing to the Bareos Project!

This PR will fix issue #2092 and bareos/internal#220

Please check

  • Short description and the purpose of this PR is present above this paragraph
  • Your name is present in the AUTHORS file (optional)

If you have any questions or problems, please give a comment in the PR.

Helpful documentation and best practices

Checklist for the reviewer of the PR (will be processed by the Bareos team)

Make sure you check/merge the PR using devtools/pr-tool to have some simple automated checks run and a proper changelog record added.

General
  • Is the PR title usable as CHANGELOG entry?
  • Purpose of the PR is understood
  • Commit descriptions are understandable and well formatted
  • Required backport PRs have been created
  • Correct milestone is set
  • All backport have been created
Source code quality
  • Source code changes are understandable
  • Variable and function names are meaningful
  • Code comments are correct (logically and spelling)
  • Required documentation changes are present and part of the PR
Tests
  • Decision taken that a test is required (if not, then remove this paragraph)
  • The choice of the type of test (unit test or systemtest) is reasonable
  • Testname matches exactly what is being tested
  • On a fail, output of the test leads quickly to the origin of the fault

@pstorz pstorz changed the title console: link with consolreres bconsole: enable app icon on windows Jan 7, 2025
@pstorz pstorz requested a review from bruno-at-bareos January 7, 2025 15:21
@bruno-at-bareos
Copy link
Contributor

Tested build Bareos-25.0.0~pre46.466959939-x64-Release

.exe files in Bareos
image

List of executable in taskmanager
image

so still bscan and bareos-dbcheck need a fix.

@sebsura
Copy link
Contributor

sebsura commented Jan 10, 2025

i think this a good place to also fix bareos/internal#191

@sebsura
Copy link
Contributor

sebsura commented Jan 13, 2025

@bruno-at-bareos look at a few comments above, I already mentioned that the sd still needs fixing :)

@bruno-at-bareos bruno-at-bareos added bugfix bug This addresses a bug labels Jan 16, 2025
@bruno-at-bareos bruno-at-bareos added this to the 25.0.0 milestone Jan 16, 2025
@bruno-at-bareos bruno-at-bareos linked an issue Jan 16, 2025 that may be closed by this pull request
@bruno-at-bareos
Copy link
Contributor

bruno-at-bareos commented Jan 16, 2025

With version Bareos-25.0.0~pre55.bf7533be1-x64-Release.exe

Tree icons is now fixed
image

And all exe icons are okay
image

Even Bareos-TrayMonitor is now again visible when running
image

Need to be fixed deprecated configuration parameters are still present for the FD and SD
(Done in #2090)

  Maximum Concurrent Jobs = 20

Copy link
Contributor

@bruno-at-bareos bruno-at-bareos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need also the check the usage of "%TEMP%" during build but also when executable are run with user rights, like bconsole.

@sebsura sebsura force-pushed the dev/pstorz/master/fix-bconsole-icon branch 5 times, most recently from 5c0d104 to 9cd63ea Compare January 22, 2025 06:38
pstorz and others added 7 commits January 24, 2025 07:10
We cannot remove the header completely yet, as our infrastructure
expects it to be there, but we can at least use the normal values for
it.
If this option is set, then the tray monitor is instructed to create a
debug trace in the given directory.
sebsura and others added 3 commits January 24, 2025 07:10
On windows its fine to have a bound socket on 127.0.0.1:X and
0.0.0.0:X, so the test fails as it expected this to not work.

Thankfully binding 0.0.0.0:X twice _does_ still fail (like the other
tests already show), so I just changed this test to be like the other
ones and have the director bind on 0.0.0.0.
Some of our tests already include an explicit wait for the language
select drop down to appear, see 'disabled_test_languages':

> self.wait_and_click(By.XPATH, '//button[@data-id="locale"]')

Hopefully this fixes the problem, where selenium cannot find the
"English" selection during our ci tests.
@BareosBot BareosBot force-pushed the dev/pstorz/master/fix-bconsole-icon branch from 12e273c to 3933a27 Compare January 24, 2025 07:11
@BareosBot BareosBot merged commit e5cf562 into bareos:master Jan 24, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug This addresses a bug requires backport to 24

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Windows 11 Tray Monitor process runing but not appearing

4 participants