New icons from Breeze project

evpo · Mar 29, 2024 · fab9933 · fab9933
1 parent c78826a
commit fab9933
Show file tree

Hide file tree

Showing 50 changed files with 498 additions and 688 deletions.
diff --git a/images/breeze/dark/gtk-convert.svg → images/breeze/dark/dialog-layers.svg b/images/breeze/dark/gtk-convert.svg → images/breeze/dark/dialog-layers.svg
diff --git a/images/breeze/dark/document-edit-sign-encrypt.svg b/images/breeze/dark/document-edit-sign-encrypt.svg
diff --git a/images/breeze/dark/document-new.svg b/images/breeze/dark/document-new.svg
diff --git a/images/breeze/dark/im-user.svg b/images/breeze/dark/im-user.svg
diff --git a/images/breeze/dark/network-vpn.svg b/images/breeze/dark/network-vpn.svg
diff --git a/images/breeze/dark/package-new.svg b/images/breeze/dark/package-new.svg
diff --git a/images/breeze/dark/redeyes.svg b/images/breeze/dark/redeyes.svg
diff --git a/images/breeze/dark/view-visible.svg b/images/breeze/dark/view-visible.svg
diff --git a/images/breeze/light/gtk-convert.svg → images/breeze/light/dialog-layers.svg b/images/breeze/light/gtk-convert.svg → images/breeze/light/dialog-layers.svg
diff --git a/images/breeze/light/document-edit-sign-encrypt.svg b/images/breeze/light/document-edit-sign-encrypt.svg
diff --git a/images/breeze/light/document-new.svg b/images/breeze/light/document-new.svg
diff --git a/images/breeze/light/im-user.svg b/images/breeze/light/im-user.svg
diff --git a/images/breeze/light/network-vpn.svg b/images/breeze/light/network-vpn.svg
diff --git a/images/breeze/light/package-new.svg b/images/breeze/light/package-new.svg
diff --git a/images/breeze/light/redeyes.svg b/images/breeze/light/redeyes.svg
diff --git a/images/breeze/light/view-visible.svg b/images/breeze/light/view-visible.svg
diff --git a/images/famfamfam/arrow_redo.png b/images/famfamfam/arrow_redo.png
diff --git a/images/famfamfam/arrow_switch.png b/images/famfamfam/arrow_switch.png
diff --git a/images/famfamfam/arrow_undo.png b/images/famfamfam/arrow_undo.png
diff --git a/images/famfamfam/cross.png b/images/famfamfam/cross.png
diff --git a/images/famfamfam/cut.png b/images/famfamfam/cut.png
diff --git a/images/famfamfam/disk.png b/images/famfamfam/disk.png
diff --git a/images/famfamfam/disk_multiple.png b/images/famfamfam/disk_multiple.png
diff --git a/images/famfamfam/find.png b/images/famfamfam/find.png
diff --git a/images/famfamfam/folder_page_white.png b/images/famfamfam/folder_page_white.png
diff --git a/images/famfamfam/key.png b/images/famfamfam/key.png
diff --git a/images/famfamfam/key_add.png b/images/famfamfam/key_add.png
diff --git a/images/famfamfam/key_delete.png b/images/famfamfam/key_delete.png
diff --git a/images/famfamfam/lock.png b/images/famfamfam/lock.png
diff --git a/images/famfamfam/lock_delete.png b/images/famfamfam/lock_delete.png
diff --git a/images/famfamfam/magnifier.png b/images/famfamfam/magnifier.png
diff --git a/images/famfamfam/magnifier_zoom_in.png b/images/famfamfam/magnifier_zoom_in.png
diff --git a/images/famfamfam/magnifier_zoom_out.png b/images/famfamfam/magnifier_zoom_out.png
diff --git a/images/famfamfam/page_copy.png b/images/famfamfam/page_copy.png
diff --git a/images/famfamfam/page_paste.png b/images/famfamfam/page_paste.png
diff --git a/images/famfamfam/page_white.png b/images/famfamfam/page_white.png
diff --git a/images/famfamfam/page_white_gear.png b/images/famfamfam/page_white_gear.png
diff --git a/images/famfamfam/page_white_key.png b/images/famfamfam/page_white_key.png
diff --git a/images/famfamfam/page_white_text.png b/images/famfamfam/page_white_text.png
diff --git a/images/famfamfam/read_only.png b/images/famfamfam/read_only.png
diff --git a/images/famfamfam/user_suit.png b/images/famfamfam/user_suit.png
diff --git a/images/famfamfam/wrap.png b/images/famfamfam/wrap.png
diff --git a/qt_ui/EncryptPad.qrc b/qt_ui/EncryptPad.qrc
@@ -1,40 +1,12 @@
 <RCC>
     <qresource prefix="/">
