Timemachine/cloud-sync
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(ui): inline SVG icons across all three dialogs
CI / test (3.10) (push) Successful in 6s
Details
CI / test (3.11) (push) Successful in 7s
Details
CI / test (3.12) (push) Successful in 6s
Details
CI / build-pyz (push) Successful in 4s
Details
CI / release (push) Has been skipped
Details

Browse Source 
New module cloud_sync/icons.py:
  - CLOUD_SVG, STORAGE_SVG: card glyphs (Material Icons, Apache-2.0)
  - WARNING_BADGE_SVG, PLUS_BADGE_SVG, SYNC_BADGE_SVG: header badges
    (hand-rolled — circle + vector primitives, no glyph font dependency)
  - svg_pixmap(svg, size): QSvgRenderer-backed rasteriser; dual-binding
    helper falls back from PySide6 to PyQt6.QtSvg.

Wired into ui_qt.py:
  - Conflict dialog: warning badge SVG (light disc + dark !), cloud
    card SVG, storage card SVG. Drops the QSS circle hack — entire
    badge is one pixmap now.
  - Login dialog: plus badge SVG (Prism-green disc + dark +).
  - Progress window: sync arrow badge SVG (Prism-green disc + circular
    arrow + head).

QSS shed: no more bg/border-radius/font-size acrobatics for badges
since the SVG includes the disc. Card icons are crisp at any DPI.

52 tests still green; pyz grows ~5 KB for the SVG strings + the new
icons module.
This commit is contained in:
claude-timemachine
2026-06-05 01:05:54 +02:00
parent 7c9d33f952
commit f1cb9f4b86
2 changed files with 119 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cloud_sync/ui_qt.py
+26 -53
View File
@@ -93,18 +93,6 @@ QLabel#title {
font-weight: bold;
letter-spacing: 2px;
}
QLabel#badge {
color: #313131;
background: #96db59;
border-radius: 16px;
font-size: 18pt;
font-weight: bold;
qproperty-alignment: AlignCenter;
min-width: 32px;
max-width: 32px;
min-height: 32px;
max-height: 32px;
}
QLabel#status {
color: #c8c8c8;
font-size: 10pt;
@@ -166,10 +154,12 @@ class QtProgressWindow:
outer.setContentsMargins(28, 24, 28, 20)
outer.setSpacing(14)
from . import icons
header = QtWidgets.QHBoxLayout()
header.setSpacing(12)
badge = QtWidgets.QLabel("↻")
badge.setObjectName("badge")
badge = QtWidgets.QLabel()
badge.setPixmap(icons.svg_pixmap(icons.SYNC_BADGE_SVG, 32))
badge.setFixedSize(32, 32)
header.addWidget(badge)
self._title_label = QtWidgets.QLabel("CLOUD SYNC")
self._title_label.setObjectName("title")
@@ -259,18 +249,6 @@ QLabel#title {
font-weight: bold;
letter-spacing: 2px;
}
QLabel#badge {
color: #313131;
background: #96db59;
border-radius: 16px;
font-size: 20pt;
font-weight: bold;
qproperty-alignment: AlignCenter;
min-width: 32px;
max-width: 32px;
min-height: 32px;
max-height: 32px;
}
QLabel#body {
color: #c8c8c8;
font-size: 10pt;
@@ -341,6 +319,7 @@ def prompt_login_qt() -> str | None:
focus accent, primary "Save and continue" button in Prism green.
"""
QtWidgets, QtCore, _ = import_qt()
from . import icons
app_existed = QtWidgets.QApplication.instance() is not None
app = QtWidgets.QApplication.instance() or QtWidgets.QApplication(sys.argv)
if not app_existed:
@@ -357,8 +336,9 @@ def prompt_login_qt() -> str | None:
header = QtWidgets.QHBoxLayout()
header.setSpacing(12)
badge = QtWidgets.QLabel("+")
badge.setObjectName("badge")
badge = QtWidgets.QLabel()
badge.setPixmap(icons.svg_pixmap(icons.PLUS_BADGE_SVG, 32))
badge.setFixedSize(32, 32)
header.addWidget(badge)
title = QtWidgets.QLabel("CONNECT CLOUD SAVE")
title.setObjectName("title")
@@ -449,18 +429,6 @@ QLabel#title {
font-weight: bold;
letter-spacing: 2px;
}
QLabel#warning {
color: #313131;
background: #d6dde6;
border-radius: 16px;
font-size: 18pt;
font-weight: bold;
qproperty-alignment: AlignCenter;
min-width: 32px;
max-width: 32px;
min-height: 32px;
max-height: 32px;
}
QLabel#body {
color: #c8c8c8;
font-size: 10pt;
@@ -489,11 +457,6 @@ QLabel#cardSubtitle {
font-size: 9pt;
background: transparent;
}
QLabel#cardIcon {
color: white;
font-size: 24pt;
background: transparent;
}
QPushButton#cancel {
background: #303030;
color: white;
@@ -525,6 +488,7 @@ def prompt_conflict_qt(
Cancel bottom-right. Card click commits and dismisses.
"""
QtWidgets, QtCore, Signal = import_qt()
from . import icons
app_existed = QtWidgets.QApplication.instance() is not None
app = QtWidgets.QApplication.instance() or QtWidgets.QApplication(sys.argv)
if not app_existed:
@@ -533,7 +497,7 @@ def prompt_conflict_qt(
class _Card(QtWidgets.QFrame):
clicked = Signal()
def __init__(self, glyph: str, title: str, subtitle: str) -> None:
def __init__(self, pixmap: Any, title: str, subtitle: str) -> None:
super().__init__()
self.setObjectName("card")
self.setCursor(QtCore.Qt.CursorShape.PointingHandCursor)
@@ -544,9 +508,9 @@ def prompt_conflict_qt(
row = QtWidgets.QHBoxLayout(self)
row.setContentsMargins(18, 14, 18, 14)
row.setSpacing(16)
icon = QtWidgets.QLabel(glyph)
icon.setObjectName("cardIcon")
icon.setFixedWidth(40)
icon = QtWidgets.QLabel()
icon.setPixmap(pixmap)
icon.setFixedSize(40, 40)
icon.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
row.addWidget(icon)
text_col = QtWidgets.QVBoxLayout()
@@ -573,8 +537,9 @@ def prompt_conflict_qt(
header = QtWidgets.QHBoxLayout()
header.setSpacing(12)
warning = QtWidgets.QLabel("!")
warning.setObjectName("warning")
warning = QtWidgets.QLabel()
warning.setPixmap(icons.svg_pixmap(icons.WARNING_BADGE_SVG, 32))
warning.setFixedSize(32, 32)
header.addWidget(warning)
title = QtWidgets.QLabel("CLOUD CONFLICT")
title.setObjectName("title")
@@ -593,8 +558,16 @@ def prompt_conflict_qt(
outer.addSpacing(6)
cloud_card = _Card("☁", "Cloud Save", f"Modified {remote_modified}")
local_card = _Card("▢", "Local Save", f"Modified {local_modified}")
cloud_card = _Card(
icons.svg_pixmap(icons.CLOUD_SVG, 32),
"Cloud Save",
f"Modified {remote_modified}",
)
local_card = _Card(
icons.svg_pixmap(icons.STORAGE_SVG, 32),
"Local Save",
f"Modified {local_modified}",
)
outer.addWidget(cloud_card)
outer.addWidget(local_card)