Merge branch 'master' of https://github.com/palaeoware/SPIERS

palaeoware · Oct 25, 2018 · 0c6b59d · 0c6b59d
2 parents 6e73bd9 + a982c50
commit 0c6b59d
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 28 deletions.
diff --git a/SPIERSalign/src/globals.h b/SPIERSalign/src/globals.h
@@ -42,11 +42,11 @@
 
 //Github
 #define GITURL "https://github.com/"
-#define GITREPOSITORY "palaeoware/SPIERSalign"
+#define GITREPOSITORY "palaeoware/SPIERS"
 #define GITISSUE "/issues"
 
 //Readthedocs
-#define READTHEDOCS "https://spiersalign.readthedocs.io/en/latest/"
+#define READTHEDOCS "https://spiersalign.readthedocs.io/"
 
 /**
  * @brief The ImageData class

diff --git a/SPIERSalign/src/mainwindowimpl.cpp b/SPIERSalign/src/mainwindowimpl.cpp
@@ -4508,7 +4508,7 @@ void MainWindowImpl::on_actionCompress_Dataset_triggered()
  */
 void MainWindowImpl::on_actionManual_triggered()
 {
-    QDesktopServices::openUrl(QUrl("file:" + qApp->applicationDirPath() + "/SPIERSalign_Manual.pdf"));
+    QDesktopServices::openUrl(QUrl(QString(READTHEDOCS)));
 }
 
 /**
@@ -4526,11 +4526,3 @@ void MainWindowImpl::on_actionCode_on_GitHub_triggered()
 {
     QDesktopServices::openUrl(QUrl(QString(GITURL) + QString(GITREPOSITORY)));
 }
-
-/**
- * @brief MainWindowImpl::on_actionOnline_User_Manual_triggered
- */
-void MainWindowImpl::on_actionOnline_User_Manual_triggered()
-{
-    QDesktopServices::openUrl(QUrl(QString(READTHEDOCS)));
-}
diff --git a/SPIERSalign/src/mainwindowimpl.h b/SPIERSalign/src/mainwindowimpl.h
@@ -140,8 +140,6 @@ private slots:
     void resizeCropH(int value);
     void clearList();
 
-    void on_actionOnline_User_Manual_triggered();
-
 private:
     void rotate (qreal rotateAngle);
     void resize(qreal sizeChange);

diff --git a/SPIERSalign/ui/mainwindow.ui b/SPIERSalign/ui/mainwindow.ui
@@ -73,7 +73,7 @@
      <x>0</x>
      <y>0</y>
      <width>598</width>
-     <height>21</height>
+     <height>24</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuDsvdsvdasv">
@@ -139,7 +139,6 @@
      <string>Help</string>
     </property>
     <addaction name="actionManual"/>
-    <addaction name="actionOnline_User_Manual"/>
     <addaction name="actionCode_on_GitHub"/>
     <addaction name="actionBugIssueFeatureRequest"/>
     <addaction name="separator"/>
@@ -937,13 +936,13 @@
   </action>
   <action name="actionManual">
    <property name="enabled">
-    <bool>false</bool>
+    <bool>true</bool>
    </property>
    <property name="text">
-    <string>Manual</string>
+    <string>Online Manual</string>
    </property>
    <property name="visible">
-    <bool>false</bool>
+    <bool>true</bool>
    </property>
   </action>
   <action name="actionBugIssueFeatureRequest">
@@ -956,9 +955,9 @@
     <string>Code on GitHub</string>
    </property>
   </action>
-  <action name="actionOnline_User_Manual">
+  <action name="action_Manual">
    <property name="text">
-    <string>Online User Manual</string>
+    <string>Online Manual</string>
    </property>
   </action>
  </widget>

diff --git a/SPIERSedit/src/globals.h b/SPIERSedit/src/globals.h
@@ -49,11 +49,11 @@
 
 //Github
 #define GITURL "https://github.com/"
-#define GITREPOSITORY "palaeoware/SPIERSedit"
+#define GITREPOSITORY "palaeoware/SPIERS"
 #define GITISSUE "/issues"
 
 //Readthedocs
-#define READTHEDOCS "https://spiersedit.readthedocs.io/en/latest/"
+#define READTHEDOCS "https://spiersedit.readthedocs.io/"
 
 extern QList<bool> FilesDirty; //for re-rendering.
 extern QString openfile;

diff --git a/SPIERSedit/ui/mainwindow.ui b/SPIERSedit/ui/mainwindow.ui
@@ -253,7 +253,7 @@
      <x>0</x>
      <y>0</y>
      <width>962</width>
-     <height>21</height>
+     <height>24</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -4109,7 +4109,7 @@ Interpreted Images:</string>
   </action>
   <action name="actionManual">
    <property name="text">
-    <string>Manual</string>
+    <string>Online Manual</string>
    </property>
   </action>
   <action name="actionGrey_out_curves_not_no_current_slice">

diff --git a/SPIERSview/src/globals.h b/SPIERSview/src/globals.h
@@ -22,9 +22,11 @@ class MainWindow;
 
 //Github
 #define GITURL "https://github.com/"
-#define GITREPOSITORY "palaeoware/SPIERSview"
+#define GITREPOSITORY "palaeoware/SPIERS"
 #define GITISSUE "/issues"
 
+#define READTHEDOCS "https://spiersview.readthedocs.io/"
+
 //SPIERSview Defines
 #define GRIDSIZE 32
 #define SCALE 2

diff --git a/SPIERSview/src/mainwindow.cpp b/SPIERSview/src/mainwindow.cpp
@@ -3181,8 +3181,7 @@ void MainWindow::on_actionBackground_Colour_triggered()
  */
 void MainWindow::on_actionManual_triggered()
 {
-    //qDebug()<<qApp->applicationDirPath() + "/SPIERSview_Manual.pdf";
-    QDesktopServices::openUrl(QUrl("file:" + qApp->applicationDirPath() + "/SPIERSview_Manual.pdf", QUrl::TolerantMode));
+    QDesktopServices::openUrl(QUrl(QString(READTHEDOCS)));
 }
 
 /**

diff --git a/SPIERSview/ui/mainwindow.ui b/SPIERSview/ui/mainwindow.ui
@@ -1984,7 +1984,7 @@
   </action>
   <action name="actionManual">
    <property name="text">
-    <string>Manual</string>
+    <string>Online Manual</string>
    </property>
   </action>
   <action name="actionQuick_Guide">