feat: improve icons and padding

14 files changed, 28 insertions, 22 deletions

diff --git a/gpgfrontend.qrc b/gpgfrontend.qrc
index fa72ca3e..dea3c3f6 100644
--- a/gpgfrontend.qrc
+++ b/gpgfrontend.qrc
@@ -18,18 +18,18 @@
         <file alias="button_paste.png">resource/lfs/icons/button_paste.png</file>
         <file alias="button_delete.png">resource/lfs/icons/button_delete.png</file>
         <file alias="configure.png">resource/lfs/icons/configure.png</file>
-        <file alias="decrypted.png">resource/lfs/icons/decrypted.png</file>
         <file alias="drafts.png">resource/lfs/icons/drafts.png</file>
         <file alias="edit.png">resource/lfs/icons/edit.png</file>
         <file alias="email.png">resource/lfs/icons/email.png</file>
-        <file alias="encrypted.png">resource/lfs/icons/encrypted.png</file>
-        <file alias="encrypted_signed.png">resource/lfs/icons/encrypted_signed.png</file>
-        <file alias="decrypted_verified.png">resource/lfs/icons/decrypted_verified.png</file>
+        <file alias="lock.png">resource/lfs/icons/lock.png</file>
+        <file alias="unlock.png">resource/lfs/icons/unlock.png</file>
+        <file alias="expand.png">resource/lfs/icons/expand.png</file>
+        <file alias="compress.png">resource/lfs/icons/compress.png</file>
         <file alias="exit.png">resource/lfs/icons/exit.png</file>
         <file alias="export_key_to_file.png">resource/lfs/icons/export_key_to_file.png</file>
         <file alias="file.png">resource/lfs/icons/file.png</file>
         <file alias="fileencryption.png">resource/lfs/icons/fileencrytion.png</file>
-        <file alias="file-browser.png">resource/lfs/icons/file-browser.png</file>
+        <file alias="file-operator.png">resource/lfs/icons/file-operator.png</file>
         <file alias="fileopen.png">resource/lfs/icons/fileopen.png</file>
         <file alias="fileprint.png">resource/lfs/icons/fileprint.png</file>
         <file alias="filesave.png">resource/lfs/icons/filesave.png</file>
diff --git a/resource/lfs/icons/compress.png b/resource/lfs/icons/compress.png
new file mode 100644
index 00000000..38066f29
--- /dev/null
+++ b/resource/lfs/icons/compress.png
diff --git a/resource/lfs/icons/decrypted.png b/resource/lfs/icons/decrypted.png
deleted file mode 100644
index 9fe6970a..00000000
--- a/resource/lfs/icons/decrypted.png
+++ /dev/null
diff --git a/resource/lfs/icons/decrypted_verified.png b/resource/lfs/icons/decrypted_verified.png
deleted file mode 100644
index 5e45f625..00000000
--- a/resource/lfs/icons/decrypted_verified.png
+++ /dev/null
diff --git a/resource/lfs/icons/encrypted.png b/resource/lfs/icons/encrypted.png
deleted file mode 100644
index 45bbf696..00000000
--- a/resource/lfs/icons/encrypted.png
+++ /dev/null
diff --git a/resource/lfs/icons/encrypted_signed.png b/resource/lfs/icons/encrypted_signed.png
deleted file mode 100644
index ffb57196..00000000
--- a/resource/lfs/icons/encrypted_signed.png
+++ /dev/null
diff --git a/resource/lfs/icons/expand.png b/resource/lfs/icons/expand.png
new file mode 100644
index 00000000..04e8b33c
--- /dev/null
+++ b/resource/lfs/icons/expand.png
diff --git a/resource/lfs/icons/file-browser.png b/resource/lfs/icons/file-browser.png
deleted file mode 100644
index 29dba7e1..00000000
--- a/resource/lfs/icons/file-browser.png
+++ /dev/null
diff --git a/resource/lfs/icons/file-operator.png b/resource/lfs/icons/file-operator.png
new file mode 100644
index 00000000..cab57a98
--- /dev/null
+++ b/resource/lfs/icons/file-operator.png
diff --git a/resource/lfs/icons/file.png b/resource/lfs/icons/file.png
index d8562029..818f87af 100644
--- a/resource/lfs/icons/file.png
+++ b/resource/lfs/icons/file.png
diff --git a/resource/lfs/icons/lock.png b/resource/lfs/icons/lock.png
new file mode 100644
index 00000000..76dd66c4
--- /dev/null
+++ b/resource/lfs/icons/lock.png
diff --git a/resource/lfs/icons/unlock.png b/resource/lfs/icons/unlock.png
new file mode 100644
index 00000000..228c8f7c
--- /dev/null
+++ b/resource/lfs/icons/unlock.png
diff --git a/src/ui/main_window/MainWindowUI.cpp b/src/ui/main_window/MainWindowUI.cpp
index 7728d0ae..59ad8401 100644
--- a/src/ui/main_window/MainWindowUI.cpp
+++ b/src/ui/main_window/MainWindowUI.cpp
@@ -49,8 +49,8 @@ void MainWindow::create_actions() {
   connect(open_act_, &QAction::triggered, edit_, &TextEdit::SlotOpen);
 
   browser_act_ = create_action(
-      "file_browser", tr("File Browser"), ":/icons/file-browser.png",
-      tr("Open a file browser"), {QKeySequence(Qt::CTRL | Qt::Key_B)});
+      "file_browser", tr("File Panel"), ":/icons/file-operator.png",
+      tr("Open a file panel"), {QKeySequence(Qt::CTRL | Qt::Key_B)});
   connect(browser_act_, &QAction::triggered, this,
           &MainWindow::slot_open_file_tab);
 
