closes #60

2011-06-08 13:00:40 +00:00
parent 166391ebde
commit 7f2e08667b
7 changed files with 133 additions and 126 deletions
--- a/swisssurfer/src/browser.hxx
+++ b/swisssurfer/src/browser.hxx
@@ -57,12 +57,11 @@ class Browser: public QMainWindow, protected Ui::Browser {
            Settings::MimeTypes mimeTypes = Settings::MimeTypes(),
            bool kiosk = false, bool login = true):
        _url(0), _clearUrl(0), _addBookmark(0), _find(0),
-        _kiosk(kiosk),
+        _kiosk(kiosk), 
        _settings(mimeTypes, this, settings, !kiosk), _errorLog(this) {
      LOG<<urls;
      try {
-        _scAuth = std::auto_ptr<SmartCardAuth>
-          (new SmartCardAuth(actlib, this, login));
+        _networkManager.scAuth(new SmartCardAuth(actlib, this, login));
      } catch (const std::exception& x) {
        LOG<<"No SmartCard Support:"<<x.what();
      }
@@ -125,6 +124,9 @@ class Browser: public QMainWindow, protected Ui::Browser {
        loadWin(urls.size());
      if (urls.size()) load(urls.at(0));
      for (int i(1); i<urls.size(); ++i) load(urls.at(i), newTab());
+      if (!QSslSocket::supportsSsl())
+        QMessageBox::critical(this, tr("SSL Not Supported"),
+                              tr("SSL is not supported on your system"));
    }

    ~Browser() {
@@ -435,13 +437,6 @@ class Browser: public QMainWindow, protected Ui::Browser {
    void load(QUrl page, QWebView* view=0) {
      LOG<<page.toString();
      statusBar()->showMessage(tr("Checking: %1").arg(page.toString()));
-      if (page.scheme()=="https") {
-	LOG<<"Need to login";
-        if (!QSslSocket::supportsSsl())
-          QMessageBox::critical(this, tr("SSL Not Supported"),
-                                tr("SSL is not supported on your system"));
-	if (_scAuth.get()) _scAuth->login(false);
-      }
      if (!check(page)) {
        LOG<<"########## BLACK LISTED IGNORED ##########";
        statusBar()->showMessage(tr("Forbidden: %1").arg(page.toString()));
@@ -1224,7 +1219,6 @@ class Browser: public QMainWindow, protected Ui::Browser {
    DownloadProcesses _downloadProcesses;
    Settings _settings;
    ErrorLog _errorLog;
-    std::auto_ptr<SmartCardAuth> _scAuth;
 };

 #endif
--- a/swisssurfer/src/makefile.am
+++ b/swisssurfer/src/makefile.am
@@ -63,8 +63,8 @@ ${QMAKE_TARGET}: ${QMAKE_MAKEFILE} ${ALL_SRC} $(LANGS:%=@PACKAGENAME@_%.qm)
 clean-local:
 	-rm -r ${QMAKE_TARGET}.app

-maintainer-clean-local: 
-	-rm -rf ${QMAKE_TARGET}.app 
+maintainer-clean-local:
+	-rm -rf ${QMAKE_TARGET}.app

 install-exec-local:
 	( test -f @PACKAGENAME@ && cp @PACKAGENAME@ ${bindir}/ ) \
@@ -72,7 +72,7 @@ install-exec-local:
 	  || ( test -d @PACKAGENAME@.app && cp -r @PACKAGENAME@.app ${bindir}/ )

 uninstall-local:
-	-rm -rf ${bindir}/@PACKAGENAME@{,.exe,.app} 
+	-rm -rf ${bindir}/@PACKAGENAME@{,.exe,.app}

 CLEANFILES = ${TARGETS} ${TARGETS:%=%.exe} $(LANGS:%=@PACKAGENAME@_%.qm) \
             *.o *.obj qrc_*.cpp ui_*.h moc_*.cpp \
--- a/swisssurfer/src/sslclientnetworkmanager.hxx
+++ b/swisssurfer/src/sslclientnetworkmanager.hxx
@@ -6,6 +6,7 @@
 // 45678901234567890123456789012345678901234567890123456789012345678901234567890
 #include <QtNetwork/QNetworkReply>
 #include <QtNetwork/QNetworkAccessManager>
+#include <smartcardauth.hxx>

 #include <QtCore/QDebug>
 #ifndef LOG
@@ -25,6 +26,10 @@ class SslClientAuthNetworkAccessManager: public QNetworkAccessManager {
      LOG;
    }

+    void scAuth(SmartCardAuth* auth) {
+      _scAuth = std::auto_ptr<SmartCardAuth>(auth);
+    }
+
  Q_SIGNALS:

    void created(QNetworkReply*);
@@ -35,6 +40,10 @@ class SslClientAuthNetworkAccessManager: public QNetworkAccessManager {
                                         const QNetworkRequest& req,
                                         QIODevice* outgoingData = 0 ) {
      LOG<<req.url();
+      if (req.url().scheme()=="https") {
+	LOG<<"Need to login";
+	if (_scAuth.get()) _scAuth->login(false);
+      }
      QNetworkReply* rep
        (QNetworkAccessManager::createRequest(op, req, outgoingData));
      created(rep);
@@ -42,4 +51,8 @@ class SslClientAuthNetworkAccessManager: public QNetworkAccessManager {
      return rep;
    }

+  private:
+
+    std::auto_ptr<SmartCardAuth> _scAuth;
+
 };
--- a/swisssurfer/src/swisssurfer_de.ts
+++ b/swisssurfer/src/swisssurfer_de.ts
@@ -236,98 +236,98 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="433"/>
+        <location filename="browser.hxx" line="439"/>
        <source>Checking: %1</source>
        <oldsource>Opening: %1</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="451"/>
+        <location filename="browser.hxx" line="450"/>
        <source>Reading: %1</source>
        <oldsource>Reading: %1%</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="466"/>
+        <location filename="browser.hxx" line="465"/>
        <source>Zoom: %1%</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="453"/>
+        <location filename="browser.hxx" line="452"/>
        <source>Illegal URL: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="515"/>
+        <location filename="browser.hxx" line="514"/>
        <source>Print Document</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="536"/>
+        <location filename="browser.hxx" line="535"/>
        <source>%1 - %2</source>
        <oldsource>Back to %1 - %2</oldsource>
        <comment>statusbar actionBack_hovered %1=url %2=title</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="678"/>
+        <location filename="browser.hxx" line="677"/>
        <source>Info: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="691"/>
+        <location filename="browser.hxx" line="690"/>
        <source>done.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="691"/>
+        <location filename="browser.hxx" line="690"/>
        <source>page load error.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="944"/>
+        <location filename="browser.hxx" line="943"/>
        <source>%1</source>
        <comment>statusbar for hovered link %1=url</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="443"/>
+        <location filename="browser.hxx" line="442"/>
        <source>Forbidden: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="437"/>
+        <location filename="browser.hxx" line="128"/>
        <source>SSL Not Supported</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="438"/>
+        <location filename="browser.hxx" line="129"/>
        <source>SSL is not supported on your system</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="444"/>
+        <location filename="browser.hxx" line="443"/>
        <source>Access Denied</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="445"/>
+        <location filename="browser.hxx" line="444"/>
        <source>&lt;p&gt;Access denied due to security considerations.&lt;/p&gt;&lt;p&gt;You are not allowed to connect to %1.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="555"/>
+        <location filename="browser.hxx" line="554"/>
        <source>%1 - %2</source>
        <comment>statusbar actionForward_hovered %1=url %2=title</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="623"/>
+        <location filename="browser.hxx" line="622"/>
        <source>About</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="624"/>
+        <location filename="browser.hxx" line="623"/>
        <source>SwissSurfer %1 (%2)

 %3
@@ -341,22 +341,22 @@ Compiled: qt-%5</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="673"/>
+        <location filename="browser.hxx" line="672"/>
        <source>%1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1078"/>
+        <location filename="browser.hxx" line="1077"/>
        <source>Save File As ...</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1141"/>
+        <location filename="browser.hxx" line="1140"/>
        <source>authentication required</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1153"/>
+        <location filename="browser.hxx" line="1152"/>
        <source>ssl error</source>
        <translation type="unfinished"></translation>
    </message>
@@ -610,7 +610,7 @@ p, li { white-space: pre-wrap; }
 <context>
    <name>QObject</name>
    <message>
-        <location filename="main.cxx" line="302"/>
+        <location filename="main.cxx" line="305"/>
        <source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
 Options:
 -h, --help        show this help text
@@ -658,27 +658,27 @@ Environment:
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="347"/>
+        <location filename="main.cxx" line="350"/>
        <source>Cannot read PEM certificate from file: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="353"/>
+        <location filename="main.cxx" line="356"/>
        <source>Read PEM certificates from file: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="360"/>
+        <location filename="main.cxx" line="363"/>
        <source>Cannot read PEM RSA key from file: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="365"/>
+        <location filename="main.cxx" line="368"/>
        <source>Read private key from file: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="376"/>
+        <location filename="main.cxx" line="379"/>
        <source>Too few arguments.
 Try: %1 --help</source>
        <translation type="unfinished"></translation>
--- a/swisssurfer/src/swisssurfer_en.ts
+++ b/swisssurfer/src/swisssurfer_en.ts
@@ -234,74 +234,74 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="433"/>
+        <location filename="browser.hxx" line="439"/>
        <source>Checking: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="437"/>
+        <location filename="browser.hxx" line="128"/>
        <source>SSL Not Supported</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="438"/>
+        <location filename="browser.hxx" line="129"/>
        <source>SSL is not supported on your system</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="443"/>
+        <location filename="browser.hxx" line="442"/>
        <source>Forbidden: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="444"/>
+        <location filename="browser.hxx" line="443"/>
        <source>Access Denied</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="445"/>
+        <location filename="browser.hxx" line="444"/>
        <source>&lt;p&gt;Access denied due to security considerations.&lt;/p&gt;&lt;p&gt;You are not allowed to connect to %1.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="451"/>
+        <location filename="browser.hxx" line="450"/>
        <source>Reading: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="453"/>
+        <location filename="browser.hxx" line="452"/>
        <source>Illegal URL: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="466"/>
+        <location filename="browser.hxx" line="465"/>
        <source>Zoom: %1%</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="515"/>
+        <location filename="browser.hxx" line="514"/>
        <source>Print Document</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="536"/>
+        <location filename="browser.hxx" line="535"/>
        <source>%1 - %2</source>
        <comment>statusbar actionBack_hovered %1=url %2=title</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="555"/>
+        <location filename="browser.hxx" line="554"/>
        <source>%1 - %2</source>
        <comment>statusbar actionForward_hovered %1=url %2=title</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="623"/>
+        <location filename="browser.hxx" line="622"/>
        <source>About</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="624"/>
+        <location filename="browser.hxx" line="623"/>
        <source>SwissSurfer %1 (%2)

 %3
@@ -310,43 +310,43 @@ Compiled: qt-%5</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="673"/>
+        <location filename="browser.hxx" line="672"/>
        <source>%1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="678"/>
+        <location filename="browser.hxx" line="677"/>
        <source>Info: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="691"/>
+        <location filename="browser.hxx" line="690"/>
        <source>done.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="691"/>
+        <location filename="browser.hxx" line="690"/>
        <source>page load error.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="944"/>
+        <location filename="browser.hxx" line="943"/>
        <source>%1</source>
        <comment>statusbar for hovered link %1=url</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1078"/>
+        <location filename="browser.hxx" line="1077"/>
        <source>Save File As ...</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1141"/>
+        <location filename="browser.hxx" line="1140"/>
        <source>authentication required</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1153"/>
+        <location filename="browser.hxx" line="1152"/>
        <source>ssl error</source>
        <translation type="unfinished"></translation>
    </message>
@@ -595,7 +595,7 @@ p, li { white-space: pre-wrap; }
 <context>
    <name>QObject</name>
    <message>
-        <location filename="main.cxx" line="302"/>
+        <location filename="main.cxx" line="305"/>
        <source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
 Options:
 -h, --help        show this help text
@@ -621,27 +621,27 @@ Environment:
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="347"/>
+        <location filename="main.cxx" line="350"/>
        <source>Cannot read PEM certificate from file: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="353"/>
+        <location filename="main.cxx" line="356"/>
        <source>Read PEM certificates from file: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="360"/>
+        <location filename="main.cxx" line="363"/>
        <source>Cannot read PEM RSA key from file: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="365"/>
+        <location filename="main.cxx" line="368"/>
        <source>Read private key from file: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="376"/>
+        <location filename="main.cxx" line="379"/>
        <source>Too few arguments.
 Try: %1 --help</source>
        <translation type="unfinished"></translation>
--- a/swisssurfer/src/swisssurfer_fr.ts
+++ b/swisssurfer/src/swisssurfer_fr.ts
@@ -236,98 +236,98 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="433"/>
+        <location filename="browser.hxx" line="439"/>
        <source>Checking: %1</source>
        <oldsource>Opening: %1</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="451"/>
+        <location filename="browser.hxx" line="450"/>
        <source>Reading: %1</source>
        <oldsource>Reading: %1%</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="466"/>
+        <location filename="browser.hxx" line="465"/>
        <source>Zoom: %1%</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="453"/>
+        <location filename="browser.hxx" line="452"/>
        <source>Illegal URL: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="515"/>
+        <location filename="browser.hxx" line="514"/>
        <source>Print Document</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="536"/>
+        <location filename="browser.hxx" line="535"/>
        <source>%1 - %2</source>
        <oldsource>Back to %1 - %2</oldsource>
        <comment>statusbar actionBack_hovered %1=url %2=title</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="678"/>
+        <location filename="browser.hxx" line="677"/>
        <source>Info: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="691"/>
+        <location filename="browser.hxx" line="690"/>
        <source>done.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="691"/>
+        <location filename="browser.hxx" line="690"/>
        <source>page load error.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="944"/>
+        <location filename="browser.hxx" line="943"/>
        <source>%1</source>
        <comment>statusbar for hovered link %1=url</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="443"/>
+        <location filename="browser.hxx" line="442"/>
        <source>Forbidden: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="437"/>
+        <location filename="browser.hxx" line="128"/>
        <source>SSL Not Supported</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="438"/>
+        <location filename="browser.hxx" line="129"/>
        <source>SSL is not supported on your system</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="444"/>
+        <location filename="browser.hxx" line="443"/>
        <source>Access Denied</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="445"/>
+        <location filename="browser.hxx" line="444"/>
        <source>&lt;p&gt;Access denied due to security considerations.&lt;/p&gt;&lt;p&gt;You are not allowed to connect to %1.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="555"/>
+        <location filename="browser.hxx" line="554"/>
        <source>%1 - %2</source>
        <comment>statusbar actionForward_hovered %1=url %2=title</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="623"/>
+        <location filename="browser.hxx" line="622"/>
        <source>About</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="624"/>
+        <location filename="browser.hxx" line="623"/>
        <source>SwissSurfer %1 (%2)

 %3
@@ -341,22 +341,22 @@ Compiled: qt-%5</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="673"/>
+        <location filename="browser.hxx" line="672"/>
        <source>%1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1078"/>
+        <location filename="browser.hxx" line="1077"/>
        <source>Save File As ...</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1141"/>
+        <location filename="browser.hxx" line="1140"/>
        <source>authentication required</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1153"/>
+        <location filename="browser.hxx" line="1152"/>
        <source>ssl error</source>
        <translation type="unfinished"></translation>
    </message>
@@ -610,7 +610,7 @@ p, li { white-space: pre-wrap; }
 <context>
    <name>QObject</name>
    <message>
-        <location filename="main.cxx" line="302"/>
+        <location filename="main.cxx" line="305"/>
        <source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
 Options:
 -h, --help        show this help text
@@ -658,27 +658,27 @@ Environment:
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="347"/>
+        <location filename="main.cxx" line="350"/>
        <source>Cannot read PEM certificate from file: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="353"/>
+        <location filename="main.cxx" line="356"/>
        <source>Read PEM certificates from file: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="360"/>
+        <location filename="main.cxx" line="363"/>
        <source>Cannot read PEM RSA key from file: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="365"/>
+        <location filename="main.cxx" line="368"/>
        <source>Read private key from file: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="376"/>
+        <location filename="main.cxx" line="379"/>
        <source>Too few arguments.
 Try: %1 --help</source>
        <translation type="unfinished"></translation>
--- a/swisssurfer/src/swisssurfer_it.ts
+++ b/swisssurfer/src/swisssurfer_it.ts
@@ -236,98 +236,98 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="433"/>
+        <location filename="browser.hxx" line="439"/>
        <source>Checking: %1</source>
        <oldsource>Opening: %1</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="451"/>
+        <location filename="browser.hxx" line="450"/>
        <source>Reading: %1</source>
        <oldsource>Reading: %1%</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="466"/>
+        <location filename="browser.hxx" line="465"/>
        <source>Zoom: %1%</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="453"/>
+        <location filename="browser.hxx" line="452"/>
        <source>Illegal URL: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="515"/>
+        <location filename="browser.hxx" line="514"/>
        <source>Print Document</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="536"/>
+        <location filename="browser.hxx" line="535"/>
        <source>%1 - %2</source>
        <oldsource>Back to %1 - %2</oldsource>
        <comment>statusbar actionBack_hovered %1=url %2=title</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="678"/>
+        <location filename="browser.hxx" line="677"/>
        <source>Info: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="691"/>
+        <location filename="browser.hxx" line="690"/>
        <source>done.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="691"/>
+        <location filename="browser.hxx" line="690"/>
        <source>page load error.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="944"/>
+        <location filename="browser.hxx" line="943"/>
        <source>%1</source>
        <comment>statusbar for hovered link %1=url</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="443"/>
+        <location filename="browser.hxx" line="442"/>
        <source>Forbidden: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="437"/>
+        <location filename="browser.hxx" line="128"/>
        <source>SSL Not Supported</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="438"/>
+        <location filename="browser.hxx" line="129"/>
        <source>SSL is not supported on your system</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="444"/>
+        <location filename="browser.hxx" line="443"/>
        <source>Access Denied</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="445"/>
+        <location filename="browser.hxx" line="444"/>
        <source>&lt;p&gt;Access denied due to security considerations.&lt;/p&gt;&lt;p&gt;You are not allowed to connect to %1.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="555"/>
+        <location filename="browser.hxx" line="554"/>
        <source>%1 - %2</source>
        <comment>statusbar actionForward_hovered %1=url %2=title</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="623"/>
+        <location filename="browser.hxx" line="622"/>
        <source>About</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="624"/>
+        <location filename="browser.hxx" line="623"/>
        <source>SwissSurfer %1 (%2)

 %3
@@ -341,22 +341,22 @@ Compiled: qt-%5</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="673"/>
+        <location filename="browser.hxx" line="672"/>
        <source>%1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1078"/>
+        <location filename="browser.hxx" line="1077"/>
        <source>Save File As ...</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1141"/>
+        <location filename="browser.hxx" line="1140"/>
        <source>authentication required</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1153"/>
+        <location filename="browser.hxx" line="1152"/>
        <source>ssl error</source>
        <translation type="unfinished"></translation>
    </message>
@@ -610,7 +610,7 @@ p, li { white-space: pre-wrap; }
 <context>
    <name>QObject</name>
    <message>
-        <location filename="main.cxx" line="302"/>
+        <location filename="main.cxx" line="305"/>
        <source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
 Options:
 -h, --help        show this help text
@@ -658,27 +658,27 @@ Environment:
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="347"/>
+        <location filename="main.cxx" line="350"/>
        <source>Cannot read PEM certificate from file: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="353"/>
+        <location filename="main.cxx" line="356"/>
        <source>Read PEM certificates from file: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="360"/>
+        <location filename="main.cxx" line="363"/>
        <source>Cannot read PEM RSA key from file: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="365"/>
+        <location filename="main.cxx" line="368"/>
        <source>Read private key from file: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="376"/>
+        <location filename="main.cxx" line="379"/>
        <source>Too few arguments.
 Try: %1 --help</source>
        <translation type="unfinished"></translation>