Commit emails of the iDok project

["Apache" <apache AT savannah.psi.ch>]

Author: huebner AT PSI.CH
Date: Fri Jul  4 12:28:37 2008
New Revision: 136

Log:
Added feature #IDO-85: Add link to online help in help menu

Modified:
   trunk/java/ch/idok/qtgui/DmsMainWindow.jui
   trunk/java/ch/idok/qtgui/Icons.java
   trunk/java/ch/idok/qtgui/MainWindow.java

Modified: trunk/java/ch/idok/qtgui/DmsMainWindow.jui
==============================================================================
--- trunk/java/ch/idok/qtgui/DmsMainWindow.jui  (original)
+++ trunk/java/ch/idok/qtgui/DmsMainWindow.jui  Fri Jul  4 12:28:37 2008
@@ -148,6 +148,8 @@
     <property name="title" >
      <string>Help</string>
     </property>
+    <addaction name="actioniDok_online_documentation" />
+    <addaction name="actioniDok_online_FAQ" />
    </widget>
    <widget class="QMenu" name="menuAbout" >
     <property name="title" >
@@ -276,6 +278,16 @@
     <string>About Qt</string>
    </property>
   </action>
+  <action name="actioniDok_online_documentation" >
+   <property name="text" >
+    <string>Online Documentation</string>
+   </property>
+  </action>
+    <action name="actioniDok_online_FAQ" >
+   <property name="text" >
+    <string>Online FAQ</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>

Modified: trunk/java/ch/idok/qtgui/Icons.java
==============================================================================
--- trunk/java/ch/idok/qtgui/Icons.java (original)
+++ trunk/java/ch/idok/qtgui/Icons.java Fri Jul  4 12:28:37 2008
@@ -28,6 +28,10 @@
 
     public static QIcon QTLOGO = new QIcon(
             "classpath:ch/idok/qtgui/images/qt.png");
+    
+    public static QIcon DOC = new QIcon(
+    "classpath:ch/idok/qtgui/images/doc.png");
+    
 
     public static QIcon RELOADICON = new QIcon(
             "classpath:ch/idok/qtgui/images/reload.png");

Modified: trunk/java/ch/idok/qtgui/MainWindow.java
==============================================================================
--- trunk/java/ch/idok/qtgui/MainWindow.java    (original)
+++ trunk/java/ch/idok/qtgui/MainWindow.java    Fri Jul  4 12:28:37 2008
@@ -55,6 +55,7 @@
 import com.trolltech.qt.gui.QToolBar;
 import com.trolltech.qt.gui.QTreeWidgetItem;
 import com.trolltech.qt.gui.QKeySequence.StandardKey;
+import com.trolltech.qt.webkit.QWebView;
 
 /**
  * This class is responsible for setting up the main graphical user interface
@@ -180,6 +181,9 @@
         ui_.dockWidgetLocalFS.setWindowTitle(tr("Local files"));
         ui_.dockWidgetMetaData.setWindowTitle(tr("Metadata"));
         ui_.previewDockWidget.setWindowTitle(tr("Preview"));
+        
+        ui_.actioniDok_online_documentation.setIcon(Icons.DOC);
+        ui_.actioniDok_online_FAQ.setIcon(Icons.DOC);
 
         ui_.actionAbout_iDok.setIcon(Icons.IDOKLOGO);
         ui_.actionAbout_Qt.setIcon(Icons.QTLOGO);
@@ -945,6 +949,15 @@
         d.exec();
         d.dispose(); // Not strictly needed, but it frees up memory faster.
     }
+    
+    public final void on_actioniDok_online_documentation_triggered() {
+        
+        startExternalProgram("http://www.idok.ch/documentation/";);
+    }
+    
+    public final void on_actioniDok_online_FAQ_triggered() {
+        startExternalProgram("http://www.idok.ch/faq/";);
+    }
 
     public final void onExit() {
         close();