From ca94e0cfc558f8667a1196f5e4c4c5ee6034684b Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Sun, 30 Jul 2017 14:12:24 +0200 Subject: Updated documentation --- src/browser.cpp | 2 ++ src/main.cpp | 21 +++++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/browser.cpp b/src/browser.cpp index 0ea36d8..0c4191f 100644 --- a/src/browser.cpp +++ b/src/browser.cpp @@ -193,6 +193,7 @@ void Browser::setConfigPath(const QString &path) m_settings = new Settings(configLocation, defaultsLocation); +#ifdef QT_DEBUG if(m_settings->isEmpty()) { // There are no keys in the settings QMessageBox::information(0, @@ -200,6 +201,7 @@ void Browser::setConfigPath(const QString &path) tr("The configuration file %1 is empty.
" "Using default values from %2.").arg(configLocation, defaultsLocation)); } +#endif } MainWindow *Browser::mainWindow() diff --git a/src/main.cpp b/src/main.cpp index bf4c29f..960c11c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -25,6 +25,7 @@ int main(int argc, char *argv[]) { + // Browser app(argc, argv); if(app.isRunning()) { qDebug("Another instance is running, returning..."); @@ -35,14 +36,30 @@ int main(int argc, char *argv[]) parser.setApplicationDescription("yet another Qt browser"); parser.addHelpOption(); parser.addVersionOption(); - parser.addPositionalArgument("URL", "URL(s) to open"); + QCommandLineOption configOption(QStringList() << "c" << "config", "Set configuration file.", "PATH"); parser.addOption(configOption); + + QCommandLineOption defaultConfigOption(QStringList() << "default-config", "Print default configuration"); + parser.addOption(defaultConfigOption); + QCommandLineOption profileOption(QStringList() << "p" << "profile", "Use this profile.", "PROFILE"); parser.addOption(profileOption); - QCommandLineOption nopluginsOption(QStringList() << "n" << "noplugins", "Don't load plugins"); + + QCommandLineOption nopluginsOption(QStringList() << "n" << "no-plugins", "Don't load plugins"); parser.addOption(nopluginsOption); + QCommandLineOption newInstanceOption(QStringList() << "new-instance", "Skip instance check at startup"); + parser.addOption(newInstanceOption); + + QCommandLineOption newWindowOption(QStringList() << "in-new-window", "Open URL in new window"); + parser.addOption(newWindowOption); + + QCommandLineOption newTabOption(QStringList() << "in-new-tab", "Open URL in new tab"); + parser.addOption(newTabOption); + + parser.addPositionalArgument("URL", "URL(s) to open"); + parser.process(app); app.setWindowIcon(QIcon(QLatin1String(":/icon.svg"))); -- cgit v1.2.1