From f3b6ecf0983dbb85a61faee21f41160df63cc575 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Tue, 21 Feb 2017 16:40:25 +0100 Subject: Single instance --- src/main.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 8dcfb03..656472c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -26,7 +26,6 @@ int main(int argc, char *argv[]) { Browser app(argc, argv); - app.setApplicationName("smolbote"); #ifdef VERSION app.setApplicationVersion(VERSION); #endif @@ -36,17 +35,24 @@ int main(int argc, char *argv[]) parser.setApplicationDescription("yet another Qt browser"); parser.addHelpOption(); parser.addVersionOption(); - - parser.addPositionalArgument("URL", "URL to open"); - + parser.addPositionalArgument("URL", "URL(s) to open"); QCommandLineOption configOption(QStringList() << "c" << "config", "Set configuration file.", "PATH"); parser.addOption(configOption); + QCommandLineOption profileOption(QStringList() << "p" << "profile", "Use this profile.", "PROFILE"); + parser.addOption(profileOption); parser.process(app); app.setConfigPath(parser.value(configOption)); - - app.addWindow(new MainWindow(parser.positionalArguments())); + if(!app.preLaunch(parser.positionalArguments())) { + return 0; + } + + MainWindow *w = new MainWindow(parser.positionalArguments()); + if(parser.isSet(profileOption)) { + w->loadProfile(parser.value(profileOption)); + } + app.addWindow(w); return app.exec(); } -- cgit v1.2.1