Skip to content

Commit

Permalink
Merge branch 'develop' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@saturneric
saturneric committed Jul 6, 2021
2 parents ad507f2 + f1ca194 commit 917a13c
Show file tree
Hide file tree
Showing 9 changed files with 67 additions and 52 deletions.
2 changes: 2 additions & 0 deletions gpgfrontend.qrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Binary file added resource/icons/refresh.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resource/icons/up.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 10 additions & 10 deletions resource/ts/gpg_frontend_fr.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
20 changes: 10 additions & 10 deletions resource/ts/gpg_frontend_ru.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
20 changes: 10 additions & 10 deletions resource/ts/gpgfrontend_en_us.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
20 changes: 10 additions & 10 deletions resource/ts/gpgfrontend_zh_chs.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
20 changes: 10 additions & 10 deletions resource/ts/gpgfrontend_zh_cht.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
17 changes: 15 additions & 2 deletions src/ui/widgets/FilePage.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand Down

0 comments on commit 917a13c

Please sign in to comment.