build in windows works

5 files changed, 34 insertions, 13 deletions

diff --git a/src/gui/mainmenu.cpp b/src/gui/mainmenu.cpp
index ab1b898..6f6ab00 100644
--- a/src/gui/mainmenu.cpp
+++ b/src/gui/mainmenu.cpp
@@ -265,5 +265,5 @@ void MainMenu::on_actionCheck_for_updates_automatically_triggered()
 
 void MainMenu::on_actionCheck_now_triggered()
 {
-    tikzit->checkForUpdates();
+    tikzit->checkForUpdates(true);
 }
diff --git a/src/gui/previewwindow.cpp b/src/gui/previewwindow.cpp
index 8625045..5452a7e 100644
--- a/src/gui/previewwindow.cpp
+++ b/src/gui/previewwindow.cpp
@@ -106,6 +106,6 @@ void PreviewWindow::render() {
     // qDebug() << "scale:" << scale;
     // qDebug() << "dpi:" << dpi;
 
-    QImage img = _page->renderToImage(dpi,dpi, (w1 - w)/2,  (h1 - h)/2, w, h);
+    QImage img = _page->renderToImage(dpi, dpi, (w1 - w)/2,  (h1 - h)/2, w, h);
     ui->pdf->setPixmap(QPixmap::fromImage(img));
 }
diff --git a/src/tikzit.cpp b/src/tikzit.cpp
index 5f74d0b..39a2924 100644
--- a/src/tikzit.cpp
+++ b/src/tikzit.cpp
@@ -129,7 +129,7 @@ void Tikzit::init()
     setCheckForUpdates(check.toBool());
 
     if (check.toBool()) {
-        checkForUpdates();
+        checkForUpdates(false);
     }
 
     _preview = new PreviewWindow();
@@ -365,16 +365,32 @@ void Tikzit::setCheckForUpdates(bool check)
     }
 }
 
-void Tikzit::checkForUpdates()
+void Tikzit::checkForUpdates(bool manual)
 {
     QNetworkAccessManager *manager = new QNetworkAccessManager(this);
-    connect(manager, SIGNAL(finished(QNetworkReply*)),
-            this, SLOT(updateReply(QNetworkReply*)));
+
+    if (manual) {
+        connect(manager, SIGNAL(finished(QNetworkReply*)),
+            this, SLOT(updateManual(QNetworkReply*)));
+    } else {
+        connect(manager, SIGNAL(finished(QNetworkReply*)),
+            this, SLOT(updateAuto(QNetworkReply*)));
+    }
 
     manager->get(QNetworkRequest(QUrl("https://tikzit.github.io/latest-version.txt")));
 }
 
-void Tikzit::updateReply(QNetworkReply *reply)
+void Tikzit::updateAuto(QNetworkReply *reply)
+{
+    updateReply(reply, false);
+}
+
+void Tikzit::updateManual(QNetworkReply *reply)
+{
+    updateReply(reply, true);
+}
+
+void Tikzit::updateReply(QNetworkReply *reply, bool manual)
 {
     if (!reply->isReadable()) return;
 
@@ -403,7 +419,7 @@ void Tikzit::updateReply(QNetworkReply *reply)
                 QString::number(latest.minorVersion()) + "." +
                 QString::number(latest.microVersion());
             if (rcLatest != 1000) strLatest += "-rc" + QString::number(rcLatest);
-            QMessageBox::information(0,
+            QMessageBox::information(nullptr,
               tr("Update available"),
               "<p><b>A new version of TikZiT is available!</b></p>"
               "<p><i>current version: " TIKZIT_VERSION "<br />"
@@ -412,10 +428,13 @@ void Tikzit::updateReply(QNetworkReply *reply)
               "<a href=\"https://tikzit.github.io\">tikzit.github.io</a>.</p>");
         }
     } else {
-        QMessageBox::warning(0,
+        // don't complain of invalid response for auto update check
+        if (manual) {
+            QMessageBox::warning(nullptr,
               tr("Invalid response"),
               "<p>Got invalid version response from "
               "<a href=\"https://tikzit.github.io\">tikzit.github.io</a>.</p>");
+        }
     }
 }
 
diff --git a/src/tikzit.h b/src/tikzit.h
index 3d4847d..9011cc3 100644
--- a/src/tikzit.h
+++ b/src/tikzit.h
@@ -137,8 +137,10 @@ public:
 
 public slots:
     void setCheckForUpdates(bool check);
-    void checkForUpdates();
-    void updateReply(QNetworkReply *reply);
+    void checkForUpdates(bool manual);
+    void updateAuto(QNetworkReply *reply);
+    void updateManual(QNetworkReply *reply);
+    void updateReply(QNetworkReply *reply, bool manual);
     void makePreview();
     void cleanupLatex();
 
diff --git a/tikzit.pro b/tikzit.pro
index 82b4032..b026511 100644
--- a/tikzit.pro
+++ b/tikzit.pro
@@ -110,9 +110,9 @@ FORMS += src/gui/mainwindow.ui \
     src/gui/styleeditor.ui \
     src/gui/previewwindow.ui
 
-INCLUDEPATH += src src/gui src/data
+INCLUDEPATH += src src/gui src/data extra
 
-LIBS += -lpoppler-qt5
+LIBS += -L"$$PWD/extra" -lpoppler-qt5
 
 DISTFILES +=