Merge pull request #45 from ghutchis/FIX_website_urls

Update website URLs for new schemes (to easily allow redirects).
ghutchis · Feb 22, 2016 · d880124 · d880124
2 parents 9c1927b + bd21d8a
commit d880124
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/avogadro/src/mainwindow.cpp b/avogadro/src/mainwindow.cpp
@@ -1856,29 +1856,34 @@ class XMLEventSource : public pqEventSource
     QDesktopServices::openUrl(QUrl("http://manual.avogadro.cc/"));
   }
 
+  void MainWindow::openForumURL() const
+  {
+    QDesktopServices::openUrl(QUrl("http://discuss.avogadro.cc/"));
+  }
+
   void MainWindow::openTutorialURL() const
   {
-    QDesktopServices::openUrl(QUrl("http://avogadro.cc/wiki/Tutorials"));
+    QDesktopServices::openUrl(QUrl("http://avogadro.cc/tutorials"));
   }
 
   void MainWindow::openFAQURL() const
   {
-    QDesktopServices::openUrl(QUrl("http://avogadro.cc/wiki/FAQ"));
+    QDesktopServices::openUrl(QUrl("http://avogadro.cc/FAQ"));
   }
 
   void MainWindow::openWebsiteURL() const
   {
-    QDesktopServices::openUrl(QUrl("http://avogadro.cc/wiki/"));
+    QDesktopServices::openUrl(QUrl("http://avogadro.cc/"));
   }
 
   void MainWindow::openReleaseNotesURL() const
   {
-    QDesktopServices::openUrl(QUrl( "http://avogadro.cc/wiki/Avogadro_" + QString(VERSION) ));
+    QDesktopServices::openUrl(QUrl( "http://avogadro.cc/Avogadro_" + QString(VERSION) ));
   }
 
   void MainWindow::openBugURL() const
   {
-    QDesktopServices::openUrl(QUrl("http://sourceforge.net/tracker/?group_id=165310&atid=835077"));
+    QDesktopServices::openUrl(QUrl("http://github.com/cryos/avogadro/issues"));
   }
 
   void MainWindow::setView(int index)
@@ -3071,6 +3076,8 @@ class XMLEventSource : public pqEventSource
              this, SLOT( openTutorialURL() ));
     connect( ui.actionFAQ, SIGNAL( triggered() ),
              this, SLOT( openFAQURL() ) );
+    connect( ui.actionAvogadro_Forum, SIGNAL( triggered() ),
+             this, SLOT( openForumURL() ));
     connect( ui.actionRelease_Notes, SIGNAL( triggered() ),
              this, SLOT( openReleaseNotesURL() ));
     connect( ui.actionAvogadro_Website, SIGNAL( triggered() ),

diff --git a/avogadro/src/mainwindow.ui b/avogadro/src/mainwindow.ui
@@ -36,6 +36,7 @@
     <addaction name="actionAvogadro_Help"/>
     <addaction name="actionTutorials"/>
     <addaction name="actionFAQ"/>
+    <addaction name="actionAvogadro_Forum"/>
     <addaction name="separator"/>
     <addaction name="actionRelease_Notes"/>
     <addaction name="actionReport_a_Bug"/>
@@ -669,6 +670,11 @@
     <string>IUPAC InChI identifier</string>
    </property>
   </action>
+  <action name="actionAvogadro_Forum">
+   <property name="text">
+    <string>Discussion Forum</string>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="avogadro.qrc"/>