Add support page link.

NathanW2 · NathanW2 · commit 7f72d7f3d35f · 2013-05-10T14:08:15.000+10:00
Load online help manual from help menu
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1075,6 +1075,7 @@ void QgisApp::createActions()
 
   connect( mActionHelpContents, SIGNAL( triggered() ), this, SLOT( helpContents() ) );
   connect( mActionHelpAPI, SIGNAL( triggered() ), this, SLOT( apiDocumentation() ) );
+  connect( mActionNeedSupport, SIGNAL( triggered() ), this, SLOT( supportProviders() ) );
   connect( mActionQgisHomePage, SIGNAL( triggered() ), this, SLOT( helpQgisHomePage() ) );
   connect( mActionCheckQgisVersion, SIGNAL( triggered() ), this, SLOT( checkQgisVersion() ) );
   connect( mActionAbout, SIGNAL( triggered() ), this, SLOT( about() ) );
@@ -6556,7 +6557,8 @@ void QgisApp::adjustBrightnessContrast( int delta, bool updateBrightness )
 
 void QgisApp::helpContents()
 {
-  openURL( "index.html" );
+  // We should really ship the HTML version of the docs local too.
+  openURL( "http://docs.qgis.org/2.0/html/en/docs/user_manual/index.html", false );
 }
 
 void QgisApp::apiDocumentation()
@@ -6571,6 +6573,11 @@ void QgisApp::apiDocumentation()
   }
 }
 
+void QgisApp::supportProviders()
+{
+  openURL( "http://www.qgis.org/en/commercial-support.html", false );
+}
+
 void QgisApp::helpQgisHomePage()
 {
   openURL( "http://qgis.org", false );
diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -851,6 +851,8 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
     void helpContents();
     //! Open the API documentation in a browser
     void apiDocumentation();
+    //! Open the QGIS support page
+    void supportProviders();
     //! Open the QGIS homepage in users browser
     void helpQgisHomePage();
     //! Open a url in the users configured browser
diff --git a/src/ui/qgisapp.ui b/src/ui/qgisapp.ui
@@ -200,6 +200,7 @@
     </property>
     <addaction name="mActionHelpContents"/>
     <addaction name="mActionHelpAPI"/>
+    <addaction name="mActionNeedSupport"/>
     <addaction name="separator"/>
     <addaction name="mActionQgisHomePage"/>
     <addaction name="mActionCheckQgisVersion"/>
@@ -2068,6 +2069,11 @@ Acts on currently active editable layer</string>
     <string>Select features using an expression</string>
    </property>
   </action>
+  <action name="mActionNeedSupport">
+   <property name="text">
+    <string>Need Support?</string>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="../../images/images.qrc"/>

Original file line number	Diff line number	Diff line change
`@@ -1075,6 +1075,7 @@ void QgisApp::createActions()`
`1075`	`1075`
`1076`	`1076`	`connect( mActionHelpContents, SIGNAL( triggered() ), this, SLOT( helpContents() ) );`
`1077`	`1077`	`connect( mActionHelpAPI, SIGNAL( triggered() ), this, SLOT( apiDocumentation() ) );`
	`1078`	`+ connect( mActionNeedSupport, SIGNAL( triggered() ), this, SLOT( supportProviders() ) );`
`1078`	`1079`	`connect( mActionQgisHomePage, SIGNAL( triggered() ), this, SLOT( helpQgisHomePage() ) );`
`1079`	`1080`	`connect( mActionCheckQgisVersion, SIGNAL( triggered() ), this, SLOT( checkQgisVersion() ) );`
`1080`	`1081`	`connect( mActionAbout, SIGNAL( triggered() ), this, SLOT( about() ) );`
`@@ -6556,7 +6557,8 @@ void QgisApp::adjustBrightnessContrast( int delta, bool updateBrightness )`
`6556`	`6557`
`6557`	`6558`	`void QgisApp::helpContents()`
`6558`	`6559`	`{`
`6559`		`- openURL( "index.html" );`
	`6560`	`+ // We should really ship the HTML version of the docs local too.`
	`6561`	`+ openURL( "http://docs.qgis.org/2.0/html/en/docs/user_manual/index.html", false );`
`6560`	`6562`	`}`
`6561`	`6563`
`6562`	`6564`	`void QgisApp::apiDocumentation()`
`@@ -6571,6 +6573,11 @@ void QgisApp::apiDocumentation()`
`6571`	`6573`	`}`
`6572`	`6574`	`}`
`6573`	`6575`
	`6576`	`+void QgisApp::supportProviders()`
	`6577`	`+{`
	`6578`	`+ openURL( "http://www.qgis.org/en/commercial-support.html", false );`
	`6579`	`+}`
	`6580`	`+`
`6574`	`6581`	`void QgisApp::helpQgisHomePage()`
`6575`	`6582`	`{`
`6576`	`6583`	`openURL( "http://qgis.org", false );`