Skip to content

Commit 7deb8c3

Browse files
CopilotRello
Copilot
and
Rello
committed
feat: implement build-time switch for neutral state icons
Co-authored-by: Rello <13385119+Rello@users.noreply.github.com>
1 parent 92e42c6 commit 7deb8c3

File tree

9 files changed

+51
-37
lines changed

9 files changed

+51
-37
lines changed

‎src/gui/CMakeLists.txt‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ IF(BUILD_UPDATER)
1818
add_subdirectory(updater)
1919
endif()
2020

21+
# Branding switch (Qt 6 only; default OFF)
22+
option(IS_BRANDED_CLIENT "If ON, use neutral (unbranded) state icons" OFF)
23+
set(STATE_SUBDIR "colored/")
24+
if(IS_BRANDED_CLIENT)
25+
set(STATE_SUBDIR "neutral/")
26+
endif()
27+
2128
configure_file(${CMAKE_SOURCE_DIR}/theme.qrc.in ${CMAKE_SOURCE_DIR}/theme.qrc)
2229
set(theme_dir ${CMAKE_SOURCE_DIR}/theme)
2330

@@ -435,7 +442,7 @@ if(NOT DEFINED APPLICATION_FOLDER_ICON_INDEX)
435442
set(APPLICATION_FOLDER_ICON_INDEX 0)
436443
endif()
437444

438-
set(STATE_ICONS_COLORS colored black white)
445+
set(STATE_ICONS_COLORS colored black white neutral)
439446

440447
foreach(state_icons_color ${STATE_ICONS_COLORS})
441448
set(STATE_ICONS_PATH "${theme_dir}/${state_icons_color}/")

