Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

[Fix] Don't show error when using unknown cmd argument. Closes #124

Browse Source 
- it is now possible to change application style, graphics system,
  X11 display, ... etc from command line
This commit is contained in:
nowrep 2012-01-05 17:26:51 +01:00
parent 9e7e0285bb
commit fb6ef29e14
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/app/commandlineoptions.cpp
View File

@ -59,13 +59,11 @@ void CommandLineOptions::parseActions()
{ {
using namespace std; using namespace std;
bool found = false;
// Skip first argument (it should be program itself) // Skip first argument (it should be program itself)
for (int i = 1; i < m_argc; i++) { for (int i = 1; i < m_argc; i++) {
QString arg(m_argv[i]); QString arg(m_argv[i]);
if (arg == "-h" || arg == "--help") { if (arg == "-h" || arg == "--help") {
showHelp(); showHelp();
found = true;
ActionPair pair; ActionPair pair;
pair.action = ExitAction; pair.action = ExitAction;
m_actions.append(pair); m_actions.append(pair);
@ -75,7 +73,6 @@ void CommandLineOptions::parseActions()
if (arg == "-a" || arg == "--authors") { if (arg == "-a" || arg == "--authors") {
cout << "QupZilla authors: " << endl; cout << "QupZilla authors: " << endl;
cout << " nowrep <nowrep@gmail.com>" << endl; cout << " nowrep <nowrep@gmail.com>" << endl;
found = true;
ActionPair pair; ActionPair pair;
pair.action = ExitAction; pair.action = ExitAction;
m_actions.append(pair); m_actions.append(pair);
@ -89,7 +86,6 @@ void CommandLineOptions::parseActions()
#endif #endif
<< "(build " << QupZilla::BUILDTIME.toUtf8().data() << ")" << "(build " << QupZilla::BUILDTIME.toUtf8().data() << ")"
<< endl; << endl;
found = true;
ActionPair pair; ActionPair pair;
pair.action = ExitAction; pair.action = ExitAction;
m_actions.append(pair); m_actions.append(pair);
@ -99,7 +95,6 @@ void CommandLineOptions::parseActions()
if (arg.startsWith("-p=") || arg.startsWith("--profile=")) { if (arg.startsWith("-p=") || arg.startsWith("--profile=")) {
arg.remove("-p="); arg.remove("-p=");
arg.remove("--profile="); arg.remove("--profile=");
found = true;
cout << "starting with profile " << arg.toUtf8().data() << endl; cout << "starting with profile " << arg.toUtf8().data() << endl;
ActionPair pair; ActionPair pair;
pair.action = StartWithProfile; pair.action = StartWithProfile;
@ -108,7 +103,6 @@ void CommandLineOptions::parseActions()
} }
if (arg.startsWith("-np") || arg.startsWith("--no-plugins")) { if (arg.startsWith("-np") || arg.startsWith("--no-plugins")) {
found = true;
ActionPair pair; ActionPair pair;
pair.action = StartWithoutAddons; pair.action = StartWithoutAddons;
pair.text = ""; pair.text = "";
@ -116,7 +110,6 @@ void CommandLineOptions::parseActions()
} }
if (arg.startsWith("-nt") || arg.startsWith("--new-tab")) { if (arg.startsWith("-nt") || arg.startsWith("--new-tab")) {
found = true;
ActionPair pair; ActionPair pair;
pair.action = NewTab; pair.action = NewTab;
pair.text = ""; pair.text = "";
@ -124,7 +117,6 @@ void CommandLineOptions::parseActions()
} }
if (arg.startsWith("-nw") || arg.startsWith("--new-window")) { if (arg.startsWith("-nw") || arg.startsWith("--new-window")) {
found = true;
ActionPair pair; ActionPair pair;
pair.action = NewWindow; pair.action = NewWindow;
pair.text = ""; pair.text = "";
@ -132,7 +124,6 @@ void CommandLineOptions::parseActions()
} }
if (arg.startsWith("-dm") || arg.startsWith("--download-manager")) { if (arg.startsWith("-dm") || arg.startsWith("--download-manager")) {
found = true;
ActionPair pair; ActionPair pair;
pair.action = ShowDownloadManager; pair.action = ShowDownloadManager;
pair.text = ""; pair.text = "";
@ -140,7 +131,6 @@ void CommandLineOptions::parseActions()
} }
if (arg.startsWith("-pb") || arg.startsWith("--private-browsing")) { if (arg.startsWith("-pb") || arg.startsWith("--private-browsing")) {
found = true;
ActionPair pair; ActionPair pair;
pair.action = StartPrivateBrowsing; pair.action = StartPrivateBrowsing;
pair.text = ""; pair.text = "";
@ -150,19 +140,10 @@ void CommandLineOptions::parseActions()
QString url(m_argv[m_argc - 1]); QString url(m_argv[m_argc - 1]);
if (m_argc > 1 && !url.isEmpty() && !url.startsWith("-")) { if (m_argc > 1 && !url.isEmpty() && !url.startsWith("-")) {
found = true;
cout << "starting with url " << url.toUtf8().data() << endl; cout << "starting with url " << url.toUtf8().data() << endl;
ActionPair pair; ActionPair pair;
pair.action = OpenUrl; pair.action = OpenUrl;
pair.text = url; pair.text = url;
m_actions.append(pair); m_actions.append(pair);
} }
if (m_argc > 1 && !found) {
cout << " Invalid option! Please see help below." << endl;
showHelp();
ActionPair pair;
pair.action = ExitAction;
m_actions.append(pair);
}
} }