diff --git a/CHANGELOG.md b/CHANGELOG.md index e3827750..f9f73663 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ CHANGELOG for FlatCAM Evo beta ================================================= +19.06.2024 + +- fixed Issues #49. Path mismatch for SVG icons -> missing checkboxes fixed as suggested by Stefan Bruens, by adapting the paths in the stylesheets files (dark and light) + 31.03.2024 - added the ability to use no path optimization diff --git a/appGUI/themes/dark_style_sheet.py b/appGUI/themes/dark_style_sheet.py index fe1006fc..e9c511dc 100644 --- a/appGUI/themes/dark_style_sheet.py +++ b/appGUI/themes/dark_style_sheet.py @@ -39,28 +39,28 @@ QWidget:disabled { selection-color: rgba(105.000, 113.000, 119.000, 1.000); } QWidget { - backward-icon: url(${path}/themes/dark/svg/arrow_upward__icon-foreground__rotate-270.svg); - forward-icon: url(${path}/themes/dark/svg/arrow_upward__icon-foreground__rotate-90.svg); - leftarrow-icon: url(${path}/themes/dark/svg/arrow_upward__icon-foreground__rotate-270.svg); - rightarrow-icon: url(${path}/themes/dark/svg/arrow_upward__icon-foreground__rotate-90.svg); - dialog-ok-icon: url(${path}/themes/dark/svg/check__icon-foreground.svg); - dialog-cancel-icon: url(${path}/themes/dark/svg/close__icon-foreground.svg); - dialog-yes-icon: url(${path}/themes/dark/svg/check_circle__icon-foreground.svg); - dialog-no-icon: url(${path}/themes/dark/svg/cancel__icon-foreground.svg); - dialog-apply-icon: url(${path}/themes/dark/svg/check__icon-foreground.svg); - dialog-reset-icon: url(${path}/themes/dark/svg/restart_alt__icon-foreground.svg); - dialog-save-icon: url(${path}/themes/dark/svg/save__icon-foreground.svg); - dialog-discard-icon: url(${path}/themes/dark/svg/delete__icon-foreground.svg); - dialog-close-icon: url(${path}/themes/dark/svg/close__icon-foreground.svg); - dialog-open-icon: url(${path}/themes/dark/svg/folder_open__icon-foreground.svg); - dialog-help-icon: url(${path}/themes/dark/svg/help__icon-foreground.svg); - filedialog-parent-directory-icon: url(${path}/themes/dark/svg/arrow_upward__icon-foreground.svg); - filedialog-new-directory-icon: url(${path}/themes/dark/svg/create_new_folder__icon-foreground.svg); - titlebar-close-icon: url(${path}/themes/dark/svg/close__icon-foreground.svg); - titlebar-normal-icon: url(${path}/themes/dark/svg/flip_to_front__icon-foreground.svg); + backward-icon: url(${path}/dark/svg/arrow_upward__icon-foreground__rotate-270.svg); + forward-icon: url(${path}/dark/svg/arrow_upward__icon-foreground__rotate-90.svg); + leftarrow-icon: url(${path}/dark/svg/arrow_upward__icon-foreground__rotate-270.svg); + rightarrow-icon: url(${path}/dark/svg/arrow_upward__icon-foreground__rotate-90.svg); + dialog-ok-icon: url(${path}/dark/svg/check__icon-foreground.svg); + dialog-cancel-icon: url(${path}/dark/svg/close__icon-foreground.svg); + dialog-yes-icon: url(${path}/dark/svg/check_circle__icon-foreground.svg); + dialog-no-icon: url(${path}/dark/svg/cancel__icon-foreground.svg); + dialog-apply-icon: url(${path}/dark/svg/check__icon-foreground.svg); + dialog-reset-icon: url(${path}/dark/svg/restart_alt__icon-foreground.svg); + dialog-save-icon: url(${path}/dark/svg/save__icon-foreground.svg); + dialog-discard-icon: url(${path}/dark/svg/delete__icon-foreground.svg); + dialog-close-icon: url(${path}/dark/svg/close__icon-foreground.svg); + dialog-open-icon: url(${path}/dark/svg/folder_open__icon-foreground.svg); + dialog-help-icon: url(${path}/dark/svg/help__icon-foreground.svg); + filedialog-parent-directory-icon: url(${path}/dark/svg/arrow_upward__icon-foreground.svg); + filedialog-new-directory-icon: url(${path}/dark/svg/create_new_folder__icon-foreground.svg); + titlebar-close-icon: url(${path}/dark/svg/close__icon-foreground.svg); + titlebar-normal-icon: url(${path}/dark/svg/flip_to_front__icon-foreground.svg); } QCommandLinkButton { - qproperty-icon: url(${path}/themes/dark/svg/east__highlight.svg); + qproperty-icon: url(${path}/dark/svg/east__highlight.svg); } QMainWindow::separator { width: 2px; @@ -122,16 +122,16 @@ QRadioButton { spacing: 8px; } QRadioButton::indicator:unchecked { - image: url(${path}/themes/dark/svg/radio_button_unchecked__icon-foreground.svg); + image: url(${path}/dark/svg/radio_button_unchecked__icon-foreground.svg); } QRadioButton::indicator:unchecked:disabled { - image: url(${path}/themes/dark/svg/radio_button_unchecked__icon-foreground-disabled.svg); + image: url(${path}/dark/svg/radio_button_unchecked__icon-foreground-disabled.svg); } QRadioButton::indicator:checked { - image: url(${path}/themes/dark/svg/radio_button_checked__highlight.svg); + image: url(${path}/dark/svg/radio_button_checked__highlight.svg); } QRadioButton::indicator:checked:disabled { - image: url(${path}/themes/dark/svg/radio_button_checked__icon-foreground-disabled.svg); + image: url(${path}/dark/svg/radio_button_checked__icon-foreground-disabled.svg); } QGroupBox { font-weight: bold; @@ -175,11 +175,11 @@ QToolBar { } QToolBar::handle:horizontal { width: 10px; - image: url(${path}/themes/dark/svg/drag_indicator_horizontal__icon-foreground.svg); + image: url(${path}/dark/svg/drag_indicator_horizontal__icon-foreground.svg); } QToolBar::handle:vertical { height: 20px; - image: url(${path}/themes/dark/svg/drag_indicator_horizontal__icon-foreground__rotate-90.svg); + image: url(${path}/dark/svg/drag_indicator_horizontal__icon-foreground__rotate-90.svg); } QToolBar::separator { background-color: rgba(63.000, 64.000, 66.000, 1.000); @@ -207,10 +207,10 @@ QToolBar > QToolButton:checked { background-color: rgba(79.000, 80.000, 84.000, 1.000); } QToolBar > QToolButton#qt_toolbar_ext_button { - image: url(${path}/themes/dark/svg/double_arrow__icon-foreground.svg); + image: url(${path}/dark/svg/double_arrow__icon-foreground.svg); } QToolBar > QToolButton#qt_toolbar_ext_button:disabled { - image: url(${path}/themes/dark/svg/double_arrow__icon-foreground-disabled.svg); + image: url(${path}/dark/svg/double_arrow__icon-foreground-disabled.svg); } QMenu { background-color: rgba(41.000, 42.000, 45.000, 1.000); @@ -237,10 +237,10 @@ QMenu::right-arrow { padding-left: 12px; height: 20px; width: 20px; - image: url(${path}/themes/dark/svg/chevron_right__icon-foreground.svg); + image: url(${path}/dark/svg/chevron_right__icon-foreground.svg); } QMenu::right-arrow:disabled { - image: url(${path}/themes/dark/svg/chevron_right__icon-foreground-disabled.svg); + image: url(${path}/dark/svg/chevron_right__icon-foreground-disabled.svg); } QScrollBar { background-color: transparent; @@ -346,10 +346,10 @@ QToolButton::menu-indicator { width: 18px; top: 6px; left: 3px; - image: url(${path}/themes/dark/svg/expand_less__icon-foreground__rotate-180.svg); + image: url(${path}/dark/svg/expand_less__icon-foreground__rotate-180.svg); } QToolButton::menu-indicator:disabled { - image: url(${path}/themes/dark/svg/expand_less__icon-foreground-disabled__rotate-180.svg); + image: url(${path}/dark/svg/expand_less__icon-foreground-disabled__rotate-180.svg); } QToolButton::menu-arrow { height: 8px; @@ -377,10 +377,10 @@ QComboBox::drop-down { QComboBox::down-arrow { height: 23px; width: 23px; - image: url(${path}/themes/dark/svg/expand_less__icon-foreground__rotate-180.svg); + image: url(${path}/dark/svg/expand_less__icon-foreground__rotate-180.svg); } QComboBox::down-arrow:disabled { - image: url(${path}/themes/dark/svg/expand_less__icon-foreground-disabled__rotate-180.svg); + image: url(${path}/dark/svg/expand_less__icon-foreground-disabled__rotate-180.svg); } QComboBox::item:selected { border: none; @@ -443,13 +443,13 @@ QTabBar { qproperty-drawBase: 0; } QTabBar::close-button:selected { - image: url(${path}/themes/dark/svg/close__icon-foreground.svg); + image: url(${path}/dark/svg/close__icon-foreground.svg); } QTabBar::close-button:!selected { - image: url(${path}/themes/dark/svg/close__tabbar-button-inselected.svg) + image: url(${path}/dark/svg/close__tabbar-button-inselected.svg) } QTabBar::close-button:disabled { - image: url(${path}/themes/dark/svg/close__icon-foreground-disabled.svg); + image: url(${path}/dark/svg/close__icon-foreground-disabled.svg); } QTabBar::close-button:hover { background-color: rgba(85.000, 128.000, 173.000, 1.000); @@ -586,17 +586,17 @@ QSplitter::handle:hover { } QSplitter::handle:horizontal { width: 5px; - image: url(${path}/themes/dark/svg/horizontal_rule__icon-foreground__rotate-90.svg); + image: url(${path}/dark/svg/horizontal_rule__icon-foreground__rotate-90.svg); } QSplitter::handle:horizontal:disabled { - image: url(${path}/themes/dark/svg/horizontal_rule__icon-foreground-disabled__rotate-90.svg); + image: url(${path}/dark/svg/horizontal_rule__icon-foreground-disabled__rotate-90.svg); } QSplitter::handle:vertical { height: 5px; - image: url(${path}/themes/dark/svg/horizontal_rule__icon-foreground.svg); + image: url(${path}/dark/svg/horizontal_rule__icon-foreground.svg); } QSplitter::handle:vertical:disabled { - image: url(${path}/themes/dark/svg/horizontal_rule__icon-foreground-disabled.svg); + image: url(${path}/dark/svg/horizontal_rule__icon-foreground-disabled.svg); } QSplitterHandle::item:hover {} QAbstractScrollArea { @@ -664,13 +664,13 @@ QAbstractItemView QAbstractButton { margin: 1px; } QTreeView::branch { - border-image: url(${path}/themes/dark/svg/vertical_line__guides-stroke-inactive.svg) 0; + border-image: url(${path}/dark/svg/vertical_line__guides-stroke-inactive.svg) 0; } QTreeView::branch:active { - border-image: url(${path}/themes/dark/svg/vertical_line__icon-foreground.svg) 0; + border-image: url(${path}/dark/svg/vertical_line__icon-foreground.svg) 0; } QTreeView::branch:disabled { - border-image: url(${path}/themes/dark/svg/vertical_line__icon-foreground-disabled.svg) 0; + border-image: url(${path}/dark/svg/vertical_line__icon-foreground-disabled.svg) 0; } QTreeView::branch:has-siblings:adjoins-item, QTreeView::branch:!has-children:!has-siblings:adjoins-item { @@ -679,20 +679,20 @@ QTreeView::branch:!has-children:!has-siblings:adjoins-item { QTreeView::branch:has-children:!has-siblings:closed, QTreeView::branch:closed:has-children:has-siblings { border-image: none; - image: url(${path}/themes/dark/svg/chevron_right__icon-foreground.svg); + image: url(${path}/dark/svg/chevron_right__icon-foreground.svg); } QTreeView::branch:has-children:!has-siblings:closed:disabled, QTreeView::branch:closed:has-children:has-siblings:disabled { - image: url(${path}/themes/dark/svg/chevron_right__icon-foreground-disabled.svg); + image: url(${path}/dark/svg/chevron_right__icon-foreground-disabled.svg); } QTreeView::branch:open:has-children:!has-siblings, QTreeView::branch:open:has-children:has-siblings { border-image: none; - image: url(${path}/themes/dark/svg/expand_less__icon-foreground__rotate-180.svg); + image: url(${path}/dark/svg/expand_less__icon-foreground__rotate-180.svg); } QTreeView::branch:open:has-children:!has-siblings:disabled, QTreeView::branch:open:has-children:has-siblings:disabled { - image: url(${path}/themes/dark/svg/expand_less__icon-foreground-disabled__rotate-180.svg); + image: url(${path}/dark/svg/expand_less__icon-foreground-disabled__rotate-180.svg); } QTableView { gridline-color: rgba(88.000, 89.000, 92.000, 1.000); @@ -744,16 +744,16 @@ QHeaderView::section::only-one { margin: 0; } QHeaderView::down-arrow { - image: url(${path}/themes/dark/svg/expand_less__icon-foreground__rotate-180.svg); + image: url(${path}/dark/svg/expand_less__icon-foreground__rotate-180.svg); } QHeaderView::down-arrow:disabled { - image: url(${path}/themes/dark/svg/expand_less__icon-foreground-disabled__rotate-180.svg); + image: url(${path}/dark/svg/expand_less__icon-foreground-disabled__rotate-180.svg); } QHeaderView::up-arrow { - image: url(${path}/themes/dark/svg/expand_less__icon-foreground.svg); + image: url(${path}/dark/svg/expand_less__icon-foreground.svg); } QHeaderView::up-arrow:disabled { - image: url(${path}/themes/dark/svg/expand_less__icon-foreground-disabled.svg); + image: url(${path}/dark/svg/expand_less__icon-foreground-disabled.svg); } QHeaderView::down-arrow::horizontal, QHeaderView::up-arrow::horizontal { @@ -812,10 +812,10 @@ QAbstractSpinBox::up-button { QAbstractSpinBox::up-arrow { height: 23px; width: 23px; - image: url(${path}/themes/dark/svg/arrow_drop_up__icon-foreground.svg); + image: url(${path}/dark/svg/arrow_drop_up__icon-foreground.svg); } QAbstractSpinBox::up-arrow:disabled { - image: url(${path}/themes/dark/svg/arrow_drop_up__icon-foreground-disabled.svg); + image: url(${path}/dark/svg/arrow_drop_up__icon-foreground-disabled.svg); } QAbstractSpinBox::down-button { subcontrol-position: bottom right; @@ -824,20 +824,20 @@ QAbstractSpinBox::down-button { QAbstractSpinBox::down-arrow { height: 23px; width: 23px; - image: url(${path}/themes/dark/svg/arrow_drop_up__icon-foreground__rotate-180.svg); + image: url(${path}/dark/svg/arrow_drop_up__icon-foreground__rotate-180.svg); } QAbstractSpinBox::down-arrow:disabled { - image: url(${path}/themes/dark/svg/arrow_drop_up__icon-foreground-disabled__rotate-180.svg); + image: url(${path}/dark/svg/arrow_drop_up__icon-foreground-disabled__rotate-180.svg); } QDateTimeEdit::drop-down { subcontrol-position: center right; border: none; padding-right: 4px; width: 16px; - image: url(${path}/themes/dark/svg/calendar_today__icon-foreground.svg); + image: url(${path}/dark/svg/calendar_today__icon-foreground.svg); } QDateTimeEdit::drop-down:disabled { - image: url(${path}/themes/dark/svg/calendar_today__icon-foreground-disabled.svg); + image: url(${path}/dark/svg/calendar_today__icon-foreground-disabled.svg); } QDateTimeEdit::down-arrow[calendarPopup="true"] { image: none; @@ -865,7 +865,7 @@ QFontDialog QScrollBar:vertical { QComboBox::indicator:checked, QMenu::indicator:checked { width: 18px; - image: url(${path}/themes/dark/svg/check__icon-foreground.svg); + image: url(${path}/dark/svg/check__icon-foreground.svg); } QMenu::indicator { width: 18px; @@ -887,30 +887,30 @@ QAbstractItemView::indicator { QCheckBox::indicator:unchecked, QGroupBox::indicator:unchecked, QAbstractItemView::indicator:unchecked { - image: url(${path}/themes/dark/svg/check_box_outline_blank__icon-foreground.svg); + image: url(${path}/dark/svg/check_box_outline_blank__icon-foreground.svg); } QCheckBox::indicator:unchecked:disabled, QGroupBox::indicator:unchecked:disabled, QAbstractItemView::indicator:unchecked:disabled { - image: url(${path}/themes/dark/svg/check_box_outline_blank__icon-foreground-disabled.svg); + image: url(${path}/dark/svg/check_box_outline_blank__icon-foreground-disabled.svg); } QCheckBox::indicator:checked, QGroupBox::indicator:checked, QAbstractItemView::indicator:checked { - image: url(${path}/themes/dark/svg/check_box__highlight.svg); + image: url(${path}/dark/svg/check_box__highlight.svg); } QCheckBox::indicator:checked:disabled, QGroupBox::indicator:checked:disabled, QAbstractItemView::indicator:checked:disabled { - image: url(${path}/themes/dark/svg/check_box__icon-foreground-disabled.svg); + image: url(${path}/dark/svg/check_box__icon-foreground-disabled.svg); } QCheckBox::indicator:indeterminate, QAbstractItemView::indicator:indeterminate { - image: url(${path}/themes/dark/svg/indeterminate_check_box__highlight.svg); + image: url(${path}/dark/svg/indeterminate_check_box__highlight.svg); } QCheckBox::indicator:indeterminate:disabled, QAbstractItemView::indicator:indeterminate:disabled { - image: url(${path}/themes/dark/svg/indeterminate_check_box__icon-foreground-disabled.svg); + image: url(${path}/dark/svg/indeterminate_check_box__icon-foreground-disabled.svg); } QMenu { $env_patch{"version": "<6.0.0", "value": "border-radius: 8px"}; diff --git a/appGUI/themes/light_style_sheet.py b/appGUI/themes/light_style_sheet.py index b0e87a96..b1ba856d 100644 --- a/appGUI/themes/light_style_sheet.py +++ b/appGUI/themes/light_style_sheet.py @@ -23,28 +23,28 @@ QWidget:disabled { selection-color: #babdc2; } QWidget { - backward-icon: url(${path}/themes/light/svg/arrow_upward__icon-foreground__rotate-270.svg); - forward-icon: url(${path}/themes/light/svg/arrow_upward__icon-foreground__rotate-90.svg); - leftarrow-icon: url(${path}/themes/light/svg/arrow_upward__icon-foreground__rotate-270.svg); - rightarrow-icon: url(${path}/themes/light/svg/arrow_upward__icon-foreground__rotate-90.svg); - dialog-ok-icon: url(${path}/themes/light/svg/check__icon-foreground.svg); - dialog-cancel-icon: url(${path}/themes/light/svg/close__icon-foreground.svg); - dialog-yes-icon: url(${path}/themes/light/svg/check_circle__icon-foreground.svg); - dialog-no-icon: url(${path}/themes/light/svg/cancel__icon-foreground.svg); - dialog-apply-icon: url(${path}/themes/light/svg/check__icon-foreground.svg); - dialog-reset-icon: url(${path}/themes/light/svg/restart_alt__icon-foreground.svg); - dialog-save-icon: url(${path}/themes/light/svg/save__icon-foreground.svg); - dialog-discard-icon: url(${path}/themes/light/svg/delete__icon-foreground.svg); - dialog-close-icon: url(${path}/themes/light/svg/close__icon-foreground.svg); - dialog-open-icon: url(${path}/themes/light/svg/folder_open__icon-foreground.svg); - dialog-help-icon: url(${path}/themes/light/svg/help__icon-foreground.svg); - filedialog-parent-directory-icon: url(${path}/themes/light/svg/arrow_upward__icon-foreground.svg); - filedialog-new-directory-icon: url(${path}/themes/light/svg/create_new_folder__icon-foreground.svg); - titlebar-close-icon: url(${path}/themes/light/svg/close__icon-foreground.svg); - titlebar-normal-icon: url(${path}/themes/light/svg/flip_to_front__icon-foreground.svg); + backward-icon: url(${path}/light/svg/arrow_upward__icon-foreground__rotate-270.svg); + forward-icon: url(${path}/light/svg/arrow_upward__icon-foreground__rotate-90.svg); + leftarrow-icon: url(${path}/light/svg/arrow_upward__icon-foreground__rotate-270.svg); + rightarrow-icon: url(${path}/light/svg/arrow_upward__icon-foreground__rotate-90.svg); + dialog-ok-icon: url(${path}/light/svg/check__icon-foreground.svg); + dialog-cancel-icon: url(${path}/light/svg/close__icon-foreground.svg); + dialog-yes-icon: url(${path}/light/svg/check_circle__icon-foreground.svg); + dialog-no-icon: url(${path}/light/svg/cancel__icon-foreground.svg); + dialog-apply-icon: url(${path}/light/svg/check__icon-foreground.svg); + dialog-reset-icon: url(${path}/light/svg/restart_alt__icon-foreground.svg); + dialog-save-icon: url(${path}/light/svg/save__icon-foreground.svg); + dialog-discard-icon: url(${path}/light/svg/delete__icon-foreground.svg); + dialog-close-icon: url(${path}/light/svg/close__icon-foreground.svg); + dialog-open-icon: url(${path}/light/svg/folder_open__icon-foreground.svg); + dialog-help-icon: url(${path}/light/svg/help__icon-foreground.svg); + filedialog-parent-directory-icon: url(${path}/light/svg/arrow_upward__icon-foreground.svg); + filedialog-new-directory-icon: url(${path}/light/svg/create_new_folder__icon-foreground.svg); + titlebar-close-icon: url(${path}/light/svg/close__icon-foreground.svg); + titlebar-normal-icon: url(${path}/light/svg/flip_to_front__icon-foreground.svg); } QCommandLinkButton { - qproperty-icon: url(${path}/themes/light/svg/east__highlight.svg); + qproperty-icon: url(${path}/light/svg/east__highlight.svg); } QMainWindow::separator { width: 2px; @@ -148,11 +148,11 @@ QToolBar { } QToolBar::handle:horizontal { width: 10px; - image: url(${path}/themes/light/svg/drag_indicator_horizontal__icon-foreground.svg); + image: url(${path}/light/svg/drag_indicator_horizontal__icon-foreground.svg); } QToolBar::handle:vertical { height: 20px; - image: url(${path}/themes/light/svg/drag_indicator_horizontal__icon-foreground__rotate-90.svg); + image: url(${path}/light/svg/drag_indicator_horizontal__icon-foreground__rotate-90.svg); } QToolBar::separator { background: #dadce0; @@ -182,11 +182,11 @@ QToolBar > QToolButton:checked { background: #c4c4c4; } QToolBar > QToolButton#qt_toolbar_ext_button { - image: url(${path}/themes/light/svg/double_arrow__icon-foreground.svg); + image: url(${path}/light/svg/double_arrow__icon-foreground.svg); $env_patch{"os": "Windows", "value": "padding: 0; qproperty-icon: unset"}; } QToolBar > QToolButton#qt_toolbar_ext_button:disabled { - image: url(${path}/themes/light/svg/double_arrow__icon-foreground-disabled.svg); + image: url(${path}/light/svg/double_arrow__icon-foreground-disabled.svg); } QToolBar > QWidget { background: transparent; @@ -217,10 +217,10 @@ QMenu::right-arrow { padding-left: 12px; height: 20px; width: 20px; - image: url(${path}/themes/light/svg/chevron_right__icon-foreground.svg); + image: url(${path}/light/svg/chevron_right__icon-foreground.svg); } QMenu::right-arrow:disabled { - image: url(${path}/themes/light/svg/chevron_right__icon-foreground-disabled.svg); + image: url(${path}/light/svg/chevron_right__icon-foreground-disabled.svg); } QScrollBar { background: #edeff2; @@ -291,40 +291,40 @@ QScrollBar::add-line:horizontal { subcontrol-position: right; } QScrollBar::up-arrow { - image: url(${path}/themes/light/svg/arrow_drop_up__scrollbar-handle.svg); + image: url(${path}/light/svg/arrow_drop_up__scrollbar-handle.svg); } QScrollBar::right-arrow { - image: url(${path}/themes/light/svg/arrow_drop_up__scrollbar-handle__rotate-90.svg); + image: url(${path}/light/svg/arrow_drop_up__scrollbar-handle__rotate-90.svg); } QScrollBar::down-arrow { - image: url(${path}/themes/light/svg/arrow_drop_up__scrollbar-handle__rotate-180.svg); + image: url(${path}/light/svg/arrow_drop_up__scrollbar-handle__rotate-180.svg); } QScrollBar::left-arrow { - image: url(${path}/themes/light/svg/arrow_drop_up__scrollbar-handle__rotate-270.svg); + image: url(${path}/light/svg/arrow_drop_up__scrollbar-handle__rotate-270.svg); } QScrollBar::up-arrow:hover { - image: url(${path}/themes/light/svg/arrow_drop_up__scrollbar-handle-pressed.svg); + image: url(${path}/light/svg/arrow_drop_up__scrollbar-handle-pressed.svg); } QScrollBar::right-arrow:hover { - image: url(${path}/themes/light/svg/arrow_drop_up__scrollbar-handle-pressed__rotate-90.svg); + image: url(${path}/light/svg/arrow_drop_up__scrollbar-handle-pressed__rotate-90.svg); } QScrollBar::down-arrow:hover { - image: url(${path}/themes/light/svg/arrow_drop_up__scrollbar-handle-pressed__rotate-180.svg); + image: url(${path}/light/svg/arrow_drop_up__scrollbar-handle-pressed__rotate-180.svg); } QScrollBar::left-arrow:hover { - image: url(${path}/themes/light/svg/arrow_drop_up__scrollbar-handle-pressed__rotate-270.svg); + image: url(${path}/light/svg/arrow_drop_up__scrollbar-handle-pressed__rotate-270.svg); } QScrollBar::up-arrow:disabled { - image: url(${path}/themes/light/svg/arrow_drop_up__scrollbar-disabled.svg); + image: url(${path}/light/svg/arrow_drop_up__scrollbar-disabled.svg); } QScrollBar::right-arrow:disabled { - image: url(${path}/themes/light/svg/arrow_drop_up__scrollbar-disabled__rotate-90.svg); + image: url(${path}/light/svg/arrow_drop_up__scrollbar-disabled__rotate-90.svg); } QScrollBar::down-arrow:disabled { - image: url(${path}/themes/light/svg/arrow_drop_up__scrollbar-disabled__rotate-180.svg); + image: url(${path}/light/svg/arrow_drop_up__scrollbar-disabled__rotate-180.svg); } QScrollBar::left-arrow:disabled { - image: url(${path}/themes/light/svg/arrow_drop_up__scrollbar-disabled__rotate-270.svg); + image: url(${path}/light/svg/arrow_drop_up__scrollbar-disabled__rotate-270.svg); } QProgressBar { border: 1px solid #dadce0; @@ -410,10 +410,10 @@ QToolButton::menu-indicator { width: 18px; top: 6px; left: 3px; - image: url(${path}/themes/light/svg/expand_less__icon-foreground__rotate-180.svg); + image: url(${path}/light/svg/expand_less__icon-foreground__rotate-180.svg); } QToolButton::menu-indicator:disabled { - image: url(${path}/themes/light/svg/expand_less__icon-foreground-disabled__rotate-180.svg); + image: url(${path}/light/svg/expand_less__icon-foreground-disabled__rotate-180.svg); } QToolButton::menu-arrow { image: unset; @@ -424,10 +424,10 @@ QToolButton::menu-button { width: 17px; border-top-right-radius: $radius{4px}; border-bottom-right-radius: $radius{4px}; - image: url(${path}/themes/light/svg/expand_less__icon-foreground__rotate-180.svg); + image: url(${path}/light/svg/expand_less__icon-foreground__rotate-180.svg); } QToolButton::menu-button:disabled { - image: url(${path}/themes/light/svg/expand_less__icon-foreground-disabled__rotate-180.svg); + image: url(${path}/light/svg/expand_less__icon-foreground-disabled__rotate-180.svg); } QToolButton[ $env_patch{"version": "<6.0.0", "qt": "PySide2", "value": "popupMode=MenuButtonPopup"} @@ -455,10 +455,10 @@ QComboBox::drop-down { padding-right: 4px; } QComboBox::down-arrow { - image: url(${path}/themes/light/svg/expand_less__icon-foreground__rotate-180.svg); + image: url(${path}/light/svg/expand_less__icon-foreground__rotate-180.svg); } QComboBox::down-arrow:disabled { - image: url(${path}/themes/light/svg/expand_less__icon-foreground-disabled__rotate-180.svg); + image: url(${path}/light/svg/expand_less__icon-foreground-disabled__rotate-180.svg); } QComboBox::item:selected { border: none; @@ -528,13 +528,13 @@ QTabBar { qproperty-drawBase: 0; } QTabBar::close-button:selected { - image: url(${path}/themes/light/svg/close__icon-foreground.svg); + image: url(${path}/light/svg/close__icon-foreground.svg); } QTabBar::close-button:!selected { - image: url(${path}/themes/light/svg/close__tabbar-button-inselected.svg) + image: url(${path}/light/svg/close__tabbar-button-inselected.svg) } QTabBar::close-button:disabled { - image: url(${path}/themes/light/svg/close__icon-foreground-disabled.svg); + image: url(${path}/light/svg/close__icon-foreground-disabled.svg); } QTabBar::close-button:hover { background: #93b2ef; @@ -780,13 +780,13 @@ QAbstractItemView QAbstractButton { margin: 0px; } QTreeView::branch { - border-image: url(${path}/themes/light/svg/vertical_line__guides-stroke-inactive.svg) 0; + border-image: url(${path}/light/svg/vertical_line__guides-stroke-inactive.svg) 0; } QTreeView::branch:active { - border-image: url(${path}/themes/light/svg/vertical_line__icon-foreground.svg) 0; + border-image: url(${path}/light/svg/vertical_line__icon-foreground.svg) 0; } QTreeView::branch:disabled { - border-image: url(${path}/themes/light/svg/vertical_line__icon-foreground-disabled.svg) 0; + border-image: url(${path}/light/svg/vertical_line__icon-foreground-disabled.svg) 0; } QTreeView::branch:has-siblings:adjoins-item, QTreeView::branch:!has-children:!has-siblings:adjoins-item { @@ -795,20 +795,20 @@ QTreeView::branch:!has-children:!has-siblings:adjoins-item { QTreeView::branch:has-children:!has-siblings:closed, QTreeView::branch:closed:has-children:has-siblings { border-image: unset; - image: url(${path}/themes/light/svg/chevron_right__icon-foreground.svg); + image: url(${path}/light/svg/chevron_right__icon-foreground.svg); } QTreeView::branch:has-children:!has-siblings:closed:disabled, QTreeView::branch:closed:has-children:has-siblings:disabled { - image: url(${path}/themes/light/svg/chevron_right__icon-foreground-disabled.svg); + image: url(${path}/light/svg/chevron_right__icon-foreground-disabled.svg); } QTreeView::branch:open:has-children:!has-siblings, QTreeView::branch:open:has-children:has-siblings { border-image: unset; - image: url(${path}/themes/light/svg/expand_less__icon-foreground__rotate-180.svg); + image: url(${path}/light/svg/expand_less__icon-foreground__rotate-180.svg); } QTreeView::branch:open:has-children:!has-siblings:disabled, QTreeView::branch:open:has-children:has-siblings:disabled { - image: url(${path}/themes/light/svg/expand_less__icon-foreground-disabled__rotate-180.svg); + image: url(${path}/light/svg/expand_less__icon-foreground-disabled__rotate-180.svg); } QTableView { gridline-color: #58595c; @@ -860,17 +860,17 @@ QHeaderView::section:only-one { } QHeaderView::down-arrow { margin: -2px -6px -6px -6px; - image: url(${path}/themes/light/svg/expand_less__icon-foreground__rotate-180.svg); + image: url(${path}/light/svg/expand_less__icon-foreground__rotate-180.svg); } QHeaderView::down-arrow:disabled { - image: url(${path}/themes/light/svg/expand_less__icon-foreground-disabled__rotate-180.svg); + image: url(${path}/light/svg/expand_less__icon-foreground-disabled__rotate-180.svg); } QHeaderView::up-arrow { margin: -2px -6px -6px -6px; - image: url(${path}/themes/light/svg/expand_less__icon-foreground.svg); + image: url(${path}/light/svg/expand_less__icon-foreground.svg); } QHeaderView::up-arrow:disabled { - image: url(${path}/themes/light/svg/expand_less__icon-foreground-disabled.svg); + image: url(${path}/light/svg/expand_less__icon-foreground-disabled.svg); } QCalendarWidget { border: none; @@ -909,10 +909,10 @@ QCalendarWidget > QTableView { border-top-right-radius: $radius{0}; } QCalendarWidget > .QWidget > QToolButton#qt_calendar_prevmonth { - qproperty-icon: url(${path}/themes/light/svg/arrow_upward__icon-foreground__rotate-270.svg); + qproperty-icon: url(${path}/light/svg/arrow_upward__icon-foreground__rotate-270.svg); } QCalendarWidget > .QWidget > QToolButton#qt_calendar_nextmonth { - qproperty-icon: url(${path}/themes/light/svg/arrow_upward__icon-foreground__rotate-90.svg); + qproperty-icon: url(${path}/light/svg/arrow_upward__icon-foreground__rotate-90.svg); } QLineEdit, QAbstractSpinBox { @@ -943,28 +943,28 @@ QAbstractSpinBox::up-button { margin: 3px 3px 1px 1px; } QAbstractSpinBox::up-arrow { - image: url(${path}/themes/light/svg/arrow_drop_up__icon-foreground.svg); + image: url(${path}/light/svg/arrow_drop_up__icon-foreground.svg); } QAbstractSpinBox::up-arrow:disabled { - image: url(${path}/themes/light/svg/arrow_drop_up__icon-foreground-disabled.svg); + image: url(${path}/light/svg/arrow_drop_up__icon-foreground-disabled.svg); } QAbstractSpinBox::down-button { subcontrol-position: bottom right; margin: 1px 3px 3px 1px; } QAbstractSpinBox::down-arrow { - image: url(${path}/themes/light/svg/arrow_drop_up__icon-foreground__rotate-180.svg); + image: url(${path}/light/svg/arrow_drop_up__icon-foreground__rotate-180.svg); } QAbstractSpinBox::down-arrow:disabled { - image: url(${path}/themes/light/svg/arrow_drop_up__icon-foreground-disabled__rotate-180.svg); + image: url(${path}/light/svg/arrow_drop_up__icon-foreground-disabled__rotate-180.svg); } QDateTimeEdit::drop-down { padding-right: 4px; width: 16px; - image: url(${path}/themes/light/svg/calendar_today__icon-foreground.svg); + image: url(${path}/light/svg/calendar_today__icon-foreground.svg); } QDateTimeEdit::drop-down:disabled { - image: url(${path}/themes/light/svg/calendar_today__icon-foreground-disabled.svg); + image: url(${path}/light/svg/calendar_today__icon-foreground-disabled.svg); } QDateTimeEdit::down-arrow[calendarPopup=true] { image: none; @@ -989,7 +989,7 @@ QFontDialog QScrollBar:vertical { QComboBox::indicator:checked, QMenu::indicator:checked { width: 18px; - image: url(${path}/themes/light/svg/check__icon-foreground.svg); + image: url(${path}/light/svg/check__icon-foreground.svg); } QMenu::indicator { width: 18px; @@ -1015,42 +1015,42 @@ QRadioButton::indicator { QCheckBox::indicator, QGroupBox::indicator, QAbstractItemView::indicator { - image: url(${path}/themes/light/svg/check_box_outline_blank__icon-foreground.svg); + image: url(${path}/light/svg/check_box_outline_blank__icon-foreground.svg); } QCheckBox::indicator:unchecked:disabled, QGroupBox::indicator:unchecked:disabled, QAbstractItemView::indicator:unchecked:disabled { - image: url(${path}/themes/light/svg/check_box_outline_blank__icon-foreground-disabled.svg); + image: url(${path}/light/svg/check_box_outline_blank__icon-foreground-disabled.svg); } QCheckBox::indicator:checked, QGroupBox::indicator:checked, QAbstractItemView::indicator:checked { - image: url(${path}/themes/light/svg/check_box__highlight.svg); + image: url(${path}/light/svg/check_box__highlight.svg); } QCheckBox::indicator:checked:disabled, QGroupBox::indicator:checked:disabled, QAbstractItemView::indicator:checked:disabled { - image: url(${path}/themes/light/svg/check_box__icon-foreground-disabled.svg); + image: url(${path}/light/svg/check_box__icon-foreground-disabled.svg); } QCheckBox::indicator:indeterminate, QAbstractItemView::indicator:indeterminate { - image: url(${path}/themes/light/svg/indeterminate_check_box__highlight.svg); + image: url(${path}/light/svg/indeterminate_check_box__highlight.svg); } QCheckBox::indicator:indeterminate:disabled, QAbstractItemView::indicator:indeterminate:disabled { - image: url(${path}/themes/light/svg/indeterminate_check_box__icon-foreground-disabled.svg); + image: url(${path}/light/svg/indeterminate_check_box__icon-foreground-disabled.svg); } QRadioButton::indicator:unchecked { - image: url(${path}/themes/light/svg/radio_button_unchecked__icon-foreground.svg); + image: url(${path}/light/svg/radio_button_unchecked__icon-foreground.svg); } QRadioButton::indicator:unchecked:disabled { - image: url(${path}/themes/light/svg/radio_button_unchecked__icon-foreground-disabled.svg); + image: url(${path}/light/svg/radio_button_unchecked__icon-foreground-disabled.svg); } QRadioButton::indicator:checked { - image: url(${path}/themes/light/svg/radio_button_checked__highlight.svg); + image: url(${path}/light/svg/radio_button_checked__highlight.svg); } QRadioButton::indicator:checked:disabled { - image: url(${path}/themes/light/svg/radio_button_checked__icon-foreground-disabled.svg); + image: url(${path}/light/svg/radio_button_checked__icon-foreground-disabled.svg); } QComboBox QAbstractItemView, QStatusBar > QMenu, diff --git a/appMain.py b/appMain.py index 3d8942de..47880ffb 100644 --- a/appMain.py +++ b/appMain.py @@ -10,7 +10,7 @@ from PyQt6 import QtGui, QtWidgets from PyQt6.QtCore import QSettings, pyqtSlot from PyQt6.QtCore import Qt, pyqtSignal, QMetaObject -from PyQt6.QtGui import QAction, QTextCursor +from PyQt6.QtGui import QAction import os.path import sys @@ -63,7 +63,7 @@ from appGUI.PlotCanvasLegacy import PlotCanvasLegacy from appGUI.PlotCanvas3d import PlotCanvas3d from appGUI.MainGUI import MainGUI from appGUI.VisPyVisuals import ShapeCollection -from appGUI.GUIElements import FCMessageBox, FCInputSpinner, FCButton, DialogBoxRadio, Dialog_box, FCTree, \ +from appGUI.GUIElements import FCMessageBox, FCInputSpinner, FCButton, DialogBoxRadio, FCTree, \ FCInputDoubleSpinner, FCFileSaveDialog, message_dialog, AppSystemTray, FCInputDialogSlider, \ GLay, FCLabel, DialogBoxChoice, VerticalScrollArea from appGUI.themes import dark_style_sheet, light_style_sheet