Merge 26940ba into 4e43514

IJHack · May 3, 2018 · 3571603 · 3571603
2 parents 4e43514 + 26940ba
commit 3571603
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 32 deletions.
diff --git a/icons/folder-new.svg b/icons/folder-new.svg
diff --git a/resources.qrc b/resources.qrc
@@ -33,5 +33,6 @@
         <file alias="applications-system.svg">icons/applications-system.svg</file>
         <file alias="edit-copy.svg">icons/edit-copy.svg</file>
         <file alias="edit-clear.svg">icons/edit-clear.svg</file>
+        <file alias="folder-new">icons/folder-new.svg</file>
     </qresource>
 </RCC>
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -103,6 +103,23 @@ void MainWindow::initToolBarButtons() {
   connect(ui->actionUpdate, SIGNAL(triggered()), this, SLOT(onUpdate()));
   connect(ui->actionUsers, SIGNAL(triggered()), this, SLOT(onUsers()));
   connect(ui->actionConfig, SIGNAL(triggered()), this, SLOT(onConfig()));
+
+  ui->actionAddPassword->setIcon(
+      QIcon::fromTheme("document-new", QIcon(":/icons/document-new.svg")));
+  ui->actionAddFolder->setIcon(
+      QIcon::fromTheme("folder-new", QIcon(":/icons/folder-new.svg")));
+  ui->actionEdit->setIcon(QIcon::fromTheme(
+      "document-properties", QIcon(":/icons/document-properties.svg")));
+  ui->actionDelete->setIcon(
+      QIcon::fromTheme("edit-delete", QIcon(":/icons/edit-delete.svg")));
+  ui->actionPush->setIcon(
+      QIcon::fromTheme("go-up", QIcon(":/icons/go-top.svg")));
+  ui->actionUpdate->setIcon(
+      QIcon::fromTheme("go-down", QIcon(":/icons/go-bottom.svg")));
+  ui->actionUsers->setIcon(QIcon::fromTheme(
+      "x-office-address-book", QIcon(":/icons/x-office-address-book.svg")));
+  ui->actionConfig->setIcon(QIcon::fromTheme(
+      "applications-system", QIcon(":/icons/applications-system.svg")));
 }
 
 /**

diff --git a/src/mainwindow.ui b/src/mainwindow.ui
@@ -327,10 +327,6 @@ p, li { white-space: pre-wrap; }
    <addaction name="actionConfig"/>
   </widget>
   <action name="actionAddPassword">
-   <property name="icon">
-    <iconset theme="document-new">
-     <normaloff>.</normaloff>.</iconset>
-   </property>
    <property name="text">
     <string>Add password</string>
    </property>
@@ -342,10 +338,6 @@ p, li { white-space: pre-wrap; }
    </property>
   </action>
   <action name="actionAddFolder">
-   <property name="icon">
-    <iconset theme="folder-new">
-     <normaloff>.</normaloff>.</iconset>
-   </property>
    <property name="text">
     <string>Add folder</string>
    </property>
@@ -354,10 +346,6 @@ p, li { white-space: pre-wrap; }
    </property>
   </action>
   <action name="actionEdit">
-   <property name="icon">
-    <iconset theme="document-properties">
-     <normaloff>.</normaloff>.</iconset>
-   </property>
    <property name="text">
     <string>Edit</string>
    </property>
@@ -366,10 +354,6 @@ p, li { white-space: pre-wrap; }
    </property>
   </action>
   <action name="actionDelete">
-   <property name="icon">
-    <iconset theme="edit-delete">
-     <normaloff>.</normaloff>.</iconset>
-   </property>
    <property name="text">
     <string>Delete</string>
    </property>
@@ -378,10 +362,6 @@ p, li { white-space: pre-wrap; }
    </property>
   </action>
   <action name="actionPush">
-   <property name="icon">
-    <iconset theme="go-up">
-     <normaloff>.</normaloff>.</iconset>
-   </property>
    <property name="text">
     <string>Push</string>
    </property>
@@ -390,10 +370,6 @@ p, li { white-space: pre-wrap; }
    </property>
   </action>
   <action name="actionUpdate">
-   <property name="icon">
-    <iconset theme="go-down">
-     <normaloff>.</normaloff>.</iconset>
-   </property>
    <property name="text">
     <string>Update</string>
    </property>
@@ -402,10 +378,6 @@ p, li { white-space: pre-wrap; }
    </property>
   </action>
   <action name="actionUsers">
-   <property name="icon">
-    <iconset theme="x-office-address-book">
-     <normaloff>.</normaloff>.</iconset>
-   </property>
    <property name="text">
     <string>Users</string>
    </property>
@@ -414,10 +386,6 @@ p, li { white-space: pre-wrap; }
    </property>
   </action>
   <action name="actionConfig">
-   <property name="icon">
-    <iconset theme="applications-system">
-     <normaloff>.</normaloff>.</iconset>
-   </property>
    <property name="text">
     <string>Config</string>
    </property>