Merge pull request #139 from Nighty3098/InDev

Now the automatic update information window will not open if there are no updates available

Author: Nighty3098

src/CodeKeeper/keeperFunc/functional.cpp

@@ -88,7 +88,8 @@ void MainWindow::getSettingsData()
     isAutoCheckUpdates = globalSettings->value("isAutoCheckUpdates").value<bool>();
 
     qDebug() << " " << dir << selectedFont << font_size << theme << isCustomTitlebar << sortNotesRole << isAutoSyncing << isVisibleNotesList
-             << isVisibleFolders << isVisiblePreview << isViewMode << git_repo << git_user << git_token << isAutoSyncB << isCustomTheme << isAutoCheckUpdates;
+             << isVisibleFolders << isVisiblePreview << isViewMode << git_repo << git_user << git_token << isAutoSyncB << isCustomTheme
+             << isAutoCheckUpdates;
 }
 
 void MainWindow::setConnectionStatus()

src/CodeKeeper/mainwindow.cpp

@@ -72,13 +72,10 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent)
             if (currentAppVersion == newAppVersion) {
 
             } else {
-                settingsWindow->checkUpdates();
+                settingsWindow->checkUpdates(false);
             }
+        } else {
         }
-        else {
-            
-        }
-
     });
     updatesThread->start();
 

src/CodeKeeper/settingsFunc/functional.cpp

@@ -52,7 +52,7 @@ void SettingsWindow::closeEvent(QCloseEvent* event)
     saveData();
 }
 
-void SettingsWindow::checkUpdates()
+void SettingsWindow::checkUpdates(bool isShow)
 {
     QString secondLastRelease = fetchSecondLastRelease();
 
@@ -134,8 +134,11 @@ void SettingsWindow::checkUpdates()
     connect(whatsNewButton, &QPushButton::clicked, [&]() {
         QDesktopServices::openUrl(QUrl("https://github.com/Nighty3098/CodeKeeper/compare/" + secondLastRelease + "..." + currentAppVersion + ""));
     });
-
-    dialog.exec();
+    
+    if (!isShow && newAppVersion == currentAppVersion) { }
+    else {
+        dialog.exec();
+    }
 }
 
 void SettingsWindow::checkRepo()

src/CodeKeeper/settingswindow.cpp

@@ -92,7 +92,7 @@ SettingsWindow::SettingsWindow(QWidget* parent) : QMainWindow { parent }
     urlToRepo->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
 
     versionInfo = new QLabel();
-    versionInfo->setText("0.1.8");
+    versionInfo->setText("0.1.9");
     versionInfo->setAlignment(Qt::AlignCenter);
 
     checkUpdatesBtn = new QPushButton(
@@ -365,7 +365,7 @@ SettingsWindow::SettingsWindow(QWidget* parent) : QMainWindow { parent }
     // connects
     connect(saveBtn, SIGNAL(clicked()), this, SLOT(saveData()));
     connect(quitBtn, SIGNAL(clicked()), this, SLOT(QuitW()));
-    connect(checkUpdatesBtn, SIGNAL(clicked()), this, SLOT(checkUpdates()));
+    connect(checkUpdatesBtn, SIGNAL(clicked()), this, SLOT(checkUpdates(true)));
     connect(openFolder, SIGNAL(clicked()), this, SLOT(fopenFolder()));
 
     QTimer* repoTimer = new QTimer(this);

src/CodeKeeper/settingswindow.h

@@ -13,7 +13,7 @@ class SettingsWindow : public QMainWindow
     ~SettingsWindow();
     QSettings *globalSettings;
 
-    void checkUpdates();
+    void checkUpdates(bool isShow);
     QString getNewAppVersion();
 
     QLabel *versionInfo;