Skip to content

Commit

Permalink
Showing error message on windows in case on error on startup
Browse files Browse the repository at this point in the history
On case, on windows, more than 1 argument is given doxywizard stops without showing a message even though a printf is present.
In this patch the message is show (for all platforms) by means of a message box, furthermore in case the argument --help is given the usage message is given in a message box.
  • Loading branch information
albert-github committed Feb 26, 2014
1 parent c7e36ca commit 6a0651d
Showing 1 changed file with 23 additions and 8 deletions.
31 changes: 23 additions & 8 deletions addon/doxywizard/doxywizard.cpp
@@ -1,4 +1,5 @@
#include <QtGui>
#include <QImageReader>
#include "doxywizard.h"
#include "version.h"
#include "expert.h"
Expand Down Expand Up @@ -624,20 +625,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();
}
}

0 comments on commit 6a0651d

Please sign in to comment.