aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKarol Kosek <krkk@krkk.ct8.pl>2020-12-26 13:43:25 +0100
committerFelix Queißner <felix@ib-queissner.de>2020-12-27 00:03:30 +0100
commit13ea5684612b85bd897e1e79d88737bc0e691b49 (patch)
tree41339368e31066b0440fa97ecbdfd453901b9f8b /src
parent136fead7a537d642e700d1696b655c4fed4ae398 (diff)
downloadkristall-13ea5684612b85bd897e1e79d88737bc0e691b49.tar.gz
Use standard icon names
document-{export,import}, and view-certificate aren't in the standard though. https://specifications.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
Diffstat (limited to 'src')
-rw-r--r--src/browsertab.cpp6
-rw-r--r--src/browsertab.ui13
-rw-r--r--src/dialogs/certificatemanagementdialog.ui12
-rw-r--r--src/dialogs/certificateselectiondialog.ui3
-rw-r--r--src/dialogs/newidentitiydialog.ui3
-rw-r--r--src/dialogs/settingsdialog.ui18
-rw-r--r--src/icons.qrc68
-rw-r--r--src/icons/dark/actions/document-export.svg (renamed from src/icons/dark/actions/save-export.svg)0
-rw-r--r--src/icons/dark/actions/document-import.svg (renamed from src/icons/dark/actions/save-import.svg)0
-rw-r--r--src/icons/dark/actions/document-new.svg (renamed from src/icons/dark/actions/create-new.svg)0
-rw-r--r--src/icons/dark/actions/document-save.svg (renamed from src/icons/dark/actions/save.svg)0
-rw-r--r--src/icons/dark/actions/edit-delete.svg (renamed from src/icons/dark/actions/delete-alert.svg)0
-rw-r--r--src/icons/dark/actions/go-down-search.svg (renamed from src/icons/dark/actions/search-next.svg)0
-rw-r--r--src/icons/dark/actions/go-next.svg (renamed from src/icons/dark/actions/navigate-forward.svg)0
-rw-r--r--src/icons/dark/actions/go-previous.svg (renamed from src/icons/dark/actions/navigate-back.svg)0
-rw-r--r--src/icons/dark/actions/go-up-search.svg (renamed from src/icons/dark/actions/search-previous.svg)0
-rw-r--r--src/icons/dark/actions/media-playback-pause.svg (renamed from src/icons/dark/actions/pause.svg)0
-rw-r--r--src/icons/dark/actions/media-playback-start.svg (renamed from src/icons/dark/actions/play.svg)0
-rw-r--r--src/icons/dark/actions/view-refresh.svg (renamed from src/icons/dark/actions/refresh.svg)0
-rw-r--r--src/icons/dark/objects/audio-volume-high.svg (renamed from src/icons/dark/objects/volume-on.svg)0
-rw-r--r--src/icons/dark/objects/audio-volume-muted.svg (renamed from src/icons/dark/objects/volume-off.svg)0
-rw-r--r--src/icons/dark/objects/go-home.svg (renamed from src/icons/dark/objects/home.svg)0
-rw-r--r--src/icons/dark/objects/help-about.svg (renamed from src/icons/dark/objects/info.svg)0
-rw-r--r--src/icons/dark/objects/view-certificate.svg (renamed from src/icons/dark/objects/certificate.svg)0
-rw-r--r--src/icons/light/actions/document-export.svg (renamed from src/icons/light/actions/save-export.svg)0
-rw-r--r--src/icons/light/actions/document-import.svg (renamed from src/icons/light/actions/save-import.svg)0
-rw-r--r--src/icons/light/actions/document-new.svg (renamed from src/icons/light/actions/create-new.svg)0
-rw-r--r--src/icons/light/actions/document-save.svg (renamed from src/icons/light/actions/save.svg)0
-rw-r--r--src/icons/light/actions/edit-delete.svg (renamed from src/icons/light/actions/delete-alert.svg)0
-rw-r--r--src/icons/light/actions/go-down-search.svg (renamed from src/icons/light/actions/search-next.svg)0
-rw-r--r--src/icons/light/actions/go-next.svg (renamed from src/icons/light/actions/navigate-forward.svg)0
-rw-r--r--src/icons/light/actions/go-previous.svg (renamed from src/icons/light/actions/navigate-back.svg)0
-rw-r--r--src/icons/light/actions/go-up-search.svg (renamed from src/icons/light/actions/search-previous.svg)0
-rw-r--r--src/icons/light/actions/media-playback-pause.svg (renamed from src/icons/light/actions/pause.svg)0
-rw-r--r--src/icons/light/actions/media-playback-start.svg (renamed from src/icons/light/actions/play.svg)0
-rw-r--r--src/icons/light/actions/view-refresh.svg (renamed from src/icons/light/actions/refresh.svg)0
-rw-r--r--src/icons/light/objects/audio-volume-high.svg (renamed from src/icons/light/objects/volume-on.svg)0
-rw-r--r--src/icons/light/objects/audio-volume-muted.svg (renamed from src/icons/light/objects/volume-off.svg)0
-rw-r--r--src/icons/light/objects/go-home.svg (renamed from src/icons/light/objects/home.svg)0
-rw-r--r--src/icons/light/objects/help-about.svg (renamed from src/icons/light/objects/info.svg)0
-rw-r--r--src/icons/light/objects/view-certificate.svg (renamed from src/icons/light/objects/certificate.svg)0
-rw-r--r--src/identitycollection.cpp2
-rw-r--r--src/mainwindow.ui21
-rw-r--r--src/widgets/mediaplayer.cpp5
-rw-r--r--src/widgets/mediaplayer.ui4
45 files changed, 66 insertions, 89 deletions
diff --git a/src/browsertab.cpp b/src/browsertab.cpp
index 1180f11..70a1a66 100644
--- a/src/browsertab.cpp
+++ b/src/browsertab.cpp
@@ -1195,13 +1195,11 @@ void BrowserTab::on_text_browser_customContextMenuRequested(const QPoint &pos)
menu.addSeparator();
}
- QAction * back = menu.addAction("Back");
- connect(back, &QAction::triggered, [this]() {
+ menu.addAction(QIcon::fromTheme("go-previous"), tr("Back"), [this]() {
this->on_back_button_clicked();
});
- QAction * forward = menu.addAction("Forward");
- connect(forward, &QAction::triggered, [this]() {
+ menu.addAction(QIcon::fromTheme("go-next"), tr("Forward"), [this]() {
this->on_forward_button_clicked();
});
diff --git a/src/browsertab.ui b/src/browsertab.ui
index df1b530..c895f02 100644
--- a/src/browsertab.ui
+++ b/src/browsertab.ui
@@ -43,8 +43,7 @@
<string>Back</string>
</property>
<property name="icon">
- <iconset theme="navigate-back">
- <normaloff>.</normaloff>.</iconset>
+ <iconset theme="go-previous"/>
</property>
</widget>
</item>
@@ -60,8 +59,7 @@
<string>Forward</string>
</property>
<property name="icon">
- <iconset theme="navigate-forward">
- <normaloff>.</normaloff>.</iconset>
+ <iconset theme="go-next"/>
</property>
</widget>
</item>
@@ -94,8 +92,7 @@
<string>Reload</string>
</property>
<property name="icon">
- <iconset theme="refresh">
- <normaloff>.</normaloff>.</iconset>
+ <iconset theme="view-refresh"/>
</property>
</widget>
</item>
@@ -223,7 +220,7 @@ p, li { white-space: pre-wrap; }
<string>Previous</string>
</property>
<property name="icon">
- <iconset theme="search-previous"/>
+ <iconset theme="go-up-search"/>
</property>
</widget>
</item>
@@ -236,7 +233,7 @@ p, li { white-space: pre-wrap; }
<string>Next</string>
</property>
<property name="icon">
- <iconset theme="search-next"/>
+ <iconset theme="go-down-search"/>
</property>
</widget>
</item>
diff --git a/src/dialogs/certificatemanagementdialog.ui b/src/dialogs/certificatemanagementdialog.ui
index 596448f..2a991de 100644
--- a/src/dialogs/certificatemanagementdialog.ui
+++ b/src/dialogs/certificatemanagementdialog.ui
@@ -55,8 +55,7 @@
<string>Create...</string>
</property>
<property name="icon">
- <iconset theme="create-new">
- <normaloff>.</normaloff>.</iconset>
+ <iconset theme="document-new"/>
</property>
</widget>
</item>
@@ -69,8 +68,7 @@
<string>Import...</string>
</property>
<property name="icon">
- <iconset theme="save-import">
- <normaloff>.</normaloff>.</iconset>
+ <iconset theme="document-import"/>
</property>
</widget>
</item>
@@ -99,8 +97,7 @@
<string>Export...</string>
</property>
<property name="icon">
- <iconset theme="save-export">
- <normaloff>.</normaloff>.</iconset>
+ <iconset theme="document-export"/>
</property>
</widget>
</item>
@@ -116,8 +113,7 @@
<string>Delete</string>
</property>
<property name="icon">
- <iconset theme="delete-alert">
- <normaloff>.</normaloff>.</iconset>
+ <iconset theme="edit-delete"/>
</property>
</widget>
</item>
diff --git a/src/dialogs/certificateselectiondialog.ui b/src/dialogs/certificateselectiondialog.ui
index 1bc167f..3c0cd1d 100644
--- a/src/dialogs/certificateselectiondialog.ui
+++ b/src/dialogs/certificateselectiondialog.ui
@@ -14,8 +14,7 @@
<string>Select client certificate</string>
</property>
<property name="windowIcon">
- <iconset>
- <normaloff>:/icons/certificate.svg</normaloff>:/icons/certificate.svg</iconset>
+ <iconset theme="view-certificate"/>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
diff --git a/src/dialogs/newidentitiydialog.ui b/src/dialogs/newidentitiydialog.ui
index 7e9511a..c5e2da2 100644
--- a/src/dialogs/newidentitiydialog.ui
+++ b/src/dialogs/newidentitiydialog.ui
@@ -14,8 +14,7 @@
<string>Create new certificate</string>
</property>
<property name="windowIcon">
- <iconset>
- <normaloff>:/icons/certificate.svg</normaloff>:/icons/certificate.svg</iconset>
+ <iconset theme="view-certificate"/>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
diff --git a/src/dialogs/settingsdialog.ui b/src/dialogs/settingsdialog.ui
index 4e92ab8..fdfd33b 100644
--- a/src/dialogs/settingsdialog.ui
+++ b/src/dialogs/settingsdialog.ui
@@ -722,8 +722,7 @@
<string>...</string>
</property>
<property name="icon">
- <iconset theme="create-new">
- <normaloff>.</normaloff>.</iconset>
+ <iconset theme="document-new"/>
</property>
</widget>
</item>
@@ -736,8 +735,7 @@
<string>...</string>
</property>
<property name="icon">
- <iconset theme="save">
- <normaloff>.</normaloff>.</iconset>
+ <iconset theme="document-save"/>
</property>
</widget>
</item>
@@ -767,8 +765,7 @@
<string>...</string>
</property>
<property name="icon">
- <iconset theme="save-import">
- <normaloff>.</normaloff>.</iconset>
+ <iconset theme="document-import"/>
</property>
</widget>
</item>
@@ -781,8 +778,7 @@
<string>...</string>
</property>
<property name="icon">
- <iconset theme="save-export">
- <normaloff>.</normaloff>.</iconset>
+ <iconset theme="document-export"/>
</property>
</widget>
</item>
@@ -848,8 +844,7 @@
</widget>
<widget class="QWidget" name="gem_trust_page">
<attribute name="icon">
- <iconset theme="certificate">
- <normaloff>.</normaloff>.</iconset>
+ <iconset theme="view-certificate"/>
</attribute>
<attribute name="title">
<string>Gemini TLS</string>
@@ -862,8 +857,7 @@
</widget>
<widget class="QWidget" name="https_trust">
<attribute name="icon">
- <iconset theme="certificate">
- <normaloff>.</normaloff>.</iconset>
+ <iconset theme="view-certificate"/>
</attribute>
<attribute name="title">
<string>HTTPS TLS</string>
diff --git a/src/icons.qrc b/src/icons.qrc
index e550b4c..ed286ea 100644
--- a/src/icons.qrc
+++ b/src/icons.qrc
@@ -17,25 +17,25 @@
<file>icons/gopher/telnet.svg</file>
<file>icons/gopher/text.svg</file>
<file>icons/light/actions/close.svg</file>
- <file>icons/light/actions/delete-alert.svg</file>
- <file>icons/light/actions/navigate-back.svg</file>
- <file>icons/light/actions/navigate-forward.svg</file>
- <file>icons/light/actions/pause.svg</file>
- <file>icons/light/actions/play.svg</file>
- <file>icons/light/actions/refresh.svg</file>
- <file>icons/light/actions/save-export.svg</file>
- <file>icons/light/actions/save-import.svg</file>
- <file>icons/light/actions/save.svg</file>
- <file>icons/light/objects/certificate.svg</file>
+ <file>icons/light/actions/edit-delete.svg</file>
+ <file>icons/light/actions/go-previous.svg</file>
+ <file>icons/light/actions/go-next.svg</file>
+ <file>icons/light/actions/media-playback-pause.svg</file>
+ <file>icons/light/actions/media-playback-start.svg</file>
+ <file>icons/light/actions/view-refresh.svg</file>
+ <file>icons/light/actions/document-export.svg</file>
+ <file>icons/light/actions/document-import.svg</file>
+ <file>icons/light/actions/document-save.svg</file>
+ <file>icons/light/objects/view-certificate.svg</file>
<file>icons/light/objects/folder.svg</file>
<file>icons/light/objects/font.svg</file>
- <file>icons/light/objects/home.svg</file>
- <file>icons/light/objects/info.svg</file>
+ <file>icons/light/objects/go-home.svg</file>
+ <file>icons/light/objects/help-about.svg</file>
<file>icons/light/objects/menu.svg</file>
<file>icons/light/objects/palette.svg</file>
<file>icons/light/objects/settings.svg</file>
- <file>icons/light/objects/volume-on.svg</file>
- <file>icons/light/objects/volume-off.svg</file>
+ <file>icons/light/objects/audio-volume-high.svg</file>
+ <file>icons/light/objects/audio-volume-muted.svg</file>
<file>icons/light/index.theme</file>
<file>icons/kristall-128.png</file>
<file>icons/kristall-16.png</file>
@@ -48,38 +48,38 @@
<file>icons/light/objects/bookmarks.svg</file>
<file>icons/light/objects/history.svg</file>
<file>icons/light/objects/table-of-contents.svg</file>
- <file>icons/light/actions/create-new.svg</file>
+ <file>icons/light/actions/document-new.svg</file>
<file>icons/dark/actions/close.svg</file>
- <file>icons/dark/actions/create-new.svg</file>
- <file>icons/dark/actions/delete-alert.svg</file>
- <file>icons/dark/actions/navigate-back.svg</file>
- <file>icons/dark/actions/navigate-forward.svg</file>
- <file>icons/dark/actions/pause.svg</file>
- <file>icons/dark/actions/play.svg</file>
- <file>icons/dark/actions/refresh.svg</file>
- <file>icons/dark/actions/save-export.svg</file>
- <file>icons/dark/actions/save-import.svg</file>
- <file>icons/dark/actions/save.svg</file>
+ <file>icons/dark/actions/document-new.svg</file>
+ <file>icons/dark/actions/edit-delete.svg</file>
+ <file>icons/dark/actions/go-previous.svg</file>
+ <file>icons/dark/actions/go-next.svg</file>
+ <file>icons/dark/actions/media-playback-pause.svg</file>
+ <file>icons/dark/actions/media-playback-start.svg</file>
+ <file>icons/dark/actions/view-refresh.svg</file>
+ <file>icons/dark/actions/document-export.svg</file>
+ <file>icons/dark/actions/document-import.svg</file>
+ <file>icons/dark/actions/document-save.svg</file>
<file>icons/dark/objects/bookmarks.svg</file>
- <file>icons/dark/objects/certificate.svg</file>
+ <file>icons/dark/objects/view-certificate.svg</file>
<file>icons/dark/objects/changelog.svg</file>
<file>icons/dark/objects/folder.svg</file>
<file>icons/dark/objects/font.svg</file>
<file>icons/dark/objects/help.svg</file>
<file>icons/dark/objects/history.svg</file>
- <file>icons/dark/objects/home.svg</file>
- <file>icons/dark/objects/info.svg</file>
+ <file>icons/dark/objects/go-home.svg</file>
+ <file>icons/dark/objects/help-about.svg</file>
<file>icons/dark/objects/menu.svg</file>
<file>icons/dark/objects/palette.svg</file>
<file>icons/dark/objects/settings.svg</file>
<file>icons/dark/objects/table-of-contents.svg</file>
- <file>icons/dark/objects/volume-off.svg</file>
- <file>icons/dark/objects/volume-on.svg</file>
+ <file>icons/dark/objects/audio-volume-muted.svg</file>
+ <file>icons/dark/objects/audio-volume-high.svg</file>
<file>icons/dark/index.theme</file>
<file>icons/update-themes.sh</file>
- <file>icons/dark/actions/search-next.svg</file>
- <file>icons/dark/actions/search-previous.svg</file>
- <file>icons/light/actions/search-next.svg</file>
- <file>icons/light/actions/search-previous.svg</file>
+ <file>icons/dark/actions/go-down-search.svg</file>
+ <file>icons/dark/actions/go-up-search.svg</file>
+ <file>icons/light/actions/go-down-search.svg</file>
+ <file>icons/light/actions/go-up-search.svg</file>
</qresource>
</RCC>
diff --git a/src/icons/dark/actions/save-export.svg b/src/icons/dark/actions/document-export.svg
index 4fb9b6d..4fb9b6d 100644
--- a/src/icons/dark/actions/save-export.svg
+++ b/src/icons/dark/actions/document-export.svg
diff --git a/src/icons/dark/actions/save-import.svg b/src/icons/dark/actions/document-import.svg
index f53bdbf..f53bdbf 100644
--- a/src/icons/dark/actions/save-import.svg
+++ b/src/icons/dark/actions/document-import.svg
diff --git a/src/icons/dark/actions/create-new.svg b/src/icons/dark/actions/document-new.svg
index b4b7423..b4b7423 100644
--- a/src/icons/dark/actions/create-new.svg
+++ b/src/icons/dark/actions/document-new.svg
diff --git a/src/icons/dark/actions/save.svg b/src/icons/dark/actions/document-save.svg
index ad5ea15..ad5ea15 100644
--- a/src/icons/dark/actions/save.svg
+++ b/src/icons/dark/actions/document-save.svg
diff --git a/src/icons/dark/actions/delete-alert.svg b/src/icons/dark/actions/edit-delete.svg
index 5c08701..5c08701 100644
--- a/src/icons/dark/actions/delete-alert.svg
+++ b/src/icons/dark/actions/edit-delete.svg
diff --git a/src/icons/dark/actions/search-next.svg b/src/icons/dark/actions/go-down-search.svg
index 59356a4..59356a4 100644
--- a/src/icons/dark/actions/search-next.svg
+++ b/src/icons/dark/actions/go-down-search.svg
diff --git a/src/icons/dark/actions/navigate-forward.svg b/src/icons/dark/actions/go-next.svg
index 9e0cbbb..9e0cbbb 100644
--- a/src/icons/dark/actions/navigate-forward.svg
+++ b/src/icons/dark/actions/go-next.svg
diff --git a/src/icons/dark/actions/navigate-back.svg b/src/icons/dark/actions/go-previous.svg
index 2f72ad4..2f72ad4 100644
--- a/src/icons/dark/actions/navigate-back.svg
+++ b/src/icons/dark/actions/go-previous.svg
diff --git a/src/icons/dark/actions/search-previous.svg b/src/icons/dark/actions/go-up-search.svg
index 4da1d2b..4da1d2b 100644
--- a/src/icons/dark/actions/search-previous.svg
+++ b/src/icons/dark/actions/go-up-search.svg
diff --git a/src/icons/dark/actions/pause.svg b/src/icons/dark/actions/media-playback-pause.svg
index 0313a77..0313a77 100644
--- a/src/icons/dark/actions/pause.svg
+++ b/src/icons/dark/actions/media-playback-pause.svg
diff --git a/src/icons/dark/actions/play.svg b/src/icons/dark/actions/media-playback-start.svg
index 7a26c10..7a26c10 100644
--- a/src/icons/dark/actions/play.svg
+++ b/src/icons/dark/actions/media-playback-start.svg
diff --git a/src/icons/dark/actions/refresh.svg b/src/icons/dark/actions/view-refresh.svg
index fec6edf..fec6edf 100644
--- a/src/icons/dark/actions/refresh.svg
+++ b/src/icons/dark/actions/view-refresh.svg
diff --git a/src/icons/dark/objects/volume-on.svg b/src/icons/dark/objects/audio-volume-high.svg
index 110e429..110e429 100644
--- a/src/icons/dark/objects/volume-on.svg
+++ b/src/icons/dark/objects/audio-volume-high.svg
diff --git a/src/icons/dark/objects/volume-off.svg b/src/icons/dark/objects/audio-volume-muted.svg
index 665e1f9..665e1f9 100644
--- a/src/icons/dark/objects/volume-off.svg
+++ b/src/icons/dark/objects/audio-volume-muted.svg
diff --git a/src/icons/dark/objects/home.svg b/src/icons/dark/objects/go-home.svg
index 337f470..337f470 100644
--- a/src/icons/dark/objects/home.svg
+++ b/src/icons/dark/objects/go-home.svg
diff --git a/src/icons/dark/objects/info.svg b/src/icons/dark/objects/help-about.svg
index 8877f79..8877f79 100644
--- a/src/icons/dark/objects/info.svg
+++ b/src/icons/dark/objects/help-about.svg
diff --git a/src/icons/dark/objects/certificate.svg b/src/icons/dark/objects/view-certificate.svg
index c3c1f8f..c3c1f8f 100644
--- a/src/icons/dark/objects/certificate.svg
+++ b/src/icons/dark/objects/view-certificate.svg
diff --git a/src/icons/light/actions/save-export.svg b/src/icons/light/actions/document-export.svg
index 86e5d0a..86e5d0a 100644
--- a/src/icons/light/actions/save-export.svg
+++ b/src/icons/light/actions/document-export.svg
diff --git a/src/icons/light/actions/save-import.svg b/src/icons/light/actions/document-import.svg
index e980bed..e980bed 100644
--- a/src/icons/light/actions/save-import.svg
+++ b/src/icons/light/actions/document-import.svg
diff --git a/src/icons/light/actions/create-new.svg b/src/icons/light/actions/document-new.svg
index 2c21839..2c21839 100644
--- a/src/icons/light/actions/create-new.svg
+++ b/src/icons/light/actions/document-new.svg
diff --git a/src/icons/light/actions/save.svg b/src/icons/light/actions/document-save.svg
index bbd8d59..bbd8d59 100644
--- a/src/icons/light/actions/save.svg
+++ b/src/icons/light/actions/document-save.svg
diff --git a/src/icons/light/actions/delete-alert.svg b/src/icons/light/actions/edit-delete.svg
index 3773f1c..3773f1c 100644
--- a/src/icons/light/actions/delete-alert.svg
+++ b/src/icons/light/actions/edit-delete.svg
diff --git a/src/icons/light/actions/search-next.svg b/src/icons/light/actions/go-down-search.svg
index fc32cf8..fc32cf8 100644
--- a/src/icons/light/actions/search-next.svg
+++ b/src/icons/light/actions/go-down-search.svg
diff --git a/src/icons/light/actions/navigate-forward.svg b/src/icons/light/actions/go-next.svg
index 22dc526..22dc526 100644
--- a/src/icons/light/actions/navigate-forward.svg
+++ b/src/icons/light/actions/go-next.svg
diff --git a/src/icons/light/actions/navigate-back.svg b/src/icons/light/actions/go-previous.svg
index 72f5e6d..72f5e6d 100644
--- a/src/icons/light/actions/navigate-back.svg
+++ b/src/icons/light/actions/go-previous.svg
diff --git a/src/icons/light/actions/search-previous.svg b/src/icons/light/actions/go-up-search.svg
index 24cd1dd..24cd1dd 100644
--- a/src/icons/light/actions/search-previous.svg
+++ b/src/icons/light/actions/go-up-search.svg
diff --git a/src/icons/light/actions/pause.svg b/src/icons/light/actions/media-playback-pause.svg
index 37ed32d..37ed32d 100644
--- a/src/icons/light/actions/pause.svg
+++ b/src/icons/light/actions/media-playback-pause.svg
diff --git a/src/icons/light/actions/play.svg b/src/icons/light/actions/media-playback-start.svg
index 87a70f2..87a70f2 100644
--- a/src/icons/light/actions/play.svg
+++ b/src/icons/light/actions/media-playback-start.svg
diff --git a/src/icons/light/actions/refresh.svg b/src/icons/light/actions/view-refresh.svg
index ebe3f16..ebe3f16 100644
--- a/src/icons/light/actions/refresh.svg
+++ b/src/icons/light/actions/view-refresh.svg
diff --git a/src/icons/light/objects/volume-on.svg b/src/icons/light/objects/audio-volume-high.svg
index a002372..a002372 100644
--- a/src/icons/light/objects/volume-on.svg
+++ b/src/icons/light/objects/audio-volume-high.svg
diff --git a/src/icons/light/objects/volume-off.svg b/src/icons/light/objects/audio-volume-muted.svg
index 01e450f..01e450f 100644
--- a/src/icons/light/objects/volume-off.svg
+++ b/src/icons/light/objects/audio-volume-muted.svg
diff --git a/src/icons/light/objects/home.svg b/src/icons/light/objects/go-home.svg
index 132e426..132e426 100644
--- a/src/icons/light/objects/home.svg
+++ b/src/icons/light/objects/go-home.svg
diff --git a/src/icons/light/objects/info.svg b/src/icons/light/objects/help-about.svg
index 06d7d6b..06d7d6b 100644
--- a/src/icons/light/objects/info.svg
+++ b/src/icons/light/objects/help-about.svg
diff --git a/src/icons/light/objects/certificate.svg b/src/icons/light/objects/view-certificate.svg
index f158c12..f158c12 100644
--- a/src/icons/light/objects/certificate.svg
+++ b/src/icons/light/objects/view-certificate.svg
diff --git a/src/identitycollection.cpp b/src/identitycollection.cpp
index 36e78cb..45a86a7 100644
--- a/src/identitycollection.cpp
+++ b/src/identitycollection.cpp
@@ -402,7 +402,7 @@ QVariant IdentityCollection::data(const QModelIndex &index, int role) const
switch(item->type) {
case Node::Root: return QVariant { };
case Node::Group: return QIcon::fromTheme("folder");
- case Node::Identity: return QIcon::fromTheme("certificate");
+ case Node::Identity: return QIcon::fromTheme("view-certificate");
default: return QVariant { };
}
}
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 8bda9c5..714d527 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -234,8 +234,7 @@
</widget>
<action name="actionAbout">
<property name="icon">
- <iconset theme="info">
- <normaloff>.</normaloff>.</iconset>
+ <iconset theme="help-about"/>
</property>
<property name="text">
<string>About...</string>
@@ -284,8 +283,7 @@
</action>
<action name="actionBackward">
<property name="icon">
- <iconset theme="navigate-back">
- <normaloff>.</normaloff>.</iconset>
+ <iconset theme="go-previous"/>
</property>
<property name="text">
<string>Back</string>
@@ -299,8 +297,7 @@
</action>
<action name="actionForward">
<property name="icon">
- <iconset theme="navigate-forward">
- <normaloff>.</normaloff>.</iconset>
+ <iconset theme="go-next"/>
</property>
<property name="text">
<string>Forward</string>
@@ -314,8 +311,7 @@
</action>
<action name="actionRefresh">
<property name="icon">
- <iconset theme="refresh">
- <normaloff>.</normaloff>.</iconset>
+ <iconset theme="view-refresh"/>
</property>
<property name="text">
<string>Refresh</string>
@@ -335,8 +331,7 @@
</action>
<action name="actionSave_as">
<property name="icon">
- <iconset theme="save">
- <normaloff>.</normaloff>.</iconset>
+ <iconset theme="document-save-as"/>
</property>
<property name="text">
<string>Save as...</string>
@@ -362,8 +357,7 @@
</action>
<action name="actionGo_to_home">
<property name="icon">
- <iconset theme="home">
- <normaloff>.</normaloff>.</iconset>
+ <iconset theme="go-home"/>
</property>
<property name="text">
<string>Go to home</string>
@@ -395,8 +389,7 @@
</action>
<action name="actionManage_Certificates">
<property name="icon">
- <iconset theme="certificate">
- <normaloff>.</normaloff>.</iconset>
+ <iconset theme="view-certificate"/>
</property>
<property name="text">
<string>Manage Certificates…</string>
diff --git a/src/widgets/mediaplayer.cpp b/src/widgets/mediaplayer.cpp
index e510d21..6344cff 100644
--- a/src/widgets/mediaplayer.cpp
+++ b/src/widgets/mediaplayer.cpp
@@ -80,7 +80,8 @@ void MediaPlayer::on_media_positionChanged(qint64 pos)
void MediaPlayer::on_media_playbackChanged(QMediaPlayer::State status)
{
- this->ui->playpause_button->setIcon(
- (status == QMediaPlayer::PlayingState) ? QIcon::fromTheme("pause") : QIcon::fromTheme("play")
+ this->ui->playpause_button->setIcon((status == QMediaPlayer::PlayingState)
+ ? QIcon::fromTheme("media-playback-pause")
+ : QIcon::fromTheme("media-playback-start")
);
}
diff --git a/src/widgets/mediaplayer.ui b/src/widgets/mediaplayer.ui
index 39fb570..9c64e0a 100644
--- a/src/widgets/mediaplayer.ui
+++ b/src/widgets/mediaplayer.ui
@@ -28,7 +28,7 @@
<string>...</string>
</property>
<property name="icon">
- <iconset theme="play"/>
+ <iconset theme="media-playback-start"/>
</property>
</widget>
</item>
@@ -58,7 +58,7 @@
<string>...</string>
</property>
<property name="icon">
- <iconset theme="volume-on"/>
+ <iconset theme="audio-volume-high"/>
</property>
<property name="checkable">
<bool>true</bool>