-        <file>../images/famfamfam/cut.png</file>
-        <file>../images/famfamfam/disk.png</file>
-        <file>../images/famfamfam/disk_multiple.png</file>
-        <file>../images/famfamfam/find.png</file>
-        <file>../images/famfamfam/folder_page_white.png</file>
-        <file>../images/famfamfam/key.png</file>
-        <file>../images/famfamfam/key_add.png</file>
-        <file>../images/famfamfam/key_delete.png</file>
-        <file>../images/famfamfam/lock.png</file>
-        <file>../images/famfamfam/lock_delete.png</file>
-        <file>../images/famfamfam/magnifier.png</file>
-        <file>../images/famfamfam/magnifier_zoom_in.png</file>
-        <file>../images/famfamfam/page_copy.png</file>
-        <file>../images/famfamfam/page_paste.png</file>
-        <file>../images/famfamfam/page_white.png</file>
-        <file>../images/famfamfam/magnifier_zoom_out.png</file>
         <file>../images/application_icon.png</file>
-        <file>../images/famfamfam/cross.png</file>
-        <file>../images/famfamfam/page_white_gear.png</file>
-        <file>../images/famfamfam/arrow_redo.png</file>
-        <file>../images/famfamfam/arrow_undo.png</file>
-        <file>../images/famfamfam/read_only.png</file>
-        <file>../images/famfamfam/arrow_switch.png</file>
-        <file>../images/famfamfam/wrap.png</file>
-        <file>../images/famfamfam/user_suit.png</file>
-        <file>../images/famfamfam/page_white_text.png</file>
-        <file>../images/famfamfam/page_white_key.png</file>
         <file>../images/breeze/light/configure.svg</file>
         <file>../images/breeze/light/dialog-cancel.svg</file>
         <file>../images/breeze/light/document-decrypt.svg</file>
         <file>../images/breeze/light/document-edit-decrypt.svg</file>
         <file>../images/breeze/light/document-edit-encrypt.svg</file>
-        <file>../images/breeze/light/document-edit-sign-encrypt.svg</file>
         <file>../images/breeze/light/document-encrypted.svg</file>
-        <file>../images/breeze/light/document-new.svg</file>
         <file>../images/breeze/light/document-open.svg</file>
         <file>../images/breeze/light/document-print.svg</file>
         <file>../images/breeze/light/document-properties.svg</file>
@@ -49,28 +21,21 @@
         <file>../images/breeze/light/format-font-size-less.svg</file>
         <file>../images/breeze/light/format-font-size-more.svg</file>
         <file>../images/breeze/light/format-font-size-reset.svg</file>
-        <file>../images/breeze/light/gtk-convert.svg</file>
-        <file>../images/breeze/light/im-user.svg</file>
         <file>../images/breeze/light/meeting-organizer.svg</file>
-        <file>../images/breeze/light/network-vpn.svg</file>
-        <file>../images/breeze/light/package-new.svg</file>
-        <file>../images/breeze/light/redeyes.svg</file>
         <file>../images/breeze/light/snap-page.svg</file>
         <file>../images/breeze/light/text-wrap.svg</file>
         <file>../images/breeze/light/view-readermode.svg</file>
-        <file>../images/breeze/light/view-visible.svg</file>
         <file>../images/breeze/light/key-add.svg</file>
         <file>../images/breeze/light/key-remove.svg</file>
         <file>../images/breeze/light/key.svg</file>
         <file>../images/breeze/light/file-encryption.svg</file>
