Changeset 1000

Timestamp:

11/13/08 12:06:02 (8 weeks ago)

Author:

liamMT

Message:

- add back in help links and move update menu item to help menu

Location:

mchelper/trunk

Files:

• include/MainWindow.h (modified) (1 diff)
• layouts/mainwindow.ui (modified) (3 diffs)
• source/MainWindow.cpp (modified) (3 diffs)

mchelper/trunk/include/MainWindow.h

@@ -101 +101 @@
   void onHideOsc(bool checked);
   void onCheckForUpdates(bool inBackground = false);
+  void onHelp();
+  void onOscTutorial();
   
   #ifdef MCHELPER_TEST_SUITE

mchelper/trunk/layouts/mainwindow.ui

@@ -113 +113 @@
      <string>File</string>
     </property>
-    <addaction name="actionAbout" />
     <addaction name="actionPreferences" />
    </widget>
@@ -136 +135 @@
      <string>Help</string>
     </property>
+    <addaction name="actionHelp" />
+    <addaction name="actionOscTutorial" />
     <addaction name="separator" />
+    <addaction name="actionAbout" />
     <addaction name="actionCheckForUpdates" />
    </widget>
@@ -211 +213 @@
    </property>
   </action>
+  <action name="actionHelp" >
+   <property name="text" >
+    <string>mchelper Help</string>
+   </property>
+  </action>
+  <action name="actionOscTutorial" >
+   <property name="text" >
+    <string>OSC Tutorial</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>

mchelper/trunk/source/MainWindow.cpp

@@ -7 +7 @@
 #include <QTextBlock>
 #include <QTime>
+#include <QDesktopServices>
+#include <QUrl>
 #include "MainWindow.h"
 #include "PacketUsbSerial.h"
@@ -59 +61 @@
   connect( actionHide_OSC, SIGNAL(triggered(bool)), this, SLOT(onHideOsc(bool)));
   connect( actionCheckForUpdates, SIGNAL(triggered()), this, SLOT(onCheckForUpdates()));
+  connect( actionHelp, SIGNAL(triggered()), this, SLOT(onHelp()));
+  connect( actionOscTutorial, SIGNAL(triggered()), this, SLOT(onOscTutorial()));
   
   // command line connections
@@ -547 +551 @@
 }
 
-
-
-
-
-
-
-
-
-
-
-
+void MainWindow::onHelp()
+{
+  if( !QDesktopServices::openUrl( QUrl("http://www.makingthings.com/documentation/tutorial/mchelper") ) )
+    statusBar()->showMessage( tr("Help is online and requires an internet connection."), 3000 );
+}
+
+void MainWindow::onOscTutorial()
+{
+  if( !QDesktopServices::openUrl( QUrl("http://www.makingthings.com/documentation/tutorial/osc") ) )
+    statusBar()->showMessage( tr("Help is online and requires an internet connection."), 3000 );
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+