mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Main: separate the QApplication and UI creation

Browse source 
When some arguments like --help and --version are passed to the
executable, we don't need to create the UI at all.

This patch separates the QApplication creation which is at first
only needed to parse the arguments and then if exit() is not
called from subsurfacestartup.c, we can call some of the
"init" methods such as setup_system_prefs(), fill_profile_color()
etc.

At this point init_ui() can be called which no longer needs
to accept the command line argument list.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Lubomir I. Ivanov 2014-03-19 18:23:43 +02:00 committed by Dirk Hohndel
parent 71f2fd91b5
commit ee2e43f11a
3 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
main.cpp
View file

@ -19,13 +19,7 @@ int main(int argc, char **argv)
int i; int i;
bool no_filenames = true; bool no_filenames = true;
setup_system_prefs(); init_qt(&argc, &argv);
prefs = default_prefs;
fill_profile_color();
init_ui(&argc, &argv);
parse_xml_init();
taglist_init_global();
QStringList files; QStringList files;
QStringList importedFiles; QStringList importedFiles;
QStringList arguments = QCoreApplication::arguments(); QStringList arguments = QCoreApplication::arguments();
@ -47,13 +41,20 @@ int main(int argc, char **argv)
if (!defaultFile.isEmpty()) if (!defaultFile.isEmpty())
files.push_back(QString(prefs.default_filename)); files.push_back(QString(prefs.default_filename));
} }
parse_xml_exit(); setup_system_prefs();
prefs = default_prefs;
fill_profile_color();
parse_xml_init();
taglist_init_global();
init_ui();
MainWindow *m = MainWindow::instance(); MainWindow *m = MainWindow::instance();
m->setLoadedWithFiles( !files.isEmpty() || !importedFiles.isEmpty()); m->setLoadedWithFiles(!files.isEmpty() || !importedFiles.isEmpty());
m->loadFiles(files); m->loadFiles(files);
m->importFiles(importedFiles); m->importFiles(importedFiles);
if (!quit) if (!quit)
run_ui(); run_ui();
exit_ui(); exit_ui();
parse_xml_exit();
return 0; return 0;
} }

12
qt-gui.cpp
View file

@ -78,12 +78,14 @@ static QString decodeUtf8(const QByteArray &fname)
} }
#endif #endif
void init_ui(int *argcp, char ***argvp) void init_qt(int *argcp, char ***argvp)
{
application = new QApplication(*argcp, *argvp);
}
void init_ui(void)
{ {
QVariant v; QVariant v;
application = new QApplication(*argcp, *argvp);
// tell Qt to use system proxies // tell Qt to use system proxies
// note: on Linux, "system" == "environment variables" // note: on Linux, "system" == "environment variables"
QNetworkProxyFactory::setUseSystemConfiguration(true); QNetworkProxyFactory::setUseSystemConfiguration(true);
@ -155,8 +157,6 @@ void init_ui(int *argcp, char ***argvp)
window->setTitle(MWTF_FILENAME); window->setTitle(MWTF_FILENAME);
else else
window->setTitle(MWTF_DEFAULT); window->setTitle(MWTF_DEFAULT);
return;
} }
void run_ui(void) void run_ui(void)

4
qt-gui.h
View file

@ -1,8 +1,8 @@
#ifndef QT_GUI_H #ifndef QT_GUI_H
#define QT_GUI_H #define QT_GUI_H
void init_ui(int *argcp, char ***argvp); void init_qt(int *argcp, char ***argvp);
void init_qt_ui(int *argcp, char ***argvp, char *errormessage); void init_ui(void);
void run_ui(void); void run_ui(void);
void exit_ui(void); void exit_ui(void);