+        <file>../images/breeze/light/dialog-layers.svg</file>
         <file>../images/breeze/dark/configure.svg</file>
         <file>../images/breeze/dark/dialog-cancel.svg</file>
         <file>../images/breeze/dark/document-decrypt.svg</file>
         <file>../images/breeze/dark/document-edit-decrypt.svg</file>
         <file>../images/breeze/dark/document-edit-encrypt.svg</file>
-        <file>../images/breeze/dark/document-edit-sign-encrypt.svg</file>
         <file>../images/breeze/dark/document-encrypted.svg</file>
-        <file>../images/breeze/dark/document-new.svg</file>
         <file>../images/breeze/dark/document-open.svg</file>
         <file>../images/breeze/dark/document-print.svg</file>
         <file>../images/breeze/dark/document-properties.svg</file>
@@ -85,19 +50,14 @@
         <file>../images/breeze/dark/format-font-size-less.svg</file>
         <file>../images/breeze/dark/format-font-size-more.svg</file>
         <file>../images/breeze/dark/format-font-size-reset.svg</file>
-        <file>../images/breeze/dark/gtk-convert.svg</file>
-        <file>../images/breeze/dark/im-user.svg</file>
         <file>../images/breeze/dark/meeting-organizer.svg</file>
-        <file>../images/breeze/dark/network-vpn.svg</file>
-        <file>../images/breeze/dark/package-new.svg</file>
-        <file>../images/breeze/dark/redeyes.svg</file>
         <file>../images/breeze/dark/snap-page.svg</file>
         <file>../images/breeze/dark/text-wrap.svg</file>
         <file>../images/breeze/dark/view-readermode.svg</file>
-        <file>../images/breeze/dark/view-visible.svg</file>
         <file>../images/breeze/dark/key-add.svg</file>
         <file>../images/breeze/dark/key-remove.svg</file>
         <file>../images/breeze/dark/key.svg</file>
         <file>../images/breeze/dark/file-encryption.svg</file>
+        <file>../images/breeze/dark/dialog-layers.svg</file>
     </qresource>
 </RCC>
diff --git a/qt_ui/application.cpp b/qt_ui/application.cpp
@@ -67,7 +67,7 @@ void Application::setMainWindow(MainWindow *window)
     mainWindow = window;
 }
 
-ThemeAppearance Application::getThemeAppearance() const
+ThemeAppearance Application::getAutoThemeAppearance() const
 {
     auto palette = this->palette();
     const QColor textColor = palette.color(QPalette::WindowText);

diff --git a/qt_ui/application.h b/qt_ui/application.h
@@ -30,7 +30,7 @@ class Application : public QApplication
     Application(int &argc, char **argv);
     void setMainWindow(MainWindow *);
     MainWindow *getMainWindow();
-    ThemeAppearance getThemeAppearance() const;
+    ThemeAppearance getAutoThemeAppearance() const;
 protected:
     bool event(QEvent *);
     void loadFile(const QString &fileName);

diff --git a/qt_ui/file_encryption_dialog.ui b/qt_ui/file_encryption_dialog.ui
@@ -378,10 +378,6 @@
           <property name="text">
            <string>Encrypt</string>
           </property>
-          <property name="icon">
-           <iconset resource="EncryptPad.qrc">
-            <normaloff>:/images/famfamfam/page_white_key.png</normaloff>:/images/famfamfam/page_white_key.png</iconset>
-          </property>
           <property name="checked">
            <bool>true</bool>
           </property>
@@ -392,10 +388,6 @@
           <property name="text">
            <string>Decrypt</string>
           </property>
-          <property name="icon">
-           <iconset resource="EncryptPad.qrc">
-            <normaloff>:/images/famfamfam/page_white_text.png</normaloff>:/images/famfamfam/page_white_text.png</iconset>
-          </property>
          </widget>
         </item>
        </layout>

diff --git a/qt_ui/main.cpp b/qt_ui/main.cpp
@@ -230,7 +230,7 @@ int main(int argc, char *argv[])
         app.setApplicationName("EncryptPad");
 
         MainWindow mainWin;
-        mainWin.setThemeAppearance(app.getThemeAppearance());
+        mainWin.setAutoThemeAppearance(app.getAutoThemeAppearance());
         app.setMainWindow(&mainWin);
         mainWin.show();