From 13ea5684612b85bd897e1e79d88737bc0e691b49 Mon Sep 17 00:00:00 2001 From: Karol Kosek Date: Sat, 26 Dec 2020 13:43:25 +0100 Subject: 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 --- src/browsertab.cpp | 6 +-- src/browsertab.ui | 13 ++--- src/dialogs/certificatemanagementdialog.ui | 12 ++--- src/dialogs/certificateselectiondialog.ui | 3 +- src/dialogs/newidentitiydialog.ui | 3 +- src/dialogs/settingsdialog.ui | 18 +++---- src/icons.qrc | 68 ++++++++++++------------ src/icons/dark/actions/create-new.svg | 1 - src/icons/dark/actions/delete-alert.svg | 1 - src/icons/dark/actions/document-export.svg | 1 + src/icons/dark/actions/document-import.svg | 9 ++++ src/icons/dark/actions/document-new.svg | 1 + src/icons/dark/actions/document-save.svg | 1 + src/icons/dark/actions/edit-delete.svg | 1 + src/icons/dark/actions/go-down-search.svg | 1 + src/icons/dark/actions/go-next.svg | 1 + src/icons/dark/actions/go-previous.svg | 1 + src/icons/dark/actions/go-up-search.svg | 1 + src/icons/dark/actions/media-playback-pause.svg | 1 + src/icons/dark/actions/media-playback-start.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/actions/search-next.svg | 1 - src/icons/dark/actions/search-previous.svg | 1 - src/icons/dark/actions/view-refresh.svg | 1 + src/icons/dark/objects/audio-volume-high.svg | 1 + src/icons/dark/objects/audio-volume-muted.svg | 1 + src/icons/dark/objects/certificate.svg | 1 - src/icons/dark/objects/go-home.svg | 1 + src/icons/dark/objects/help-about.svg | 1 + src/icons/dark/objects/home.svg | 1 - src/icons/dark/objects/info.svg | 1 - src/icons/dark/objects/view-certificate.svg | 1 + src/icons/dark/objects/volume-off.svg | 1 - src/icons/dark/objects/volume-on.svg | 1 - src/icons/light/actions/create-new.svg | 1 - src/icons/light/actions/delete-alert.svg | 1 - src/icons/light/actions/document-export.svg | 1 + src/icons/light/actions/document-import.svg | 9 ++++ src/icons/light/actions/document-new.svg | 1 + src/icons/light/actions/document-save.svg | 1 + src/icons/light/actions/edit-delete.svg | 1 + src/icons/light/actions/go-down-search.svg | 1 + src/icons/light/actions/go-next.svg | 1 + src/icons/light/actions/go-previous.svg | 1 + src/icons/light/actions/go-up-search.svg | 1 + src/icons/light/actions/media-playback-pause.svg | 1 + src/icons/light/actions/media-playback-start.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/actions/search-next.svg | 1 - src/icons/light/actions/search-previous.svg | 1 - src/icons/light/actions/view-refresh.svg | 1 + src/icons/light/objects/audio-volume-high.svg | 1 + src/icons/light/objects/audio-volume-muted.svg | 1 + src/icons/light/objects/certificate.svg | 1 - src/icons/light/objects/go-home.svg | 1 + src/icons/light/objects/help-about.svg | 1 + src/icons/light/objects/home.svg | 1 - src/icons/light/objects/info.svg | 1 - src/icons/light/objects/view-certificate.svg | 1 + src/icons/light/objects/volume-off.svg | 1 - src/icons/light/objects/volume-on.svg | 1 - src/identitycollection.cpp | 2 +- src/mainwindow.ui | 21 +++----- src/widgets/mediaplayer.cpp | 5 +- src/widgets/mediaplayer.ui | 4 +- 79 files changed, 116 insertions(+), 139 deletions(-) delete mode 100644 src/icons/dark/actions/create-new.svg delete mode 100644 src/icons/dark/actions/delete-alert.svg create mode 100644 src/icons/dark/actions/document-export.svg create mode 100644 src/icons/dark/actions/document-import.svg create mode 100644 src/icons/dark/actions/document-new.svg create mode 100644 src/icons/dark/actions/document-save.svg create mode 100644 src/icons/dark/actions/edit-delete.svg create mode 100644 src/icons/dark/actions/go-down-search.svg create mode 100644 src/icons/dark/actions/go-next.svg create mode 100644 src/icons/dark/actions/go-previous.svg create mode 100644 src/icons/dark/actions/go-up-search.svg create mode 100644 src/icons/dark/actions/media-playback-pause.svg create mode 100644 src/icons/dark/actions/media-playback-start.svg delete mode 100644 src/icons/dark/actions/navigate-back.svg delete mode 100644 src/icons/dark/actions/navigate-forward.svg delete mode 100644 src/icons/dark/actions/pause.svg delete mode 100644 src/icons/dark/actions/play.svg delete mode 100644 src/icons/dark/actions/refresh.svg delete mode 100644 src/icons/dark/actions/save-export.svg delete mode 100644 src/icons/dark/actions/save-import.svg delete mode 100644 src/icons/dark/actions/save.svg delete mode 100644 src/icons/dark/actions/search-next.svg delete mode 100644 src/icons/dark/actions/search-previous.svg create mode 100644 src/icons/dark/actions/view-refresh.svg create mode 100644 src/icons/dark/objects/audio-volume-high.svg create mode 100644 src/icons/dark/objects/audio-volume-muted.svg delete mode 100644 src/icons/dark/objects/certificate.svg create mode 100644 src/icons/dark/objects/go-home.svg create mode 100644 src/icons/dark/objects/help-about.svg delete mode 100644 src/icons/dark/objects/home.svg delete mode 100644 src/icons/dark/objects/info.svg create mode 100644 src/icons/dark/objects/view-certificate.svg delete mode 100644 src/icons/dark/objects/volume-off.svg delete mode 100644 src/icons/dark/objects/volume-on.svg delete mode 100644 src/icons/light/actions/create-new.svg delete mode 100644 src/icons/light/actions/delete-alert.svg create mode 100644 src/icons/light/actions/document-export.svg create mode 100644 src/icons/light/actions/document-import.svg create mode 100644 src/icons/light/actions/document-new.svg create mode 100644 src/icons/light/actions/document-save.svg create mode 100644 src/icons/light/actions/edit-delete.svg create mode 100644 src/icons/light/actions/go-down-search.svg create mode 100644 src/icons/light/actions/go-next.svg create mode 100644 src/icons/light/actions/go-previous.svg create mode 100644 src/icons/light/actions/go-up-search.svg create mode 100644 src/icons/light/actions/media-playback-pause.svg create mode 100644 src/icons/light/actions/media-playback-start.svg delete mode 100644 src/icons/light/actions/navigate-back.svg delete mode 100644 src/icons/light/actions/navigate-forward.svg delete mode 100644 src/icons/light/actions/pause.svg delete mode 100644 src/icons/light/actions/play.svg delete mode 100644 src/icons/light/actions/refresh.svg delete mode 100644 src/icons/light/actions/save-export.svg delete mode 100644 src/icons/light/actions/save-import.svg delete mode 100644 src/icons/light/actions/save.svg delete mode 100644 src/icons/light/actions/search-next.svg delete mode 100644 src/icons/light/actions/search-previous.svg create mode 100644 src/icons/light/actions/view-refresh.svg create mode 100644 src/icons/light/objects/audio-volume-high.svg create mode 100644 src/icons/light/objects/audio-volume-muted.svg delete mode 100644 src/icons/light/objects/certificate.svg create mode 100644 src/icons/light/objects/go-home.svg create mode 100644 src/icons/light/objects/help-about.svg delete mode 100644 src/icons/light/objects/home.svg delete mode 100644 src/icons/light/objects/info.svg create mode 100644 src/icons/light/objects/view-certificate.svg delete mode 100644 src/icons/light/objects/volume-off.svg delete mode 100644 src/icons/light/objects/volume-on.svg (limited to 'src') 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 @@ Back - - .. + @@ -60,8 +59,7 @@ Forward - - .. + @@ -94,8 +92,7 @@ Reload - - .. + @@ -223,7 +220,7 @@ p, li { white-space: pre-wrap; } Previous - + @@ -236,7 +233,7 @@ p, li { white-space: pre-wrap; } Next - + 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 @@ Create... - - .. + @@ -69,8 +68,7 @@ Import... - - .. + @@ -99,8 +97,7 @@ Export... - - .. + @@ -116,8 +113,7 @@ Delete - - .. + 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 @@ Select client certificate - - :/icons/certificate.svg:/icons/certificate.svg + 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 @@ Create new certificate - - :/icons/certificate.svg:/icons/certificate.svg + 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 @@ ... - - .. + @@ -736,8 +735,7 @@ ... - - .. + @@ -767,8 +765,7 @@ ... - - .. + @@ -781,8 +778,7 @@ ... - - .. + @@ -848,8 +844,7 @@ - - .. + Gemini TLS @@ -862,8 +857,7 @@ - - .. + HTTPS TLS 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 @@ icons/gopher/telnet.svg icons/gopher/text.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/actions/edit-delete.svg + icons/light/actions/go-previous.svg + icons/light/actions/go-next.svg + icons/light/actions/media-playback-pause.svg + icons/light/actions/media-playback-start.svg + icons/light/actions/view-refresh.svg + icons/light/actions/document-export.svg + icons/light/actions/document-import.svg + icons/light/actions/document-save.svg + icons/light/objects/view-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/go-home.svg + icons/light/objects/help-about.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/objects/audio-volume-high.svg + icons/light/objects/audio-volume-muted.svg icons/light/index.theme icons/kristall-128.png icons/kristall-16.png @@ -48,38 +48,38 @@ icons/light/objects/bookmarks.svg icons/light/objects/history.svg icons/light/objects/table-of-contents.svg - icons/light/actions/create-new.svg + icons/light/actions/document-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/actions/document-new.svg + icons/dark/actions/edit-delete.svg + icons/dark/actions/go-previous.svg + icons/dark/actions/go-next.svg + icons/dark/actions/media-playback-pause.svg + icons/dark/actions/media-playback-start.svg + icons/dark/actions/view-refresh.svg + icons/dark/actions/document-export.svg + icons/dark/actions/document-import.svg + icons/dark/actions/document-save.svg icons/dark/objects/bookmarks.svg - icons/dark/objects/certificate.svg + icons/dark/objects/view-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/go-home.svg + icons/dark/objects/help-about.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/objects/audio-volume-muted.svg + icons/dark/objects/audio-volume-high.svg icons/dark/index.theme icons/update-themes.sh - icons/dark/actions/search-next.svg - icons/dark/actions/search-previous.svg - icons/light/actions/search-next.svg - icons/light/actions/search-previous.svg + icons/dark/actions/go-down-search.svg + icons/dark/actions/go-up-search.svg + icons/light/actions/go-down-search.svg + icons/light/actions/go-up-search.svg diff --git a/src/icons/dark/actions/create-new.svg b/src/icons/dark/actions/create-new.svg deleted file mode 100644 index b4b7423..0000000 --- a/src/icons/dark/actions/create-new.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark/actions/delete-alert.svg b/src/icons/dark/actions/delete-alert.svg deleted file mode 100644 index 5c08701..0000000 --- a/src/icons/dark/actions/delete-alert.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark/actions/document-export.svg b/src/icons/dark/actions/document-export.svg new file mode 100644 index 0000000..4fb9b6d --- /dev/null +++ b/src/icons/dark/actions/document-export.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/actions/document-import.svg b/src/icons/dark/actions/document-import.svg new file mode 100644 index 0000000..f53bdbf --- /dev/null +++ b/src/icons/dark/actions/document-import.svg @@ -0,0 +1,9 @@ + + + + diff --git a/src/icons/dark/actions/document-new.svg b/src/icons/dark/actions/document-new.svg new file mode 100644 index 0000000..b4b7423 --- /dev/null +++ b/src/icons/dark/actions/document-new.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/actions/document-save.svg b/src/icons/dark/actions/document-save.svg new file mode 100644 index 0000000..ad5ea15 --- /dev/null +++ b/src/icons/dark/actions/document-save.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/actions/edit-delete.svg b/src/icons/dark/actions/edit-delete.svg new file mode 100644 index 0000000..5c08701 --- /dev/null +++ b/src/icons/dark/actions/edit-delete.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/actions/go-down-search.svg b/src/icons/dark/actions/go-down-search.svg new file mode 100644 index 0000000..59356a4 --- /dev/null +++ b/src/icons/dark/actions/go-down-search.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/actions/go-next.svg b/src/icons/dark/actions/go-next.svg new file mode 100644 index 0000000..9e0cbbb --- /dev/null +++ b/src/icons/dark/actions/go-next.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/actions/go-previous.svg b/src/icons/dark/actions/go-previous.svg new file mode 100644 index 0000000..2f72ad4 --- /dev/null +++ b/src/icons/dark/actions/go-previous.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/actions/go-up-search.svg b/src/icons/dark/actions/go-up-search.svg new file mode 100644 index 0000000..4da1d2b --- /dev/null +++ b/src/icons/dark/actions/go-up-search.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/actions/media-playback-pause.svg b/src/icons/dark/actions/media-playback-pause.svg new file mode 100644 index 0000000..0313a77 --- /dev/null +++ b/src/icons/dark/actions/media-playback-pause.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/actions/media-playback-start.svg b/src/icons/dark/actions/media-playback-start.svg new file mode 100644 index 0000000..7a26c10 --- /dev/null +++ b/src/icons/dark/actions/media-playback-start.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 deleted file mode 100644 index 2f72ad4..0000000 --- a/src/icons/dark/actions/navigate-back.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark/actions/navigate-forward.svg b/src/icons/dark/actions/navigate-forward.svg deleted file mode 100644 index 9e0cbbb..0000000 --- a/src/icons/dark/actions/navigate-forward.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark/actions/pause.svg b/src/icons/dark/actions/pause.svg deleted file mode 100644 index 0313a77..0000000 --- a/src/icons/dark/actions/pause.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark/actions/play.svg b/src/icons/dark/actions/play.svg deleted file mode 100644 index 7a26c10..0000000 --- a/src/icons/dark/actions/play.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark/actions/refresh.svg b/src/icons/dark/actions/refresh.svg deleted file mode 100644 index fec6edf..0000000 --- a/src/icons/dark/actions/refresh.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark/actions/save-export.svg b/src/icons/dark/actions/save-export.svg deleted file mode 100644 index 4fb9b6d..0000000 --- a/src/icons/dark/actions/save-export.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark/actions/save-import.svg b/src/icons/dark/actions/save-import.svg deleted file mode 100644 index f53bdbf..0000000 --- a/src/icons/dark/actions/save-import.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - diff --git a/src/icons/dark/actions/save.svg b/src/icons/dark/actions/save.svg deleted file mode 100644 index ad5ea15..0000000 --- a/src/icons/dark/actions/save.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark/actions/search-next.svg b/src/icons/dark/actions/search-next.svg deleted file mode 100644 index 59356a4..0000000 --- a/src/icons/dark/actions/search-next.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark/actions/search-previous.svg b/src/icons/dark/actions/search-previous.svg deleted file mode 100644 index 4da1d2b..0000000 --- a/src/icons/dark/actions/search-previous.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark/actions/view-refresh.svg b/src/icons/dark/actions/view-refresh.svg new file mode 100644 index 0000000..fec6edf --- /dev/null +++ b/src/icons/dark/actions/view-refresh.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/objects/audio-volume-high.svg b/src/icons/dark/objects/audio-volume-high.svg new file mode 100644 index 0000000..110e429 --- /dev/null +++ b/src/icons/dark/objects/audio-volume-high.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/objects/audio-volume-muted.svg b/src/icons/dark/objects/audio-volume-muted.svg new file mode 100644 index 0000000..665e1f9 --- /dev/null +++ b/src/icons/dark/objects/audio-volume-muted.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 deleted file mode 100644 index c3c1f8f..0000000 --- a/src/icons/dark/objects/certificate.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark/objects/go-home.svg b/src/icons/dark/objects/go-home.svg new file mode 100644 index 0000000..337f470 --- /dev/null +++ b/src/icons/dark/objects/go-home.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/dark/objects/help-about.svg b/src/icons/dark/objects/help-about.svg new file mode 100644 index 0000000..8877f79 --- /dev/null +++ b/src/icons/dark/objects/help-about.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 deleted file mode 100644 index 337f470..0000000 --- a/src/icons/dark/objects/home.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark/objects/info.svg b/src/icons/dark/objects/info.svg deleted file mode 100644 index 8877f79..0000000 --- a/src/icons/dark/objects/info.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark/objects/view-certificate.svg b/src/icons/dark/objects/view-certificate.svg new file mode 100644 index 0000000..c3c1f8f --- /dev/null +++ b/src/icons/dark/objects/view-certificate.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 deleted file mode 100644 index 665e1f9..0000000 --- a/src/icons/dark/objects/volume-off.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/dark/objects/volume-on.svg b/src/icons/dark/objects/volume-on.svg deleted file mode 100644 index 110e429..0000000 --- a/src/icons/dark/objects/volume-on.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/light/actions/create-new.svg b/src/icons/light/actions/create-new.svg deleted file mode 100644 index 2c21839..0000000 --- a/src/icons/light/actions/create-new.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/light/actions/delete-alert.svg b/src/icons/light/actions/delete-alert.svg deleted file mode 100644 index 3773f1c..0000000 --- a/src/icons/light/actions/delete-alert.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/light/actions/document-export.svg b/src/icons/light/actions/document-export.svg new file mode 100644 index 0000000..86e5d0a --- /dev/null +++ b/src/icons/light/actions/document-export.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/actions/document-import.svg b/src/icons/light/actions/document-import.svg new file mode 100644 index 0000000..e980bed --- /dev/null +++ b/src/icons/light/actions/document-import.svg @@ -0,0 +1,9 @@ + + + + diff --git a/src/icons/light/actions/document-new.svg b/src/icons/light/actions/document-new.svg new file mode 100644 index 0000000..2c21839 --- /dev/null +++ b/src/icons/light/actions/document-new.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/actions/document-save.svg b/src/icons/light/actions/document-save.svg new file mode 100644 index 0000000..bbd8d59 --- /dev/null +++ b/src/icons/light/actions/document-save.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/actions/edit-delete.svg b/src/icons/light/actions/edit-delete.svg new file mode 100644 index 0000000..3773f1c --- /dev/null +++ b/src/icons/light/actions/edit-delete.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/actions/go-down-search.svg b/src/icons/light/actions/go-down-search.svg new file mode 100644 index 0000000..fc32cf8 --- /dev/null +++ b/src/icons/light/actions/go-down-search.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/actions/go-next.svg b/src/icons/light/actions/go-next.svg new file mode 100644 index 0000000..22dc526 --- /dev/null +++ b/src/icons/light/actions/go-next.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/actions/go-previous.svg b/src/icons/light/actions/go-previous.svg new file mode 100644 index 0000000..72f5e6d --- /dev/null +++ b/src/icons/light/actions/go-previous.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/actions/go-up-search.svg b/src/icons/light/actions/go-up-search.svg new file mode 100644 index 0000000..24cd1dd --- /dev/null +++ b/src/icons/light/actions/go-up-search.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/actions/media-playback-pause.svg b/src/icons/light/actions/media-playback-pause.svg new file mode 100644 index 0000000..37ed32d --- /dev/null +++ b/src/icons/light/actions/media-playback-pause.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/actions/media-playback-start.svg b/src/icons/light/actions/media-playback-start.svg new file mode 100644 index 0000000..87a70f2 --- /dev/null +++ b/src/icons/light/actions/media-playback-start.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 deleted file mode 100644 index 72f5e6d..0000000 --- a/src/icons/light/actions/navigate-back.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/light/actions/navigate-forward.svg b/src/icons/light/actions/navigate-forward.svg deleted file mode 100644 index 22dc526..0000000 --- a/src/icons/light/actions/navigate-forward.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/light/actions/pause.svg b/src/icons/light/actions/pause.svg deleted file mode 100644 index 37ed32d..0000000 --- a/src/icons/light/actions/pause.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/light/actions/play.svg b/src/icons/light/actions/play.svg deleted file mode 100644 index 87a70f2..0000000 --- a/src/icons/light/actions/play.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/light/actions/refresh.svg b/src/icons/light/actions/refresh.svg deleted file mode 100644 index ebe3f16..0000000 --- a/src/icons/light/actions/refresh.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/light/actions/save-export.svg b/src/icons/light/actions/save-export.svg deleted file mode 100644 index 86e5d0a..0000000 --- a/src/icons/light/actions/save-export.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/light/actions/save-import.svg b/src/icons/light/actions/save-import.svg deleted file mode 100644 index e980bed..0000000 --- a/src/icons/light/actions/save-import.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - diff --git a/src/icons/light/actions/save.svg b/src/icons/light/actions/save.svg deleted file mode 100644 index bbd8d59..0000000 --- a/src/icons/light/actions/save.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/light/actions/search-next.svg b/src/icons/light/actions/search-next.svg deleted file mode 100644 index fc32cf8..0000000 --- a/src/icons/light/actions/search-next.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/light/actions/search-previous.svg b/src/icons/light/actions/search-previous.svg deleted file mode 100644 index 24cd1dd..0000000 --- a/src/icons/light/actions/search-previous.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/light/actions/view-refresh.svg b/src/icons/light/actions/view-refresh.svg new file mode 100644 index 0000000..ebe3f16 --- /dev/null +++ b/src/icons/light/actions/view-refresh.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/objects/audio-volume-high.svg b/src/icons/light/objects/audio-volume-high.svg new file mode 100644 index 0000000..a002372 --- /dev/null +++ b/src/icons/light/objects/audio-volume-high.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/objects/audio-volume-muted.svg b/src/icons/light/objects/audio-volume-muted.svg new file mode 100644 index 0000000..01e450f --- /dev/null +++ b/src/icons/light/objects/audio-volume-muted.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 deleted file mode 100644 index f158c12..0000000 --- a/src/icons/light/objects/certificate.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/light/objects/go-home.svg b/src/icons/light/objects/go-home.svg new file mode 100644 index 0000000..132e426 --- /dev/null +++ b/src/icons/light/objects/go-home.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/light/objects/help-about.svg b/src/icons/light/objects/help-about.svg new file mode 100644 index 0000000..06d7d6b --- /dev/null +++ b/src/icons/light/objects/help-about.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 deleted file mode 100644 index 132e426..0000000 --- a/src/icons/light/objects/home.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/light/objects/info.svg b/src/icons/light/objects/info.svg deleted file mode 100644 index 06d7d6b..0000000 --- a/src/icons/light/objects/info.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/light/objects/view-certificate.svg b/src/icons/light/objects/view-certificate.svg new file mode 100644 index 0000000..f158c12 --- /dev/null +++ b/src/icons/light/objects/view-certificate.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 deleted file mode 100644 index 01e450f..0000000 --- a/src/icons/light/objects/volume-off.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/icons/light/objects/volume-on.svg b/src/icons/light/objects/volume-on.svg deleted file mode 100644 index a002372..0000000 --- a/src/icons/light/objects/volume-on.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file 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 @@ - - .. + About... @@ -284,8 +283,7 @@ - - .. + Back @@ -299,8 +297,7 @@ - - .. + Forward @@ -314,8 +311,7 @@ - - .. + Refresh @@ -335,8 +331,7 @@ - - .. + Save as... @@ -362,8 +357,7 @@ - - .. + Go to home @@ -395,8 +389,7 @@ - - .. + Manage Certificates… 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 @@ ... - + @@ -58,7 +58,7 @@ ... - + true -- cgit v1.2.3