wilderjds
/
falkon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CommandLineOptions: Port to QCommandLineParser

Browse Source 
This comes with removing all 2-chars short options,
only long options are now available.
That means there are no longer both "-nw, --new-window" options,
only "--new-window".
remotes/origin/falkon
David Rosca 11 years ago
parent 7e1a0d7720
commit 8521b782bd
3 changed files with 159 additions and 177 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 313
      src/lib/app/commandlineoptions.cpp
  2. 11
      src/lib/app/commandlineoptions.h
  3. 12
      src/lib/app/mainapplication.cpp

313
src/lib/app/commandlineoptions.cpp
Unescape View File

@ -1,6 +1,6 @@
/* ============================================================
* QupZilla - WebKit based browser
* Copyright (C) 2010-2014 David Rosca <nowrep@gmail.com>
* QupZilla - QtWebEngine based browser
* Copyright (C) 2010-2015 David Rosca <nowrep@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -16,13 +16,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* ============================================================ */
#include "commandlineoptions.h"
#include "browserwindow.h"
#include <QCoreApplication>
#include <QFileInfo>
#include <QCoreApplication>
#include <QCommandLineParser>
CommandLineOptions::CommandLineOptions(int &argc)
: m_argc(argc)
#include <iostream>
CommandLineOptions::CommandLineOptions()
{
parseActions();
}
@ -32,180 +33,160 @@ CommandLineOptions::ActionPairList CommandLineOptions::getActions()
return m_actions;
}
void CommandLineOptions::showHelp()
{
using namespace std;
const char* help = " Usage: qupzilla [options] URL \n"
"\n"
" QupZilla options:\n"
" -h or --help print this message \n"
" -a or --authors print QupZilla authors \n"
" -v or --version print QupZilla version \n"
"\n"
" -p=PROFILE or --profile=PROFILE start with specified profile \n"
" -ne or --no-extensions start without extensions\n"
" -po or --portable start in portable mode\n"
"\n"
" Options to control running QupZilla:\n"
" -nt or --new-tab open new tab\n"
" -nw or --new-window open new window\n"
" -pb or --private-browsing start private browsing\n"
" -dm or --download-manager show download manager\n"
" -fs or --fullscreen toggle fullscreen\n"
" -nr or --no-remote open new browser instance\n"
" -ct=URL or --current-tab=URL open URL in current tab\n"
" -ow=URL or --open-window=URL open URL in new window\n"
"\n"
" QupZilla is a new, fast and secure web browser\n"
" based on WebKit core (http://webkit.org) and\n"
" written in Qt Framework (http://qt-project.org/) \n\n"
" For more information please visit wiki at \n"
" https://github.com/QupZilla/qupzilla/wiki \n";
cout << help << " > " << Qz::WWWADDRESS << endl;
}
void CommandLineOptions::parseActions()
{
using namespace std;
// Options
QCommandLineOption authorsOption(QStringList({QSL("a"), QSL("authors")}));
authorsOption.setDescription(QSL("Displays author information."));
QCommandLineOption profileOption(QStringList({QSL("p"), QSL("profile")}));
profileOption.setValueName(QSL("profileName"));
profileOption.setDescription(QSL("Starts with specified profile."));
QCommandLineOption noExtensionsOption(QSL("no-extensions"));
noExtensionsOption.setDescription(QSL("Starts without extensions."));
QCommandLineOption privateBrowsingOption(QSL("private-browsing"));
privateBrowsingOption.setDescription(QSL("Starts private browsing."));
QCommandLineOption portableOption(QSL("portable"));
portableOption.setDescription(QSL("Starts in portable mode."));
QCommandLineOption noRemoteOption(QSL("no-remote"));
noRemoteOption.setDescription(QSL("Starts new browser instance."));
QCommandLineOption newTabOption(QSL("new-tab"));
newTabOption.setDescription(QSL("Opens new tab."));
QCommandLineOption newWindowOption(QSL("new-window"));
newWindowOption.setDescription(QSL("Opens new window."));
QCommandLineOption downloadManagerOption(QSL("download-manager"));
downloadManagerOption.setDescription(QSL("Opens download manager."));
QCommandLineOption currentTabOption(QSL("current-tab"));
currentTabOption.setValueName(QSL("URL"));
currentTabOption.setDescription(QSL("Opens URL in current tab."));
QCommandLineOption openWindowOption(QSL("open-window"));
openWindowOption.setValueName(QSL("URL"));
openWindowOption.setDescription(QSL("Opens URL in new window."));
QCommandLineOption fullscreenOption(QSL("fullscreen"));
fullscreenOption.setDescription(QSL("Toggles fullscreen."));
// Parser
QCommandLineParser parser;
parser.setApplicationDescription(QSL("QtWebEngine based browser"));
parser.addHelpOption();
parser.addVersionOption();
parser.addOption(authorsOption);
parser.addOption(profileOption);
parser.addOption(noExtensionsOption);
parser.addOption(privateBrowsingOption);
parser.addOption(portableOption);
parser.addOption(noRemoteOption);
parser.addOption(newTabOption);
parser.addOption(newWindowOption);
parser.addOption(downloadManagerOption);
parser.addOption(currentTabOption);
parser.addOption(openWindowOption);
parser.addOption(fullscreenOption);
parser.addPositionalArgument(QSL("URL"), QSL("URLs to open"), QSL("[URL...]"));
parser.process(QCoreApplication::arguments());
if (parser.isSet(authorsOption)) {
std::cout << "David Rosca <nowrep@gmail.com>" << std::endl;
const QStringList arguments = QCoreApplication::arguments();
if (arguments.isEmpty()) {
ActionPair pair;
pair.action = Qz::CL_ExitAction;
m_actions.append(pair);
return;
}
// Skip first argument (it should be program itself)
for (int i = 1; i < arguments.count(); ++i) {
QString arg = arguments.at(i);
if (arg == QLatin1String("-h") || arg == QLatin1String("--help")) {
showHelp();
ActionPair pair;
pair.action = Qz::CL_ExitAction;
m_actions.append(pair);
break;
}
if (arg == QLatin1String("-a") || arg == QLatin1String("--authors")) {
cout << "QupZilla authors: " << endl;
cout << " David Rosca <nowrep@gmail.com>" << endl;
ActionPair pair;
pair.action = Qz::CL_ExitAction;
m_actions.append(pair);
break;
}
if (arg == QLatin1String("-v") || arg == QLatin1String("--version")) {
cout << "QupZilla v" << Qz::VERSION
#ifdef GIT_REVISION
<< " rev " << GIT_REVISION << " "
#endif
<< "(build " << Qz::BUILDTIME << ")"
<< endl;
ActionPair pair;
pair.action = Qz::CL_ExitAction;
m_actions.append(pair);
break;
}
if (arg.startsWith(QLatin1String("-p=")) || arg.startsWith(QLatin1String("--profile="))) {
int index = arg.indexOf(QLatin1Char('='));
if (index != -1) {
const QString profileName = arg.mid(index + 1);
cout << "QupZilla: Starting with profile '" << profileName.toUtf8().data() << "'" << endl;
ActionPair pair;
pair.action = Qz::CL_StartWithProfile;
pair.text = profileName;
m_actions.append(pair);
}
}
if (arg.startsWith(QLatin1String("-ne")) || arg.startsWith(QLatin1String("--no-extensions"))) {
ActionPair pair;
pair.action = Qz::CL_StartWithoutAddons;
m_actions.append(pair);
}
if (arg.startsWith(QLatin1String("-nt")) || arg.startsWith(QLatin1String("--new-tab"))) {
ActionPair pair;
pair.action = Qz::CL_NewTab;
m_actions.append(pair);
}
if (arg.startsWith(QLatin1String("-nw")) || arg.startsWith(QLatin1String("--new-window"))) {
ActionPair pair;
pair.action = Qz::CL_NewWindow;
m_actions.append(pair);
}
if (arg.startsWith(QLatin1String("-dm")) || arg.startsWith(QLatin1String("--download-manager"))) {
ActionPair pair;
pair.action = Qz::CL_ShowDownloadManager;
m_actions.append(pair);
}
if (arg.startsWith(QLatin1String("-pb")) || arg.startsWith(QLatin1String("--private-browsing"))) {
ActionPair pair;
pair.action = Qz::CL_StartPrivateBrowsing;
m_actions.append(pair);
}
if (arg.startsWith(QLatin1String("-nr")) || arg.startsWith(QLatin1String("--no-remote"))) {
ActionPair pair;
pair.action = Qz::CL_StartNewInstance;
m_actions.append(pair);
}
if (arg.startsWith(QLatin1String("-po")) || arg.startsWith(QLatin1String("--portable"))) {
ActionPair pair;
pair.action = Qz::CL_StartPortable;
m_actions.append(pair);
}
if (arg.startsWith(QLatin1String("-fs")) || arg.startsWith(QLatin1String("--fullscreen"))) {
ActionPair pair;
pair.action = Qz::CL_ToggleFullScreen;
m_actions.append(pair);
}
if (arg.startsWith(QLatin1String("-ct")) || arg.startsWith(QLatin1String("--current-tab"))) {
int index = arg.indexOf(QLatin1Char('='));
if (index != -1) {
ActionPair pair;
pair.action = Qz::CL_OpenUrlInCurrentTab;
pair.text = arg.mid(index + 1);
m_actions.append(pair);
}
}
if (arg.startsWith(QLatin1String("-ow")) || arg.startsWith(QLatin1String("--open-window"))) {
int index = arg.indexOf(QLatin1Char('='));
if (index != -1) {
ActionPair pair;
pair.action = Qz::CL_OpenUrlInNewWindow;
pair.text = arg.mid(index + 1);
m_actions.append(pair);
}
}
if (parser.isSet(profileOption)) {
const QString profileName = parser.value(profileOption);
std::cout << "QupZilla: Starting with profile '" << profileName.toUtf8().data() << "'" << std::endl;
ActionPair pair;
pair.action = Qz::CL_StartWithProfile;
pair.text = profileName;
m_actions.append(pair);
}
if (parser.isSet(noExtensionsOption)) {
ActionPair pair;
pair.action = Qz::CL_StartWithoutAddons;
m_actions.append(pair);
}
if (parser.isSet(privateBrowsingOption)) {
ActionPair pair;
pair.action = Qz::CL_StartPrivateBrowsing;
m_actions.append(pair);
}
if (parser.isSet(portableOption)) {
ActionPair pair;
pair.action = Qz::CL_StartPortable;
m_actions.append(pair);
}
if (parser.isSet(noRemoteOption)) {
ActionPair pair;
pair.action = Qz::CL_StartNewInstance;
m_actions.append(pair);
}
QString url = arguments.last();
if (parser.isSet(newTabOption)) {
ActionPair pair;
pair.action = Qz::CL_NewTab;
m_actions.append(pair);
}
if (parser.isSet(newWindowOption)) {
ActionPair pair;
pair.action = Qz::CL_NewWindow;
m_actions.append(pair);
}
if (parser.isSet(downloadManagerOption)) {
ActionPair pair;
pair.action = Qz::CL_ShowDownloadManager;
m_actions.append(pair);
}
if (parser.isSet(currentTabOption)) {
ActionPair pair;
pair.action = Qz::CL_OpenUrlInCurrentTab;
pair.text = parser.value(currentTabOption);
m_actions.append(pair);
}
if (parser.isSet(openWindowOption)) {
ActionPair pair;
pair.action = Qz::CL_OpenUrlInNewWindow;
pair.text = parser.value(openWindowOption);
m_actions.append(pair);
}
if (parser.isSet(fullscreenOption)) {
ActionPair pair;
pair.action = Qz::CL_ToggleFullScreen;
m_actions.append(pair);
}
if (parser.positionalArguments().isEmpty())
return;
QString url = parser.positionalArguments().last();
QFileInfo fileInfo(url);
if (fileInfo.exists()) {
url = fileInfo.absoluteFilePath();
}
if (m_argc > 1 &&
!url.isEmpty() &&
!url.startsWith(QLatin1Char('-')) &&
(url.contains(QLatin1Char('.')) ||
url.contains(QLatin1Char('/')) ||
url.contains(QLatin1Char('\\'))
)
) {
if (!url.isEmpty() && !url.startsWith(QLatin1Char('-'))) {
ActionPair pair;
pair.action = Qz::CL_OpenUrl;
pair.text = url;

11
src/lib/app/commandlineoptions.h
Unescape View File

@ -1,6 +1,6 @@
/* ============================================================
* QupZilla - WebKit based browser
* Copyright (C) 2010-2014 David Rosca <nowrep@gmail.com>
* QupZilla - QtWebEngine based browser
* Copyright (C) 2010-2015 David Rosca <nowrep@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -18,10 +18,7 @@
#ifndef COMMANDLINEOPTIONS_H
#define COMMANDLINEOPTIONS_H
#include <QPair>
#include <QString>
#include <QVector>
#include <iostream>
#include "qzcommon.h"
@ -35,14 +32,12 @@ public:
typedef QVector<ActionPair> ActionPairList;
explicit CommandLineOptions(int &argc);
explicit CommandLineOptions();
ActionPairList getActions();
private:
void showHelp();
void parseActions();
int m_argc;
ActionPairList m_actions;
};

12
src/lib/app/mainapplication.cpp
Unescape View File

@ -65,6 +65,8 @@
#include <QWebEngineDownloadItem>
#include <QWebEngineScriptCollection>
#include <iostream>
#if defined(Q_OS_WIN) && !defined(Q_OS_OS2)
#include "registerqappassociation.h"
#endif
@ -100,10 +102,15 @@ MainApplication::MainApplication(int &argc, char** argv)
setAttribute(Qt::AA_UseHighDpiPixmaps, true);
setApplicationName(QLatin1String("QupZilla"));
setApplicationVersion(Qz::VERSION);
setOrganizationDomain(QLatin1String("qupzilla"));
setWindowIcon(QIcon::fromTheme(QSL("qupzilla"), QIcon(QSL(":icons/exeicons/qupzilla-window.png"))));
#ifdef GIT_REVISION
setApplicationVersion(QSL("%1 (%2)").arg(Qz::VERSION, GIT_REVISION));
#else
setApplicationVersion(Qz::VERSION);
#endif
// Set fallback icon theme (eg. on Windows/Mac)
if (QIcon::fromTheme(QSL("view-refresh")).isNull()) {
QIcon::setThemeSearchPaths(QStringList() << QL1S(":/oxygen-fallback"));
@ -135,8 +142,7 @@ MainApplication::MainApplication(int &argc, char** argv)
bool newInstance = false;
if (argc > 1) {
CommandLineOptions cmd(argc);
CommandLineOptions cmd;
foreach (const CommandLineOptions::ActionPair &pair, cmd.getActions()) {
switch (pair.action) {
case Qz::CL_StartWithoutAddons:

Write Preview
Loading…
Cancel
Save