aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsaturneric <[email protected]>2024-05-03 16:09:45 +0000
committersaturneric <[email protected]>2024-05-03 16:09:45 +0000
commit056edbbd2681caeb56bd2cb0bf4c855068f33a93 (patch)
tree8e62625f541006f6e69d59638c69ac53c4f6d959
parentfix: update translations (diff)
downloadGpgFrontend-056edbbd2681caeb56bd2cb0bf4c855068f33a93.tar.gz
GpgFrontend-056edbbd2681caeb56bd2cb0bf4c855068f33a93.zip
feat: add different icons
-rw-r--r--gpgfrontend.qrc12
-rw-r--r--resource/lfs/icons/clear-f.pngbin0 -> 2884 bytes
-rw-r--r--resource/lfs/icons/detail.pngbin0 -> 2082 bytes
-rw-r--r--resource/lfs/icons/key.pngbin0 -> 3282 bytes
-rw-r--r--resource/lfs/icons/module.pngbin0 -> 2977 bytes
-rw-r--r--resource/lfs/icons/redo.pngbin0 -> 2822 bytes
-rw-r--r--resource/lfs/icons/restart.pngbin0 -> 5209 bytes
-rw-r--r--resource/lfs/icons/stairs.pngbin0 -> 908 bytes
-rw-r--r--resource/lfs/icons/translate.pngbin0 -> 4429 bytes
-rw-r--r--resource/lfs/icons/undo.pngbin4347 -> 2919 bytes
-rw-r--r--resource/lfs/icons/update.pngbin0 -> 2497 bytes
-rw-r--r--resource/lfs/icons/wizard.pngbin0 -> 2441 bytes
-rw-r--r--resource/lfs/icons/zoomin.pngbin0 -> 4839 bytes
-rw-r--r--resource/lfs/icons/zoomout.pngbin0 -> 4608 bytes
-rw-r--r--src/ui/main_window/KeyMgmt.cpp6
-rw-r--r--src/ui/main_window/MainWindowUI.cpp20
16 files changed, 30 insertions, 8 deletions
diff --git a/gpgfrontend.qrc b/gpgfrontend.qrc
index e6b4a6d4..e311ed6a 100644
--- a/gpgfrontend.qrc
+++ b/gpgfrontend.qrc
@@ -62,6 +62,7 @@
<file alias="trash.png">resource/lfs/icons/trash.png</file>
<file alias="editor.png">resource/lfs/icons/editor.png</file>
<file alias="undo.png">resource/lfs/icons/undo.png</file>
+ <file alias="redo.png">resource/lfs/icons/redo.png</file>
<file alias="verify.png">resource/lfs/icons/verify.png</file>
<file alias="export_key_to_clipboard.png">resource/lfs/icons/export_key_to_clipboard.png</file>
<file alias="mimetypes/application-pdf.png">resource/lfs/icons/mimetypes/application-pdf.png</file>
@@ -85,6 +86,17 @@
<file alias="total_selection.png">resource/lfs/icons/total_selection.png</file>
<file alias="search.png">resource/lfs/icons/search.png</file>
<file alias="close.png">resource/lfs/icons/close.png</file>
+ <file alias="module.png">resource/lfs/icons/module.png</file>
+ <file alias="restart.png">resource/lfs/icons/restart.png</file>
+ <file alias="clear-f.png">resource/lfs/icons/clear-f.png</file>
+ <file alias="zoomin.png">resource/lfs/icons/zoomin.png</file>
+ <file alias="zoomout.png">resource/lfs/icons/zoomout.png</file>
+ <file alias="wizard.png">resource/lfs/icons/wizard.png</file>
+ <file alias="update.png">resource/lfs/icons/update.png</file>
+ <file alias="translate.png">resource/lfs/icons/translate.png</file>
+ <file alias="key.png">resource/lfs/icons/key.png</file>
+ <file alias="stairs.png">resource/lfs/icons/stairs.png</file>
+ <file alias="detail.png">resource/lfs/icons/detail.png</file>
</qresource>
<qresource prefix="/test/key">
<file alias="pv1.key">resource/lfs/test/data/pv1.key</file>
diff --git a/resource/lfs/icons/clear-f.png b/resource/lfs/icons/clear-f.png
new file mode 100644
index 00000000..5400cc32
--- /dev/null
+++ b/resource/lfs/icons/clear-f.png
Binary files differ
diff --git a/resource/lfs/icons/detail.png b/resource/lfs/icons/detail.png
new file mode 100644
index 00000000..91301d7d
--- /dev/null
+++ b/resource/lfs/icons/detail.png
Binary files differ
diff --git a/resource/lfs/icons/key.png b/resource/lfs/icons/key.png
new file mode 100644
index 00000000..7d7abf60
--- /dev/null
+++ b/resource/lfs/icons/key.png
Binary files differ
diff --git a/resource/lfs/icons/module.png b/resource/lfs/icons/module.png
new file mode 100644
index 00000000..13a62404
--- /dev/null
+++ b/resource/lfs/icons/module.png
Binary files differ
diff --git a/resource/lfs/icons/redo.png b/resource/lfs/icons/redo.png
new file mode 100644
index 00000000..5f5b6601
--- /dev/null
+++ b/resource/lfs/icons/redo.png
Binary files differ
diff --git a/resource/lfs/icons/restart.png b/resource/lfs/icons/restart.png
new file mode 100644
index 00000000..ebb91f5c
--- /dev/null
+++ b/resource/lfs/icons/restart.png
Binary files differ
diff --git a/resource/lfs/icons/stairs.png b/resource/lfs/icons/stairs.png
new file mode 100644
index 00000000..313813af
--- /dev/null
+++ b/resource/lfs/icons/stairs.png
Binary files differ
diff --git a/resource/lfs/icons/translate.png b/resource/lfs/icons/translate.png
new file mode 100644
index 00000000..467d4890
--- /dev/null
+++ b/resource/lfs/icons/translate.png
Binary files differ
diff --git a/resource/lfs/icons/undo.png b/resource/lfs/icons/undo.png
index 19717cc8..9765d267 100644
--- a/resource/lfs/icons/undo.png
+++ b/resource/lfs/icons/undo.png
Binary files differ
diff --git a/resource/lfs/icons/update.png b/resource/lfs/icons/update.png
new file mode 100644
index 00000000..43e1f470
--- /dev/null
+++ b/resource/lfs/icons/update.png
Binary files differ
diff --git a/resource/lfs/icons/wizard.png b/resource/lfs/icons/wizard.png
new file mode 100644
index 00000000..647b9e18
--- /dev/null
+++ b/resource/lfs/icons/wizard.png
Binary files differ
diff --git a/resource/lfs/icons/zoomin.png b/resource/lfs/icons/zoomin.png
new file mode 100644
index 00000000..c08fde74
--- /dev/null
+++ b/resource/lfs/icons/zoomin.png
Binary files differ
diff --git a/resource/lfs/icons/zoomout.png b/resource/lfs/icons/zoomout.png
new file mode 100644
index 00000000..4f1938d8
--- /dev/null
+++ b/resource/lfs/icons/zoomout.png
Binary files differ
diff --git a/src/ui/main_window/KeyMgmt.cpp b/src/ui/main_window/KeyMgmt.cpp
index af9a6b31..afc6129c 100644
--- a/src/ui/main_window/KeyMgmt.cpp
+++ b/src/ui/main_window/KeyMgmt.cpp
@@ -229,22 +229,26 @@ void KeyMgmt::create_actions() {
&KeyMgmt::SlotExportAsOpenSSHFormat);
delete_selected_keys_act_ = new QAction(tr("Delete Selected Key(s)"), this);
+ delete_selected_keys_act_->setIcon(QIcon(":/icons/button_delete.png"));
delete_selected_keys_act_->setToolTip(tr("Delete the Selected keys"));
connect(delete_selected_keys_act_, &QAction::triggered, this,
&KeyMgmt::SlotDeleteSelectedKeys);
delete_checked_keys_act_ = new QAction(tr("Delete Checked Key(s)"), this);
- delete_checked_keys_act_->setToolTip(tr("Delete the Checked keys"));
delete_checked_keys_act_->setIcon(QIcon(":/icons/button_delete.png"));
+ delete_checked_keys_act_->setToolTip(tr("Delete the Checked keys"));
+
connect(delete_checked_keys_act_, &QAction::triggered, this,
&KeyMgmt::SlotDeleteCheckedKeys);
show_key_details_act_ = new QAction(tr("Show Key Details"), this);
+ show_key_details_act_->setIcon(QIcon(":/icons/detail.png"));
show_key_details_act_->setToolTip(tr("Show Details for this Key"));
connect(show_key_details_act_, &QAction::triggered, this,
&KeyMgmt::SlotShowKeyDetails);
set_owner_trust_of_key_act_ = new QAction(tr("Set Owner Trust Level"), this);
+ set_owner_trust_of_key_act_->setIcon(QIcon(":/icons/stairs.png"));
set_owner_trust_of_key_act_->setToolTip(tr("Set Owner Trust Level"));
set_owner_trust_of_key_act_->setData(QVariant("set_owner_trust_level"));
connect(set_owner_trust_of_key_act_, &QAction::triggered, this, [this]() {
diff --git a/src/ui/main_window/MainWindowUI.cpp b/src/ui/main_window/MainWindowUI.cpp
index 02b630d2..c6db5b27 100644
--- a/src/ui/main_window/MainWindowUI.cpp
+++ b/src/ui/main_window/MainWindowUI.cpp
@@ -83,6 +83,7 @@ void MainWindow::create_actions() {
connect(print_act_, &QAction::triggered, edit_, &TextEdit::SlotPrint);
close_tab_act_ = new QAction(tr("Close"), this);
+ close_tab_act_->setIcon(QIcon(":/icons/close.png"));
close_tab_act_->setShortcut(QKeySequence::Close);
close_tab_act_->setToolTip(tr("Close file"));
connect(close_tab_act_, &QAction::triggered, edit_, &TextEdit::SlotCloseTab);
@@ -96,20 +97,24 @@ void MainWindow::create_actions() {
/* Edit Menu
*/
undo_act_ = new QAction(tr("Undo"), this);
+ undo_act_->setIcon(QIcon(":/icons/undo.png"));
undo_act_->setShortcut(QKeySequence::Undo);
undo_act_->setToolTip(tr("Undo Last Edit Action"));
connect(undo_act_, &QAction::triggered, edit_, &TextEdit::SlotUndo);
redo_act_ = new QAction(tr("Redo"), this);
+ redo_act_->setIcon(QIcon(":/icons/redo.png"));
redo_act_->setShortcut(QKeySequence::Redo);
redo_act_->setToolTip(tr("Redo Last Edit Action"));
connect(redo_act_, &QAction::triggered, edit_, &TextEdit::SlotRedo);
zoom_in_act_ = new QAction(tr("Zoom In"), this);
+ zoom_in_act_->setIcon(QIcon(":/icons/zoomin.png"));
zoom_in_act_->setShortcut(QKeySequence::ZoomIn);
connect(zoom_in_act_, &QAction::triggered, edit_, &TextEdit::SlotZoomIn);
zoom_out_act_ = new QAction(tr("Zoom Out"), this);
+ zoom_out_act_->setIcon(QIcon(":/icons/zoomout.png"));
zoom_out_act_->setShortcut(QKeySequence::ZoomOut);
connect(zoom_out_act_, &QAction::triggered, edit_, &TextEdit::SlotZoomOut);
@@ -344,7 +349,7 @@ void MainWindow::create_actions() {
&MainWindow::slot_open_key_management);
clean_gpg_password_cache_act_ = new QAction(tr("Clear Password Cache"), this);
- clean_gpg_password_cache_act_->setIcon(QIcon(":/icons/configure.png"));
+ clean_gpg_password_cache_act_->setIcon(QIcon(":/icons/clear-f.png"));
clean_gpg_password_cache_act_->setToolTip(
tr("Clear Password Cache of GnuPG"));
connect(clean_gpg_password_cache_act_, &QAction::triggered, this, [=]() {
@@ -361,7 +366,7 @@ void MainWindow::create_actions() {
});
reload_components_act_ = new QAction(tr("Reload All Components"), this);
- reload_components_act_->setIcon(QIcon(":/icons/configure.png"));
+ reload_components_act_->setIcon(QIcon(":/icons/restart.png"));
reload_components_act_->setToolTip(tr("Reload All GnuPG's Components"));
connect(reload_components_act_, &QAction::triggered, this, [=]() {
GpgFrontend::GpgAdvancedOperator::ReloadGpgComponents(
@@ -379,7 +384,7 @@ void MainWindow::create_actions() {
});
restart_components_act_ = new QAction(tr("Restart All Components"), this);
- restart_components_act_->setIcon(QIcon(":/icons/configure.png"));
+ restart_components_act_->setIcon(QIcon(":/icons/restart.png"));
restart_components_act_->setToolTip(tr("Restart All GnuPG's Components"));
connect(restart_components_act_, &QAction::triggered, this, [=]() {
GpgFrontend::GpgAdvancedOperator::RestartGpgComponents();
@@ -406,7 +411,7 @@ void MainWindow::create_actions() {
[this]() { (new GnuPGControllerDialog(this))->exec(); });
module_controller_open_act_ = new QAction(tr("Open Module Controller"), this);
- module_controller_open_act_->setIcon(QIcon(":/icons/configure.png"));
+ module_controller_open_act_->setIcon(QIcon(":/icons/module.png"));
module_controller_open_act_->setToolTip(tr("Open Module Controller Dialog"));
connect(module_controller_open_act_, &QAction::triggered, this,
[this]() { (new ModuleControllerDialog(this))->exec(); });
@@ -423,27 +428,28 @@ void MainWindow::create_actions() {
if (Module::IsModuleActivate(kGnuPGInfoGatheringModuleID)) {
gnupg_act_ = new QAction(tr("GnuPG"), this);
- gnupg_act_->setIcon(QIcon(":/icons/help.png"));
+ gnupg_act_->setIcon(QIcon(":/icons/key.png"));
gnupg_act_->setToolTip(tr("Information about Gnupg"));
connect(gnupg_act_, &QAction::triggered, this,
[=]() { new AboutDialog(tr("GnuPG"), this); });
}
translate_act_ = new QAction(tr("Translate"), this);
- translate_act_->setIcon(QIcon(":/icons/help.png"));
+ translate_act_->setIcon(QIcon(":/icons/translate.png"));
translate_act_->setToolTip(tr("Information about translation"));
connect(translate_act_, &QAction::triggered, this,
[=]() { new AboutDialog(tr("Translators"), this); });
if (Module::IsModuleActivate(kVersionCheckingModuleID)) {
check_update_act_ = new QAction(tr("Check for Updates"), this);
- check_update_act_->setIcon(QIcon(":/icons/help.png"));
+ check_update_act_->setIcon(QIcon(":/icons/update.png"));
check_update_act_->setToolTip(tr("Check for updates"));
connect(check_update_act_, &QAction::triggered, this,
[=]() { new AboutDialog(tr("Update"), this); });
}
start_wizard_act_ = new QAction(tr("Open Wizard"), this);
+ start_wizard_act_->setIcon(QIcon(":/icons/wizard.png"));
start_wizard_act_->setToolTip(tr("Open the wizard"));
connect(start_wizard_act_, &QAction::triggered, this,
&MainWindow::slot_start_wizard);