Merge branch 'develop' into mainv1.1.1

9 files changed, 67 insertions, 52 deletions

diff --git a/gpgfrontend.qrc b/gpgfrontend.qrc
index fce9f6bc..71513dbd 100644
--- a/gpgfrontend.qrc
+++ b/gpgfrontend.qrc
@@ -55,5 +55,7 @@
         <file alias="mimetypes/unknown.png">resource/icons/mimetypes/unknown.png</file>
         <file alias="button_previous.png">resource/icons/button_previous.png</file>
         <file alias="button_next.png">resource/icons/button_next.png</file>
+        <file alias="refresh.png">resource/icons/refresh.png</file>
+        <file alias="up.png">resource/icons/up.png</file>
     </qresource>
 </RCC>
diff --git a/resource/icons/refresh.png b/resource/icons/refresh.png
new file mode 100644
index 00000000..54745560
--- /dev/null
+++ b/resource/icons/refresh.png
diff --git a/resource/icons/up.png b/resource/icons/up.png
new file mode 100644
index 00000000..46c47c70
--- /dev/null
+++ b/resource/icons/up.png
diff --git a/resource/ts/gpg_frontend_fr.ts b/resource/ts/gpg_frontend_fr.ts
index 5399b146..8db386f7 100644
--- a/resource/ts/gpg_frontend_fr.ts
+++ b/resource/ts/gpg_frontend_fr.ts
@@ -292,52 +292,52 @@
 <context>
     <name>FilePage</name>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="137"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="144"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="139"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="146"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="141"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="148"/>
         <source>Encrypt and Sign</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="143"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="150"/>
         <source>Decrypt and Verify</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="145"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="152"/>
         <source>Only Sign</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="147"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="154"/>
         <source>Only Verify</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="198"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="205"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="199"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="206"/>
         <source>Are you sure you want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="209"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="216"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="210"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="217"/>
         <source>Unable to delete the file or folder.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/resource/ts/gpg_frontend_ru.ts b/resource/ts/gpg_frontend_ru.ts
index 0fbf5c03..cbe79ea5 100644
--- a/resource/ts/gpg_frontend_ru.ts
+++ b/resource/ts/gpg_frontend_ru.ts
@@ -292,52 +292,52 @@
 <context>
     <name>FilePage</name>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="137"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="144"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="139"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="146"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="141"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="148"/>
         <source>Encrypt and Sign</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="143"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="150"/>
         <source>Decrypt and Verify</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="145"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="152"/>
         <source>Only Sign</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="147"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="154"/>
         <source>Only Verify</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="198"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="205"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="199"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="206"/>
         <source>Are you sure you want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="209"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="216"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="210"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="217"/>
         <source>Unable to delete the file or folder.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/resource/ts/gpgfrontend_en_us.ts b/resource/ts/gpgfrontend_en_us.ts
index 101b1cb6..39d72fca 100644
--- a/resource/ts/gpgfrontend_en_us.ts
+++ b/resource/ts/gpgfrontend_en_us.ts
@@ -292,52 +292,52 @@
 <context>
     <name>FilePage</name>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="137"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="144"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="139"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="146"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="141"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="148"/>
         <source>Encrypt and Sign</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="143"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="150"/>
         <source>Decrypt and Verify</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="145"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="152"/>
         <source>Only Sign</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="147"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="154"/>
         <source>Only Verify</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="198"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="205"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="199"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="206"/>
         <source>Are you sure you want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="209"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="216"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="210"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="217"/>
         <source>Unable to delete the file or folder.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/resource/ts/gpgfrontend_zh_chs.ts b/resource/ts/gpgfrontend_zh_chs.ts
index 86c632f6..0e80e99a 100644
--- a/resource/ts/gpgfrontend_zh_chs.ts
+++ b/resource/ts/gpgfrontend_zh_chs.ts
@@ -292,52 +292,52 @@
 <context>
     <name>FilePage</name>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="137"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="144"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="139"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="146"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="141"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="148"/>
         <source>Encrypt and Sign</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="143"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="150"/>
         <source>Decrypt and Verify</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="145"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="152"/>
         <source>Only Sign</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="147"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="154"/>
         <source>Only Verify</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="198"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="205"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="199"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="206"/>
         <source>Are you sure you want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="209"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="216"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="210"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="217"/>
         <source>Unable to delete the file or folder.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/resource/ts/gpgfrontend_zh_cht.ts b/resource/ts/gpgfrontend_zh_cht.ts
index 86c632f6..0e80e99a 100644
--- a/resource/ts/gpgfrontend_zh_cht.ts
+++ b/resource/ts/gpgfrontend_zh_cht.ts
@@ -292,52 +292,52 @@
 <context>
     <name>FilePage</name>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="137"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="144"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="139"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="146"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="141"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="148"/>
         <source>Encrypt and Sign</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="143"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="150"/>
         <source>Decrypt and Verify</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="145"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="152"/>
         <source>Only Sign</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="147"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="154"/>
         <source>Only Verify</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="198"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="205"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="199"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="206"/>
         <source>Are you sure you want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="209"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="216"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/widgets/FilePage.cpp" line="210"/>
+        <location filename="../../src/ui/widgets/FilePage.cpp" line="217"/>
         <source>Unable to delete the file or folder.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/src/ui/widgets/FilePage.cpp b/src/ui/widgets/FilePage.cpp
index bab6cf68..e330eb68 100644
--- a/src/ui/widgets/FilePage.cpp
+++ b/src/ui/widgets/FilePage.cpp
@@ -46,15 +46,28 @@ FilePage::FilePage(QWidget *parent) : QWidget(parent) {
 
     createPopupMenu();
 
-    upLevelButton = new QPushButton("Up");
+
+    upLevelButton = new QPushButton();
     connect(upLevelButton, SIGNAL(clicked(bool)), this, SLOT(slotUpLevel()));
 
+    auto upPixmap = QPixmap(":up.png");
+    upPixmap = upPixmap.scaled(18, 18, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+    QIcon upButtonIcon(upPixmap);
+    upLevelButton->setIcon(upButtonIcon);
+    upLevelButton->setIconSize(upPixmap.rect().size());
+
     refreshButton = new QPushButton("Refresh");
     connect(refreshButton, SIGNAL(clicked(bool)), this, SLOT(slotGoPath()));
 
-    goPathButton = new QPushButton("Go");
+    goPathButton = new QPushButton();
     connect(goPathButton, SIGNAL(clicked(bool)), this, SLOT(slotGoPath()));
 
+    auto updatePixmap = QPixmap(":refresh.png");
+    updatePixmap = updatePixmap.scaled(18, 18, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+    QIcon updateButtonIcon(updatePixmap);
+    goPathButton->setIcon(updateButtonIcon);
+    goPathButton->setIconSize(updatePixmap.rect().size());
+
     pathEdit = new QLineEdit();
     pathEdit->setText(dirModel->rootPath());