web/surfer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

support bookmark-file; refs #116

Browse Source
This commit is contained in:
Marc Wäckerlin
2012-04-17 14:50:35 +00:00
parent ac8fa676c0
commit 4c1a396547
13 changed files with 401 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main.cxx
View File

@@ -333,6 +333,7 @@ int main(int argv, char** argc) try {
bool quirks(false);
bool login(false);
Settings::MimeTypes mimetypes;
QString bookmarks;
QStringList args(app.arguments());
std::auto_ptr<QSettings> settings
(std::auto_ptr<QSettings>(new QSettings("SwissSign", "SwissBrowser")));
@@ -356,6 +357,8 @@ int main(int argv, char** argc) try {
" -y, --key <file> load local certificate key from <file>\n"
" -m, --mime <mime> <ext> <tool>\n"
" start <tool> for mimetype <mime>\n"
" -b, --bookmarks <file>\n"
" load and save bookmarks from and to <file>\n"
" <url> optional full URL\n"
"Environment:\n"
" LANGUAGE \"de\", \"en\", ... (actual: %5)\n"
@@ -382,6 +385,8 @@ int main(int argv, char** argc) try {
login = true;
} else if ((*it=="-l" || *it=="--lib") && ++it!=args.end()) {
actlib = *it;
} else if ((*it=="-b" || *it=="--bookmarks") && ++it!=args.end()) {
bookmarks = *it;
} else if ((*it=="-s" || *it=="--settings") && ++it!=args.end()) {
settings = std::auto_ptr<QSettings>
(new QSettings(*it, QSettings::IniFormat));
@@ -427,7 +432,7 @@ int main(int argv, char** argc) try {
//............................................................................
if (env.contains("QTWEBKIT_PLUGIN_PATH")) qt_drt_overwritePluginDirectories();
Browser browser(actlib, urls, settings.get(), mimetypes, silent,
login, quirks);
login, quirks, bookmarks);
return app.exec();
} catch (std::exception& x) {
std::cerr<<"**** Error: "<<x.what()<<std::endl;