Release-1.2.3

4 files changed, 57 insertions, 7 deletions

diff --git a/addon/doxywizard/doxywizard_templ.cpp b/addon/doxywizard/doxywizard_templ.cpp
index 00ed10c..4ba932a 100644
--- a/addon/doxywizard/doxywizard_templ.cpp
+++ b/addon/doxywizard/doxywizard_templ.cpp
@@ -126,6 +126,10 @@ Wizard::Wizard(int argc,char **argv) :
        new QToolButton( QPixmap( filesave_xpm ), "Save File", QString::null,
                         this, SLOT(saveFile()), fileTools, "save file" );
 
+ //Micha: QToolButton *  =
+       new QToolButton( QPixmap( rundoxygen_xpm ), "Save and Run doxygen", QString::null,
+                        this, SLOT(runDoxygen()), fileTools, "save and run doxygen" );
+
 
   QWhatsThis::whatsThisButton( fileTools );     
   
@@ -142,10 +146,10 @@ Wizard::Wizard(int argc,char **argv) :
   file->insertItem( "&Quit", this, SLOT(quit()),     CTRL+Key_Q );
 
   // Doxygen popupmenu
-  //QPopupMenu* doxygen = new QPopupMenu;
-  //int itemIndex = doxygen->insertItem( "&Run" );
-  //doxygen->setWhatsThis ( itemIndex, "Run doxygen with the current configuration file..." );
-  //doxygen->setItemEnabled( itemIndex, FALSE );
+  QPopupMenu* doxygen = new QPopupMenu;
+  int itemIndex = doxygen->insertItem( QIconSet(QPixmap(rundoxygen_xpm)), 
+                                       "&Run", this, SLOT(runDoxygen()), CTRL+Key_R );
+  doxygen->setWhatsThis ( itemIndex, "Run doxygen with the current configuration file..." );
 
   // Help popupmenu
   QPopupMenu* help = new QPopupMenu;
@@ -154,7 +158,7 @@ Wizard::Wizard(int argc,char **argv) :
 
   // menubar definition
   menuBar()->insertItem( "&File", file );
-  //menuBar()->insertItem( "&Doxygen", doxygen );
+  menuBar()->insertItem( "&Doxygen", doxygen );
   menuBar()->insertSeparator();
   menuBar()->insertItem( "&Help", help ); 
 
@@ -262,10 +266,20 @@ void Wizard::saveAsFile()
   }
 
   saveConfig(configFileName);
-  statusBar()->message("Saved as "+ configFileName, messageTimeout );
+  statusBar()->message("Saved as  "+ configFileName, messageTimeout );
+}
+
+//Micha
+void Wizard::runDoxygen()
+{
+  saveFile();
+  QString s = "doxygen " + configFileName;
+  system((const char*)s);  
+  statusBar()->message("doxygen completed: "+ configFileName, messageTimeout );
   hasChanged = FALSE;
   refreshCaption();
-}
+} 
+
 
 void Wizard::quit()
 {
diff --git a/addon/doxywizard/doxywizard_templ.h b/addon/doxywizard/doxywizard_templ.h
index e0c228e..9df50bf 100644
--- a/addon/doxywizard/doxywizard_templ.h
+++ b/addon/doxywizard/doxywizard_templ.h
@@ -43,6 +43,7 @@ class Wizard : public QMainWindow
     void quit();
     void changed();
     void about();
+    void runDoxygen(); // Micha
 
   signals:
 
diff --git a/addon/doxywizard/pixmaps.cpp b/addon/doxywizard/pixmaps.cpp
index e3631c5..6ae7f60 100644
--- a/addon/doxywizard/pixmaps.cpp
+++ b/addon/doxywizard/pixmaps.cpp
@@ -201,4 +201,38 @@ static const char *filesave_xpm_data[] =
   "b............."
 };
 const char **filesave_xpm = (const char **)filesave_xpm_data;
+/* XPM */
+static const char *rundoxygen_xpm_data[] = 
+{
+ "16 16 11 1",
+" 	c None",
+".	c #000000",
+"+	c #DCDCDC",
+"@	c #A0A0A0",
+"#	c #C3C3C3",
+"$	c #808080",
+"%	c #FFA858",
+"&	c #FFDCA8",
+"*	c #FFFFC0",
+"=	c #FFFFFF",
+"-	c #585858",
+"       ..       ",
+"   .. .++. ..   ",
+"  .+@.@##@.@+.  ",
+"  .@+$@%%@$+@.  ",
+"   .$%%&%&%$.   ",
+" ..+@%&$$%&@+.. ",
+".+#@%&%@@&*%@#+.",
+".$@+$&*&&=*$+@$.",
+" .--+$&*=&$+--. ",
+"  .$#++$$++#$.  ",
+" .@=$-$++$-$=@. ",
+" .+@-..@@..-@+. ",
+"  ... .+=. ...  ",
+"      .-$.      ",
+"       ..       ",
+"                "
+};
+
+const char **rundoxygen_xpm = (const char **)rundoxygen_xpm_data;
 
diff --git a/addon/doxywizard/pixmaps.h b/addon/doxywizard/pixmaps.h
index 6c0bb97..b95b75f 100644
--- a/addon/doxywizard/pixmaps.h
+++ b/addon/doxywizard/pixmaps.h
@@ -22,5 +22,6 @@ extern const char** del_xpm;
 extern const char** update_xpm;
 extern const char** fileopen_xpm;
 extern const char** filesave_xpm;
+extern const char** rundoxygen_xpm;
 
 #endif