Updated manual link, and also standardised defines to globals.h

SPIERSedit.pro

@@ -59,7 +59,6 @@ HEADERS += src/display.h \
     src/keysafespinbox.h \
     src/mainview.h \
     src/darkstyletheme.h \
-    src/version.h \
     ../SPIERScommon/netmodule.h \
     ../SPIERScommon/semanticversion.h \
     ../SPIERScommon/prereleasecomponent.h

src/dialogaboutimpl.cpp

@@ -1,5 +1,7 @@
 #include "dialogaboutimpl.h"
 #include "mainwindowimpl.h"
+#include "globals.h"
+
 #include "../../SPIERScommon/netmodule.h"
 //
 
@@ -31,7 +33,7 @@ void DialogAboutImpl::on_pushButton_clicked()
 }
 
 */
-#include "version.h"
+
 #include <QString>
 
 DialogAboutImpl::DialogAboutImpl(QWidget *parent, Qt::WindowFlags f)

src/globals.h

@@ -18,6 +18,25 @@
 
 // internal version for file purposes - take as SPIERSedit 2.this
 #define SPIERS_VERSION 2
+
+//Legal Stuff
+#define COPYRIGHT "Copyright © 2018 Mark D. Sutton, Russell J. Garwood, Alan R.T.Spencer"
+#define LICENCE "This program comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to redistribute it under the conditions of the GPL v3  license"
+
+//Programme Name
+#define PRODUCTNAME "SPIERS Edit"
+
+//Email
+#define EMAIL "palaeoware@gmail.com"
+
+//Github
+#define GITURL "https://github.com/"
+#define GITREPOSITORY "palaeoware/SPIERSedit"
+#define GITISSUE "/issues"
+
+//Readthedocs
+#define READTHEDOCS "https://spiersedit.readthedocs.io/en/latest/"
+
 extern QList<bool> FilesDirty; //for re-rendering.
 extern QString openfile;
 extern bool bodgeflag;

src/main.cpp

@@ -20,7 +20,6 @@ Generated by QDevelop - left as is
 #include "mainwindowimpl.h"
 #include "display.h"
 #include "globals.h"
-#include "version.h"
 #include "darkstyletheme.h"
 
 #include "../../SPIERScommon/netmodule.h"

src/mainwindow3.cpp

@@ -17,7 +17,7 @@
 #include "settingsimpl.h"
 #include "backthread.h"
 #include "histogram.h"
-#include "version.h"
+#include "globals.h"
 
 #include <QColorDialog>
 #include <QFileDialog>
@@ -219,9 +219,7 @@ void MainWindowImpl::SetUpBrushEnabling()
 
 void MainWindowImpl::on_actionManual_triggered()
 {
-
-    QDesktopServices::openUrl(QUrl("file:" + qApp->applicationDirPath() + "/SPIERSedit_Manual.pdf", QUrl::TolerantMode));
-
+    QDesktopServices::openUrl(QUrl(QString(READTHEDOCS)));
 }
 
 
@@ -326,7 +324,7 @@ void MainWindowImpl::on_actionOutput_visible_image_set_triggered()
     int lastsep = qMax(FullFiles.at(0).lastIndexOf("\\"), FullFiles.at(0).lastIndexOf("/")); //this is last separator in path
     QString workingdir = FullFiles.at(0).left(lastsep);
 
-    QString targetdir = QFileDialog::getExistingDirectory(0, "Select output directory", workingdir);
+    QString targetdir = QFileDialog::getExistingDirectory(nullptr, "Select output directory", workingdir);
 
     //loop through all files
 

src/mainwindowimpl2.cpp

@@ -2778,11 +2778,15 @@ void MainWindowImpl::on_actionMaskCopy_selected_from_next_triggered() //from nex
 
         //do advance/back
         if (MasksMoveForward)
+        {
             if (CurrentFile == FileCount - 1) Message ("This is the last file - can't move forward!");
             else SliderPos->setValue(CurrentFile + 2);
+        }
         else if (MasksMoveBack)
+        {
             if (CurrentFile == 0) Message ("This is the first file - can't move back!");
             else SliderPos->setValue(CurrentFile);
+        }
 
         ResetUndo();
     }