summaryrefslogtreecommitdiffstats
path: root/addon
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2008-10-05 09:07:25 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2008-10-05 09:07:25 (GMT)
commit3102b81d682bf0b3b4dd50148434ab8e575a3d2e (patch)
tree9ff275a866b1660085cb0e638922291f5b2abd36 /addon
parent631bd3426f23c6a69b8a19156b25387ceba007d4 (diff)
downloadDoxygen-3102b81d682bf0b3b4dd50148434ab8e575a3d2e.zip
Doxygen-3102b81d682bf0b3b4dd50148434ab8e575a3d2e.tar.gz
Doxygen-3102b81d682bf0b3b4dd50148434ab8e575a3d2e.tar.bz2
Release-1.5.7.1
Diffstat (limited to 'addon')
-rw-r--r--addon/doxywizard/doxywizard.cpp30
1 files changed, 18 insertions, 12 deletions
diff --git a/addon/doxywizard/doxywizard.cpp b/addon/doxywizard/doxywizard.cpp
index 1679bc9..160ba9c 100644
--- a/addon/doxywizard/doxywizard.cpp
+++ b/addon/doxywizard/doxywizard.cpp
@@ -49,12 +49,18 @@ QCString getResourcePath()
void setDotPath()
{
- Config_getString("DOT_PATH")=getResourcePath();
+ // TODO: enable this if we ship dot with doxygen again...
+// Config_getString("DOT_PATH")=getResourcePath();
}
-void setMscgenPath()
+bool setMscgenPath()
{
- Config_getString("MSCGEN_PATH")=getResourcePath();
+ if (Config_getString("MSCGEN_PATH")!=getResourcePath())
+ {
+ Config_getString("MSCGEN_PATH")=getResourcePath();
+ return TRUE;
+ }
+ return FALSE;
}
#endif
@@ -496,11 +502,11 @@ Step4::Step4(QWidget *parent) : QWidget(parent,"Step4")
m_dotOptions->setEnabled(FALSE);
gbox->addWidget(w,4,0);
-#if defined(Q_OS_MACX) // we bundle dot with the mac package
- m_diagramMode->setButton(2);
-#else
+//#if defined(Q_OS_MACX) // we bundle dot with the mac package
+// m_diagramMode->setButton(2);
+//#else
m_diagramMode->setButton(1);
-#endif
+//#endif
layout->addWidget(m_diagramMode);
layout->addStretch(1);
@@ -1106,11 +1112,11 @@ void MainWidget::loadConfigFromFile(const QString &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("DOT_PATH").isEmpty())
+ //{
+ // setDotPath();
+ // setConfigSaved(FALSE);
+ //}
if (Config_getString("MSCGEN_PATH").isEmpty())
{
setMscgenPath();