summaryrefslogtreecommitdiffstats
path: root/addon/doxywizard/doxywizard.cpp
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2006-08-09 08:29:54 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2006-08-09 08:29:54 (GMT)
commitf1ddf16acd015f8cf9ffc1fbf5719e8c764150e2 (patch)
treea09074ed1c9a5c1efb292f69db4f9bbb3a97cb19 /addon/doxywizard/doxywizard.cpp
parent3a7dcb4cbc953fcf5ab62243743707e5e0e3d379 (diff)
downloadDoxygen-f1ddf16acd015f8cf9ffc1fbf5719e8c764150e2.zip
Doxygen-f1ddf16acd015f8cf9ffc1fbf5719e8c764150e2.tar.gz
Doxygen-f1ddf16acd015f8cf9ffc1fbf5719e8c764150e2.tar.bz2
Release-1.4.7-20060809
Diffstat (limited to 'addon/doxywizard/doxywizard.cpp')
-rw-r--r--addon/doxywizard/doxywizard.cpp31
1 files changed, 22 insertions, 9 deletions
diff --git a/addon/doxywizard/doxywizard.cpp b/addon/doxywizard/doxywizard.cpp
index 099792b..d10ff05 100644
--- a/addon/doxywizard/doxywizard.cpp
+++ b/addon/doxywizard/doxywizard.cpp
@@ -47,6 +47,7 @@ QCString getResourcePath()
return result;
}
+#if 0
#define GRAPHVIZ_PATH "/Applications/Graphviz.app"
#define DOT_PATH GRAPHVIZ_PATH "/Contents/MacOS"
#define DOT_LOCATION DOT_PATH "/dot"
@@ -73,6 +74,12 @@ void setDotPath()
//Config_getBool("HAVE_DOT")=TRUE;
}
}
+#endif
+
+void setDotPath()
+{
+ Config_getString("DOT_PATH")=getResourcePath();
+}
#endif
@@ -512,7 +519,12 @@ Step4::Step4(QWidget *parent) : QWidget(parent,"Step4")
dotGroup->setButton(0);
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
m_diagramMode->setButton(1);
+#endif
layout->addWidget(m_diagramMode);
layout->addStretch(1);
@@ -678,6 +690,7 @@ MainWidget::MainWidget(QWidget *parent)
// initialize config settings
Config::instance()->init();
Config::instance()->check();
+ Config_getBool("HAVE_DOT")=TRUE;
#if defined(Q_OS_MACX)
setDotPath();
#endif
@@ -887,8 +900,8 @@ void MainWidget::launchWizard()
// -------- Initialize the dialog ----------------
// step1
- wizard.setProjectName(Config_getString("PROJECT_NAME"));
- wizard.setProjectNumber(Config_getString("PROJECT_NUMBER"));
+ wizard.setProjectName(QString::fromLocal8Bit(Config_getString("PROJECT_NAME")));
+ wizard.setProjectNumber(QString::fromLocal8Bit(Config_getString("PROJECT_NUMBER")));
if (Config_getList("INPUT").count()>0)
{
QString dirName=Config_getList("INPUT").getFirst();
@@ -899,7 +912,7 @@ void MainWidget::launchWizard()
}
}
wizard.setRecursiveScan(Config_getBool("RECURSIVE"));
- wizard.setDestinationDir(Config_getString("OUTPUT_DIRECTORY"));
+ wizard.setDestinationDir(QString::fromLocal8Bit(Config_getString("OUTPUT_DIRECTORY")));
// step2
wizard.setExtractAll(Config_getBool("EXTRACT_ALL"));
@@ -979,12 +992,12 @@ void MainWidget::launchWizard()
// -------- Store the results ----------------
// step1
- Config_getString("PROJECT_NAME")=wizard.getProjectName();
+ Config_getString("PROJECT_NAME")=wizard.getProjectName().local8Bit();
Config_getString("PROJECT_NUMBER")=wizard.getProjectNumber();
Config_getList("INPUT").clear();
Config_getList("INPUT").append(wizard.getSourceDir());
Config_getBool("RECURSIVE")=wizard.scanRecursively();
- Config_getString("OUTPUT_DIRECTORY")=wizard.getDestinationDir();
+ Config_getString("OUTPUT_DIRECTORY")=wizard.getDestinationDir().local8Bit();
// step2
if (wizard.extractAll())
@@ -1125,7 +1138,7 @@ void MainWidget::loadConfigFromFile(const QString &fn)
else
{
Config::instance()->convertStrToVal();
-#if defined(Q_OS_MACX)
+#if 0 //defined(Q_OS_MACX)
if (checkIfDotInstalled() &&
qstricmp(Config_getString("DOT_PATH"),DOT_PATH)!=0
)
@@ -1163,9 +1176,9 @@ void MainWidget::launchExpert()
Expert expert(this);
expert.init();
expert.exec();
-#if defined(Q_OS_MACX)
- setDotPath();
-#endif
+//#if defined(Q_OS_MACX)
+// setDotPath();
+//#endif
if (expert.hasChanged()) setConfigSaved(FALSE);
}