summaryrefslogtreecommitdiffstats
path: root/addon
diff options
context:
space:
mode:
Diffstat (limited to 'addon')
-rw-r--r--addon/doxmlparser/examples/metrics/.cvsignore2
-rw-r--r--addon/doxmlparser/src/.cvsignore2
-rw-r--r--addon/doxmlparser/test/.cvsignore2
-rw-r--r--addon/doxywizard/.cvsignore2
-rw-r--r--addon/doxywizard/doxywizard.cpp40
-rw-r--r--addon/doxywizard/doxywizard.pro.in2
-rwxr-xr-xaddon/doxywizard/doxywizard.resbin0 -> 13464 bytes
7 files changed, 28 insertions, 22 deletions
diff --git a/addon/doxmlparser/examples/metrics/.cvsignore b/addon/doxmlparser/examples/metrics/.cvsignore
new file mode 100644
index 0000000..06de5f5
--- /dev/null
+++ b/addon/doxmlparser/examples/metrics/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+metrics.pro
diff --git a/addon/doxmlparser/src/.cvsignore b/addon/doxmlparser/src/.cvsignore
new file mode 100644
index 0000000..6d40d43
--- /dev/null
+++ b/addon/doxmlparser/src/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+doxmlparser.pro
diff --git a/addon/doxmlparser/test/.cvsignore b/addon/doxmlparser/test/.cvsignore
new file mode 100644
index 0000000..6d469ff
--- /dev/null
+++ b/addon/doxmlparser/test/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+xmlparse.pro
diff --git a/addon/doxywizard/.cvsignore b/addon/doxywizard/.cvsignore
new file mode 100644
index 0000000..02b5a07
--- /dev/null
+++ b/addon/doxywizard/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+doxywizard.pro \ No newline at end of file
diff --git a/addon/doxywizard/doxywizard.cpp b/addon/doxywizard/doxywizard.cpp
index 9c9737d..9462296 100644
--- a/addon/doxywizard/doxywizard.cpp
+++ b/addon/doxywizard/doxywizard.cpp
@@ -308,24 +308,6 @@ Step3::Step3(QWidget *parent) : QWidget(parent,"Step3")
bg->setButton(0);
layout->addWidget(bg);
- //w = new QWidget( this );
- //bl = new QHBoxLayout(w);
- //bl->addWidget(new QLabel("Select the output language:",w));
- //m_outputLang = new QComboBox(w);
- //m_outputLang->setMinimumSize(m_outputLang->sizeHint());
- //bl->setSpacing(10);
- //bl->addWidget(m_outputLang);
- //bl->addStretch(1);
- //m_outputLang->insertItem("English");
- //m_outputLang->insertItem("Dutch");
- //m_outputLang->insertItem("German");
- //m_outputLang->insertItem("Spanish");
- //m_outputLang->insertItem("French");
- //m_outputLang->insertItem("Chinese");
- //m_outputLang->insertItem("Japanese");
- //m_outputLang->insertItem("Korean");
- //layout->addWidget(w);
-
layout->addStretch(1);
connect(m_latexEnabled,SIGNAL(stateChanged(int)),
@@ -558,9 +540,9 @@ void Step4::setDiagramMode(DiagramMode mode)
{
switch(mode)
{
- case DM_None: m_diagramMode->setButton(0); break;
- case DM_Builtin: m_diagramMode->setButton(1); break;
- case DM_Dot: m_diagramMode->setButton(2); break;
+ case DM_None: m_diagramMode->setButton(0); diagramModeChanged(0); break;
+ case DM_Builtin: m_diagramMode->setButton(1); diagramModeChanged(1); break;
+ case DM_Dot: m_diagramMode->setButton(2); diagramModeChanged(2); break;
}
}
@@ -654,6 +636,12 @@ MainWidget::MainWidget(QWidget *parent)
// initialize config settings
Config::instance()->init();
Config::instance()->check();
+#if defined(Q_OS_MACX)
+ // we bundle dot with doxywizard on the Mac so we can safely enable
+ // it here
+ Config_getString("DOT_PATH")=getResourcePath();
+ Config_getBool("HAVE_DOT")=TRUE;
+#endif
QWidget *w = new QWidget(this);
setCentralWidget(w);
@@ -1130,7 +1118,10 @@ void MainWidget::launchExpert()
expert.init();
expert.exec();
#if defined(Q_OS_MACX)
+ // we bundle dot with doxywizard on the Mac so we can safely enable
+ // it here
Config_getString("DOT_PATH")=getResourcePath();
+ Config_getBool("HAVE_DOT")=TRUE;
#endif
setConfigSaved(FALSE);
}
@@ -1183,6 +1174,13 @@ void MainWidget::resetConfig()
{
// initialize config settings
Config::instance()->init();
+#if defined(Q_OS_MACX)
+ // we bundle dot with doxywizard on the Mac so we can safely enable
+ // it here
+ Config_getString("DOT_PATH")=getResourcePath();
+ Config_getBool("HAVE_DOT")=TRUE;
+#endif
+
m_configFileName = "";
setConfigSaved(FALSE);
statusBar()->message("Configuration settings reset to their defaults",messageTimeout);
diff --git a/addon/doxywizard/doxywizard.pro.in b/addon/doxywizard/doxywizard.pro.in
index 78f32f9..6cb1250 100644
--- a/addon/doxywizard/doxywizard.pro.in
+++ b/addon/doxywizard/doxywizard.pro.in
@@ -53,7 +53,7 @@ win32:INCLUDEPATH += .
macosx-c++:LIBS+=-framework CoreFoundation -framework ApplicationServices
# extra link options
-win32:TMAKE_LFLAGS = /NODEFAULTLIB:msvcrt.lib
+win32:TMAKE_LFLAGS = /NODEFAULTLIB:msvcrt.lib doxywizard.res
win32:TMAKE_LIBS = $(QTDIR)\lib\qtmain.lib $(QTDIR)\lib\qt-mt332.lib user32.lib gdi32.lib comdlg32.lib imm32.lib ole32.lib uuid.lib wsock32.lib
win32:TMAKE_LIBS_QT =
diff --git a/addon/doxywizard/doxywizard.res b/addon/doxywizard/doxywizard.res
new file mode 100755
index 0000000..283b8bb
--- /dev/null
+++ b/addon/doxywizard/doxywizard.res
Binary files differ