From 73036f38e14c0ca511918abf640bf0db6a60d4fb Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 21 Feb 2025 23:07:22 -0500 Subject: [PATCH] Move theme icons to separate folders --- .../branch_closed.png} | Bin .../branch_end.png} | Bin .../branch_more.png} | Bin .../branch_open.png} | Bin .../checkbox_checked.png} | Bin .../checkbox_checked@2x.png} | Bin .../checkbox_checked_disabled.png} | Bin .../checkbox_checked_disabled@2x.png} | Bin .../checkbox_unchecked.png} | Bin .../checkbox_unchecked@2x.png} | Bin .../checkbox_unchecked_disabled.png} | Bin .../checkbox_unchecked_disabled@2x.png} | Bin .../branch_closed.png} | Bin .../branch_end.png} | Bin .../branch_more.png} | Bin .../branch_open.png} | Bin .../checkbox_checked.png} | Bin .../checkbox_checked@2x.png} | Bin .../checkbox_checked_disabled.png} | Bin .../checkbox_checked_disabled@2x.png} | Bin .../checkbox_unchecked.png} | Bin .../checkbox_unchecked@2x.png} | Bin .../checkbox_unchecked_disabled.png} | Bin .../checkbox_unchecked_disabled@2x.png} | Bin resources/icons/ui/midnight_vline.png | Bin 124 -> 0 bytes resources/images.qrc | 48 +++++++++--------- resources/themes/dark.qss | 36 ++++++------- resources/themes/midnight.qss | 36 ++++++------- 28 files changed, 60 insertions(+), 60 deletions(-) rename resources/icons/ui/{dark_branch_closed.png => dark/branch_closed.png} (100%) rename resources/icons/ui/{dark_branch_end.png => dark/branch_end.png} (100%) rename resources/icons/ui/{dark_branch_more.png => dark/branch_more.png} (100%) rename resources/icons/ui/{dark_branch_open.png => dark/branch_open.png} (100%) rename resources/icons/ui/{dark_checkbox_checked.png => dark/checkbox_checked.png} (100%) rename resources/icons/ui/{dark_checkbox_checked@2x.png => dark/checkbox_checked@2x.png} (100%) rename resources/icons/ui/{dark_checkbox_checked_disabled.png => dark/checkbox_checked_disabled.png} (100%) rename resources/icons/ui/{dark_checkbox_checked_disabled@2x.png => dark/checkbox_checked_disabled@2x.png} (100%) rename resources/icons/ui/{dark_checkbox_unchecked.png => dark/checkbox_unchecked.png} (100%) rename resources/icons/ui/{dark_checkbox_unchecked@2x.png => dark/checkbox_unchecked@2x.png} (100%) rename resources/icons/ui/{dark_checkbox_unchecked_disabled.png => dark/checkbox_unchecked_disabled.png} (100%) rename resources/icons/ui/{dark_checkbox_unchecked_disabled@2x.png => dark/checkbox_unchecked_disabled@2x.png} (100%) rename resources/icons/ui/{midnight_branch_closed.png => midnight/branch_closed.png} (100%) rename resources/icons/ui/{midnight_branch_end.png => midnight/branch_end.png} (100%) rename resources/icons/ui/{midnight_branch_more.png => midnight/branch_more.png} (100%) rename resources/icons/ui/{midnight_branch_open.png => midnight/branch_open.png} (100%) rename resources/icons/ui/{midnight_checkbox_checked.png => midnight/checkbox_checked.png} (100%) rename resources/icons/ui/{midnight_checkbox_checked@2x.png => midnight/checkbox_checked@2x.png} (100%) rename resources/icons/ui/{midnight_checkbox_checked_disabled.png => midnight/checkbox_checked_disabled.png} (100%) rename resources/icons/ui/{midnight_checkbox_checked_disabled@2x.png => midnight/checkbox_checked_disabled@2x.png} (100%) rename resources/icons/ui/{midnight_checkbox_unchecked.png => midnight/checkbox_unchecked.png} (100%) rename resources/icons/ui/{midnight_checkbox_unchecked@2x.png => midnight/checkbox_unchecked@2x.png} (100%) rename resources/icons/ui/{midnight_checkbox_unchecked_disabled.png => midnight/checkbox_unchecked_disabled.png} (100%) rename resources/icons/ui/{midnight_checkbox_unchecked_disabled@2x.png => midnight/checkbox_unchecked_disabled@2x.png} (100%) delete mode 100644 resources/icons/ui/midnight_vline.png diff --git a/resources/icons/ui/dark_branch_closed.png b/resources/icons/ui/dark/branch_closed.png similarity index 100% rename from resources/icons/ui/dark_branch_closed.png rename to resources/icons/ui/dark/branch_closed.png diff --git a/resources/icons/ui/dark_branch_end.png b/resources/icons/ui/dark/branch_end.png similarity index 100% rename from resources/icons/ui/dark_branch_end.png rename to resources/icons/ui/dark/branch_end.png diff --git a/resources/icons/ui/dark_branch_more.png b/resources/icons/ui/dark/branch_more.png similarity index 100% rename from resources/icons/ui/dark_branch_more.png rename to resources/icons/ui/dark/branch_more.png diff --git a/resources/icons/ui/dark_branch_open.png b/resources/icons/ui/dark/branch_open.png similarity index 100% rename from resources/icons/ui/dark_branch_open.png rename to resources/icons/ui/dark/branch_open.png diff --git a/resources/icons/ui/dark_checkbox_checked.png b/resources/icons/ui/dark/checkbox_checked.png similarity index 100% rename from resources/icons/ui/dark_checkbox_checked.png rename to resources/icons/ui/dark/checkbox_checked.png diff --git a/resources/icons/ui/dark_checkbox_checked@2x.png b/resources/icons/ui/dark/checkbox_checked@2x.png similarity index 100% rename from resources/icons/ui/dark_checkbox_checked@2x.png rename to resources/icons/ui/dark/checkbox_checked@2x.png diff --git a/resources/icons/ui/dark_checkbox_checked_disabled.png b/resources/icons/ui/dark/checkbox_checked_disabled.png similarity index 100% rename from resources/icons/ui/dark_checkbox_checked_disabled.png rename to resources/icons/ui/dark/checkbox_checked_disabled.png diff --git a/resources/icons/ui/dark_checkbox_checked_disabled@2x.png b/resources/icons/ui/dark/checkbox_checked_disabled@2x.png similarity index 100% rename from resources/icons/ui/dark_checkbox_checked_disabled@2x.png rename to resources/icons/ui/dark/checkbox_checked_disabled@2x.png diff --git a/resources/icons/ui/dark_checkbox_unchecked.png b/resources/icons/ui/dark/checkbox_unchecked.png similarity index 100% rename from resources/icons/ui/dark_checkbox_unchecked.png rename to resources/icons/ui/dark/checkbox_unchecked.png diff --git a/resources/icons/ui/dark_checkbox_unchecked@2x.png b/resources/icons/ui/dark/checkbox_unchecked@2x.png similarity index 100% rename from resources/icons/ui/dark_checkbox_unchecked@2x.png rename to resources/icons/ui/dark/checkbox_unchecked@2x.png diff --git a/resources/icons/ui/dark_checkbox_unchecked_disabled.png b/resources/icons/ui/dark/checkbox_unchecked_disabled.png similarity index 100% rename from resources/icons/ui/dark_checkbox_unchecked_disabled.png rename to resources/icons/ui/dark/checkbox_unchecked_disabled.png diff --git a/resources/icons/ui/dark_checkbox_unchecked_disabled@2x.png b/resources/icons/ui/dark/checkbox_unchecked_disabled@2x.png similarity index 100% rename from resources/icons/ui/dark_checkbox_unchecked_disabled@2x.png rename to resources/icons/ui/dark/checkbox_unchecked_disabled@2x.png diff --git a/resources/icons/ui/midnight_branch_closed.png b/resources/icons/ui/midnight/branch_closed.png similarity index 100% rename from resources/icons/ui/midnight_branch_closed.png rename to resources/icons/ui/midnight/branch_closed.png diff --git a/resources/icons/ui/midnight_branch_end.png b/resources/icons/ui/midnight/branch_end.png similarity index 100% rename from resources/icons/ui/midnight_branch_end.png rename to resources/icons/ui/midnight/branch_end.png diff --git a/resources/icons/ui/midnight_branch_more.png b/resources/icons/ui/midnight/branch_more.png similarity index 100% rename from resources/icons/ui/midnight_branch_more.png rename to resources/icons/ui/midnight/branch_more.png diff --git a/resources/icons/ui/midnight_branch_open.png b/resources/icons/ui/midnight/branch_open.png similarity index 100% rename from resources/icons/ui/midnight_branch_open.png rename to resources/icons/ui/midnight/branch_open.png diff --git a/resources/icons/ui/midnight_checkbox_checked.png b/resources/icons/ui/midnight/checkbox_checked.png similarity index 100% rename from resources/icons/ui/midnight_checkbox_checked.png rename to resources/icons/ui/midnight/checkbox_checked.png diff --git a/resources/icons/ui/midnight_checkbox_checked@2x.png b/resources/icons/ui/midnight/checkbox_checked@2x.png similarity index 100% rename from resources/icons/ui/midnight_checkbox_checked@2x.png rename to resources/icons/ui/midnight/checkbox_checked@2x.png diff --git a/resources/icons/ui/midnight_checkbox_checked_disabled.png b/resources/icons/ui/midnight/checkbox_checked_disabled.png similarity index 100% rename from resources/icons/ui/midnight_checkbox_checked_disabled.png rename to resources/icons/ui/midnight/checkbox_checked_disabled.png diff --git a/resources/icons/ui/midnight_checkbox_checked_disabled@2x.png b/resources/icons/ui/midnight/checkbox_checked_disabled@2x.png similarity index 100% rename from resources/icons/ui/midnight_checkbox_checked_disabled@2x.png rename to resources/icons/ui/midnight/checkbox_checked_disabled@2x.png diff --git a/resources/icons/ui/midnight_checkbox_unchecked.png b/resources/icons/ui/midnight/checkbox_unchecked.png similarity index 100% rename from resources/icons/ui/midnight_checkbox_unchecked.png rename to resources/icons/ui/midnight/checkbox_unchecked.png diff --git a/resources/icons/ui/midnight_checkbox_unchecked@2x.png b/resources/icons/ui/midnight/checkbox_unchecked@2x.png similarity index 100% rename from resources/icons/ui/midnight_checkbox_unchecked@2x.png rename to resources/icons/ui/midnight/checkbox_unchecked@2x.png diff --git a/resources/icons/ui/midnight_checkbox_unchecked_disabled.png b/resources/icons/ui/midnight/checkbox_unchecked_disabled.png similarity index 100% rename from resources/icons/ui/midnight_checkbox_unchecked_disabled.png rename to resources/icons/ui/midnight/checkbox_unchecked_disabled.png diff --git a/resources/icons/ui/midnight_checkbox_unchecked_disabled@2x.png b/resources/icons/ui/midnight/checkbox_unchecked_disabled@2x.png similarity index 100% rename from resources/icons/ui/midnight_checkbox_unchecked_disabled@2x.png rename to resources/icons/ui/midnight/checkbox_unchecked_disabled@2x.png diff --git a/resources/icons/ui/midnight_vline.png b/resources/icons/ui/midnight_vline.png deleted file mode 100644 index 8f0c336fd8c07b851766be334a0b3ab2744afaff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 124 zcmeAS@N?(olHy`uVBq!ia0vp^fk14<#0(_2UW&B=Qak}ZA+G=b|4$C{g`lg;Rdj*k zEG0pH!3;H4#wCm%2Z4NPPZ!4!3;*PV2F7y|Y&r=cB@k%Q#l#>uQ|xhh=&~H3G6qjq KKbLh*2~7Z6Micons/viewsprites.ico icons/application_form_edit.ico icons/connections.ico - icons/ui/dark_checkbox_checked_disabled.png - icons/ui/dark_checkbox_checked_disabled@2x.png - icons/ui/dark_checkbox_checked.png - icons/ui/dark_checkbox_checked@2x.png - icons/ui/dark_checkbox_unchecked_disabled.png - icons/ui/dark_checkbox_unchecked_disabled@2x.png - icons/ui/dark_checkbox_unchecked.png - icons/ui/dark_checkbox_unchecked@2x.png - icons/ui/dark_branch_closed.png - icons/ui/dark_branch_open.png - icons/ui/dark_branch_end.png - icons/ui/dark_branch_more.png - icons/ui/midnight_checkbox_checked_disabled.png - icons/ui/midnight_checkbox_checked_disabled@2x.png - icons/ui/midnight_checkbox_checked.png - icons/ui/midnight_checkbox_checked@2x.png - icons/ui/midnight_checkbox_unchecked_disabled.png - icons/ui/midnight_checkbox_unchecked_disabled@2x.png - icons/ui/midnight_checkbox_unchecked.png - icons/ui/midnight_checkbox_unchecked@2x.png - icons/ui/midnight_branch_closed.png - icons/ui/midnight_branch_open.png - icons/ui/midnight_branch_end.png - icons/ui/midnight_branch_more.png + icons/ui/dark/checkbox_checked_disabled.png + icons/ui/dark/checkbox_checked_disabled@2x.png + icons/ui/dark/checkbox_checked.png + icons/ui/dark/checkbox_checked@2x.png + icons/ui/dark/checkbox_unchecked_disabled.png + icons/ui/dark/checkbox_unchecked_disabled@2x.png + icons/ui/dark/checkbox_unchecked.png + icons/ui/dark/checkbox_unchecked@2x.png + icons/ui/dark/branch_closed.png + icons/ui/dark/branch_open.png + icons/ui/dark/branch_end.png + icons/ui/dark/branch_more.png + icons/ui/midnight/checkbox_checked_disabled.png + icons/ui/midnight/checkbox_checked_disabled@2x.png + icons/ui/midnight/checkbox_checked.png + icons/ui/midnight/checkbox_checked@2x.png + icons/ui/midnight/checkbox_unchecked_disabled.png + icons/ui/midnight/checkbox_unchecked_disabled@2x.png + icons/ui/midnight/checkbox_unchecked.png + icons/ui/midnight/checkbox_unchecked@2x.png + icons/ui/midnight/branch_closed.png + icons/ui/midnight/branch_open.png + icons/ui/midnight/branch_end.png + icons/ui/midnight/branch_more.png images/blank_tileset.png images/collisions.png images/collisions_unknown.png diff --git a/resources/themes/dark.qss b/resources/themes/dark.qss index e02d2a45..cf240867 100644 --- a/resources/themes/dark.qss +++ b/resources/themes/dark.qss @@ -100,39 +100,39 @@ QMenu::indicator { } QMenu::indicator { - image: url(":/icons/ui/dark_checkbox_unchecked.png"); + image: url(":/icons/ui/dark/checkbox_unchecked.png"); } QMenu::indicator:non-exclusive:unchecked { - image: url(":/icons/ui/dark_checkbox_unchecked.png"); + image: url(":/icons/ui/dark/checkbox_unchecked.png"); } QMenu::indicator:non-exclusive:unchecked:selected { - image: url(":/icons/ui/dark_checkbox_unchecked.png"); + image: url(":/icons/ui/dark/checkbox_unchecked.png"); } QMenu::indicator:non-exclusive:checked { - image: url(":/icons/ui/dark_checkbox_checked.png"); + image: url(":/icons/ui/dark/checkbox_checked.png"); } QMenu::indicator:non-exclusive:checked:selected { - image: url(":/icons/ui/dark_checkbox_checked.png"); + image: url(":/icons/ui/dark/checkbox_checked.png"); } QMenu::indicator:exclusive:unchecked { - image: url(":/icons/ui/dark_checkbox_unchecked.png"); + image: url(":/icons/ui/dark/checkbox_unchecked.png"); } QMenu::indicator:exclusive:unchecked:selected { - image: url(":/icons/ui/dark_checkbox_unchecked.png"); + image: url(":/icons/ui/dark/checkbox_unchecked.png"); } QMenu::indicator:exclusive:checked { - image: url(":/icons/ui/dark_checkbox_checked.png"); + image: url(":/icons/ui/dark/checkbox_checked.png"); } QMenu::indicator:exclusive:checked:selected { - image: url(":/icons/ui/dark_checkbox_checked.png"); + image: url(":/icons/ui/dark/checkbox_checked.png"); } @@ -204,7 +204,7 @@ QCheckBox::indicator { } QRadioButton::indicator::unchecked, QCheckBox::indicator::unchecked { - image: url(:/icons/ui/dark_checkbox_unchecked.png) + image: url(:/icons/ui/dark/checkbox_unchecked.png) } QRadioButton::indicator:unchecked:hover, QCheckBox::indicator:unchecked:hover { @@ -212,11 +212,11 @@ QRadioButton::indicator:unchecked:hover, QCheckBox::indicator:unchecked:hover { } QCheckBox::indicator:unchecked:disabled { - image: url(":/icons/ui/dark_checkbox_unchecked_disabled.png"); + image: url(":/icons/ui/dark/checkbox_unchecked_disabled.png"); } QRadioButton::indicator::checked, QCheckBox::indicator::checked { - image: url(":/icons/ui/dark_checkbox_checked.png"); + image: url(":/icons/ui/dark/checkbox_checked.png"); } QRadioButton::indicator:checked:hover, QCheckBox::indicator:checked:hover { @@ -224,7 +224,7 @@ QRadioButton::indicator:checked:hover, QCheckBox::indicator:checked:hover { } QCheckBox::indicator:checked:disabled { - image: url(":/icons/ui/dark_checkbox_checked_disabled.png"); + image: url(":/icons/ui/dark/checkbox_checked_disabled.png"); } /* Map List View */ @@ -247,27 +247,27 @@ QTreeView::branch { } QTreeView::branch:has-siblings:!adjoins-item { - border-image: url(:/icons/ui/dark_vline.png) 0; + border-image: url(:/icons/ui/dark/vline.png) 0; } QTreeView::branch:has-siblings:adjoins-item { - border-image: url(:/icons/ui/dark_branch_more.png) 0; + border-image: url(:/icons/ui/dark/branch_more.png) 0; } QTreeView::branch:!has-children:!has-siblings:adjoins-item { - border-image: url(:/icons/ui/dark_branch_end.png) 0; + border-image: url(:/icons/ui/dark/branch_end.png) 0; } QTreeView::branch:has-children:!has-siblings:closed, QTreeView::branch:closed:has-children:has-siblings { border-image: none; - image: url(:/icons/ui/dark_branch_closed.png); + image: url(:/icons/ui/dark/branch_closed.png); } QTreeView::branch:open:has-children:!has-siblings, QTreeView::branch:open:has-children:has-siblings { border-image: none; - image: url(:/icons/ui/dark_branch_open.png); + image: url(:/icons/ui/dark/branch_open.png); } /* Scroll Bar */ diff --git a/resources/themes/midnight.qss b/resources/themes/midnight.qss index a8587e59..6b9e6bfa 100644 --- a/resources/themes/midnight.qss +++ b/resources/themes/midnight.qss @@ -102,39 +102,39 @@ QMenu::indicator { } QMenu::indicator { - image: url(":/icons/ui/midnight_checkbox_unchecked.png"); + image: url(":/icons/ui/midnight/checkbox_unchecked.png"); } QMenu::indicator:non-exclusive:unchecked { - image: url(":/icons/ui/midnight_checkbox_unchecked.png"); + image: url(":/icons/ui/midnight/checkbox_unchecked.png"); } QMenu::indicator:non-exclusive:unchecked:selected { - image: url(":/icons/ui/midnight_checkbox_unchecked.png"); + image: url(":/icons/ui/midnight/checkbox_unchecked.png"); } QMenu::indicator:non-exclusive:checked { - image: url(":/icons/ui/midnight_checkbox_checked.png"); + image: url(":/icons/ui/midnight/checkbox_checked.png"); } QMenu::indicator:non-exclusive:checked:selected { - image: url(":/icons/ui/midnight_checkbox_checked.png"); + image: url(":/icons/ui/midnight/checkbox_checked.png"); } QMenu::indicator:exclusive:unchecked { - image: url(":/icons/ui/midnight_checkbox_unchecked.png"); + image: url(":/icons/ui/midnight/checkbox_unchecked.png"); } QMenu::indicator:exclusive:unchecked:selected { - image: url(":/icons/ui/midnight_checkbox_unchecked.png"); + image: url(":/icons/ui/midnight/checkbox_unchecked.png"); } QMenu::indicator:exclusive:checked { - image: url(":/icons/ui/midnight_checkbox_checked.png"); + image: url(":/icons/ui/midnight/checkbox_checked.png"); } QMenu::indicator:exclusive:checked:selected { - image: url(":/icons/ui/midnight_checkbox_checked.png"); + image: url(":/icons/ui/midnight/checkbox_checked.png"); } /* Combo Boxes */ @@ -203,7 +203,7 @@ QCheckBox::indicator { } QRadioButton::indicator::unchecked, QCheckBox::indicator::unchecked { - image: url(:/icons/ui/midnight_checkbox_unchecked.png) + image: url(:/icons/ui/midnight/checkbox_unchecked.png) } QRadioButton::indicator:unchecked:hover, QCheckBox::indicator:unchecked:hover { @@ -211,11 +211,11 @@ QRadioButton::indicator:unchecked:hover, QCheckBox::indicator:unchecked:hover { } QCheckBox::indicator:unchecked:disabled { - image: url(":/icons/ui/midnight_checkbox_unchecked_disabled.png"); + image: url(":/icons/ui/midnight/checkbox_unchecked_disabled.png"); } QRadioButton::indicator::checked, QCheckBox::indicator::checked { - image: url(":/icons/ui/midnight_checkbox_checked.png"); + image: url(":/icons/ui/midnight/checkbox_checked.png"); } QRadioButton::indicator:checked:hover, QCheckBox::indicator:checked:hover { @@ -223,7 +223,7 @@ QRadioButton::indicator:checked:hover, QCheckBox::indicator:checked:hover { } QCheckBox::indicator:checked:disabled { - image: url(":/icons/ui/midnight_checkbox_checked_disabled.png"); + image: url(":/icons/ui/midnight/checkbox_checked_disabled.png"); } /* Map List View */ @@ -246,27 +246,27 @@ QTreeView::branch { } QTreeView::branch:has-siblings:!adjoins-item { - border-image: url(:/icons/ui/midnight_vline.png) 0; + border-image: url(:/icons/ui/midnight/vline.png) 0; } QTreeView::branch:has-siblings:adjoins-item { - border-image: url(:/icons/ui/midnight_branch_more.png) 0; + border-image: url(:/icons/ui/midnight/branch_more.png) 0; } QTreeView::branch:!has-children:!has-siblings:adjoins-item { - border-image: url(:/icons/ui/midnight_branch_end.png) 0; + border-image: url(:/icons/ui/midnight/branch_end.png) 0; } QTreeView::branch:has-children:!has-siblings:closed, QTreeView::branch:closed:has-children:has-siblings { border-image: none; - image: url(:/icons/ui/midnight_branch_closed.png); + image: url(:/icons/ui/midnight/branch_closed.png); } QTreeView::branch:open:has-children:!has-siblings, QTreeView::branch:open:has-children:has-siblings { border-image: none; - image: url(:/icons/ui/midnight_branch_open.png); + image: url(:/icons/ui/midnight/branch_open.png); } /* Scroll Bar */