Merge pull request #384 from UnitooTeam/master

Should fix #383

4 files changed, 73 insertions, 32 deletions

diff --git a/icons/folder-new.svg b/icons/folder-new.svg
new file mode 100644
index 00000000..7f01003a
--- /dev/null
+++ b/icons/folder-new.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="folder-new.svg"
+   inkscape:version="0.92.2 2405546, 2018-03-11">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1440"
+     inkscape:window-height="836"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="9.8333333"
+     inkscape:cx="-8.6440678"
+     inkscape:cy="12"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="M20 6h-8l-2-2H4c-1.11 0-1.99.89-1.99 2L2 18c0 1.11.89 2 2 2h16c1.11 0 2-.89 2-2V8c0-1.11-.89-2-2-2zm-1 8h-3v3h-2v-3h-3v-2h3V9h2v3h3v2z"
+     id="path2"
+     style="fill:#979797;fill-opacity:1" />
+</svg>
diff --git a/resources.qrc b/resources.qrc
index 03a44182..d1d31261 100644
--- 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
index 2751523b..bc913ccf 100644
--- 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
index 51b4bb3b..65a6747b 100644
--- 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>