Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix master issue 1306 (system-tray icon) and releated "missing icons" issues #1480

Merged
merged 11 commits into from
Jul 17, 2023
Merged

Fix master issue 1306 (system-tray icon) and releated "missing icons" issues #1480

merged 11 commits into from
Jul 17, 2023

Conversation

aryoda
Copy link
Contributor

@aryoda aryoda commented Jul 17, 2023

Candidate to fix all major sys-tray icon and missing app icon issues (#1159, #1236, #1306, #1364).
Refactor qtsystrayiconplugin.py

@buhtz After merging this you can refactor icon.py (thanks for waiting for my PR to avoid merge conflicts :-)

aryoda added 9 commits January 30, 2023 22:25
@aryoda
Fix #1364, #1306, #1236, #1159. Refactor Qt systrayicon plugin
0ef157b 
* #1364: Missing con in SSH private key button
* #1306: Master issue for missing or empty systemtray icon
* #1236: Systray icon missing or empty (GUI and cron)
* #1159: KDE plasma icon compatibility suggestions
@aryoda
Merge branch 'dev' of https://github.com/bit-team/backintime into dev
9db82c2
@aryoda
wip: Fix all system tray icon issues (part 1)
a476da9 
Still wip: Use Qt5 instead of xdpyinfo to check if a DE is available...
@aryoda
Merge branch 'dev' of https://github.com/bit-team/backintime into dev
36d8d59
@aryoda
forward integrate upstream changes (dev branch) into this branch
8cfcea2
@aryoda
Candidate to fix all major systray-icon and missing icon issues (#1364,
6606180 
#1306, #1236, #1159)
@aryoda
Merge branch 'dev' of https://github.com/bit-team/backintime into dev
8f3b46d
@aryoda
forward integration of dev (solved a conflict manually in qtsystrayic…
53dc84d 
…on.py)
@aryoda
Small CHANGES fixes
a107ad9
buhtz
buhtz reviewed Jul 17, 2023
View reviewed changes
CHANGES
* Fix bug: Unit test fails on some machines due to warning "Ignoring XDG_SESSION_TYPE=wayland on Gnome..." (#1429)
* Fix bug: Generation of config-manpage caused an error with Debian's Lintian (#1398).
* Fix bug: Return empty list in smartRemove (#1392, Debian Bug Report 973760)
* Breaking change: Minimal Python version 3.8 required (#1358).
* Feature: Exclude /swapfile by default (#1053)
* Documentation: Removed outdated docbook (#1345).
* Build: Introduced .readthedocs.yaml as asked by ReadTheDocs.org (#1443).
* Dependency: The oxygen icons should be installed with the BiT Qt GUI since they are used as fallback in case of missing icons
Copy link
Member

Choose a reason for hiding this comment

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

This info should be added to the README.md. There it is where distro maintainers pick up this information.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, I forgot that :-)

I will add this ASAP

I would also like to keep it in the CHANGES since this is what pkg maintainers do read first I guess (not the diff of the README)

aryoda
aryoda commented Jul 17, 2023
View reviewed changes
common/tools.py Outdated

logger.debug(f"Qt5 probing result: exit code {proc.returncode}")

if proc.returncode != 23: # if some Qt5 parts are missing: Show details
Copy link
Contributor Author

@aryoda aryoda Jul 17, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Damn, I forgot to remove my testing code. Will follow up on this with a new commit...

Copy link
Member

Choose a reason for hiding this comment

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

I thought it has to be this way. Some more verbose logging in such a complex situation isn't bad.

buhtz
buhtz reviewed Jul 17, 2023
View reviewed changes
qt/qtsystrayicon.py
# TODO Is this really required? If the client is not configured for X11
# it may use Wayland or something else...
# Or is this just required when run as root (where GUIs are not
# configured normally)?
Copy link
Member

Choose a reason for hiding this comment

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

I don't know, sorry. ;)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I keep this comment for the future

buhtz
buhtz reviewed Jul 17, 2023
View reviewed changes
qt/qtsystrayicon.py
@@ -56,7 +60,7 @@ def __init__(self):
self.qapp.setQuitOnLastWindowClosed(False)

import icon
self.icon = icon
self.icon = icon # What does this code do? Make the import accessible?
Copy link
Member

Choose a reason for hiding this comment

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

Yes.
It is the same in app.py's MainWindow.
Let's keep it that way until next refactor session.

buhtz
buhtz approved these changes Jul 17, 2023
View reviewed changes
Copy link
Member

@buhtz buhtz left a comment

Choose a reason for hiding this comment

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

Very nice. Well done. High quality docu.

@buhtz
Copy link
Member

buhtz commented Jul 17, 2023

(#1159, #1236, #1306, #1364)

I assume the merge will close all this issues because of your commit messages. It is OK for me.

But maybe we should re-open the issues immediately and ask the reports for feedback?

@aryoda
Copy link
Contributor Author

aryoda commented Jul 17, 2023

I assume the merge will close all this issues because of your commit messages. It is OK for me.
But maybe we should re-open the issues immediately and ask the reports for feedback?

Yes, I will re-open them if auto-closed, but I tried to avoid this by not directly using the "fix"... keyword followed by the issue numbers. Let's see what github does here...

@aryoda aryoda merged commit 535b1c7 into bit-team:dev Jul 17, 2023
This was referenced Jul 17, 2023
Closed
Closed
Closed
Closed
Closed
Closed
Merged
aryoda added a commit that referenced this pull request Sep 7, 2023
@aryoda
Document fixed issue #1386 in CHANGES
5295fa4 
I have forgot to mention this fix (contained in PR #1480) in the CHANGES
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@buhtz buhtz buhtz approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@aryoda @buhtz