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.

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

Rework domains widget #235

Merged
merged 3 commits into from
Jan 11, 2025
Merged

Rework domains widget #235

merged 3 commits into from
Jan 11, 2025

Conversation

fepitre
Copy link
Member

@fepitre fepitre commented Nov 30, 2024

@fepitre fepitre changed the title Devel301124 Rework domains widget Nov 30, 2024
@fepitre fepitre force-pushed the devel301124 branch 5 times, most recently from 15c3e12 to 559df60 Compare November 30, 2024 17:33
Copy link

codecov bot commented Nov 30, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 93.16%. Comparing base (2b12854) to head (d550f7d).
Report is 7 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #235      +/-   ##
==========================================
- Coverage   93.18%   93.16%   -0.02%     
==========================================
  Files          58       58              
  Lines       11046    11051       +5     
==========================================
+ Hits        10293    10296       +3     
- Misses        753      755       +2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link

@alimirjamali alimirjamali left a comment

Choose a reason for hiding this comment

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

Technically both of Pylint checks and Black formatting style are enforced here? If that is the case, it might be better to update Python specific Coding Style Guidelines as well. There is a brief line there with a link to PEP8.

@fepitre
Copy link
Member Author

fepitre commented Dec 2, 2024

Technically both of Pylint checks and Black formatting style are enforced here? If that is the case, it might be better to update Python specific Coding Style Guidelines as well. There is a brief line there with a link to PEP8.

Yes, but it's not yet enforced in guidelines. It's up to @marmarek but for now we have several other places to blacken first.

Copy link
Member

@marmarta marmarta left a comment

Choose a reason for hiding this comment

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

There's something very wrong with the margins here, I'm afraid:

  • your changes:
    fepitre-qui-domains
  • previous state
    fepitre-qui-domains-2

I'm not against some more margins, but this is too much ;)


gi.require_version("Gtk", "3.0") # isort:skip
from gi.repository import Gio, Gtk, GObject, GLib, GdkPixbuf # isort:skip
from gi.repository import Gio, Gtk, GLib, GdkPixbuf # isort:skip
Copy link
Member

Choose a reason for hiding this comment

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

please don't move import gi away from this, it makes it more confusing...

Copy link
Member Author

Choose a reason for hiding this comment

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

What do you mean? This dependency is not required anymore, how should I remove it?

Copy link
Member

Choose a reason for hiding this comment

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

oh, sorry, wrong line - my problem is that you moved import gi above this line, and I think it shoulld be in its old location, just above gi.require_version

qui/tray/domains.py Outdated Show resolved Hide resolved
@fepitre
Copy link
Member Author

fepitre commented Dec 11, 2024

There's something very wrong with the margins here, I'm afraid:

* your changes:
  ![fepitre-qui-domains](https://private-user-images.githubusercontent.com/7242298/394781409-1d9e70ce-46df-4429-8f4a-22c0f88b8e94.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzM5Mjk4ODMsIm5iZiI6MTczMzkyOTU4MywicGF0aCI6Ii83MjQyMjk4LzM5NDc4MTQwOS0xZDllNzBjZS00NmRmLTQ0MjktOGY0YS0yMmMwZjg4YjhlOTQucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI0MTIxMSUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNDEyMTFUMTUwNjIzWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9ODU1ZmJlOThhOTllYmE5MjQ5ZGNjZDFlMTg5ZWVhN2E5YTg2MmYwNDE3MjNmMmJjZmFiYjNkMTcwYTA1ZWNkOSZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QifQ.8yWiCmOvdRWkipa5ED5KHmxN2EqsNfXyb7GTJacIS4g)

* previous state
  ![fepitre-qui-domains-2](https://private-user-images.githubusercontent.com/7242298/394781416-86eb95a8-79e7-4cfe-a4a0-ef982f86a876.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzM5Mjk4ODMsIm5iZiI6MTczMzkyOTU4MywicGF0aCI6Ii83MjQyMjk4LzM5NDc4MTQxNi04NmViOTVhOC03OWU3LTRjZmUtYTRhMC1lZjk4MmY4NmE4NzYucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI0MTIxMSUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNDEyMTFUMTUwNjIzWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9NzEyMjBjODBkNWJhYzZmYTc0ZGQ0Yjk4YTQ2NWExYzgyYzdkOGY5MjA1NDcyZjM2MWQ5NmFlMDVlNDZjZGI1NiZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QifQ.6nLSkJ2IAIY_zFWB2QMWeF5avvKaerlNqqYaY8sOD9A)

I'm not against some more margins, but this is too much ;)

Yes I'm aware of this but I was waiting on current refactor before fighting with margins.

@DemiMarie
Copy link

@fepitre can you move the reformatting to a separate PR?

@fepitre fepitre force-pushed the devel301124 branch 4 times, most recently from ffd5d68 to c088f6f Compare January 8, 2025 16:17
@fepitre
Copy link
Member Author

fepitre commented Jan 8, 2025

As discussed in private chat, I've added Open Qube Manger in bold text.

@fepitre
Copy link
Member Author

fepitre commented Jan 8, 2025

Also, there is still big left margin, I'm trying to figure out the reason.

@fepitre
Copy link
Member Author

fepitre commented Jan 9, 2025

I also fixed vanished separator on the menu.

@qubesos-bot
Copy link

qubesos-bot commented Jan 11, 2025

OpenQA test summary

Complete test suite and dependencies: https://openqa.qubes-os.org/tests/overview?distri=qubesos&version=4.3&build=2025011103-4.3&flavor=pull-requests

Test run included the following:

New failures, excluding unstable

Compared to: https://openqa.qubes-os.org/tests/overview?distri=qubesos&version=4.3&build=2024111705-4.3&flavor=update

Failed tests

16 failures

Fixed failures

Compared to: https://openqa.qubes-os.org/tests/119126#dependencies

3 fixed
  • system_tests_extra

    • TC_00_QVCTest_whonix-gateway-17: test_010_screenshare (failure)
      ~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^... AssertionError: 0 == 0
  • system_tests_basic_vm_qrexec_gui_zfs

    • switch_pool: Failed (test died)
      # Test died: command 'dnf install -y ./zfs-release.rpm' failed at /...
  • system_tests_audio@hw1

Unstable tests

  • system_tests_update

    update2/Failed (1/5 times with errors)
    • job 121711 # Test died: command '(set -o pipefail; qubesctl --show-output stat...
  • system_tests_update@hw1

    update2/Failed (1/5 times with errors)
    • job 121711 # Test died: command '(set -o pipefail; qubesctl --show-output stat...
  • system_tests_update@hw7

    update2/Failed (1/5 times with errors)
    • job 121711 # Test died: command '(set -o pipefail; qubesctl --show-output stat...

@marmarta
Copy link
Member

Sooo, I generally really like it, but maybe if you moved vm icons 1 pixel closer to text, openqa won't complain? I think that's the difference there (otherwise someone has to click through openqa :D)

@marmarta
Copy link
Member

OTOH, maybe trying to exactly fit the pixel requirements of OpenQA is a bad idea and clicking through those is the better one.

@marmarta
Copy link
Member

fixed OpenQa screenshots.

@marmarek marmarek merged commit 94d5788 into QubesOS:main Jan 11, 2025
3 of 5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Icons are not being displayed under Qubes Domains and Qubes Devices widgets on i3 WM
6 participants