Release-1.5.4

17 files changed, 34 insertions, 17 deletions

diff --git a/addon/doxywizard/Makefile.in b/addon/doxywizard/Makefile.in
index 91adeab..f92c6b6 100644
--- a/addon/doxywizard/Makefile.in
+++ b/addon/doxywizard/Makefile.in
@@ -1,5 +1,5 @@
 #
-# 
+# $Id$
 #
 # Copyright (C) 1997-2007 by Dimitri van Heesch.
 # 
diff --git a/addon/doxywizard/Makefile.win_nmake.in b/addon/doxywizard/Makefile.win_nmake.in
index 764cef6..07fdb34 100644
--- a/addon/doxywizard/Makefile.win_nmake.in
+++ b/addon/doxywizard/Makefile.win_nmake.in
@@ -1,5 +1,5 @@
 #
-# 
+# $Id$
 #
 # Copyright (C) 1997-2007 by Dimitri van Heesch.
 # 
diff --git a/addon/doxywizard/doxywizard.cpp b/addon/doxywizard/doxywizard.cpp
index 9cbd414..35755ce 100644
--- a/addon/doxywizard/doxywizard.cpp
+++ b/addon/doxywizard/doxywizard.cpp
@@ -1103,10 +1103,14 @@ void MainWidget::launchWizard()
         break;
     }
 #if defined(Q_OS_MACX)
-    if (Config_getBool("HAVE_DOT"))
+    if (Config_getString("DOT_PATH").isEmpty())
     {
       setDotPath();
     }
+    if (Config_getString("MSCGEN_PATH").isEmpty())
+    {
+      setMscgenPath();
+    }
 #endif
     setConfigSaved(FALSE);
   }
@@ -1142,6 +1146,18 @@ void MainWidget::loadConfigFromFile(const QString &fn)
     addRecentFile(fn);
     m_workingDir->setText(QFileInfo(fn).dirPath(TRUE));
     m_configFileName = fn;
+#if defined(Q_OS_MACX)
+    if (Config_getString("DOT_PATH").isEmpty())
+    {
+      setDotPath();
+      setConfigSaved(FALSE);
+    }
+    if (Config_getString("MSCGEN_PATH").isEmpty())
+    {
+      setMscgenPath();
+      setConfigSaved(FALSE);
+    }
+#endif
     statusBar()->message("New configuration loaded",messageTimeout);
   }
 }
@@ -1228,6 +1244,7 @@ void MainWidget::resetConfig()
     Config::instance()->init();
 #if defined(Q_OS_MACX)
     setDotPath();
+    setMscgenPath();
 #endif
 
     m_configFileName = "";
diff --git a/addon/doxywizard/doxywizard.pro.in b/addon/doxywizard/doxywizard.pro.in
index 6f49eae..8a8b72c 100644
--- a/addon/doxywizard/doxywizard.pro.in
+++ b/addon/doxywizard/doxywizard.pro.in
@@ -1,5 +1,5 @@
 #
-# 
+# $Id$
 #
 # Copyright (C) 1997-2007 by Dimitri van Heesch.
 #
diff --git a/addon/doxywizard/expert.cpp b/addon/doxywizard/expert.cpp
index d0ecd88..6b96f0b 100644
--- a/addon/doxywizard/expert.cpp
+++ b/addon/doxywizard/expert.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2007 by Dimitri van Heesch.
  *
diff --git a/addon/doxywizard/expert.h b/addon/doxywizard/expert.h
index 9d2097f..0dc922f 100644
--- a/addon/doxywizard/expert.h
+++ b/addon/doxywizard/expert.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2007 by Dimitri van Heesch.
  *
diff --git a/addon/doxywizard/inputbool.cpp b/addon/doxywizard/inputbool.cpp
index 13178ac..12cb27e 100644
--- a/addon/doxywizard/inputbool.cpp
+++ b/addon/doxywizard/inputbool.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2007 by Dimitri van Heesch.
  *
diff --git a/addon/doxywizard/inputbool.h b/addon/doxywizard/inputbool.h
index 10e5b67..466bd83 100644
--- a/addon/doxywizard/inputbool.h
+++ b/addon/doxywizard/inputbool.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2007 by Dimitri van Heesch.
  *
diff --git a/addon/doxywizard/inputint.cpp b/addon/doxywizard/inputint.cpp
index cf2077e..b849fc9 100644
--- a/addon/doxywizard/inputint.cpp
+++ b/addon/doxywizard/inputint.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2007 by Dimitri van Heesch.
  *
diff --git a/addon/doxywizard/inputint.h b/addon/doxywizard/inputint.h
index ca8227d..7b6b2de 100644
--- a/addon/doxywizard/inputint.h
+++ b/addon/doxywizard/inputint.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2007 by Dimitri van Heesch.
  *
diff --git a/addon/doxywizard/inputstring.cpp b/addon/doxywizard/inputstring.cpp
index 7a6004a..7d20eaf 100644
--- a/addon/doxywizard/inputstring.cpp
+++ b/addon/doxywizard/inputstring.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2007 by Dimitri van Heesch.
  *
diff --git a/addon/doxywizard/inputstring.h b/addon/doxywizard/inputstring.h
index afce279..9a23df5 100644
--- a/addon/doxywizard/inputstring.h
+++ b/addon/doxywizard/inputstring.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2007 by Dimitri van Heesch.
  *
diff --git a/addon/doxywizard/inputstrlist.cpp b/addon/doxywizard/inputstrlist.cpp
index 35115aa..55d7d72 100644
--- a/addon/doxywizard/inputstrlist.cpp
+++ b/addon/doxywizard/inputstrlist.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2007 by Dimitri van Heesch.
  *
diff --git a/addon/doxywizard/inputstrlist.h b/addon/doxywizard/inputstrlist.h
index a441bfb..7dcc4a0 100644
--- a/addon/doxywizard/inputstrlist.h
+++ b/addon/doxywizard/inputstrlist.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2007 by Dimitri van Heesch.
  *
diff --git a/addon/doxywizard/qtbc.h b/addon/doxywizard/qtbc.h
index 61a7896..b56541e 100644
--- a/addon/doxywizard/qtbc.h
+++ b/addon/doxywizard/qtbc.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2007 by Dimitri van Heesch.
  *
diff --git a/addon/doxywizard/version.cpp b/addon/doxywizard/version.cpp
index 5a00b3e..b8df91e 100644
--- a/addon/doxywizard/version.cpp
+++ b/addon/doxywizard/version.cpp
@@ -1 +1 @@
-char versionString[]="0.1";
+char versionString[]="1.5.4";
diff --git a/addon/doxywizard/version.h b/addon/doxywizard/version.h
index a040af7..9dfec1f 100644
--- a/addon/doxywizard/version.h
+++ b/addon/doxywizard/version.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * 
+ * $Id$
  *
  * Copyright (C) 1997-2007 by Dimitri van Heesch.
  *