Add option to delay autostart by 5 seconds

Author: ThePBone

dialog/firstlaunchwizard.cpp

@@ -93,7 +93,8 @@ FirstLaunchWizard::FirstLaunchWizard(AppConfigWrapper* _appconf, MainWindow* mai
     auto systray_autostart_radio = [this,autostart_path,mainwin]{
         if(ui->p3_systray_minOnBoot->isChecked()){
             AutostartManager::saveDesktopFile(autostart_path,mainwin->GetExecutablePath(),
-                                              ui->p3_systray_autostartViper->isChecked());
+                                              ui->p3_systray_autostartViper->isChecked(),
+                                              AutostartManager::inspectDesktopFile(autostart_path,AutostartManager::Delayed));
         }
         else QFile(autostart_path).remove();
         ui->p3_systray_autostartViper->setEnabled(ui->p3_systray_minOnBoot->isChecked());

dialog/settings.ui

@@ -113,7 +113,7 @@
      <item>
       <widget class="QStackedWidget" name="stackedWidget">
        <property name="currentIndex">
-        <number>1</number>
+        <number>4</number>
        </property>
        <widget class="QWidget" name="general">
         <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -806,6 +806,13 @@
                  </property>
                 </widget>
                </item>
+               <item>
+                <widget class="QCheckBox" name="systray_delay">
+                 <property name="text">
+                  <string>Delay autostart by 5 seconds</string>
+                 </property>
+                </widget>
+               </item>
               </layout>
              </widget>
             </item>

dialog/settingsdlg.cpp

@@ -145,14 +145,16 @@ SettingsDlg::SettingsDlg(MainWindow* mainwin,QWidget *parent) :
     auto autostart_update = [this,mainwin,autostart_path]{
         if(ui->systray_minOnBoot->isChecked()){
             AutostartManager::saveDesktopFile(autostart_path,mainwin->GetExecutablePath(),
-                                              ui->systray_autostartViper->isChecked());
+                                              ui->systray_autostartViper->isChecked(),
+                                              ui->systray_delay->isChecked());
         }
         else QFile(autostart_path).remove();
         ui->systray_autostartViper->setEnabled(ui->systray_minOnBoot->isChecked());
+        ui->systray_delay->setEnabled(ui->systray_minOnBoot->isChecked());
     };
     connect(ui->systray_minOnBoot,&QPushButton::clicked,this,autostart_update);
     connect(ui->systray_autostartViper,&QPushButton::clicked,this,autostart_update);
-
+    connect(ui->systray_delay,&QPushButton::clicked,this,autostart_update);
 
     auto change_theme_mode = [this]{
         if(lockslot)return;
@@ -425,10 +427,13 @@ void SettingsDlg::refreshAll(){
 
     bool autostart_enabled = AutostartManager::inspectDesktopFile(autostart_path,AutostartManager::Exists);
     bool autostartviper_enabled = AutostartManager::inspectDesktopFile(autostart_path,AutostartManager::UsesViperAutostart);
+    bool autostart_delayed = AutostartManager::inspectDesktopFile(autostart_path,AutostartManager::Delayed);
 
     ui->systray_minOnBoot->setChecked(autostart_enabled);
     ui->systray_autostartViper->setEnabled(autostart_enabled);
     ui->systray_autostartViper->setChecked(autostartviper_enabled);
+    ui->systray_delay->setEnabled(autostart_enabled);
+    ui->systray_delay->setChecked(autostart_delayed);
 
     ui->deftab_favorite->setChecked(!appconf->getConv_DefTab());
     ui->deftab_filesys->setChecked(appconf->getConv_DefTab());

mainwindow.cpp

@@ -155,7 +155,9 @@ MainWindow::MainWindow(QString exepath, bool statupInTray, bool allowMultipleIns
     if(!m_appwrapper->getIntroShown())
         LaunchFirstRunSetup();
     else
-        RunDiagnosticChecks();
+        QTimer::singleShot(300,this,[this]{
+            RunDiagnosticChecks();
+        });
 
     //setStyle(new PhantomStyle);
 }

misc/autostartmanager.cpp

@@ -10,9 +10,13 @@ AutostartManager::AutostartManager()
 }
 
 void AutostartManager::saveDesktopFile(QString path, const QString& exepath,
-                                       bool enableAutostartViper){
+                                       bool enableAutostartViper, bool delayed){
     ConfigContainer* conf = new ConfigContainer();
-    conf->setValue("Exec",QString("%1 --tray%2").arg(exepath).arg(enableAutostartViper ? " --startviper" : ""));
+    conf->setValue("Exec",QString("%0%1 --tray%2%3")
+                   .arg(delayed ? "sleep 5s && " : "")
+                   .arg(exepath)
+                   .arg(enableAutostartViper ? " --startviper" : "")
+                   .arg(delayed ? " &" : ""));
     conf->setValue("Name","Viper4Linux2-GUI Systray");
     conf->setValue("StartupNotify",false);
     conf->setValue("Terminal",false);
@@ -28,14 +32,14 @@ void AutostartManager::saveDesktopFile(QString path, const QString& exepath,
 
 bool AutostartManager::inspectDesktopFile(const QString& path, InspectionMode mode){
     ConfigContainer conf;
+    conf.setConfigMap(ConfigIO::readFile(path));
     switch(mode){
     case UsesViperAutostart:
-        conf.setConfigMap(ConfigIO::readFile(path));
         return conf.getString("Exec").contains("--startviper");
-        break;
+    case Delayed:
+        return conf.getString("Exec").contains("sleep 5s");
     case Exists:
         return QFile::exists(path);
-        break;
     }
     return false;
 }

misc/autostartmanager.h

@@ -22,10 +22,11 @@ class AutostartManager
 public:
     typedef enum InspectionMode{
         UsesViperAutostart,
-        Exists
+        Exists,
+        Delayed,
     }InspectionMode;
     AutostartManager();
-    static void saveDesktopFile(QString path, const QString& exepath, bool enableAutostartViper);
+    static void saveDesktopFile(QString path, const QString& exepath, bool enableAutostartViper, bool delayed);
     static bool inspectDesktopFile(const QString& path, InspectionMode mode);
     static QString getAutostartPath(const QString& filename);
 };