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

set SWISSSURFER_USERAGENT e.g. to "Mozilla/5.0 (%Platform%; %Security%; %Subplatform%; %Locale%) AppleWebKit/%WebKitVersion% (KHTML, like Gecko) %AppVersion Safari/%WebKitVersion%"; closes #88

Browse Source
This commit is contained in:
Marc Wäckerlin
2011-06-29 06:52:18 +00:00
parent 313b75fbf0
commit 6d16b9e672
7 changed files with 166 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
swisssurfer/src/browser.hxx
View File

@@ -631,7 +631,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
void on_actionAbout_triggered() {
QMessageBox::about(this, tr("About"),
tr("SwissSurfer\n"
tr("%8\n"
"Version: %1\n"
"Builddate: %2\n"
"Libraries:\n"
@@ -645,7 +645,8 @@ class Browser: public QMainWindow, protected Ui::Browser {
.arg(QString::fromStdString(pcsc::version()))
.arg(qVersion())
.arg(QT_VERSION_STR)
.arg(SHLIB_VERSION_NUMBER));
.arg(SHLIB_VERSION_NUMBER)
.arg(QApplication::applicationName()));
}
void on_actionSettings_triggered() {

15
swisssurfer/src/main.cxx
View File

@@ -250,6 +250,8 @@ int main(int argv, char** argc) try {
QTextCodec::setCodecForTr(utf8);
QApplication app(argv, argc);
app.setWindowIcon(QIcon(":/icons/appicon"));
app.setApplicationName(QObject::trUtf8("SwissSurfer", "application name"));
app.setApplicationVersion(VERSION);
QTranslator qtTranslator;
if (env.contains("LANGUAGE")) QLocale::setDefault(env["LANGUAGE"]);
qtTranslator.load(":/language/qt_" + QLocale::system().name());
@@ -325,10 +327,19 @@ int main(int argv, char** argc) try {
" LANGUAGE \"de\", \"en\", ... (actual: %5)\n"
" 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")
" PROXY_HOST proxy host name (actual: %4)\n"
" SWISSSURFER_USERAGENT fake user agent (actual: %6)\n"
" %Platform% and %Subplatform% are expanded\n"
" to the windowing system and the operation\n"
" system. %Security% expands to U if SSL is\n"
" available, otherwise N. %Locale% is\n"
" replaced with locale name. %WebKitVersion%\n"
" is the version of WebKit the application\n"
" was compiled against. %AppVersion% expands\n"
" to application name/version\n")
.arg(QFileInfo(argc[0]).fileName())
.arg(env["PROXY_TYPE"]).arg(env["PROXY_PORT"]).arg(env["PROXY_HOST"])
.arg(env["LANGUAGE"])
.arg(env["LANGUAGE"]).arg(env["SWISSSURFER_USERAGENT"])
.toStdString()
<<std::endl;
return 0;

70
swisssurfer/src/swisssurfer_de.ts
View File

@@ -280,22 +280,22 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="694"/>
<location filename="browser.hxx" line="695"/>
<source>Info: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="707"/>
<location filename="browser.hxx" line="708"/>
<source>done.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="707"/>
<location filename="browser.hxx" line="708"/>
<source>page load error.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="960"/>
<location filename="browser.hxx" line="961"/>
<source>%1</source>
<comment>statusbar for hovered link %1=url</comment>
<translation type="unfinished"></translation>
@@ -338,7 +338,7 @@
</message>
<message>
<location filename="browser.hxx" line="634"/>
<source>SwissSurfer
<source>%8
Version: %1
Builddate: %2
Libraries:
@@ -346,8 +346,7 @@ Libraries:
%4
qt-%5 (%6)
openssl-%7</source>
<oldsource>SwissSurfer %1 (%2)
<oldsource>SwissSurfer
Version: %1
Builddate: %2
Libraries:
@@ -358,22 +357,22 @@ openssl-%7</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="689"/>
<location filename="browser.hxx" line="690"/>
<source>%1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1096"/>
<location filename="browser.hxx" line="1097"/>
<source>Save File As ...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1159"/>
<location filename="browser.hxx" line="1160"/>
<source>authentication required</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1171"/>
<location filename="browser.hxx" line="1172"/>
<source>ssl error</source>
<translation type="unfinished"></translation>
</message>
@@ -681,7 +680,13 @@ openssl-%7</oldsource>
<context>
<name>QObject</name>
<message>
<location filename="main.cxx" line="307"/>
<location filename="main.cxx" line="253"/>
<source>SwissSurfer</source>
<comment>application name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cxx" line="309"/>
<source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
Options:
-h, --help show this help text
@@ -703,53 +708,40 @@ Environment:
PROXY_TYPE &quot;http&quot; or &quot;socks&quot; or &quot;&quot; (actual: %2)
PROXY_PORT proxy port number (actual: %3)
PROXY_HOST proxy host name (actual: %4)
SWISSSURFER_USERAGENT fake user agent (actual: %6)
%Platform% and %Subplatform% are expanded
to the windowing system and the operation
system. %Security% expands to U if SSL is
available, otherwise N. %Locale% is
replaced with locale name. %WebKitVersion%
is the version of WebKit the application
was compiled against. %AppVersion% expands
to application name/version
</source>
<oldsource>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
Options:
-h, --help show this help text
-k, --kiosk no url bar
if you sepcify -k and -s, -k must be first
-n, --no-settings don&apos;t load or store any settings
--no-login don&apos;t ask for smartcard password
-l, --lib &lt;file&gt; path to file libengine_act.so
-s, --settings &lt;file&gt;
load settings from &lt;file&gt;
if you sepcify -k and -s, -k must be first
-c, --cert &lt;file&gt; load local client certificate from &lt;file&gt;
-y, --key &lt;file&gt; load local certificate key from &lt;file&gt;
-m, --mime &lt;mime&gt; &lt;ext&gt; &lt;tool&gt;
start &lt;tool&gt; for mimetype &lt;mime&gt;
&lt;url&gt; optional full URL
Environment:
LANGUAGE &quot;de&quot;, &quot;en&quot;, ... (actual: %5)
PROXY_TYPE &quot;http&quot; or &quot;socks&quot; or &quot;&quot; (actual: %2)
PROXY_PORT proxy port number (actual: %3)
PROXY_HOST proxy host name (actual: %4)
</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cxx" line="352"/>
<location filename="main.cxx" line="363"/>
<source>Cannot read PEM certificate from file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cxx" line="358"/>
<location filename="main.cxx" line="369"/>
<source>Read PEM certificates from file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cxx" line="365"/>
<location filename="main.cxx" line="376"/>
<source>Cannot read PEM RSA key from file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cxx" line="370"/>
<location filename="main.cxx" line="381"/>
<source>Read private key from file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cxx" line="381"/>
<location filename="main.cxx" line="392"/>
<source>Too few arguments.
Try: %1 --help</source>
<translation type="unfinished"></translation>

48
swisssurfer/src/swisssurfer_en.ts
View File

@@ -312,7 +312,7 @@
</message>
<message>
<location filename="browser.hxx" line="634"/>
<source>SwissSurfer
<source>%8
Version: %1
Builddate: %2
Libraries:
@@ -320,8 +320,7 @@ Libraries:
%4
qt-%5 (%6)
openssl-%7</source>
<oldsource>SwissSurfer %1 (%2)
<oldsource>SwissSurfer
Version: %1
Builddate: %2
Libraries:
@@ -332,43 +331,43 @@ openssl-%7</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="689"/>
<location filename="browser.hxx" line="690"/>
<source>%1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="694"/>
<location filename="browser.hxx" line="695"/>
<source>Info: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="707"/>
<location filename="browser.hxx" line="708"/>
<source>done.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="707"/>
<location filename="browser.hxx" line="708"/>
<source>page load error.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="960"/>
<location filename="browser.hxx" line="961"/>
<source>%1</source>
<comment>statusbar for hovered link %1=url</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1096"/>
<location filename="browser.hxx" line="1097"/>
<source>Save File As ...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1159"/>
<location filename="browser.hxx" line="1160"/>
<source>authentication required</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1171"/>
<location filename="browser.hxx" line="1172"/>
<source>ssl error</source>
<translation type="unfinished"></translation>
</message>
@@ -671,7 +670,13 @@ openssl-%7</oldsource>
<context>
<name>QObject</name>
<message>
<location filename="main.cxx" line="307"/>
<location filename="main.cxx" line="253"/>
<source>SwissSurfer</source>
<comment>application name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cxx" line="309"/>
<source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
Options:
-h, --help show this help text
@@ -693,31 +698,40 @@ Environment:
PROXY_TYPE &quot;http&quot; or &quot;socks&quot; or &quot;&quot; (actual: %2)
PROXY_PORT proxy port number (actual: %3)
PROXY_HOST proxy host name (actual: %4)
SWISSSURFER_USERAGENT fake user agent (actual: %6)
%Platform% and %Subplatform% are expanded
to the windowing system and the operation
system. %Security% expands to U if SSL is
available, otherwise N. %Locale% is
replaced with locale name. %WebKitVersion%
is the version of WebKit the application
was compiled against. %AppVersion% expands
to application name/version
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cxx" line="352"/>
<location filename="main.cxx" line="363"/>
<source>Cannot read PEM certificate from file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cxx" line="358"/>
<location filename="main.cxx" line="369"/>
<source>Read PEM certificates from file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cxx" line="365"/>
<location filename="main.cxx" line="376"/>
<source>Cannot read PEM RSA key from file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cxx" line="370"/>
<location filename="main.cxx" line="381"/>
<source>Read private key from file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cxx" line="381"/>
<location filename="main.cxx" line="392"/>
<source>Too few arguments.
Try: %1 --help</source>
<translation type="unfinished"></translation>

70
swisssurfer/src/swisssurfer_fr.ts
View File

@@ -280,22 +280,22 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="694"/>
<location filename="browser.hxx" line="695"/>
<source>Info: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="707"/>
<location filename="browser.hxx" line="708"/>
<source>done.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="707"/>
<location filename="browser.hxx" line="708"/>
<source>page load error.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="960"/>
<location filename="browser.hxx" line="961"/>
<source>%1</source>
<comment>statusbar for hovered link %1=url</comment>
<translation type="unfinished"></translation>
@@ -338,7 +338,7 @@
</message>
<message>
<location filename="browser.hxx" line="634"/>
<source>SwissSurfer
<source>%8
Version: %1
Builddate: %2
Libraries:
@@ -346,8 +346,7 @@ Libraries:
%4
qt-%5 (%6)
openssl-%7</source>
<oldsource>SwissSurfer %1 (%2)
<oldsource>SwissSurfer
Version: %1
Builddate: %2
Libraries:
@@ -358,22 +357,22 @@ openssl-%7</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="689"/>
<location filename="browser.hxx" line="690"/>
<source>%1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1096"/>
<location filename="browser.hxx" line="1097"/>
<source>Save File As ...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1159"/>
<location filename="browser.hxx" line="1160"/>
<source>authentication required</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1171"/>
<location filename="browser.hxx" line="1172"/>
<source>ssl error</source>
<translation type="unfinished"></translation>
</message>
@@ -681,7 +680,13 @@ openssl-%7</oldsource>
<context>
<name>QObject</name>
<message>
<location filename="main.cxx" line="307"/>
<location filename="main.cxx" line="253"/>
<source>SwissSurfer</source>
<comment>application name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cxx" line="309"/>
<source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
Options:
-h, --help show this help text
@@ -703,53 +708,40 @@ Environment:
PROXY_TYPE &quot;http&quot; or &quot;socks&quot; or &quot;&quot; (actual: %2)
PROXY_PORT proxy port number (actual: %3)
PROXY_HOST proxy host name (actual: %4)
SWISSSURFER_USERAGENT fake user agent (actual: %6)
%Platform% and %Subplatform% are expanded
to the windowing system and the operation
system. %Security% expands to U if SSL is
available, otherwise N. %Locale% is
replaced with locale name. %WebKitVersion%
is the version of WebKit the application
was compiled against. %AppVersion% expands
to application name/version
</source>
<oldsource>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
Options:
-h, --help show this help text
-k, --kiosk no url bar
if you sepcify -k and -s, -k must be first
-n, --no-settings don&apos;t load or store any settings
--no-login don&apos;t ask for smartcard password
-l, --lib &lt;file&gt; path to file libengine_act.so
-s, --settings &lt;file&gt;
load settings from &lt;file&gt;
if you sepcify -k and -s, -k must be first
-c, --cert &lt;file&gt; load local client certificate from &lt;file&gt;
-y, --key &lt;file&gt; load local certificate key from &lt;file&gt;
-m, --mime &lt;mime&gt; &lt;ext&gt; &lt;tool&gt;
start &lt;tool&gt; for mimetype &lt;mime&gt;
&lt;url&gt; optional full URL
Environment:
LANGUAGE &quot;de&quot;, &quot;en&quot;, ... (actual: %5)
PROXY_TYPE &quot;http&quot; or &quot;socks&quot; or &quot;&quot; (actual: %2)
PROXY_PORT proxy port number (actual: %3)
PROXY_HOST proxy host name (actual: %4)
</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cxx" line="352"/>
<location filename="main.cxx" line="363"/>
<source>Cannot read PEM certificate from file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cxx" line="358"/>
<location filename="main.cxx" line="369"/>
<source>Read PEM certificates from file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cxx" line="365"/>
<location filename="main.cxx" line="376"/>
<source>Cannot read PEM RSA key from file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cxx" line="370"/>
<location filename="main.cxx" line="381"/>
<source>Read private key from file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cxx" line="381"/>
<location filename="main.cxx" line="392"/>
<source>Too few arguments.
Try: %1 --help</source>
<translation type="unfinished"></translation>

70
swisssurfer/src/swisssurfer_it.ts
View File

@@ -280,22 +280,22 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="694"/>
<location filename="browser.hxx" line="695"/>
<source>Info: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="707"/>
<location filename="browser.hxx" line="708"/>
<source>done.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="707"/>
<location filename="browser.hxx" line="708"/>
<source>page load error.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="960"/>
<location filename="browser.hxx" line="961"/>
<source>%1</source>
<comment>statusbar for hovered link %1=url</comment>
<translation type="unfinished"></translation>
@@ -338,7 +338,7 @@
</message>
<message>
<location filename="browser.hxx" line="634"/>
<source>SwissSurfer
<source>%8
Version: %1
Builddate: %2
Libraries:
@@ -346,8 +346,7 @@ Libraries:
%4
qt-%5 (%6)
openssl-%7</source>
<oldsource>SwissSurfer %1 (%2)
<oldsource>SwissSurfer
Version: %1
Builddate: %2
Libraries:
@@ -358,22 +357,22 @@ openssl-%7</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="689"/>
<location filename="browser.hxx" line="690"/>
<source>%1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1096"/>
<location filename="browser.hxx" line="1097"/>
<source>Save File As ...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1159"/>
<location filename="browser.hxx" line="1160"/>
<source>authentication required</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1171"/>
<location filename="browser.hxx" line="1172"/>
<source>ssl error</source>
<translation type="unfinished"></translation>
</message>
@@ -681,7 +680,13 @@ openssl-%7</oldsource>
<context>
<name>QObject</name>
<message>
<location filename="main.cxx" line="307"/>
<location filename="main.cxx" line="253"/>
<source>SwissSurfer</source>
<comment>application name</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cxx" line="309"/>
<source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
Options:
-h, --help show this help text
@@ -703,53 +708,40 @@ Environment:
PROXY_TYPE &quot;http&quot; or &quot;socks&quot; or &quot;&quot; (actual: %2)
PROXY_PORT proxy port number (actual: %3)
PROXY_HOST proxy host name (actual: %4)
SWISSSURFER_USERAGENT fake user agent (actual: %6)
%Platform% and %Subplatform% are expanded
to the windowing system and the operation
system. %Security% expands to U if SSL is
available, otherwise N. %Locale% is
replaced with locale name. %WebKitVersion%
is the version of WebKit the application
was compiled against. %AppVersion% expands
to application name/version
</source>
<oldsource>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
Options:
-h, --help show this help text
-k, --kiosk no url bar
if you sepcify -k and -s, -k must be first
-n, --no-settings don&apos;t load or store any settings
--no-login don&apos;t ask for smartcard password
-l, --lib &lt;file&gt; path to file libengine_act.so
-s, --settings &lt;file&gt;
load settings from &lt;file&gt;
if you sepcify -k and -s, -k must be first
-c, --cert &lt;file&gt; load local client certificate from &lt;file&gt;
-y, --key &lt;file&gt; load local certificate key from &lt;file&gt;
-m, --mime &lt;mime&gt; &lt;ext&gt; &lt;tool&gt;
start &lt;tool&gt; for mimetype &lt;mime&gt;
&lt;url&gt; optional full URL
Environment:
LANGUAGE &quot;de&quot;, &quot;en&quot;, ... (actual: %5)
PROXY_TYPE &quot;http&quot; or &quot;socks&quot; or &quot;&quot; (actual: %2)
PROXY_PORT proxy port number (actual: %3)
PROXY_HOST proxy host name (actual: %4)
</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cxx" line="352"/>
<location filename="main.cxx" line="363"/>
<source>Cannot read PEM certificate from file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cxx" line="358"/>
<location filename="main.cxx" line="369"/>
<source>Read PEM certificates from file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cxx" line="365"/>
<location filename="main.cxx" line="376"/>
<source>Cannot read PEM RSA key from file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cxx" line="370"/>
<location filename="main.cxx" line="381"/>
<source>Read private key from file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cxx" line="381"/>
<location filename="main.cxx" line="392"/>
<source>Too few arguments.
Try: %1 --help</source>
<translation type="unfinished"></translation>

7
swisssurfer/src/webpage.hxx
View File

@@ -9,6 +9,7 @@
#define __WEBPAGE_HXX__
#include <QtWebKit/QWebPage>
#include <QtCore/QProcessEnvironment>
class Browser;
@@ -16,7 +17,11 @@ class WebPage: public QWebPage {
public:
WebPage(Browser* b, QObject *parent = 0): QWebPage(parent), _browser(b) {}
protected:
QWebPage* createWindow(WebWindowType type);
virtual QWebPage* createWindow(WebWindowType type);
virtual QString userAgentForUrl(const QUrl& url) const {
return QProcessEnvironment::systemEnvironment()
.value("SWISSSURFER_USERAGENT", QWebPage::userAgentForUrl(url));
}
private:
Browser* _browser;
};