From 67633631b04c40db0affaadcdcf68068ed4357f7 Mon Sep 17 00:00:00 2001 From: "Felix (xq) Queißner" Date: Mon, 22 Jun 2020 20:27:50 +0200 Subject: Introduces light and dark icon themes. --- src/browsertab.ui | 32 ++++------ src/certificatemanagementdialog.ui | 27 +++----- src/icons.qrc | 92 +++++++++++++++++++-------- src/icons/arrow-left.svg | 1 - src/icons/arrow-right.svg | 1 - src/icons/certificate.svg | 1 - src/icons/close.svg | 1 - src/icons/common/certificate-off.svg | 1 + src/icons/common/certificate-on.svg | 14 ++++ src/icons/common/favourite-off.svg | 1 + src/icons/common/favourite-on.svg | 4 ++ src/icons/common/qt.svg | 67 +++++++++++++++++++ src/icons/content-save-import.svg | 9 --- src/icons/content-save-move.svg | 1 - src/icons/content-save.svg | 1 - src/icons/dark/actions/close.svg | 1 + src/icons/dark/actions/create-new.svg | 1 + src/icons/dark/actions/delete-alert.svg | 1 + src/icons/dark/actions/navigate-back.svg | 1 + src/icons/dark/actions/navigate-forward.svg | 1 + src/icons/dark/actions/pause.svg | 1 + src/icons/dark/actions/play.svg | 1 + src/icons/dark/actions/refresh.svg | 1 + src/icons/dark/actions/save-export.svg | 1 + src/icons/dark/actions/save-import.svg | 9 +++ src/icons/dark/actions/save.svg | 1 + src/icons/dark/index.theme | 21 ++++++ src/icons/dark/objects/bookmarks.svg | 1 + src/icons/dark/objects/certificate.svg | 1 + src/icons/dark/objects/changelog.svg | 1 + src/icons/dark/objects/folder.svg | 1 + src/icons/dark/objects/font.svg | 1 + src/icons/dark/objects/help.svg | 1 + src/icons/dark/objects/history.svg | 1 + src/icons/dark/objects/home.svg | 1 + src/icons/dark/objects/info.svg | 1 + src/icons/dark/objects/menu.svg | 1 + src/icons/dark/objects/palette.svg | 1 + src/icons/dark/objects/settings.svg | 1 + src/icons/dark/objects/table-of-contents.svg | 1 + src/icons/dark/objects/volume-off.svg | 1 + src/icons/dark/objects/volume-on.svg | 1 + src/icons/delete-alert.svg | 1 - src/icons/folder-open.svg | 1 - src/icons/format-font.svg | 1 - src/icons/heart-outline.svg | 1 - src/icons/heart.svg | 1 - src/icons/help-box.svg | 1 - src/icons/home.svg | 1 - src/icons/info.svg | 1 - src/icons/light/actions/close.svg | 1 + src/icons/light/actions/create-new.svg | 1 + src/icons/light/actions/delete-alert.svg | 1 + src/icons/light/actions/navigate-back.svg | 1 + src/icons/light/actions/navigate-forward.svg | 1 + src/icons/light/actions/pause.svg | 1 + src/icons/light/actions/play.svg | 1 + src/icons/light/actions/refresh.svg | 1 + src/icons/light/actions/save-export.svg | 1 + src/icons/light/actions/save-import.svg | 9 +++ src/icons/light/actions/save.svg | 1 + src/icons/light/index.theme | 21 ++++++ src/icons/light/objects/bookmarks.svg | 1 + src/icons/light/objects/certificate.svg | 1 + src/icons/light/objects/changelog.svg | 1 + src/icons/light/objects/folder.svg | 1 + src/icons/light/objects/font.svg | 1 + src/icons/light/objects/help.svg | 1 + src/icons/light/objects/history.svg | 1 + src/icons/light/objects/home.svg | 1 + src/icons/light/objects/info.svg | 1 + src/icons/light/objects/menu.svg | 1 + src/icons/light/objects/palette.svg | 1 + src/icons/light/objects/settings.svg | 1 + src/icons/light/objects/table-of-contents.svg | 1 + src/icons/light/objects/volume-off.svg | 1 + src/icons/light/objects/volume-on.svg | 1 + src/icons/menu.svg | 1 - src/icons/palette.svg | 1 - src/icons/pause.svg | 1 - src/icons/play.svg | 1 - src/icons/plus.svg | 1 - src/icons/refresh.svg | 1 - src/icons/settings.svg | 1 - src/icons/shield-lock.svg | 1 - src/icons/shield-outline.svg | 1 - src/icons/update-themes.sh | 10 +++ src/icons/volume-high.svg | 1 - src/icons/volume-off.svg | 1 - src/identitycollection.cpp | 4 +- src/mainwindow.cpp | 1 + src/mainwindow.hpp | 19 +++--- src/mainwindow.ui | 51 ++++++++------- src/mediaplayer.cpp | 6 +- src/mediaplayer.hpp | 1 + src/mediaplayer.ui | 11 +--- src/settingsdialog.ui | 83 ++++++++---------------- 97 files changed, 373 insertions(+), 195 deletions(-) delete mode 100644 src/icons/arrow-left.svg delete mode 100644 src/icons/arrow-right.svg delete mode 100644 src/icons/certificate.svg delete mode 100644 src/icons/close.svg create mode 100644 src/icons/common/certificate-off.svg create mode 100644 src/icons/common/certificate-on.svg create mode 100644 src/icons/common/favourite-off.svg create mode 100644 src/icons/common/favourite-on.svg create mode 100644 src/icons/common/qt.svg delete mode 100644 src/icons/content-save-import.svg delete mode 100644 src/icons/content-save-move.svg delete mode 100644 src/icons/content-save.svg create mode 100644 src/icons/dark/actions/close.svg create mode 100644 src/icons/dark/actions/create-new.svg create mode 100644 src/icons/dark/actions/delete-alert.svg create mode 100644 src/icons/dark/actions/navigate-back.svg create mode 100644 src/icons/dark/actions/navigate-forward.svg create mode 100644 src/icons/dark/actions/pause.svg create mode 100644 src/icons/dark/actions/play.svg create mode 100644 src/icons/dark/actions/refresh.svg create mode 100644 src/icons/dark/actions/save-export.svg create mode 100644 src/icons/dark/actions/save-import.svg create mode 100644 src/icons/dark/actions/save.svg create mode 100644 src/icons/dark/index.theme create mode 100644 src/icons/dark/objects/bookmarks.svg create mode 100644 src/icons/dark/objects/certificate.svg create mode 100644 src/icons/dark/objects/changelog.svg create mode 100644 src/icons/dark/objects/folder.svg create mode 100644 src/icons/dark/objects/font.svg create mode 100644 src/icons/dark/objects/help.svg create mode 100644 src/icons/dark/objects/history.svg create mode 100644 src/icons/dark/objects/home.svg create mode 100644 src/icons/dark/objects/info.svg create mode 100644 src/icons/dark/objects/menu.svg create mode 100644 src/icons/dark/objects/palette.svg create mode 100644 src/icons/dark/objects/settings.svg create mode 100644 src/icons/dark/objects/table-of-contents.svg create mode 100644 src/icons/dark/objects/volume-off.svg create mode 100644 src/icons/dark/objects/volume-on.svg delete mode 100644 src/icons/delete-alert.svg delete mode 100644 src/icons/folder-open.svg delete mode 100644 src/icons/format-font.svg delete mode 100644 src/icons/heart-outline.svg delete mode 100644 src/icons/heart.svg delete mode 100644 src/icons/help-box.svg delete mode 100644 src/icons/home.svg delete mode 100644 src/icons/info.svg create mode 100644 src/icons/light/actions/close.svg create mode 100644 src/icons/light/actions/create-new.svg create mode 100644 src/icons/light/actions/delete-alert.svg create mode 100644 src/icons/light/actions/navigate-back.svg create mode 100644 src/icons/light/actions/navigate-forward.svg create mode 100644 src/icons/light/actions/pause.svg create mode 100644 src/icons/light/actions/play.svg create mode 100644 src/icons/light/actions/refresh.svg create mode 100644 src/icons/light/actions/save-export.svg create mode 100644 src/icons/light/actions/save-import.svg create mode 100644 src/icons/light/actions/save.svg create mode 100644 src/icons/light/index.theme create mode 100644 src/icons/light/objects/bookmarks.svg create mode 100644 src/icons/light/objects/certificate.svg create mode 100644 src/icons/light/objects/changelog.svg create mode 100644 src/icons/light/objects/folder.svg create mode 100644 src/icons/light/objects/font.svg create mode 100644 src/icons/light/objects/help.svg create mode 100644 src/icons/light/objects/history.svg create mode 100644 src/icons/light/objects/home.svg create mode 100644 src/icons/light/objects/info.svg create mode 100644 src/icons/light/objects/menu.svg create mode 100644 src/icons/light/objects/palette.svg create mode 100644 src/icons/light/objects/settings.svg create mode 100644 src/icons/light/objects/table-of-contents.svg create mode 100644 src/icons/light/objects/volume-off.svg create mode 100644 src/icons/light/objects/volume-on.svg delete mode 100644 src/icons/menu.svg delete mode 100644 src/icons/palette.svg delete mode 100644 src/icons/pause.svg delete mode 100644 src/icons/play.svg delete mode 100644 src/icons/plus.svg delete mode 100644 src/icons/refresh.svg delete mode 100644 src/icons/settings.svg delete mode 100644 src/icons/shield-lock.svg delete mode 100644 src/icons/shield-outline.svg create mode 100755 src/icons/update-themes.sh delete mode 100644 src/icons/volume-high.svg delete mode 100644 src/icons/volume-off.svg (limited to 'src') diff --git a/src/browsertab.ui b/src/browsertab.ui index c7c7354..63bd9ec 100644 --- a/src/browsertab.ui +++ b/src/browsertab.ui @@ -40,11 +40,10 @@ Navigate back - + Back - - :/icons/arrow-left.svg:/icons/arrow-left.svg + @@ -57,11 +56,10 @@ Navigate forward - ... + Forward - - :/icons/arrow-right.svg:/icons/arrow-right.svg + @@ -74,11 +72,10 @@ Stop loading - + Stop - - :/icons/close.svg:/icons/close.svg + @@ -91,11 +88,10 @@ Refresh current location - + Reload - - :/icons/refresh.svg:/icons/refresh.svg + @@ -115,12 +111,12 @@ Add/remove from favourites - + Favourite - :/icons/heart-outline.svg - :/icons/heart.svg:/icons/heart-outline.svg + :/icons/common/favourite-off.svg + :/icons/common/favourite-on.svg:/icons/common/favourite-off.svg true @@ -136,12 +132,12 @@ Enable/disable client certificate for this tab - ... + Client Certificate - :/icons/shield-outline.svg - :/icons/shield-lock.svg:/icons/shield-outline.svg + :/icons/common/certificate-off.svg + :/icons/common/certificate-on.svg:/icons/common/certificate-off.svg true diff --git a/src/certificatemanagementdialog.ui b/src/certificatemanagementdialog.ui index 659e36e..82dd788 100644 --- a/src/certificatemanagementdialog.ui +++ b/src/certificatemanagementdialog.ui @@ -14,8 +14,7 @@ Certificate Manager - - :/icons/certificate.svg:/icons/certificate.svg + @@ -52,11 +51,10 @@ Craete new certificate - ... + Create... - - :/icons/plus.svg:/icons/plus.svg + @@ -66,11 +64,10 @@ Import certificate - ... + Import... - - :/icons/content-save-import.svg:/icons/content-save-import.svg + @@ -96,11 +93,10 @@ Export certificate - ... + Export... - - :/icons/content-save-move.svg:/icons/content-save-move.svg + @@ -113,11 +109,10 @@ Delete certificate - ... + Delete - - :/icons/delete-alert.svg:/icons/delete-alert.svg + @@ -261,9 +256,7 @@ - - - + buttonBox diff --git a/src/icons.qrc b/src/icons.qrc index 2bd76e6..58249a7 100644 --- a/src/icons.qrc +++ b/src/icons.qrc @@ -1,26 +1,9 @@ - icons/arrow-left.svg - icons/arrow-right.svg - icons/heart-outline.svg - icons/heart.svg - icons/menu.svg - icons/refresh.svg - icons/close.svg - icons/format-font.svg - icons/palette.svg - icons/kristall.svg - icons/settings.svg - icons/content-save-move.svg - icons/content-save.svg - icons/home.svg - icons/plus.svg - icons/content-save-import.svg - icons/folder-open.svg - icons/volume-high.svg - icons/volume-off.svg - icons/play.svg - icons/pause.svg + icons/common/certificate-off.svg + icons/common/certificate-on.svg + icons/common/favourite-off.svg + icons/common/favourite-on.svg icons/gopher/binary.svg icons/gopher/directory.svg icons/gopher/dns.svg @@ -33,11 +16,66 @@ icons/gopher/sound.svg icons/gopher/telnet.svg icons/gopher/text.svg - icons/info.svg - icons/help-box.svg - icons/shield-outline.svg - icons/shield-lock.svg - icons/certificate.svg - icons/delete-alert.svg + icons/light/actions/close.svg + icons/light/actions/delete-alert.svg + icons/light/actions/navigate-back.svg + icons/light/actions/navigate-forward.svg + icons/light/actions/pause.svg + icons/light/actions/play.svg + icons/light/actions/refresh.svg + icons/light/actions/save-export.svg + icons/light/actions/save-import.svg + icons/light/actions/save.svg + icons/light/objects/certificate.svg + icons/light/objects/folder.svg + icons/light/objects/font.svg + icons/light/objects/home.svg + icons/light/objects/info.svg + icons/light/objects/menu.svg + icons/light/objects/palette.svg + icons/light/objects/settings.svg + icons/light/objects/volume-on.svg + icons/light/objects/volume-off.svg + icons/light/index.theme + icons/kristall-128.png + icons/kristall-16.png + icons/kristall-32.png + icons/kristall-64.png + icons/kristall.svg + icons/light/objects/help.svg + icons/common/qt.svg + icons/light/objects/changelog.svg + icons/light/objects/bookmarks.svg + icons/light/objects/history.svg + icons/light/objects/table-of-contents.svg + icons/light/actions/create-new.svg + icons/dark/actions/close.svg + icons/dark/actions/create-new.svg + icons/dark/actions/delete-alert.svg + icons/dark/actions/navigate-back.svg + icons/dark/actions/navigate-forward.svg + icons/dark/actions/pause.svg + icons/dark/actions/play.svg + icons/dark/actions/refresh.svg + icons/dark/actions/save-export.svg + icons/dark/actions/save-import.svg + icons/dark/actions/save.svg + icons/dark/objects/bookmarks.svg + icons/dark/objects/certificate.svg + icons/dark/objects/changelog.svg + icons/dark/objects/folder.svg + icons/dark/objects/font.svg + icons/dark/objects/help.svg + icons/dark/objects/history.svg + icons/dark/objects/home.svg + icons/dark/objects/info.svg + icons/dark/objects/menu.svg + icons/dark/objects/palette.svg + icons/dark/objects/settings.svg + icons/dark/objects/table-of-contents.svg + icons/dark/objects/volume-off.svg + icons/dark/objects/volume-on.svg + icons/dark/index.theme + icons/update-themes.sh diff --git a/src/icons/arrow-left.svg b/src/icons/arrow-left.svg deleted file mode 100644 index 72f5e6d..0000000 --- a/src/icons/arrow-left.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/arrow-right.svg b/src/icons/arrow-right.svg deleted file mode 100644 index 22dc526..0000000 --- a/src/icons/arrow-right.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/certificate.svg b/src/icons/certificate.svg deleted file mode 100644 index f158c12..0000000 --- a/src/icons/certificate.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/close.svg b/src/icons/close.svg deleted file mode 100644 index 18691d7..0000000 --- a/src/icons/close.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/common/certificate-off.svg b/src/icons/common/certificate-off.svg new file mode 100644 index 0000000..c46cd12 --- /dev/null +++ b/src/icons/common/certificate-off.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/common/certificate-on.svg b/src/icons/common/certificate-on.svg new file mode 100644 index 0000000..1390967 --- /dev/null +++ b/src/icons/common/certificate-on.svg @@ -0,0 +1,14 @@ + + + + + diff --git a/src/icons/common/favourite-off.svg b/src/icons/common/favourite-off.svg new file mode 100644 index 0000000..26b2df3 --- /dev/null +++ b/src/icons/common/favourite-off.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/common/favourite-on.svg b/src/icons/common/favourite-on.svg new file mode 100644 index 0000000..0bc5b64 --- /dev/null +++ b/src/icons/common/favourite-on.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/icons/common/qt.svg b/src/icons/common/qt.svg new file mode 100644 index 0000000..cb8989b --- /dev/null +++ b/src/icons/common/qt.svg @@ -0,0 +1,67 @@ + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/src/icons/content-save-import.svg b/src/icons/content-save-import.svg deleted file mode 100644 index e980bed..0000000 --- a/src/icons/content-save-import.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - diff --git a/src/icons/content-save-move.svg b/src/icons/content-save-move.svg deleted file mode 100644 index 86e5d0a..0000000 --- a/src/icons/content-save-move.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/content-save.svg b/src/icons/content-save.svg deleted file mode 100644 index bbd8d59..0000000 --- a/src/icons/content-save.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark/actions/close.svg b/src/icons/dark/actions/close.svg new file mode 100644 index 0000000..af528d6 --- /dev/null +++ b/src/icons/dark/actions/close.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/actions/create-new.svg b/src/icons/dark/actions/create-new.svg new file mode 100644 index 0000000..b4b7423 --- /dev/null +++ b/src/icons/dark/actions/create-new.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/actions/delete-alert.svg b/src/icons/dark/actions/delete-alert.svg new file mode 100644 index 0000000..5c08701 --- /dev/null +++ b/src/icons/dark/actions/delete-alert.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/actions/navigate-back.svg b/src/icons/dark/actions/navigate-back.svg new file mode 100644 index 0000000..2f72ad4 --- /dev/null +++ b/src/icons/dark/actions/navigate-back.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/actions/navigate-forward.svg b/src/icons/dark/actions/navigate-forward.svg new file mode 100644 index 0000000..9e0cbbb --- /dev/null +++ b/src/icons/dark/actions/navigate-forward.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/actions/pause.svg b/src/icons/dark/actions/pause.svg new file mode 100644 index 0000000..0313a77 --- /dev/null +++ b/src/icons/dark/actions/pause.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/actions/play.svg b/src/icons/dark/actions/play.svg new file mode 100644 index 0000000..7a26c10 --- /dev/null +++ b/src/icons/dark/actions/play.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/actions/refresh.svg b/src/icons/dark/actions/refresh.svg new file mode 100644 index 0000000..fec6edf --- /dev/null +++ b/src/icons/dark/actions/refresh.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/actions/save-export.svg b/src/icons/dark/actions/save-export.svg new file mode 100644 index 0000000..4fb9b6d --- /dev/null +++ b/src/icons/dark/actions/save-export.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/actions/save-import.svg b/src/icons/dark/actions/save-import.svg new file mode 100644 index 0000000..f53bdbf --- /dev/null +++ b/src/icons/dark/actions/save-import.svg @@ -0,0 +1,9 @@ + + + + diff --git a/src/icons/dark/actions/save.svg b/src/icons/dark/actions/save.svg new file mode 100644 index 0000000..ad5ea15 --- /dev/null +++ b/src/icons/dark/actions/save.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/index.theme b/src/icons/dark/index.theme new file mode 100644 index 0000000..7afb522 --- /dev/null +++ b/src/icons/dark/index.theme @@ -0,0 +1,21 @@ +[Icon Theme] +Name=dark +Comment=This is the Kristall' dark icon theme + +Directories=actions,objects + +[actions] +Size=32 +MinSize=16 +MaxSize=512 +Type=Scalable + + +[objects] +Size=32 +MinSize=16 +MaxSize=512 +Type=Scalable + + + diff --git a/src/icons/dark/objects/bookmarks.svg b/src/icons/dark/objects/bookmarks.svg new file mode 100644 index 0000000..194306c --- /dev/null +++ b/src/icons/dark/objects/bookmarks.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/objects/certificate.svg b/src/icons/dark/objects/certificate.svg new file mode 100644 index 0000000..c3c1f8f --- /dev/null +++ b/src/icons/dark/objects/certificate.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/objects/changelog.svg b/src/icons/dark/objects/changelog.svg new file mode 100644 index 0000000..6e3c21c --- /dev/null +++ b/src/icons/dark/objects/changelog.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/objects/folder.svg b/src/icons/dark/objects/folder.svg new file mode 100644 index 0000000..faa31e5 --- /dev/null +++ b/src/icons/dark/objects/folder.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/objects/font.svg b/src/icons/dark/objects/font.svg new file mode 100644 index 0000000..fd2501b --- /dev/null +++ b/src/icons/dark/objects/font.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/objects/help.svg b/src/icons/dark/objects/help.svg new file mode 100644 index 0000000..2b55194 --- /dev/null +++ b/src/icons/dark/objects/help.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/objects/history.svg b/src/icons/dark/objects/history.svg new file mode 100644 index 0000000..63eb95d --- /dev/null +++ b/src/icons/dark/objects/history.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/objects/home.svg b/src/icons/dark/objects/home.svg new file mode 100644 index 0000000..337f470 --- /dev/null +++ b/src/icons/dark/objects/home.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/objects/info.svg b/src/icons/dark/objects/info.svg new file mode 100644 index 0000000..8877f79 --- /dev/null +++ b/src/icons/dark/objects/info.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/objects/menu.svg b/src/icons/dark/objects/menu.svg new file mode 100644 index 0000000..5ab824c --- /dev/null +++ b/src/icons/dark/objects/menu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/objects/palette.svg b/src/icons/dark/objects/palette.svg new file mode 100644 index 0000000..26c7e71 --- /dev/null +++ b/src/icons/dark/objects/palette.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/objects/settings.svg b/src/icons/dark/objects/settings.svg new file mode 100644 index 0000000..21b412e --- /dev/null +++ b/src/icons/dark/objects/settings.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/objects/table-of-contents.svg b/src/icons/dark/objects/table-of-contents.svg new file mode 100644 index 0000000..fdb6371 --- /dev/null +++ b/src/icons/dark/objects/table-of-contents.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/objects/volume-off.svg b/src/icons/dark/objects/volume-off.svg new file mode 100644 index 0000000..665e1f9 --- /dev/null +++ b/src/icons/dark/objects/volume-off.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/objects/volume-on.svg b/src/icons/dark/objects/volume-on.svg new file mode 100644 index 0000000..110e429 --- /dev/null +++ b/src/icons/dark/objects/volume-on.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/delete-alert.svg b/src/icons/delete-alert.svg deleted file mode 100644 index 3773f1c..0000000 --- a/src/icons/delete-alert.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/folder-open.svg b/src/icons/folder-open.svg deleted file mode 100644 index 09ce7cc..0000000 --- a/src/icons/folder-open.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/format-font.svg b/src/icons/format-font.svg deleted file mode 100644 index c88cb71..0000000 --- a/src/icons/format-font.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/heart-outline.svg b/src/icons/heart-outline.svg deleted file mode 100644 index 26b2df3..0000000 --- a/src/icons/heart-outline.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/heart.svg b/src/icons/heart.svg deleted file mode 100644 index 2cad9fc..0000000 --- a/src/icons/heart.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/help-box.svg b/src/icons/help-box.svg deleted file mode 100644 index 7a08fc4..0000000 --- a/src/icons/help-box.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/home.svg b/src/icons/home.svg deleted file mode 100644 index 132e426..0000000 --- a/src/icons/home.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/info.svg b/src/icons/info.svg deleted file mode 100644 index 06d7d6b..0000000 --- a/src/icons/info.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/light/actions/close.svg b/src/icons/light/actions/close.svg new file mode 100644 index 0000000..18691d7 --- /dev/null +++ b/src/icons/light/actions/close.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/actions/create-new.svg b/src/icons/light/actions/create-new.svg new file mode 100644 index 0000000..2c21839 --- /dev/null +++ b/src/icons/light/actions/create-new.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/actions/delete-alert.svg b/src/icons/light/actions/delete-alert.svg new file mode 100644 index 0000000..3773f1c --- /dev/null +++ b/src/icons/light/actions/delete-alert.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/actions/navigate-back.svg b/src/icons/light/actions/navigate-back.svg new file mode 100644 index 0000000..72f5e6d --- /dev/null +++ b/src/icons/light/actions/navigate-back.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/actions/navigate-forward.svg b/src/icons/light/actions/navigate-forward.svg new file mode 100644 index 0000000..22dc526 --- /dev/null +++ b/src/icons/light/actions/navigate-forward.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/actions/pause.svg b/src/icons/light/actions/pause.svg new file mode 100644 index 0000000..37ed32d --- /dev/null +++ b/src/icons/light/actions/pause.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/actions/play.svg b/src/icons/light/actions/play.svg new file mode 100644 index 0000000..87a70f2 --- /dev/null +++ b/src/icons/light/actions/play.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/actions/refresh.svg b/src/icons/light/actions/refresh.svg new file mode 100644 index 0000000..ebe3f16 --- /dev/null +++ b/src/icons/light/actions/refresh.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/actions/save-export.svg b/src/icons/light/actions/save-export.svg new file mode 100644 index 0000000..86e5d0a --- /dev/null +++ b/src/icons/light/actions/save-export.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/actions/save-import.svg b/src/icons/light/actions/save-import.svg new file mode 100644 index 0000000..e980bed --- /dev/null +++ b/src/icons/light/actions/save-import.svg @@ -0,0 +1,9 @@ + + + + diff --git a/src/icons/light/actions/save.svg b/src/icons/light/actions/save.svg new file mode 100644 index 0000000..bbd8d59 --- /dev/null +++ b/src/icons/light/actions/save.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/index.theme b/src/icons/light/index.theme new file mode 100644 index 0000000..03ef468 --- /dev/null +++ b/src/icons/light/index.theme @@ -0,0 +1,21 @@ +[Icon Theme] +Name=light +Comment=This is the Kristall' light icon theme + +Directories=actions,objects + +[actions] +Size=32 +MinSize=16 +MaxSize=512 +Type=Scalable + + +[objects] +Size=32 +MinSize=16 +MaxSize=512 +Type=Scalable + + + diff --git a/src/icons/light/objects/bookmarks.svg b/src/icons/light/objects/bookmarks.svg new file mode 100644 index 0000000..c64ec93 --- /dev/null +++ b/src/icons/light/objects/bookmarks.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/objects/certificate.svg b/src/icons/light/objects/certificate.svg new file mode 100644 index 0000000..f158c12 --- /dev/null +++ b/src/icons/light/objects/certificate.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/objects/changelog.svg b/src/icons/light/objects/changelog.svg new file mode 100644 index 0000000..3eb8f96 --- /dev/null +++ b/src/icons/light/objects/changelog.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/objects/folder.svg b/src/icons/light/objects/folder.svg new file mode 100644 index 0000000..09ce7cc --- /dev/null +++ b/src/icons/light/objects/folder.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/objects/font.svg b/src/icons/light/objects/font.svg new file mode 100644 index 0000000..c88cb71 --- /dev/null +++ b/src/icons/light/objects/font.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/objects/help.svg b/src/icons/light/objects/help.svg new file mode 100644 index 0000000..7a08fc4 --- /dev/null +++ b/src/icons/light/objects/help.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/objects/history.svg b/src/icons/light/objects/history.svg new file mode 100644 index 0000000..531f3ed --- /dev/null +++ b/src/icons/light/objects/history.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/objects/home.svg b/src/icons/light/objects/home.svg new file mode 100644 index 0000000..132e426 --- /dev/null +++ b/src/icons/light/objects/home.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/objects/info.svg b/src/icons/light/objects/info.svg new file mode 100644 index 0000000..06d7d6b --- /dev/null +++ b/src/icons/light/objects/info.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/objects/menu.svg b/src/icons/light/objects/menu.svg new file mode 100644 index 0000000..64844e7 --- /dev/null +++ b/src/icons/light/objects/menu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/objects/palette.svg b/src/icons/light/objects/palette.svg new file mode 100644 index 0000000..ebf6936 --- /dev/null +++ b/src/icons/light/objects/palette.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/objects/settings.svg b/src/icons/light/objects/settings.svg new file mode 100644 index 0000000..731a5a7 --- /dev/null +++ b/src/icons/light/objects/settings.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/objects/table-of-contents.svg b/src/icons/light/objects/table-of-contents.svg new file mode 100644 index 0000000..1c14a8f --- /dev/null +++ b/src/icons/light/objects/table-of-contents.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/objects/volume-off.svg b/src/icons/light/objects/volume-off.svg new file mode 100644 index 0000000..01e450f --- /dev/null +++ b/src/icons/light/objects/volume-off.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/objects/volume-on.svg b/src/icons/light/objects/volume-on.svg new file mode 100644 index 0000000..a002372 --- /dev/null +++ b/src/icons/light/objects/volume-on.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/menu.svg b/src/icons/menu.svg deleted file mode 100644 index 64844e7..0000000 --- a/src/icons/menu.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/palette.svg b/src/icons/palette.svg deleted file mode 100644 index ebf6936..0000000 --- a/src/icons/palette.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/pause.svg b/src/icons/pause.svg deleted file mode 100644 index 37ed32d..0000000 --- a/src/icons/pause.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/play.svg b/src/icons/play.svg deleted file mode 100644 index 87a70f2..0000000 --- a/src/icons/play.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/plus.svg b/src/icons/plus.svg deleted file mode 100644 index 2c21839..0000000 --- a/src/icons/plus.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/refresh.svg b/src/icons/refresh.svg deleted file mode 100644 index ebe3f16..0000000 --- a/src/icons/refresh.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/settings.svg b/src/icons/settings.svg deleted file mode 100644 index 731a5a7..0000000 --- a/src/icons/settings.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/shield-lock.svg b/src/icons/shield-lock.svg deleted file mode 100644 index b4def0f..0000000 --- a/src/icons/shield-lock.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/shield-outline.svg b/src/icons/shield-outline.svg deleted file mode 100644 index c46cd12..0000000 --- a/src/icons/shield-outline.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/update-themes.sh b/src/icons/update-themes.sh new file mode 100755 index 0000000..7975fb0 --- /dev/null +++ b/src/icons/update-themes.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +rm -rf dark/actions/* +rm -rf dark/objects/* + +cp -r light/actions/*.svg dark/actions +cp -r light/objects/*.svg dark/objects + + +sed -i 's/d=/fill="#FFFFFF" d=/g' dark/{objects,actions}/*.svg \ No newline at end of file diff --git a/src/icons/volume-high.svg b/src/icons/volume-high.svg deleted file mode 100644 index a002372..0000000 --- a/src/icons/volume-high.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/volume-off.svg b/src/icons/volume-off.svg deleted file mode 100644 index 01e450f..0000000 --- a/src/icons/volume-off.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/identitycollection.cpp b/src/identitycollection.cpp index 069a492..e839996 100644 --- a/src/identitycollection.cpp +++ b/src/identitycollection.cpp @@ -339,8 +339,8 @@ QVariant IdentityCollection::data(const QModelIndex &index, int role) const switch(item->type) { case Node::Root: return QVariant { }; - case Node::Group: return QIcon(":/icons/folder-open.svg"); - case Node::Identity: return QIcon(":/icons/certificate.svg"); + case Node::Group: return QIcon::fromTheme("folder"); + case Node::Identity: return QIcon::fromTheme("certificate"); default: return QVariant { }; } } diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 81a209a..9711cfa 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -51,6 +51,7 @@ MainWindow::MainWindow(QApplication * app, QWidget *parent) : act->setCheckable(true); act->setChecked(dock->isVisible()); act->setData(QVariant::fromValue(dock)); + // act->setIcon(dock->windowIcon()); connect(act, QOverload::of(&QAction::triggered), dock, &QDockWidget::setVisible); } diff --git a/src/mainwindow.hpp b/src/mainwindow.hpp index 7f58034..dfa7ebc 100644 --- a/src/mainwindow.hpp +++ b/src/mainwindow.hpp @@ -44,10 +44,6 @@ private slots: void on_history_view_doubleClicked(const QModelIndex &index); - void on_tab_titleChanged(QString const & title); - - void on_tab_locationChanged(QUrl const & url); - void on_outline_view_clicked(const QModelIndex &index); void on_actionSettings_triggered(); @@ -74,10 +70,6 @@ private slots: void on_actionAdd_to_favourites_triggered(); - void on_tab_fileLoaded(DocumentStats const & stats); - - void on_focus_inputbar(); - void on_actionHelp_triggered(); void on_history_view_customContextMenuRequested(const QPoint &pos); @@ -88,6 +80,17 @@ private slots: void on_actionManage_Certificates_triggered(); +private: // slots + + void on_tab_fileLoaded(DocumentStats const & stats); + + void on_tab_titleChanged(QString const & title); + + void on_tab_locationChanged(QUrl const & url); + + void on_focus_inputbar(); + + private: void reloadTheme(); diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 445c748..f7ac5cb 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -57,6 +57,9 @@ + + + Document Outline @@ -92,8 +95,7 @@ - - :/icons/heart.svg:/icons/heart.svg + Bookmarks @@ -122,6 +124,9 @@ + + + History @@ -205,14 +210,16 @@ - - :/icons/info.svg:/icons/info.svg + About... + + + Quit @@ -227,8 +234,7 @@ - - :/icons/close.svg:/icons/close.svg + Close Tab @@ -239,8 +245,7 @@ - - :/icons/settings.svg:/icons/settings.svg + Settings @@ -248,8 +253,7 @@ - - :/icons/arrow-left.svg:/icons/arrow-left.svg + Backward @@ -260,8 +264,7 @@ - - :/icons/arrow-right.svg:/icons/arrow-right.svg + Foreward @@ -272,8 +275,7 @@ - - :/icons/refresh.svg:/icons/refresh.svg + Refresh @@ -283,14 +285,17 @@ + + + :/icons/common/qt.svg:/icons/common/qt.svg + About Qt... - - :/icons/content-save.svg:/icons/content-save.svg + Save as... @@ -305,7 +310,7 @@ - :/icons/heart.svg:/icons/heart.svg + :/icons/common/favourite-on.svg:/icons/common/favourite-on.svg Add to favourites @@ -316,8 +321,7 @@ - - :/icons/home.svg:/icons/home.svg + Go to home @@ -328,8 +332,7 @@ - - :/icons/help-box.svg:/icons/help-box.svg + Help @@ -339,14 +342,16 @@ + + + Changelog - - :/icons/certificate.svg:/icons/certificate.svg + Manage Certificates… diff --git a/src/mediaplayer.cpp b/src/mediaplayer.cpp index 66a5455..e510d21 100644 --- a/src/mediaplayer.cpp +++ b/src/mediaplayer.cpp @@ -80,7 +80,7 @@ void MediaPlayer::on_media_positionChanged(qint64 pos) void MediaPlayer::on_media_playbackChanged(QMediaPlayer::State status) { - this->ui->playpause_button->setIcon(QIcon( - (status == QMediaPlayer::PlayingState) ? ":/icons/pause.svg" : ":/icons/play.svg" - )); + this->ui->playpause_button->setIcon( + (status == QMediaPlayer::PlayingState) ? QIcon::fromTheme("pause") : QIcon::fromTheme("play") + ); } diff --git a/src/mediaplayer.hpp b/src/mediaplayer.hpp index 406a0e0..c39a800 100644 --- a/src/mediaplayer.hpp +++ b/src/mediaplayer.hpp @@ -27,6 +27,7 @@ private slots: void on_mute_button_clicked(bool checked); +private: // slots void on_media_positionChanged(qint64 pos); void on_media_playbackChanged(QMediaPlayer::State); diff --git a/src/mediaplayer.ui b/src/mediaplayer.ui index cdbb21d..39fb570 100644 --- a/src/mediaplayer.ui +++ b/src/mediaplayer.ui @@ -28,8 +28,7 @@ ... - - :/icons/play.svg:/icons/play.svg + @@ -59,9 +58,7 @@ ... - - :/icons/volume-high.svg - :/icons/volume-off.svg:/icons/volume-high.svg + true @@ -83,8 +80,6 @@ 1 - - - + diff --git a/src/settingsdialog.ui b/src/settingsdialog.ui index 1c2040e..401e36b 100644 --- a/src/settingsdialog.ui +++ b/src/settingsdialog.ui @@ -14,8 +14,7 @@ Settings - - :/icons/settings.svg:/icons/settings.svg + @@ -25,8 +24,7 @@ - - :/icons/settings.svg:/icons/settings.svg + Generic @@ -289,8 +287,7 @@ - - :/icons/palette.svg:/icons/palette.svg + Style @@ -319,8 +316,7 @@ - - :/icons/palette.svg:/icons/palette.svg + @@ -358,8 +354,7 @@ - - :/icons/format-font.svg:/icons/format-font.svg + @@ -369,8 +364,7 @@ - - :/icons/palette.svg:/icons/palette.svg + @@ -401,8 +395,7 @@ - - :/icons/format-font.svg:/icons/format-font.svg + @@ -412,8 +405,7 @@ - - :/icons/palette.svg:/icons/palette.svg + @@ -444,8 +436,7 @@ - - :/icons/format-font.svg:/icons/format-font.svg + @@ -455,8 +446,7 @@ - - :/icons/palette.svg:/icons/palette.svg + @@ -487,8 +477,7 @@ - - :/icons/format-font.svg:/icons/format-font.svg + @@ -498,8 +487,7 @@ - - :/icons/palette.svg:/icons/palette.svg + @@ -536,8 +524,7 @@ - - :/icons/format-font.svg:/icons/format-font.svg + @@ -547,8 +534,7 @@ - - :/icons/palette.svg:/icons/palette.svg + @@ -621,8 +607,7 @@ - - :/icons/palette.svg:/icons/palette.svg + @@ -646,8 +631,7 @@ - - :/icons/palette.svg:/icons/palette.svg + @@ -671,8 +655,7 @@ - - :/icons/palette.svg:/icons/palette.svg + @@ -722,8 +705,7 @@ ... - - :/icons/plus.svg:/icons/plus.svg + @@ -736,8 +718,7 @@ ... - - :/icons/content-save.svg:/icons/content-save.svg + @@ -750,8 +731,7 @@ ... - - :/icons/folder-open.svg:/icons/folder-open.svg + @@ -767,8 +747,7 @@ ... - - :/icons/content-save-import.svg:/icons/content-save-import.svg + @@ -781,8 +760,7 @@ ... - - :/icons/content-save-move.svg:/icons/content-save-move.svg + @@ -817,8 +795,7 @@ ... - - :/icons/palette.svg:/icons/palette.svg + @@ -848,8 +825,7 @@ - - :/icons/certificate.svg:/icons/certificate.svg + Gemini TLS @@ -862,8 +838,7 @@ - - :/icons/certificate.svg:/icons/certificate.svg + HTTPS TLS @@ -896,9 +871,7 @@ 1 - - - + buttonBox @@ -935,8 +908,8 @@ - - + + -- cgit v1.2.3