summaryrefslogtreecommitdiffstats
path: root/addon
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2006-10-17 18:03:21 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2006-10-17 18:03:21 (GMT)
commit65f47e04daaf7f06da11c64af364e65e60e66387 (patch)
tree54faf2b759aca5cdc6184168aa676ed669435766 /addon
parent3c8148441a129febc5c2b9e4b2b2cbd018ad3b6e (diff)
downloadDoxygen-65f47e04daaf7f06da11c64af364e65e60e66387.zip
Doxygen-65f47e04daaf7f06da11c64af364e65e60e66387.tar.gz
Doxygen-65f47e04daaf7f06da11c64af364e65e60e66387.tar.bz2
Release-1.5.0
Diffstat (limited to 'addon')
-rw-r--r--addon/doxywizard/doxywizard.cpp40
-rw-r--r--addon/doxywizard/doxywizard.h2
2 files changed, 11 insertions, 31 deletions
diff --git a/addon/doxywizard/doxywizard.cpp b/addon/doxywizard/doxywizard.cpp
index d10ff05..a48058c 100644
--- a/addon/doxywizard/doxywizard.cpp
+++ b/addon/doxywizard/doxywizard.cpp
@@ -47,35 +47,6 @@ 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"
-
-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
-
void setDotPath()
{
Config_getString("DOT_PATH")=getResourcePath();
@@ -235,11 +206,12 @@ Step2::Step2(QWidget *parent) : QWidget(parent,"Step2")
layout->addWidget(f);
m_optimizeLang = new QButtonGroup("Select programming language to optimize the results for",this);
- gbox = new QGridLayout( m_optimizeLang, 4, 1, 8, 0 );
+ gbox = new QGridLayout( m_optimizeLang, 5, 1, 8, 0 );
gbox->addRowSpacing( 0, fontMetrics().lineSpacing()+2 );
gbox->addWidget(new QRadioButton("Optimize for C++ output",m_optimizeLang),1,0);
gbox->addWidget(new QRadioButton("Optimize for Java output",m_optimizeLang),2,0);
gbox->addWidget(new QRadioButton("Optimize for C output",m_optimizeLang),3,0);
+ gbox->addWidget(new QRadioButton("Optimize for C# output",m_optimizeLang),4,0);
m_optimizeLang->setButton(0);
layout->addWidget(m_optimizeLang);
@@ -279,6 +251,7 @@ OptLang Step2::optimizeFor() const
case 0: return Lang_Cpp;
case 1: return Lang_Java;
case 2: return Lang_C;
+ case 3: return Lang_CS;
}
return Lang_Cpp;
}
@@ -302,6 +275,7 @@ void Step2::setOptimizeFor(OptLang lang)
case Lang_Cpp: m_optimizeLang->setButton(0); break;
case Lang_Java: m_optimizeLang->setButton(1); break;
case Lang_C: m_optimizeLang->setButton(2); break;
+ case Lang_CS: m_optimizeLang->setButton(3); break;
}
}
@@ -1048,6 +1022,12 @@ void MainWidget::launchWizard()
Config_getBool("OPTIMIZE_OUTPUT_FOR_C")=TRUE;
Config_getBool("OPTIMIZE_OUTPUT_JAVA")=FALSE;
break;
+ case Lang_CS:
+ Config_getBool("OPTIMIZE_OUTPUT_FOR_C")=FALSE;
+ Config_getBool("OPTIMIZE_OUTPUT_JAVA")=TRUE;
+ Config_getBool("EXTRACT_STATIC")=TRUE;
+ Config_getBool("EXTRACT_LOCAL_CLASSES")=TRUE;
+ break;
}
// step3
diff --git a/addon/doxywizard/doxywizard.h b/addon/doxywizard/doxywizard.h
index c937dae..115a70b 100644
--- a/addon/doxywizard/doxywizard.h
+++ b/addon/doxywizard/doxywizard.h
@@ -18,7 +18,7 @@ class QProcess;
class QTimer;
class QPopupMenu;
-enum OptLang { Lang_Cpp, Lang_C, Lang_Java };
+enum OptLang { Lang_Cpp, Lang_C, Lang_Java, Lang_CS };
enum HtmlStyle { HS_Plain, HS_TreeView, HS_CHM };
enum TexStyle { TS_PDFHyper, TS_PDF, TS_PS };
enum DiagramMode { DM_None, DM_Builtin, DM_Dot };