Release-1.2.3

6 files changed, 101 insertions, 11 deletions

diff --git a/addon/configgen/config_templ.l b/addon/configgen/config_templ.l
index 98a688f..81d4acf 100644
--- a/addon/configgen/config_templ.l
+++ b/addon/configgen/config_templ.l
@@ -140,8 +140,12 @@ static FILE *tryPath(const char *path,const char *fileName)
   return 0;
 }
 
+static void substEnvVarsInStrList(QStrList &sl);
+static void substEnvVarsInString(QCString &s);
+
 static FILE *findFile(const char *fileName)
 {
+  substEnvVarsInStrList(includePathList);
   char *s=includePathList.first();
   while (s) // try each of the include paths
   {
@@ -162,6 +166,7 @@ static void readIncludeFile(const char *incName)
   } 
 
   QCString inc = incName;
+  substEnvVarsInString(inc);
   inc = inc.stripWhiteSpace();
   uint incLen = inc.length();
   if (inc.at(0)=='"' && inc.at(incLen-1)=='"') // strip quotes
@@ -430,6 +435,23 @@ void configStrToVal()
     }
     Config::colsInAlphaIndex=cols;
   }
+
+  if (enumValuesPerLineString.isEmpty())
+  {
+    Config::enumValuesPerLine=4;
+  }
+  else
+  {
+    bool ok;
+    int cols = enumValuesPerLineString.toInt(&ok);
+    if (!ok || cols<1 || cols>20)
+    {
+      warn_cont("Warning: argument of ENUM_VALUES_PER_LINE is not a valid number in the range [1..20]!\n"
+	   "Using the default of 4!\n");
+      cols = 4;
+    }
+    Config::enumValuesPerLine=cols;
+  }
   
   if (maxDotGraphWidthString.isEmpty())
   {
@@ -441,7 +463,7 @@ void configStrToVal()
     int width =maxDotGraphWidthString.toInt(&ok);
     if (!ok)
     {
-      warn_cont("Warning: argument of MAX_DOT_GRAPH_WIDTH is not a valid number in the range [1..20]!\n"
+      warn_cont("Warning: argument of MAX_DOT_GRAPH_WIDTH is not a valid number in the range [100..30000]!\n"
 	   "Using the default of 1024 pixels!\n");
       width=1024;
     }
@@ -466,7 +488,7 @@ void configStrToVal()
     int height =maxDotGraphHeightString.toInt(&ok);
     if (!ok)
     {
-      warn_cont("Warning: argument of MAX_DOT_GRAPH_WIDTH is not a valid number in the range [1..20]!\n"
+      warn_cont("Warning: argument of MAX_DOT_GRAPH_WIDTH is not a valid number in the range [100..30000]!\n"
 	   "Using the default of 1024 pixels!\n");
       height=1024;
     }
diff --git a/addon/configgen/configgen.cpp b/addon/configgen/configgen.cpp
index c9d5a2d..95aab45 100644
--- a/addon/configgen/configgen.cpp
+++ b/addon/configgen/configgen.cpp
@@ -775,8 +775,8 @@ void init()
                     "information to generate all constant output in the proper language. \n"
                     "The default language is English, other supported languages are: \n"
                     "Dutch, French, Italian, Czech, Swedish, German, Finnish, Japanese, \n"
-                    "Korean, Hungarian, Spanish, Romanian, Russian, Croatian, Polish, \n"
-                    "Portuguese and Slovene.\n"
+                    "Korean, Hungarian, Norwegian, Spanish, Romanian, Russian, Croatian, \n"
+                    "Polish, Portuguese and Slovene.\n"
                    );
   ConfigString::addFixedValue("outputLanguage","Croatian");
   ConfigString::addFixedValue("outputLanguage","Czech");
@@ -789,6 +789,7 @@ void init()
   ConfigString::addFixedValue("outputLanguage","Italian");
   ConfigString::addFixedValue("outputLanguage","Japanese");
   ConfigString::addFixedValue("outputLanguage","Korean");
+  ConfigString::addFixedValue("outputLanguage","Norwegian");
   ConfigString::addFixedValue("outputLanguage","Romanian");
   ConfigString::addFixedValue("outputLanguage","Russian");
   ConfigString::addFixedValue("outputLanguage","Polish");
@@ -1169,6 +1170,14 @@ void init()
                     "to standard output. \n",
                     ConfigString::File
                    );
+  ConfigBool::add(  "filterForSourceFlag",
+                    "FILTER_SOURCE_FILES",
+                    "FALSE",
+                    "do we filter source files?",
+                    "If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using \n"
+                    "INPUT_FILTER) will be used to filter the input files when producing source \n"
+                    "files to browse. \n"
+                );    
   
   //-----------------------------------------------------------------------------------------------
   ConfigInfo::add(  "Index","configuration options related to the alphabetical class index");
@@ -1279,6 +1288,15 @@ void init()
                     "the value YES disables it. \n"
                  );
   addDependency("noIndexFlag","generateHtml");
+  ConfigInt::add(   "enumValuesPerLine",
+                    "ENUM_VALUES_PER_LINE",
+                    "4",
+                    "number of enum values that are put on one line",
+                    "This tag can be used to set the number of enum values (range [1..20]) \n"
+                    "that doxygen will group on one line in the generated HTML documentation. \n",
+                    1,20
+                );
+  addDependency("enumValuesPerLine","generateHtml");
   //-----------------------------------------------------------------------------------------------
   ConfigInfo::add(  "LaTeX","configuration options related to the LaTeX output");
   //-----------------------------------------------------------------------------------------------
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