Updated the QAssistant launching code for Qt 4.5 (At least on windows; needs testing...
[mussa.git] / qui / MussaWindow.hpp
index 1d6e2746d4da9e8353affa18532500be2b914770..bba3106191748925ffb57bc83c77b2ee7878ff3c 100644 (file)
@@ -11,6 +11,7 @@
 #include <QProgressDialog>
 #include <QSpinBox>
 #include <QToolBar>
+#include <QProcess>
 
 #include "qui/MussaAlignedWindow.hpp"
 #include "qui/motif_editor/MotifEditor.hpp"
@@ -142,7 +143,8 @@ protected:
   QAction *whatsThisAction;
   QAction *viewMussaAlignmentAction;
 
-  QAssistantClient *manualAssistant;
+  //QAssistantClient *manualAssistant;
+  QProcess *assistantProcess;
 
   //! initialze the actions
   void setupActions();
@@ -150,6 +152,8 @@ protected:
   void closeEvent(QCloseEvent *event);
   //! initialize this windows menu object
   void setupMainMenu();
+  //! initialize all of our widgets
+  void setupWidgets();
   //! initialize assistant client
   void setupAssistant();
   //! stub function to fill in QActions