‎theme.qrc.in‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@
99
<file alias="theme/colored/@APPLICATION_ICON_NAME@-icon-256.png">theme/colored/256-@APPLICATION_ICON_NAME@-icon.png</file>
1010
<file alias="theme/colored/@APPLICATION_ICON_NAME@-icon-512.png">theme/colored/512-@APPLICATION_ICON_NAME@-icon.png</file>
1111
<file alias="theme/colored/@APPLICATION_ICON_NAME@-icon-1024.png">theme/colored/1024-@APPLICATION_ICON_NAME@-icon.png</file>
12-
<file>theme/colored/state-error-32.png</file>
13-
<file>theme/colored/state-error-64.png</file>
14-
<file>theme/colored/state-error-128.png</file>
15-
<file>theme/colored/state-error-256.png</file>
16-
<file>theme/colored/state-ok-32.png</file>
17-
<file>theme/colored/state-ok-64.png</file>
18-
<file>theme/colored/state-ok-128.png</file>
19-
<file>theme/colored/state-ok-256.png</file>
20-
<file>theme/colored/state-pause-32.png</file>
21-
<file>theme/colored/state-pause-64.png</file>
22-
<file>theme/colored/state-pause-128.png</file>
23-
<file>theme/colored/state-pause-256.png</file>
24-
<file>theme/colored/state-sync-32.png</file>
25-
<file>theme/colored/state-sync-64.png</file>
26-
<file>theme/colored/state-sync-128.png</file>
27-
<file>theme/colored/state-sync-256.png</file>
12+
<file>theme/@STATE_SUBDIR@state-error-32.png</file>
13+
<file>theme/@STATE_SUBDIR@state-error-64.png</file>
14+
<file>theme/@STATE_SUBDIR@state-error-128.png</file>
15+
<file>theme/@STATE_SUBDIR@state-error-256.png</file>
16+
<file>theme/@STATE_SUBDIR@state-ok-32.png</file>
17+
<file>theme/@STATE_SUBDIR@state-ok-64.png</file>
18+
<file>theme/@STATE_SUBDIR@state-ok-128.png</file>
19+
<file>theme/@STATE_SUBDIR@state-ok-256.png</file>
20+
<file>theme/@STATE_SUBDIR@state-pause-32.png</file>
21+
<file>theme/@STATE_SUBDIR@state-pause-64.png</file>
22+
<file>theme/@STATE_SUBDIR@state-pause-128.png</file>
23+
<file>theme/@STATE_SUBDIR@state-pause-256.png</file>
24+
<file>theme/@STATE_SUBDIR@state-sync-32.png</file>
25+
<file>theme/@STATE_SUBDIR@state-sync-64.png</file>
26+
<file>theme/@STATE_SUBDIR@state-sync-128.png</file>
27+
<file>theme/@STATE_SUBDIR@state-sync-256.png</file>
2828
<file>theme/colored/wizard_logo.png</file>
2929
<file>theme/colored/wizard_logo@2x.png</file>
3030
<file>theme/colored/wizard_logo.svg</file>
@@ -65,26 +65,26 @@
6565
<file>theme/black/state-sync-64.png</file>
6666
<file>theme/black/state-sync-128.png</file>
6767
<file>theme/black/state-sync-256.png</file>
68-
<file>theme/colored/state-error.svg</file>
69-
<file>theme/colored/state-error-16.png</file>
70-
<file>theme/colored/state-offline.svg</file>
71-
<file>theme/colored/state-offline-16.png</file>
72-
<file>theme/colored/state-offline-32.png</file>
73-
<file>theme/colored/state-offline-64.png</file>
74-
<file>theme/colored/state-offline-128.png</file>
75-
<file>theme/colored/state-offline-256.png</file>
76-
<file>theme/colored/state-ok.svg</file>
77-
<file>theme/colored/state-ok-16.png</file>
78-
<file>theme/colored/state-pause.svg</file>
79-
<file>theme/colored/state-pause-16.png</file>
80-
<file>theme/colored/state-sync.svg</file>
81-
<file>theme/colored/state-sync-16.png</file>
82-
<file>theme/colored/state-warning.svg</file>
83-
<file>theme/colored/state-warning-16.png</file>
84-
<file>theme/colored/state-warning-32.png</file>
85-
<file>theme/colored/state-warning-64.png</file>
86-
<file>theme/colored/state-warning-128.png</file>
87-
<file>theme/colored/state-warning-256.png</file>
68+
<file>theme/@STATE_SUBDIR@state-error.svg</file>
69+
<file>theme/@STATE_SUBDIR@state-error-16.png</file>
70+
<file>theme/@STATE_SUBDIR@state-offline.svg</file>
71+
<file>theme/@STATE_SUBDIR@state-offline-16.png</file>
72+
<file>theme/@STATE_SUBDIR@state-offline-32.png</file>
73+
<file>theme/@STATE_SUBDIR@state-offline-64.png</file>
74+
<file>theme/@STATE_SUBDIR@state-offline-128.png</file>
75+
<file>theme/@STATE_SUBDIR@state-offline-256.png</file>
76+
<file>theme/@STATE_SUBDIR@state-ok.svg</file>
77+
<file>theme/@STATE_SUBDIR@state-ok-16.png</file>
78+
<file>theme/@STATE_SUBDIR@state-pause.svg</file>
79+
<file>theme/@STATE_SUBDIR@state-pause-16.png</file>
80+
<file>theme/@STATE_SUBDIR@state-sync.svg</file>
81+
<file>theme/@STATE_SUBDIR@state-sync-16.png</file>
82+
<file>theme/@STATE_SUBDIR@state-warning.svg</file>
83+
<file>theme/@STATE_SUBDIR@state-warning-16.png</file>
84+
<file>theme/@STATE_SUBDIR@state-warning-32.png</file>
85+
<file>theme/@STATE_SUBDIR@state-warning-64.png</file>
86+
<file>theme/@STATE_SUBDIR@state-warning-128.png</file>
87+
<file>theme/@STATE_SUBDIR@state-warning-256.png</file>
8888
<file>theme/black/folder.png</file>
8989
<file>theme/black/folder.svg</file>
9090
<file>theme/black/folder-group.svg</file>

‎theme/neutral/state-error.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎theme/neutral/state-info.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎theme/neutral/state-offline.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎theme/neutral/state-ok.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎theme/neutral/state-pause.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎theme/neutral/state-sync.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎theme/neutral/state-warning.svg‎

Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)