@@ -141,29 +141,29 @@ void MainWindow::create_actions() {
   /*
    * Crypt Menu
    */
-  encrypt_act_ = create_action("encrypt", tr("Encrypt"),
-                               ":/icons/encrypted.png", tr("Encrypt Message"),
+  encrypt_act_ = create_action("encrypt", tr("Encrypt"), ":/icons/lock.png",
+                               tr("Encrypt Message"),
                                {QKeySequence(Qt::CTRL | Qt::Key_E)});
   connect(encrypt_act_, &QAction::triggered, this,
           &MainWindow::SlotGeneralEncrypt);
 
-  encrypt_sign_act_ = create_action(
-      "encrypt_sign", tr("Encrypt Sign"), ":/icons/encrypted_signed.png",
-      tr("Encrypt and Sign Message"),
-      {QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_E)});
+  encrypt_sign_act_ =
+      create_action("encrypt_sign", tr("Encrypt Sign"), ":/icons/compress.png",
+                    tr("Encrypt and Sign Message"),
+                    {QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_E)});
   connect(encrypt_sign_act_, &QAction::triggered, this,
           &MainWindow::SlotGeneralEncryptSign);
 
-  decrypt_act_ = create_action("decrypt", tr("Decrypt"),
-                               ":/icons/decrypted.png", tr("Decrypt Message"),
+  decrypt_act_ = create_action("decrypt", tr("Decrypt"), ":/icons/unlock.png",
+                               tr("Decrypt Message"),
                                {QKeySequence(Qt::CTRL | Qt::Key_D)});
   connect(decrypt_act_, &QAction::triggered, this,
           &MainWindow::SlotGeneralDecrypt);
 
-  decrypt_verify_act_ = create_action(
-      "decrypt_verify", tr("Decrypt Verify"), ":/icons/decrypted_verified.png",
-      tr("Decrypt and Verify Message"),
-      {QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_D)});
+  decrypt_verify_act_ =
+      create_action("decrypt_verify", tr("Decrypt Verify"),
+                    ":/icons/expand.png", tr("Decrypt and Verify Message"),
+                    {QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_D)});
   connect(decrypt_verify_act_, &QAction::triggered, this,
           &MainWindow::SlotGeneralDecryptVerify);
 
@@ -499,9 +499,9 @@ void MainWindow::create_tool_bars() {
   crypt_tool_bar_ = addToolBar(tr("Operations"));
   crypt_tool_bar_->setObjectName("cryptToolBar");
   crypt_tool_bar_->addAction(encrypt_act_);
-  crypt_tool_bar_->addAction(encrypt_sign_act_);
+  // crypt_tool_bar_->addAction(encrypt_sign_act_);
   crypt_tool_bar_->addAction(decrypt_act_);
-  crypt_tool_bar_->addAction(decrypt_verify_act_);
+  // crypt_tool_bar_->addAction(decrypt_verify_act_);
   crypt_tool_bar_->addAction(sign_act_);
   crypt_tool_bar_->addAction(verify_act_);
   view_menu_->addAction(crypt_tool_bar_->toggleViewAction());
diff --git a/ui/PlainTextEditor.ui b/ui/PlainTextEditor.ui
index 266eba56..241c6f50 100644
--- a/ui/PlainTextEditor.ui
+++ b/ui/PlainTextEditor.ui
@@ -39,6 +39,12 @@
        <property name="spacing">
         <number>12</number>
        </property>
+       <property name="leftMargin">
+        <number>5</number>
+       </property>
+       <property name="rightMargin">
+        <number>5</number>
+       </property>
        <item>
         <widget class="QLabel" name="loadingLabel">
          <property name="text">
@@ -49,7 +55,7 @@
        <item>
         <spacer name="horizontalSpacer">
          <property name="orientation">
-          <enum>Qt::Horizontal</enum>
+          <enum>Qt::Orientation::Horizontal</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>