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

done point 1) in refs #108; separated ButtonLineEdit for refs #115

Browse Source
This commit is contained in:
Marc Wäckerlin
2012-02-13 15:29:07 +00:00
parent 088163a14d
commit 9ae8812ef5
19 changed files with 377 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main.cxx
View File

@@ -26,23 +26,26 @@
#include <memory>
/*! @mainpage The Secure Swiss PKCS#11 WebBrowser
The browser is divided into a library, qbrowserlib that implements
generic browsing utilities, the main browser page that collects
those features into a main window, a PKCS#11 Post-SuisseID
hardware token client authentication and a designer plugin for
flexible GUI creation.
*/
//! @defgroup browser The SwissBrowser Executable and Main Window
//! @defgroup pkcs11 The PKCS#11 Client Authentication
//! @defgroup qbrowserlib The Swiss Browser Library
//! @defgroup designer Qt Designer Plugin for Browser Related Widgets
/*! @mainpage The Secure Swiss PKCS#11 WebBrowser
The browser is divided into a library, @ref qbrowserlib that implements
generic browsing utilities, the main @ref browser page that collects
those features into a main window, a @ref pkcs11 Post-SuisseID
hardware token client authentication and a @ref designer plugin for
flexible GUI creation.
*/
//! @addtogroup browser
//! @{
QString TMP;
const QByteArray SWISSSIGN_EV_GOLD_CA_2009_G2
("-----BEGIN CERTIFICATE-----\n"
"MIIGvzCCBaegAwIBAgIQAPI39KUS4aGJo+mkR4+YuTANBgkqhkiG9w0BAQUFADBN\n"
@@ -309,6 +312,7 @@ int main(int argv, char** argc) try {
<<"Port"<<QNetworkProxy::applicationProxy().port();
qDebug()<<"***************************************************************";
//----------------------------------------------------------------------------
TMP=QDir::toNativeSeparators(QDir::tempPath());
QStringList urls;
QString actlib
#ifdef Q_OS_LINUX
@@ -338,6 +342,7 @@ int main(int argv, char** argc) try {
("Usage: %1 [OPTIONS...] [<url> ...]\n"
"Options:\n"
" -h, --help show this help text\n"
" -t --tmp path temporary folder for data caching\n"
" -k, --kiosk no url bar\n"
" if you sepcify -k and -s, -k must be first\n"
" -q, --quirks alternate user interface\n"
@@ -357,13 +362,15 @@ int main(int argv, char** argc) try {
" PROXY_TYPE \"http\" or \"socks\" or \"\" (actual: %2)\n"
" PROXY_PORT proxy port number (actual: %3)\n"
" PROXY_HOST proxy host name (actual: %4)\n"
" SWISSSURFER_USERAGENT fake user agent (actual: %6)\n")
" SWISS_USERAGENT fake user agent (actual: %6)\n")
.arg(QFileInfo(argc[0]).fileName())
.arg(env["PROXY_TYPE"]).arg(env["PROXY_PORT"]).arg(env["PROXY_HOST"])
.arg(env["LANGUAGE"]).arg(env["SWISSSURFER_USERAGENT"])
.arg(env["LANGUAGE"]).arg(env["SWISS_USERAGENT"])
.toStdString()
<<std::endl;
return 0;
} else if ((*it=="-t" || *it=="--tmp") && ++it!=args.end()) {
TMP=*it;
} else if ((*it=="-k" || *it=="--kiosk")) {
silent=true;
settings.reset();