Release-1.5.5-20080307

3 files changed, 27 insertions, 24 deletions

diff --git a/addon/doxywizard/doxywizard.cpp b/addon/doxywizard/doxywizard.cpp
index 3ef67bf..1679bc9 100644
--- a/addon/doxywizard/doxywizard.cpp
+++ b/addon/doxywizard/doxywizard.cpp
@@ -506,8 +506,8 @@ Step4::Step4(QWidget *parent) : QWidget(parent,"Step4")
 
   connect(m_diagramMode,SIGNAL(clicked(int)),
           this,SLOT(diagramModeChanged(int)));
-  connect(m_dotCall,SIGNAL(stateChanged(int)),
-          parent,SLOT(changeCallGraphState(int)));
+  //connect(m_dotCall,SIGNAL(stateChanged(int)),
+  //        parent,SLOT(changeCallGraphState(int)));
 }
 
 void Step4::diagramModeChanged(int buttonId)
@@ -515,15 +515,15 @@ void Step4::diagramModeChanged(int buttonId)
   m_dotOptions->setEnabled(buttonId==2);
 }
 
-void Step4::disableCallGraphs()
-{
-  m_dotCall->setChecked(FALSE);
-}
+//void Step4::disableCallGraphs()
+//{
+//  m_dotCall->setChecked(FALSE);
+//}
 
-bool Step4::callGraphEnabled() const
-{
-  return m_dotCall->isOn();
-}
+//bool Step4::callGraphEnabled() const
+//{
+//  return m_dotCall->isOn();
+//}
 
 DiagramMode Step4::diagramMode() const
 {
@@ -880,7 +880,7 @@ void MainWidget::launchWizard()
   {
     wizard.setHtmlStyle(HS_CHM);
   }
-  else if (Config_getBool("GENERATE_TREEVIEW"))
+  else if (Config_getEnum("GENERATE_TREEVIEW")!="NONE")
   {
     wizard.setHtmlStyle(HS_TreeView);
   }
@@ -1008,15 +1008,15 @@ void MainWidget::launchWizard()
       {
         case HS_Plain:
           Config_getBool("GENERATE_HTMLHELP")=FALSE;
-          Config_getBool("GENERATE_TREEVIEW")=FALSE;
+          Config_getEnum("GENERATE_TREEVIEW")="NONE";
           break;
         case HS_TreeView:
           Config_getBool("GENERATE_HTMLHELP")=FALSE;
-          Config_getBool("GENERATE_TREEVIEW")=TRUE;
+          Config_getEnum("GENERATE_TREEVIEW")="ALL";
           break;
         case HS_CHM:
           Config_getBool("GENERATE_HTMLHELP")=TRUE;
-          Config_getBool("GENERATE_TREEVIEW")=FALSE;
+          Config_getEnum("GENERATE_TREEVIEW")="NONE";
           break;
       }
     }
diff --git a/addon/doxywizard/doxywizard.h b/addon/doxywizard/doxywizard.h
index 0e46a53..6e157b1 100644
--- a/addon/doxywizard/doxywizard.h
+++ b/addon/doxywizard/doxywizard.h
@@ -126,8 +126,8 @@ class Step4 : public QWidget
 
   public:
     Step4(QWidget *parent);
-    void disableCallGraphs();
-    bool callGraphEnabled() const;
+    //void disableCallGraphs();
+    //bool callGraphEnabled() const;
 
     DiagramMode diagramMode() const;
     bool classDiagram() const;
@@ -165,7 +165,7 @@ class Wizard : public QTabDialog
 
   public:
     Wizard(QWidget *parent);
-    void disableCallGraphs();
+    //void disableCallGraphs();
 
     // step1
     QString getProjectName() const    { return m_step1->getProjectName(); }
diff --git a/addon/doxywizard/inputstring.cpp b/addon/doxywizard/inputstring.cpp
index ffe4398..03f7098 100644
--- a/addon/doxywizard/inputstring.cpp
+++ b/addon/doxywizard/inputstring.cpp
@@ -170,14 +170,17 @@ void InputString::init()
 {
   if (sm==StringFixed)
   {
-    int *itemIndex = m_values->find(str);
-    if (itemIndex)
+    if (m_values)
     {
-      com->setCurrentItem(*itemIndex);
-    } 
-    else
-    {
-      com->setCurrentItem(0);
+      int *itemIndex = m_values->find(str);
+      if (itemIndex)
+      {
+        com->setCurrentItem(*itemIndex);
+      } 
+      else
+      {
+        com->setCurrentItem(0);
+      }
     }
   }
   else