summaryrefslogtreecommitdiffstats
path: root/addon/doxywizard
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2005-01-11 19:39:24 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2005-01-11 19:39:24 (GMT)
commit13feb604f3aa783f927ed47df8e4c561a8d8032a (patch)
tree54c695c7de59dfcbeb32cf134b82f5e4d0eeb460 /addon/doxywizard
parent8dc1328efbd82110ca3def379951286b09fddd15 (diff)
downloadDoxygen-13feb604f3aa783f927ed47df8e4c561a8d8032a.zip
Doxygen-13feb604f3aa783f927ed47df8e4c561a8d8032a.tar.gz
Doxygen-13feb604f3aa783f927ed47df8e4c561a8d8032a.tar.bz2
Release-1.4.1
Diffstat (limited to 'addon/doxywizard')
-rw-r--r--addon/doxywizard/Makefile.in2
-rw-r--r--addon/doxywizard/Makefile.win_nmake.in2
-rw-r--r--addon/doxywizard/doxywizard.cpp57
-rw-r--r--addon/doxywizard/doxywizard.pro.in2
-rw-r--r--addon/doxywizard/expert.cpp21
-rw-r--r--addon/doxywizard/expert.h8
-rw-r--r--addon/doxywizard/inputbool.cpp2
-rw-r--r--addon/doxywizard/inputbool.h2
-rw-r--r--addon/doxywizard/inputint.cpp2
-rw-r--r--addon/doxywizard/inputint.h2
-rw-r--r--addon/doxywizard/inputstring.cpp2
-rw-r--r--addon/doxywizard/inputstring.h2
-rw-r--r--addon/doxywizard/inputstrlist.cpp2
-rw-r--r--addon/doxywizard/inputstrlist.h2
-rw-r--r--addon/doxywizard/qtbc.h2
-rw-r--r--addon/doxywizard/version.h2
16 files changed, 70 insertions, 42 deletions
diff --git a/addon/doxywizard/Makefile.in b/addon/doxywizard/Makefile.in
index c018de7..42d5871 100644
--- a/addon/doxywizard/Makefile.in
+++ b/addon/doxywizard/Makefile.in
@@ -1,7 +1,7 @@
#
#
#
-# Copyright (C) 1997-2004 by Dimitri van Heesch.
+# Copyright (C) 1997-2005 by Dimitri van Heesch.
#
# Permission to use, copy, modify, and distribute this software and its
# documentation under the terms of the GNU General Public License is hereby
diff --git a/addon/doxywizard/Makefile.win_nmake.in b/addon/doxywizard/Makefile.win_nmake.in
index ab942a8..7ebcdf8 100644
--- a/addon/doxywizard/Makefile.win_nmake.in
+++ b/addon/doxywizard/Makefile.win_nmake.in
@@ -1,7 +1,7 @@
#
#
#
-# Copyright (C) 1997-2004 by Dimitri van Heesch.
+# Copyright (C) 1997-2005 by Dimitri van Heesch.
#
# Permission to use, copy, modify, and distribute this software and its
# documentation under the terms of the GNU General Public License is hereby
diff --git a/addon/doxywizard/doxywizard.cpp b/addon/doxywizard/doxywizard.cpp
index 97ff827..83ae3b6 100644
--- a/addon/doxywizard/doxywizard.cpp
+++ b/addon/doxywizard/doxywizard.cpp
@@ -32,7 +32,6 @@
#include "expert.h"
#include "config.h"
-
const int messageTimeout = 5000; //!< status bar message timeout in millisec.
#if defined(Q_OS_MACX)
@@ -46,6 +45,34 @@ QCString getResourcePath()
result+="/Contents/Resources/";
return result;
}
+
+#define GRAPHVIZ_PATH "/Applications/Graphviz.app"
+#define DOT_PATH GRAPHVIZ_PATH "/Contents/MacOS"
+#define DOT_LOCATION DOT_PATH "/dot"
+
+bool checkIfDotInstalled()
+{
+ QFileInfo fi(GRAPHVIZ_PATH);
+ if (fi.exists() && fi.isDir())
+ {
+ fi.setFile(DOT_LOCATION);
+ if (fi.exists() && fi.isFile())
+ {
+ return TRUE;
+ }
+ }
+ return FALSE;
+}
+
+void setDotPath()
+{
+ if (checkIfDotInstalled())
+ {
+ Config_getString("DOT_PATH")=DOT_PATH;
+ Config_getBool("HAVE_DOT")=TRUE;
+ }
+}
+
#endif
@@ -651,10 +678,7 @@ MainWidget::MainWidget(QWidget *parent)
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;
+ setDotPath();
#endif
QWidget *w = new QWidget(this);
@@ -1079,7 +1103,10 @@ void MainWidget::launchWizard()
break;
}
#if defined(Q_OS_MACX)
- Config_getString("DOT_PATH")=getResourcePath();
+ if (Config_getBool("HAVE_DOT"))
+ {
+ setDotPath();
+ }
#endif
setConfigSaved(FALSE);
}
@@ -1098,9 +1125,11 @@ void MainWidget::loadConfigFromFile(const QString &fn)
{
Config::instance()->convertStrToVal();
#if defined(Q_OS_MACX)
- if (Config_getString("DOT_PATH")!=getResourcePath())
+ if (checkIfDotInstalled() &&
+ qstricmp(Config_getString("DOT_PATH"),DOT_PATH)!=0
+ )
{
- Config_getString("DOT_PATH")=getResourcePath();
+ Config_getString("DOT_PATH")=DOT_PATH;
setConfigSaved(FALSE);
}
else
@@ -1134,12 +1163,9 @@ 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;
+ setDotPath();
#endif
- setConfigSaved(FALSE);
+ if (expert.hasChanged()) setConfigSaved(FALSE);
}
void MainWidget::saveDefaults()
@@ -1191,10 +1217,7 @@ 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;
+ setDotPath();
#endif
m_configFileName = "";
diff --git a/addon/doxywizard/doxywizard.pro.in b/addon/doxywizard/doxywizard.pro.in
index 6cb1250..ae83cb8 100644
--- a/addon/doxywizard/doxywizard.pro.in
+++ b/addon/doxywizard/doxywizard.pro.in
@@ -1,7 +1,7 @@
#
#
#
-# Copyright (C) 1997-2004 by Dimitri van Heesch.
+# Copyright (C) 1997-2005 by Dimitri van Heesch.
#
# Permission to use, copy, modify, and distribute this software and its
# documentation under the terms of the GNU General Public License is hereby
diff --git a/addon/doxywizard/expert.cpp b/addon/doxywizard/expert.cpp
index 084ad95..a9d4028 100644
--- a/addon/doxywizard/expert.cpp
+++ b/addon/doxywizard/expert.cpp
@@ -2,7 +2,7 @@
*
*
*
- * Copyright (C) 1997-2004 by Dimitri van Heesch.
+ * Copyright (C) 1997-2005 by Dimitri van Heesch.
*
* Permission to use, copy, modify, and distribute this software and its
* documentation under the terms of the GNU General Public License is hereby
@@ -48,6 +48,7 @@ Expert::Expert( QWidget *parent ) : QTabDialog( parent )
m_dependencies->setAutoDelete(TRUE);
m_inputWidgets = new QDict< IInput >;
m_switches = new QDict< QObject >;
+ m_changed = FALSE;
setHelpButton();
@@ -94,7 +95,7 @@ Expert::Expert( QWidget *parent ) : QTabDialog( parent )
pageLayout->addWidget(inputString);
QWhatsThis::add(inputString, option->docs().simplifyWhiteSpace() );
QToolTip::add(inputString,option->docs());
- connect(inputString,SIGNAL(changed()),SIGNAL(changed()));
+ connect(inputString,SIGNAL(changed()),SLOT(changed()));
m_inputWidgets->insert(option->name(),inputString);
addDependency(m_switches,option->dependsOn(),option->name());
}
@@ -117,7 +118,7 @@ Expert::Expert( QWidget *parent ) : QTabDialog( parent )
inputString->init();
QWhatsThis::add(inputString, option->docs().simplifyWhiteSpace() );
QToolTip::add(inputString, option->docs());
- connect(inputString,SIGNAL(changed()),SIGNAL(changed()));
+ connect(inputString,SIGNAL(changed()),SLOT(changed()));
m_inputWidgets->insert(option->name(),inputString);
addDependency(m_switches,option->dependsOn(),option->name());
}
@@ -142,7 +143,7 @@ Expert::Expert( QWidget *parent ) : QTabDialog( parent )
pageLayout->addWidget(inputStrList);
QWhatsThis::add(inputStrList, option->docs().simplifyWhiteSpace() );
QToolTip::add(inputStrList, option->docs());
- connect(inputStrList,SIGNAL(changed()),SIGNAL(changed()));
+ connect(inputStrList,SIGNAL(changed()),SLOT(changed()));
m_inputWidgets->insert(option->name(),inputStrList);
addDependency(m_switches,option->dependsOn(),option->name());
}
@@ -159,7 +160,7 @@ Expert::Expert( QWidget *parent ) : QTabDialog( parent )
pageLayout->addWidget(inputBool);
QWhatsThis::add(inputBool, option->docs().simplifyWhiteSpace() );
QToolTip::add(inputBool, option->docs() );
- connect(inputBool,SIGNAL(changed()),SIGNAL(changed()));
+ connect(inputBool,SIGNAL(changed()),SLOT(changed()));
m_inputWidgets->insert(option->name(),inputBool);
addDependency(m_switches,option->dependsOn(),option->name());
}
@@ -177,7 +178,7 @@ Expert::Expert( QWidget *parent ) : QTabDialog( parent )
pageLayout->addWidget(inputInt);
QWhatsThis::add(inputInt, option->docs().simplifyWhiteSpace() );
QToolTip::add(inputInt, option->docs() );
- connect(inputInt,SIGNAL(changed()),SIGNAL(changed()));
+ connect(inputInt,SIGNAL(changed()),SLOT(changed()));
m_inputWidgets->insert(option->name(),inputInt);
addDependency(m_switches,option->dependsOn(),option->name());
}
@@ -197,8 +198,7 @@ Expert::Expert( QWidget *parent ) : QTabDialog( parent )
emit toggle(di.currentKey(),((InputBool *)obj)->getState());
}
- connect(this,SIGNAL(helpButtonPressed()),
- this,SLOT(handleHelp()));
+ connect(this,SIGNAL(helpButtonPressed()),this,SLOT(handleHelp()));
}
@@ -269,3 +269,8 @@ void Expert::init()
}
+void Expert::changed()
+{
+ m_changed=TRUE;
+}
+
diff --git a/addon/doxywizard/expert.h b/addon/doxywizard/expert.h
index 7deeb17..4fdaea1 100644
--- a/addon/doxywizard/expert.h
+++ b/addon/doxywizard/expert.h
@@ -2,7 +2,7 @@
*
*
*
- * Copyright (C) 1997-2004 by Dimitri van Heesch.
+ * Copyright (C) 1997-2005 by Dimitri van Heesch.
*
* Permission to use, copy, modify, and distribute this software and its
* documentation under the terms of the GNU General Public License is hereby
@@ -65,18 +65,18 @@ class Expert : public QTabDialog
void init();
void addDependency(QDict<QObject> *switches,
const QCString &dep,const QCString &name);
+ bool hasChanged() const { return m_changed; }
- signals:
- void changed();
-
private slots:
void toggle(const char *,bool);
void handleHelp();
+ void changed();
private:
QDict<IInput> *m_inputWidgets;
QDict< QList<IInput> > *m_dependencies;
QDict<QObject> *m_switches;
+ bool m_changed;
};
#endif
diff --git a/addon/doxywizard/inputbool.cpp b/addon/doxywizard/inputbool.cpp
index e1f16a1..554c228 100644
--- a/addon/doxywizard/inputbool.cpp
+++ b/addon/doxywizard/inputbool.cpp
@@ -2,7 +2,7 @@
*
*
*
- * Copyright (C) 1997-2004 by Dimitri van Heesch.
+ * Copyright (C) 1997-2005 by Dimitri van Heesch.
*
* Permission to use, copy, modify, and distribute this software and its
* documentation under the terms of the GNU General Public License is hereby
diff --git a/addon/doxywizard/inputbool.h b/addon/doxywizard/inputbool.h
index 5a56d83..ee76ba9 100644
--- a/addon/doxywizard/inputbool.h
+++ b/addon/doxywizard/inputbool.h
@@ -2,7 +2,7 @@
*
*
*
- * Copyright (C) 1997-2004 by Dimitri van Heesch.
+ * Copyright (C) 1997-2005 by Dimitri van Heesch.
*
* Permission to use, copy, modify, and distribute this software and its
* documentation under the terms of the GNU General Public License is hereby
diff --git a/addon/doxywizard/inputint.cpp b/addon/doxywizard/inputint.cpp
index c3bd11f..4398f31 100644
--- a/addon/doxywizard/inputint.cpp
+++ b/addon/doxywizard/inputint.cpp
@@ -2,7 +2,7 @@
*
*
*
- * Copyright (C) 1997-2004 by Dimitri van Heesch.
+ * Copyright (C) 1997-2005 by Dimitri van Heesch.
*
* Permission to use, copy, modify, and distribute this software and its
* documentation under the terms of the GNU General Public License is hereby
diff --git a/addon/doxywizard/inputint.h b/addon/doxywizard/inputint.h
index fbe3813..92435b7 100644
--- a/addon/doxywizard/inputint.h
+++ b/addon/doxywizard/inputint.h
@@ -2,7 +2,7 @@
*
*
*
- * Copyright (C) 1997-2004 by Dimitri van Heesch.
+ * Copyright (C) 1997-2005 by Dimitri van Heesch.
*
* Permission to use, copy, modify, and distribute this software and its
* documentation under the terms of the GNU General Public License is hereby
diff --git a/addon/doxywizard/inputstring.cpp b/addon/doxywizard/inputstring.cpp
index 6450cb9..f301384 100644
--- a/addon/doxywizard/inputstring.cpp
+++ b/addon/doxywizard/inputstring.cpp
@@ -2,7 +2,7 @@
*
*
*
- * Copyright (C) 1997-2004 by Dimitri van Heesch.
+ * Copyright (C) 1997-2005 by Dimitri van Heesch.
*
* Permission to use, copy, modify, and distribute this software and its
* documentation under the terms of the GNU General Public License is hereby
diff --git a/addon/doxywizard/inputstring.h b/addon/doxywizard/inputstring.h
index cd2ac91..ddcdfea 100644
--- a/addon/doxywizard/inputstring.h
+++ b/addon/doxywizard/inputstring.h
@@ -2,7 +2,7 @@
*
*
*
- * Copyright (C) 1997-2004 by Dimitri van Heesch.
+ * Copyright (C) 1997-2005 by Dimitri van Heesch.
*
* Permission to use, copy, modify, and distribute this software and its
* documentation under the terms of the GNU General Public License is hereby
diff --git a/addon/doxywizard/inputstrlist.cpp b/addon/doxywizard/inputstrlist.cpp
index f8e4888..fc8cf50 100644
--- a/addon/doxywizard/inputstrlist.cpp
+++ b/addon/doxywizard/inputstrlist.cpp
@@ -2,7 +2,7 @@
*
*
*
- * Copyright (C) 1997-2004 by Dimitri van Heesch.
+ * Copyright (C) 1997-2005 by Dimitri van Heesch.
*
* Permission to use, copy, modify, and distribute this software and its
* documentation under the terms of the GNU General Public License is hereby
diff --git a/addon/doxywizard/inputstrlist.h b/addon/doxywizard/inputstrlist.h
index 6d23910..0156c20 100644
--- a/addon/doxywizard/inputstrlist.h
+++ b/addon/doxywizard/inputstrlist.h
@@ -2,7 +2,7 @@
*
*
*
- * Copyright (C) 1997-2004 by Dimitri van Heesch.
+ * Copyright (C) 1997-2005 by Dimitri van Heesch.
*
* Permission to use, copy, modify, and distribute this software and its
* documentation under the terms of the GNU General Public License is hereby
diff --git a/addon/doxywizard/qtbc.h b/addon/doxywizard/qtbc.h
index ed1ab98..452974c 100644
--- a/addon/doxywizard/qtbc.h
+++ b/addon/doxywizard/qtbc.h
@@ -2,7 +2,7 @@
*
*
*
- * Copyright (C) 1997-2004 by Dimitri van Heesch.
+ * Copyright (C) 1997-2005 by Dimitri van Heesch.
*
* Permission to use, copy, modify, and distribute this software and its
* documentation under the terms of the GNU General Public License is hereby
diff --git a/addon/doxywizard/version.h b/addon/doxywizard/version.h
index 382b523..0cbe12a 100644
--- a/addon/doxywizard/version.h
+++ b/addon/doxywizard/version.h
@@ -2,7 +2,7 @@
*
*
*
- * Copyright (C) 1997-2004 by Dimitri van Heesch.
+ * Copyright (C) 1997-2005 by Dimitri van Heesch.
*
* Permission to use, copy, modify, and distribute this software and its
* documentation under the terms of the GNU General Public License is hereby