Skip to content

Commit eddb71c

Browse files
committed
Replaces icon references with themed reference to enable icon set changes defined for light & dark
1 parent c0cb3f1 commit eddb71c

File tree

102 files changed

+647
-476
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+647
-476
lines changed

QLog.pro

+1-1
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ FORMS += \
365365
RESOURCES += \
366366
i18n/i18n.qrc \
367367
res/flags/flags.qrc \
368-
res/icons/icons.qrc \
368+
res/icons.qrc \
369369
res/res.qrc
370370

371371
OTHER_FILES += \

core/main.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -531,6 +531,8 @@ int main(int argc, char* argv[])
531531

532532
splash.showMessage(QObject::tr("Starting Application"), Qt::AlignBottom|Qt::AlignCenter);
533533

534+
QIcon::setThemeName("light");
535+
534536
startRigThread();
535537
startRotThread();
536538
startCWKeyerThread();

models/LogbookModel.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ QVariant LogbookModel::data(const QModelIndex &index, int role) const
3737
{
3838
QVariant value = QSqlTableModel::data(index, Qt::DisplayRole);
3939
if (value.toString() == "Y") {
40-
return QIcon(":/icons/done-24px.svg");
40+
return QIcon::fromTheme("done");
4141
}
4242
// else {
4343
// return QIcon(":/icons/close-24px.svg");

res/icons.qrc

+64
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
<RCC>
2+
<qresource prefix="/">
3+
<file>icons/light/svg/alert.svg</file>
4+
<file>icons/light/svg/baseline-play_arrow.svg</file>
5+
<file>icons/light/svg/baseline-play_back.svg</file>
6+
<file>icons/light/svg/baseline-play_down.svg</file>
7+
<file>icons/light/svg/baseline-play_up.svg</file>
8+
<file>icons/light/svg/baseline-search.svg</file>
9+
<file>icons/light/svg/baseline-stop.svg</file>
10+
<file>icons/light/svg/clear-button.svg</file>
11+
<file>icons/light/svg/close.svg</file>
12+
<file>icons/light/svg/cloud_download.svg</file>
13+
<file>icons/light/svg/cloud_upload.svg</file>
14+
<file>icons/light/svg/connect.svg</file>
15+
<file>icons/light/svg/disconnect.svg</file>
16+
<file>icons/light/svg/done.svg</file>
17+
<file>icons/light/svg/filter_list.svg</file>
18+
<file>icons/light/svg/light-dark.svg</file>
19+
<file>icons/light/svg/menu.svg</file>
20+
<file>icons/light/svg/new-window.svg</file>
21+
<file>icons/light/svg/password.svg</file>
22+
<file>icons/light/svg/search-globe_green.svg</file>
23+
<file>icons/light/svg/search-globe_orange.svg</file>
24+
<file>icons/light/svg/search-globe_red.svg</file>
25+
<file>icons/light/svg/search-globe.svg</file>
26+
<file>icons/light/svg/zoom_in.svg</file>
27+
<file>icons/light/svg/zoom_out.svg</file>
28+
<file>icons/light/index.theme</file>
29+
<file>icons/light/svg/alert-active.svg</file>
30+
<file>icons/light/svg/arrow-undo.svg</file>
31+
<file>icons/light/svg/download.svg</file>
32+
<file>icons/light/svg/cancel.svg</file>
33+
<file>icons/dark/svg/alert-active.svg</file>
34+
<file>icons/dark/svg/zoom_out.svg</file>
35+
<file>icons/dark/svg/done.svg</file>
36+
<file>icons/dark/svg/download.svg</file>
37+
<file>icons/dark/svg/filter_list.svg</file>
38+
<file>icons/dark/svg/light-dark.svg</file>
39+
<file>icons/dark/svg/menu.svg</file>
40+
<file>icons/dark/svg/new-window.svg</file>
41+
<file>icons/dark/svg/password.svg</file>
42+
<file>icons/dark/svg/search-globe_green.svg</file>
43+
<file>icons/dark/svg/search-globe_orange.svg</file>
44+
<file>icons/dark/svg/search-globe_red.svg</file>
45+
<file>icons/dark/svg/search-globe.svg</file>
46+
<file>icons/dark/svg/zoom_in.svg</file>
47+
<file>icons/dark/svg/alert.svg</file>
48+
<file>icons/dark/svg/arrow-undo.svg</file>
49+
<file>icons/dark/svg/baseline-play_arrow.svg</file>
50+
<file>icons/dark/svg/baseline-play_back.svg</file>
51+
<file>icons/dark/svg/baseline-play_down.svg</file>
52+
<file>icons/dark/svg/baseline-play_up.svg</file>
53+
<file>icons/dark/svg/baseline-search.svg</file>
54+
<file>icons/dark/svg/baseline-stop.svg</file>
55+
<file>icons/dark/svg/cancel.svg</file>
56+
<file>icons/dark/svg/clear-button.svg</file>
57+
<file>icons/dark/svg/close.svg</file>
58+
<file>icons/dark/svg/cloud_download.svg</file>
59+
<file>icons/dark/svg/cloud_upload.svg</file>
60+
<file>icons/dark/svg/connect.svg</file>
61+
<file>icons/dark/svg/disconnect.svg</file>
62+
<file>icons/dark/index.theme</file>
63+
</qresource>
64+
</RCC>

res/icons/alert.svg

-1
This file was deleted.

res/icons/baseline-pause-24px.svg

-1
This file was deleted.

res/icons/baseline-play_arrow-24px.svg

-1
This file was deleted.

res/icons/baseline-play_back-24px.svg

-1
This file was deleted.

res/icons/baseline-play_down-24px.svg

-2
This file was deleted.

res/icons/baseline-play_up-24px.svg

-1
This file was deleted.

res/icons/baseline-search-24px.svg

-1
This file was deleted.

res/icons/cancel-24px.svg

-1
This file was deleted.

res/icons/check_circle-24px.svg

-1
This file was deleted.

res/icons/clear-button.svg

-3
This file was deleted.

res/icons/close-24px.svg

-1
This file was deleted.

res/icons/cloud_download-24px.svg

-1
This file was deleted.

res/icons/cloud_upload-24px.svg

-1
This file was deleted.

res/icons/dark/index.theme

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
[Icon Theme]
2+
Name=dark
3+
Comment=dark theme icons
4+
5+
#PanelDefault=22
6+
#PanelSizes=22
7+
8+
#https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html
9+
10+
Directories=svg
11+
12+
[svg]
13+
Size=24
14+
Context=Applications
15+
MinSize=16
16+
MaxSize=512
17+
Type=Scalable

res/icons/dark/svg/alert-active.svg

+3
Loading

res/icons/dark/svg/alert.svg

+3
Loading

res/icons/dark/svg/arrow-undo.svg

+1
Loading
Loading
Loading
Loading
+1
Loading
+3
Loading

res/icons/dark/svg/cancel.svg

+1
Loading

res/icons/dark/svg/clear-button.svg

+3
Loading

res/icons/dark/svg/close.svg

+1
Loading

res/icons/dark/svg/cloud_download.svg

+1
Loading

res/icons/dark/svg/cloud_upload.svg

+1
Loading

res/icons/dark/svg/download.svg

+1
Loading

res/icons/dark/svg/filter_list.svg

+1
Loading

res/icons/dark/svg/light-dark.svg

+1
Loading

res/icons/dark/svg/menu.svg

+1
Loading

res/icons/dark/svg/password.svg

+3
Loading

res/icons/dark/svg/search-globe.svg

+10
Loading

0 commit comments

Comments
 (0)