From d6dc135fe117f9344b4d52dc253781b3ed7fb6ab Mon Sep 17 00:00:00 2001
From: Vaibhav Pandey <contact@vaibhavpandey.com>
Date: Fri, 8 Mar 2019 17:57:44 +0530
Subject: [PATCH] Fix auto-select signed APK and decrease Splash duration.

---
 sources/mainwindow.cpp   | 33 ++++++++++++++-------------------
 sources/splashwindow.cpp |  3 ++-
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/sources/mainwindow.cpp b/sources/mainwindow.cpp
index 4285676..542866e 100644
--- a/sources/mainwindow.cpp
+++ b/sources/mainwindow.cpp
@@ -609,7 +609,9 @@ void MainWindow::handleSignFinished(const QString &apk)
     m_ProgressDialog->deleteLater();
     m_StatusMessage->setText(tr("Signing finished."));
     auto selected = m_ProjectsTree->selectedItems().first();
-    reloadChildren(selected->parent());
+    auto parent = selected->parent();
+    reloadChildren(parent);
+    selected = parent->child(0);
     m_ProjectsTree->scrollToItem(selected);
     m_ProjectsTree->selectionModel()->clearSelection();
     selected->setSelected(true);
@@ -622,18 +624,16 @@ void MainWindow::handleTreeContextMenu(const QPoint &point)
     if (item) {
         const int type = item->data(0, Qt::UserRole + 1).toInt();
         const QString path = item->data(0, Qt::UserRole + 2).toString();
-    #ifdef QT_DEBUG
+#ifdef QT_DEBUG
         qDebug() << "Context menu requested for" << item->text(0) << "at" << point;
-    #endif
-        auto open = menu.addAction(tr("Open"));
+#endif
         if (type == File) {
+            auto open = menu.addAction(tr("Open"));
             connect(open, &QAction::triggered, [=] {
                 openFile(path);
             });
-        } else {
-            open->setEnabled(false);
         }
-    #ifdef Q_OS_WIN
+#ifdef Q_OS_WIN
         auto openin = menu.addAction(tr("Open in Explorer"));
         connect(openin, &QAction::triggered, [=] {
             QStringList args;
@@ -643,7 +643,7 @@ void MainWindow::handleTreeContextMenu(const QPoint &point)
             args << QDir::toNativeSeparators(path);
             QProcess::startDetached("explorer.exe", args);
         });
-    #elif defined(Q_OS_MACOS)
+#elif defined(Q_OS_MACOS)
         auto openin = menu.addAction(tr("Open in Finder"));
         connect(openin, &QAction::triggered, [=] {
             QStringList args;
@@ -653,33 +653,28 @@ void MainWindow::handleTreeContextMenu(const QPoint &point)
             args << "-e" << "tell application \"Finder\" to activate";
             QProcess::execute("/usr/bin/osascript", args);
         });
-    #else
+#else
         auto openin = menu.addAction(tr("Open in Files"));
         connect(openin, &QAction::triggered, [=] {
             QProcess::startDetached("xdg-open", QStringList() << path);
         });
-    #endif
+#endif
         menu.addSeparator();
         auto build = menu.addAction(tr("Build"));
         connect(build, &QAction::triggered, this, &MainWindow::handleActionBuild);
-        menu.addSeparator();
-        auto install = menu.addAction(tr("Install"));
-        auto sign = menu.addAction(tr("Sign / Export"));
         if (path.endsWith(".apk")) {
+            menu.addSeparator();
+            auto install = menu.addAction(tr("Install"));
             connect(install, &QAction::triggered, this, &MainWindow::handleActionInstall);
+            auto sign = menu.addAction(tr("Sign / Export"));
             connect(sign, &QAction::triggered, this, &MainWindow::handleActionSign);
-        } else {
-            install->setEnabled(false);
-            sign->setEnabled(false);
         }
         menu.addSeparator();
-        auto refresh = menu.addAction(tr("Refresh"));
         if (type != File) {
+            auto refresh = menu.addAction(tr("Refresh"));
             connect(refresh, &QAction::triggered, [=] {
                 reloadChildren(item);
             });
-        } else {
-            refresh->setEnabled(false);
         }
     } else {
         auto apk = menu.addAction(tr("Open APK"));
diff --git a/sources/splashwindow.cpp b/sources/splashwindow.cpp
index 9be73be..b609920 100644
--- a/sources/splashwindow.cpp
+++ b/sources/splashwindow.cpp
@@ -6,6 +6,7 @@
 #include "processutils.h"
 #include "splashwindow.h"
 
+#define SPLASH_DURATION 1000
 #define SPLASH_WIDTH 512
 #define SPLASH_HEIGHT 320
 
@@ -15,7 +16,7 @@ SplashWindow::SplashWindow()
     setCentralWidget(buildCentralWidget());
     setMaximumSize(SPLASH_WIDTH, SPLASH_HEIGHT);
     setMinimumSize(SPLASH_WIDTH, SPLASH_HEIGHT);
-    QTimer::singleShot(3 * 1000, [=] {
+    QTimer::singleShot(SPLASH_DURATION, [=] {
         (new MainWindow())->show();
         close();
     });