summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2014-02-27 18:48:21 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2014-02-27 18:48:21 (GMT)
commit910d2c0d0c226e86d3181cd5da32118002835f24 (patch)
tree06a877a96eecb81a9fd7e0874cb2715ab61c7656
parente6d504fa083f2792d646d61b9a970a8632da2f72 (diff)
parent0e12f6bfa938b675f827074eb3693eff362e6b96 (diff)
downloadDoxygen-910d2c0d0c226e86d3181cd5da32118002835f24.zip
Doxygen-910d2c0d0c226e86d3181cd5da32118002835f24.tar.gz
Doxygen-910d2c0d0c226e86d3181cd5da32118002835f24.tar.bz2
Merge pull request #125 from albert-github/feature/doxygwizard_args
Showing error message on windows in case of an error on startup
-rw-r--r--addon/doxywizard/doxywizard.cpp30
1 files changed, 22 insertions, 8 deletions
diff --git a/addon/doxywizard/doxywizard.cpp b/addon/doxywizard/doxywizard.cpp
index ce764e0..99310a1 100644
--- a/addon/doxywizard/doxywizard.cpp
+++ b/addon/doxywizard/doxywizard.cpp
@@ -624,20 +624,34 @@ bool MainWindow::discardUnsavedChanges(bool saveOption)
}
//-----------------------------------------------------------------------
-
int main(int argc,char **argv)
{
QApplication a(argc,argv);
- MainWindow &main = MainWindow::instance();
- if (argc==2 && argv[1][0]!='-') // name of config file as an argument
+ if (argc == 2)
{
- main.loadConfigFromFile(QString::fromLocal8Bit(argv[1]));
+ if (!qstrcmp(argv[1],"--help"))
+ {
+ QMessageBox msgBox;
+ msgBox.setText(QString().sprintf("Usage: %s [config file]",argv[0]));
+ msgBox.exec();
+ exit(0);
+ }
}
- else if (argc>1)
+ if (argc > 2)
{
- printf("Usage: %s [config file]\n",argv[0]);
+ QMessageBox msgBox;
+ msgBox.setText(QString().sprintf("Too many arguments specified\n\nUsage: %s [config file]",argv[0]));
+ msgBox.exec();
exit(1);
}
- main.show();
- return a.exec();
+ else
+ {
+ MainWindow &main = MainWindow::instance();
+ if (argc==2 && argv[1][0]!='-') // name of config file as an argument
+ {
+ main.loadConfigFromFile(QString::fromLocal8Bit(argv[1]));
+ }
+ main.show();
+ return a.exec();
+ }
}