Merge branch 'develop' into develop-ci

1 files changed, 44 insertions, 13 deletions

diff --git a/src/ui/widgets/FilePage.cpp b/src/ui/widgets/FilePage.cpp
index bab6cf68..b9602d58 100644
--- a/src/ui/widgets/FilePage.cpp
+++ b/src/ui/widgets/FilePage.cpp
@@ -46,15 +46,33 @@ FilePage::FilePage(QWidget *parent) : QWidget(parent) {
 
     createPopupMenu();
 
-    upLevelButton = new QPushButton("Up");
+
+    upLevelButton = new QPushButton();
     connect(upLevelButton, SIGNAL(clicked(bool)), this, SLOT(slotUpLevel()));
 
+    QString buttonStyle = "QPushButton{border:none;background-color:rgba(255, 255, 255,100);}";
+
+
+    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());
+    upLevelButton->setStyleSheet(buttonStyle);
+
     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());
+    goPathButton->setStyleSheet(buttonStyle);
+
     pathEdit = new QLineEdit();
     pathEdit->setText(dirModel->rootPath());
 
@@ -62,7 +80,7 @@ FilePage::FilePage(QWidget *parent) : QWidget(parent) {
     menuLayout->addWidget(upLevelButton);
     menuLayout->setStretchFactor(upLevelButton, 1);
     menuLayout->addWidget(pathEdit);
-    menuLayout->setStretchFactor(pathEdit, 8);
+    menuLayout->setStretchFactor(pathEdit, 10);
     menuLayout->addWidget(goPathButton);
     menuLayout->setStretchFactor(goPathButton, 1);
     // menuLayout->addWidget(refreshButton);
@@ -87,17 +105,22 @@ FilePage::FilePage(QWidget *parent) : QWidget(parent) {
 }
 
 void FilePage::fileTreeViewItemClicked(const QModelIndex &index) {
-    mPath = dirModel->fileInfo(index).absoluteFilePath();
-    qDebug() << "mPath" << mPath;
+    selectedPath = dirModel->fileInfo(index).absoluteFilePath();
+    qDebug() << "selectedPath" << selectedPath;
 }
 
 void FilePage::slotUpLevel() {
     QModelIndex currentRoot = dirTreeView->rootIndex();
-    mPath = dirModel->fileInfo(currentRoot.parent()).absoluteFilePath();
-    auto fileInfo = QFileInfo(mPath);
+
+    mPath = dirModel->fileInfo(currentRoot).absoluteFilePath();
+    QDir dir(mPath);
+    dir.makeAbsolute();
+    dir.setPath(QDir::cleanPath(dir.filePath(QStringLiteral(".."))));
+    mPath = dir.absolutePath();
+    auto fileInfo = QFileInfo(dir.absolutePath());
     if(fileInfo.isDir() && fileInfo.isReadable() && fileInfo.isExecutable()) {
-        dirTreeView->setRootIndex(currentRoot.parent());
         pathEdit->setText(mPath);
+        slotGoPath();
     }
     qDebug() << "Current Root mPath" << mPath;
     emit pathChanged(mPath);
@@ -106,8 +129,9 @@ void FilePage::slotUpLevel() {
 void FilePage::fileTreeViewItemDoubleClicked(const QModelIndex &index) {
     mPath = dirModel->fileInfo(index).absoluteFilePath();
     auto fileInfo = QFileInfo(mPath);
+    auto targetModelIndex = dirTreeView->model()->index(index.row(), 0, index.parent());
     if(fileInfo.isDir() && fileInfo.isReadable() && fileInfo.isExecutable()) {
-        dirTreeView->setRootIndex(index);
+        dirTreeView->setRootIndex(targetModelIndex);
         pathEdit->setText(mPath);
     }
     qDebug() << "Index mPath" << mPath;
@@ -115,7 +139,7 @@ void FilePage::fileTreeViewItemDoubleClicked(const QModelIndex &index) {
 }
 
 QString FilePage::getSelected() const {
-    return mPath;
+    return selectedPath;
 }
 
 void FilePage::slotGoPath() {
@@ -159,10 +183,10 @@ void FilePage::createPopupMenu() {
 
 void FilePage::onCustomContextMenu(const QPoint &point) {
     QModelIndex index = dirTreeView->indexAt(point);
-    mPath = dirModel->fileInfo(index).absoluteFilePath();
-    qDebug() << "Right Click" <<  mPath;
+    selectedPath = dirModel->fileInfo(index).absoluteFilePath();
+    qDebug() << "Right Click" <<  selectedPath;
     if (index.isValid()) {
-        QFileInfo info(mPath);
+        QFileInfo info(selectedPath);
         encryptItemAct->setEnabled(info.isFile() && (info.suffix() != "gpg" && info.suffix() != "sig"));
         decryptItemAct->setEnabled(info.isFile() && info.suffix() == "gpg");
         signItemAct->setEnabled(info.isFile() && (info.suffix() != "gpg" && info.suffix() != "sig"));
@@ -234,3 +258,10 @@ void FilePage::slotVerifyItem() {
     if(mainWindow != nullptr)
         mainWindow->slotFileVerify();
 }
+
+void FilePage::keyPressEvent(QKeyEvent *event) {
+    qDebug() << "Key Press" << event->key();
+    if(event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter) {
+        slotGoPath();
+    }
+}