Certificate Info + Search Bar + Bug Fixes; refs #107

13 years ago · d565f8a606
parent d4d460d365
commit d565f8a606
10 changed files with 316 additions and 176 deletions
--- a/swisssurfer/src/browser.hxx
+++ b/swisssurfer/src/browser.hxx
@ -69,7 +69,8 @@ class Browser: public QMainWindow, protected Ui::Browser {
        _proxy("http://swisssign.com", this),
        _showErrorLog(0),
        _startUrl(urls.size()),
-        _quirks(quirks), _search(new ButtonLineEdit) {
+        _quirks(quirks), _search(new ButtonLineEdit),
+        _searchEngines(new QComboBox) {
      LOG<<urls;
      _home = "about:blank";
      if (urls.size()) _home = urls.at(0);
@ -138,7 +139,16 @@ class Browser: public QMainWindow, protected Ui::Browser {
                                        QSizePolicy::Minimum));
      }
      _toolbar->addWidget(_url);
-      _toolbar->addWidget(_search=new ButtonLineEdit);
+      QFrame* searchFrame(new QFrame);
+      searchFrame->setBackgroundRole(QPalette::Base);
+      searchFrame->setAutoFillBackground(true);
+      QHBoxLayout* layout(new QHBoxLayout);
+      layout->addWidget(_searchEngines);
+      _searchEngines->setStyleSheet(tr("background-color: white",
+                                       "search engines combobox"));
+      layout->addWidget(_search);
+      searchFrame->setLayout(layout);
+      _toolbar->addWidget(searchFrame);
      _search->add(actionSearch);
      if (!_quirks) _search->add(actionClearSearch);
      _search->setSizePolicy(QSizePolicy(QSizePolicy::Fixed,
@ -164,6 +174,8 @@ class Browser: public QMainWindow, protected Ui::Browser {
                     SLOT(downloadError(QString))));
      assert(connect(&_downloadManager, SIGNAL(metaDataChanged(QNetworkReply*)),
                     SLOT(metaDataChanged(QNetworkReply*))));
+      assert(connect(&_settings, SIGNAL(newSettings()), SLOT(newSettings())));
+      newSettings();
      on_actionNewTab_triggered();

      if (!settings || _kiosk) {
@ -522,6 +534,20 @@ class Browser: public QMainWindow, protected Ui::Browser {
      view->load(page);
    }

+    void newSettings() {
+      _searchEngines->clear();
+      for (Settings::SearchEngines::const_iterator
+             it(_settings.searchEngines().begin());
+           it!=_settings.searchEngines().end(); it++)
+        if (QFile(":/icons/"+it.key()).exists())
+          _searchEngines->addItem(QIcon(":/icons/"+it.key()), "", it.value());
+        else
+          _searchEngines->addItem(it.key(), it.value());
+      if (_searchEngines->count()==0)
+        _searchEngines->addItem(QIcon(":/icons/gg"), tr("gg"),
+                                tr("http://www.google.com/search?hl=%2&q=%1"));
+    }
+
    void on_actionAddBookmark_triggered() {
      QComboBox* url(qobject_cast<QComboBox*>(_url));
      if (_url) {
@ -721,7 +747,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
    }
    
    void on_actionSearch_triggered() {
-      load(tr("http://google.com/search?hl=%2&q=%1")
+      load(_searchEngines->itemData(_searchEngines->currentIndex()).toString()
           .arg(_search->text())
           .arg(QLocale::system().name().left(2)));
    }
@ -807,12 +833,13 @@ class Browser: public QMainWindow, protected Ui::Browser {
        connect(a, SIGNAL(triggered(bool)), SLOT(loadFromHistory()));
      }
      QStringList tabs(_settings()->value("Window/Tabs").toStringList());
-      while (_tabs->count()>1) _tabs->removeTab(0);
+      int oldCnt(_tabs->count());
      for (QStringList::iterator it(tabs.begin()); it!=tabs.end(); ++it) {
        LOG<<"-------------------------------------------------------------";
        load(*it, newTab());
        LOG<<"+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
      }
+      for (int i(0); i<oldCnt && _tabs->count()>1; ++i) _tabs->removeTab(0);
      _tabs->setTabsClosable(_tabs->count()>1);
      _tabs->setCurrentIndex(_settings()->value("Window/CurrentTab").toInt());
      restoreGeometry(_settings()->value("Window/Geometry").toByteArray());
@ -1350,7 +1377,12 @@ class Browser: public QMainWindow, protected Ui::Browser {

    void started() {
      QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
-      actionStop->setEnabled(true);
+      if (_quirks) {
+        actionStop->setEnabled(true);
+      } else {
+        actionStop->setVisible(true);
+        actionReload->setVisible(false);
+      }
      _progress->setRange(0, 0);
      _progress->setValue(0);
      _progress->setEnabled(true);
@ -1360,7 +1392,12 @@ class Browser: public QMainWindow, protected Ui::Browser {
    void finished() {
      LOG;
      QApplication::restoreOverrideCursor();
-      actionStop->setEnabled(false);
+      if (_quirks) {
+        actionStop->setEnabled(false);
+      } else {
+        actionStop->setVisible(false);
+        actionReload->setVisible(true);
+      }
      _progress->setRange(0, 1);
      _progress->setValue(1);
      _progress->setEnabled(false);
@ -1526,5 +1563,6 @@ class Browser: public QMainWindow, protected Ui::Browser {
    bool _startUrl;
    bool _quirks;
    ButtonLineEdit* _search;
+    QComboBox* _searchEngines;
 };
 #endif
--- a/swisssurfer/src/logincertificate.hxx
+++ b/swisssurfer/src/logincertificate.hxx
@ -17,8 +17,9 @@ class LoginCertificate: public QDialog, protected Ui::LoginCertificate {
      setup();
    }
    LoginCertificate& setup() {
-      _cert->certificate(QSslConfiguration::defaultConfiguration()
-                         .localCertificate());
+      QSslCertificate c(QSslConfiguration::defaultConfiguration()
+                        .localCertificate());
+      _cert->certificate(c);
      return *this;
    }
  protected:
--- a/swisssurfer/src/pinentry.hxx
+++ b/swisssurfer/src/pinentry.hxx
@ -25,6 +25,18 @@ class PinEntry: public QDialog, public Ui::PinEntry {
    PinEntry(const QSslCertificate& cert, QWidget *parent=0): QDialog(parent) {
      setupUi(this);
      _cert->certificate(cert);
+      _name->setText(utfConv(cert.subjectInfo(QSslCertificate::CommonName))
+                     .remove(" (Authentication)"));
+      _mail->setText(utfConv(cert.alternateSubjectNames()
+                             .value(QSsl::EmailEntry)));
+      if (!cert.subjectInfo(QByteArray("serialNumber")).isEmpty()) {
+        _certSerialTitle->setText(tr("SuisseID Number:"));
+        _certSerial->setText(cert.subjectInfo(QByteArray("serialNumber")));
+      } else {
+        _certSerialTitle->setText
+          (tr("Postzertifikat:", "title for postzertificate serial number"));
+        _certSerial->setText(cert.serialNumber());
+      }
    }
    PinEntry& retries(int num) {
      _pinstatus->setCurrentIndex(num==-1?1:(num==-2?2:0));
@ -63,6 +75,13 @@ class PinEntry: public QDialog, public Ui::PinEntry {
    void on__showDetails_toggled(bool s) {
      _certStack->setCurrentIndex(s?1:0);
    }
+  protected:
+    QString utfConv(const QString& txt) {
+      QByteArray value(txt.toAscii());
+      for (int i(-1); (i=value.indexOf("\\x"))!=-1 && i+3<value.size();)
+        value.replace(i, 4, QByteArray::fromHex(value.mid(i+2, 2)));
+      return QString::fromUtf8(value.data(), value.size());
+    }
  private:
    QEventLoop _run;
 };
--- a/swisssurfer/src/pinentry.ui
+++ b/swisssurfer/src/pinentry.ui
@ -59,7 +59,7 @@
            </widget>
           </item>
           <item row="0" column="1">
-            <widget class="QLabel" name="label_6">
+            <widget class="QLabel" name="_name">
             <property name="text">
              <string>TextLabel</string>
             </property>
@ -73,21 +73,21 @@
            </widget>
           </item>
           <item row="1" column="1">
-            <widget class="QLabel" name="label_7">
+            <widget class="QLabel" name="_mail">
             <property name="text">
              <string>TextLabel</string>
             </property>
            </widget>
           </item>
           <item row="2" column="0">
-            <widget class="QLabel" name="label_5">
+            <widget class="QLabel" name="_certSerialTitle">
             <property name="text">
              <string>SuisseID Number:</string>
             </property>
            </widget>
           </item>
           <item row="2" column="1">
-            <widget class="QLabel" name="label_8">
+            <widget class="QLabel" name="_certSerial">
             <property name="text">
              <string>TextLabel</string>
             </property>
--- a/swisssurfer/src/resources.qrc
+++ b/swisssurfer/src/resources.qrc
@ -1,7 +1,8 @@
 <RCC>
  <qresource prefix="icons">
-    <file>resources/icons/sscd_missing.png</file>
-    <file>resources/icons/sscd_ready.png</file>
+    <file alias="gg">resources/icons/gg.png</file>
+    <file alias="tel">resources/icons/tel.png</file>
+    <file alias="wp">resources/icons/wp.png</file>
    <file alias="about">resources/icons/about.png</file>
    <file alias="addbookmark">resources/icons/addbookmark.png</file>
    <file alias="back">resources/icons/back.png</file>
@ -17,7 +18,6 @@
    <file alias="printpreview">resources/icons/printpreview.png</file>
    <file alias="reload">resources/icons/reload.png</file>
    <file alias="settings">resources/icons/settings.png</file>
-    <file alias="icons">resources/icons/source</file>
    <file alias="stop">resources/icons/stop.png</file>
    <file alias="up">resources/icons/up.png</file>
    <file alias="usercert">resources/icons/usercert.png</file>
--- a/swisssurfer/src/settings.hxx
+++ b/swisssurfer/src/settings.hxx
@ -25,6 +25,11 @@ class Settings: public QDialog, protected Ui::Settings {
  public:

    typedef QMap<QString, QVariant> MimeTypes;
+    typedef QMap<QString, QVariant> SearchEngines;
+
+  Q_SIGNALS:
+
+    void newSettings();

  public:

@ -147,6 +152,10 @@ class Settings: public QDialog, protected Ui::Settings {
      return url;
    }

+    const SearchEngines& searchEngines() const {
+      return _searchEngines;
+    }
+
    bool save() {
      LOG;
      if (!_settings || !_settings->isWritable()) return false;
@ -218,6 +227,7 @@ class Settings: public QDialog, protected Ui::Settings {
      QVariant val(_settings->value("QWebSettings/SearchEngines"));
      if (val.isValid() && val.canConvert(QVariant::Map))
        _searchEngines = val.toMap();
+      newSettings();
      return true;
    }

@ -252,6 +262,7 @@ class Settings: public QDialog, protected Ui::Settings {
          _searchEngineTable->item(row, 1)->text();
      // Save
      if (_autoWrite) save();
+      newSettings();
    }

    void on__buttons_rejected() {
@ -350,7 +361,6 @@ class Settings: public QDialog, protected Ui::Settings {
    QSettings* _settings;
    bool _autoWrite;
    MimeTypes _mimetypes;
-    typedef QMap<QString, QVariant> SearchEngines;
    SearchEngines _searchEngines;

 };
--- a/swisssurfer/src/swisssurfer_de.ts
+++ b/swisssurfer/src/swisssurfer_de.ts
@ -160,7 +160,7 @@
    </message>
    <message>
        <location filename="browser.ui" line="292"/>
-        <location filename="browser.hxx" line="471"/>
+        <location filename="browser.hxx" line="483"/>
        <source>New Tab</source>
        <translation type="unfinished"></translation>
    </message>
@ -322,126 +322,137 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="505"/>
+        <location filename="browser.hxx" line="517"/>
        <source>Checking: %1</source>
        <oldsource>Opening: %1</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="516"/>
+        <location filename="browser.hxx" line="528"/>
        <source>Reading: %1</source>
        <oldsource>Reading: %1%</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="541"/>
+        <location filename="browser.hxx" line="567"/>
        <source>Zoom: %1%</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="518"/>
+        <location filename="browser.hxx" line="530"/>
        <source>Illegal URL: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="601"/>
+        <location filename="browser.hxx" line="547"/>
+        <source>gg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="browser.hxx" line="627"/>
        <source>Print Document</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="622"/>
+        <location filename="browser.hxx" line="648"/>
        <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="864"/>
+        <location filename="browser.hxx" line="891"/>
        <source>Info: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="881"/>
+        <location filename="browser.hxx" line="908"/>
        <source>done.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1136"/>
+        <location filename="browser.hxx" line="1163"/>
        <source>%1</source>
        <comment>statusbar for hovered link %1=url</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="508"/>
+        <location filename="browser.hxx" line="520"/>
        <source>Forbidden: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="186"/>
+        <location filename="browser.hxx" line="147"/>
+        <source>background-color: white</source>
+        <comment>search engines combobox</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="browser.hxx" line="198"/>
        <source>SSL Not Supported</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="187"/>
+        <location filename="browser.hxx" line="199"/>
        <source>SSL is not supported on your system</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="509"/>
+        <location filename="browser.hxx" line="521"/>
        <source>Access Denied</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="510"/>
+        <location filename="browser.hxx" line="522"/>
        <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="558"/>
+        <location filename="browser.hxx" line="548"/>
+        <source>http://www.google.com/search?hl=%2&amp;q=%1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="browser.hxx" line="584"/>
        <source>opening new window</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="641"/>
+        <location filename="browser.hxx" line="667"/>
        <source>%1 - %2</source>
        <comment>statusbar actionForward_hovered %1=url %2=title</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="682"/>
-        <location filename="browser.hxx" line="696"/>
+        <location filename="browser.hxx" line="708"/>
+        <location filename="browser.hxx" line="722"/>
        <source>background-color: white</source>
        <comment>neutral find</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="704"/>
-        <location filename="browser.hxx" line="714"/>
+        <location filename="browser.hxx" line="730"/>
+        <location filename="browser.hxx" line="740"/>
        <source>background-color: #ADA</source>
        <oldsource>background-color: #7F7</oldsource>
        <comment>text found</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="706"/>
-        <location filename="browser.hxx" line="716"/>
+        <location filename="browser.hxx" line="732"/>
+        <location filename="browser.hxx" line="742"/>
        <source>background-color: #F77</source>
        <oldsource>background-color: lightred</oldsource>
        <comment>text not found</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="724"/>
-        <source>http://google.com/search?hl=%2&amp;q=%1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="browser.hxx" line="746"/>
+        <location filename="browser.hxx" line="772"/>
        <source>About</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="747"/>
+        <location filename="browser.hxx" line="773"/>
        <source>%8
 Version: %1
 Builddate: %2
@ -461,42 +472,42 @@ openssl-%7</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="859"/>
+        <location filename="browser.hxx" line="886"/>
        <source>%1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1312"/>
+        <location filename="browser.hxx" line="1339"/>
        <source>launching application ...</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1378"/>
+        <location filename="browser.hxx" line="1415"/>
        <source>errors</source>
        <comment>show error log</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1395"/>
-        <location filename="browser.hxx" line="1398"/>
+        <location filename="browser.hxx" line="1432"/>
+        <location filename="browser.hxx" line="1435"/>
        <source>background-color: #F77</source>
        <comment>invalid url</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1405"/>
-        <location filename="browser.hxx" line="1408"/>
+        <location filename="browser.hxx" line="1442"/>
+        <location filename="browser.hxx" line="1445"/>
        <source>background-color: white</source>
        <comment>valid url</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1423"/>
+        <location filename="browser.hxx" line="1460"/>
        <source>authentication required</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1435"/>
+        <location filename="browser.hxx" line="1472"/>
        <source>ssl error</source>
        <translation type="unfinished"></translation>
    </message>
@ -813,6 +824,7 @@ openssl-%7</oldsource>
    </message>
    <message>
        <location filename="pinentry.ui" line="85"/>
+        <location filename="pinentry.hxx" line="33"/>
        <source>SuisseID Number:</source>
        <translation type="unfinished"></translation>
    </message>
@ -832,7 +844,13 @@ openssl-%7</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="pinentry.hxx" line="31"/>
+        <location filename="pinentry.hxx" line="37"/>
+        <source>Postzertifikat:</source>
+        <comment>title for postzertificate serial number</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="pinentry.hxx" line="43"/>
        <source>there are %1 PIN attempts left</source>
        <translation type="unfinished"></translation>
    </message>
--- a/swisssurfer/src/swisssurfer_en.ts
+++ b/swisssurfer/src/swisssurfer_en.ts
@ -180,7 +180,7 @@
    </message>
    <message>
        <location filename="browser.ui" line="292"/>
-        <location filename="browser.hxx" line="471"/>
+        <location filename="browser.hxx" line="483"/>
        <source>New Tab</source>
        <translation type="unfinished"></translation>
    </message>
@ -320,107 +320,118 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="505"/>
+        <location filename="browser.hxx" line="517"/>
        <source>Checking: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="186"/>
+        <location filename="browser.hxx" line="198"/>
        <source>SSL Not Supported</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="187"/>
+        <location filename="browser.hxx" line="147"/>
+        <source>background-color: white</source>
+        <comment>search engines combobox</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="browser.hxx" line="199"/>
        <source>SSL is not supported on your system</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="508"/>
+        <location filename="browser.hxx" line="520"/>
        <source>Forbidden: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="509"/>
+        <location filename="browser.hxx" line="521"/>
        <source>Access Denied</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="510"/>
+        <location filename="browser.hxx" line="522"/>
        <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="516"/>
+        <location filename="browser.hxx" line="528"/>
        <source>Reading: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="518"/>
+        <location filename="browser.hxx" line="530"/>
        <source>Illegal URL: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="541"/>
+        <location filename="browser.hxx" line="547"/>
+        <source>gg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="browser.hxx" line="548"/>
+        <source>http://www.google.com/search?hl=%2&amp;q=%1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="browser.hxx" line="567"/>
        <source>Zoom: %1%</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="558"/>
+        <location filename="browser.hxx" line="584"/>
        <source>opening new window</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="601"/>
+        <location filename="browser.hxx" line="627"/>
        <source>Print Document</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="622"/>
+        <location filename="browser.hxx" line="648"/>
        <source>%1 - %2</source>
        <comment>statusbar actionBack_hovered %1=url %2=title</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="641"/>
+        <location filename="browser.hxx" line="667"/>
        <source>%1 - %2</source>
        <comment>statusbar actionForward_hovered %1=url %2=title</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="682"/>
-        <location filename="browser.hxx" line="696"/>
+        <location filename="browser.hxx" line="708"/>
+        <location filename="browser.hxx" line="722"/>
        <source>background-color: white</source>
        <comment>neutral find</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="704"/>
-        <location filename="browser.hxx" line="714"/>
+        <location filename="browser.hxx" line="730"/>
+        <location filename="browser.hxx" line="740"/>
        <source>background-color: #ADA</source>
        <oldsource>background-color: #7F7</oldsource>
        <comment>text found</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="706"/>
-        <location filename="browser.hxx" line="716"/>
+        <location filename="browser.hxx" line="732"/>
+        <location filename="browser.hxx" line="742"/>
        <source>background-color: #F77</source>
        <oldsource>background-color: lightred</oldsource>
        <comment>text not found</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="724"/>
-        <source>http://google.com/search?hl=%2&amp;q=%1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="browser.hxx" line="746"/>
+        <location filename="browser.hxx" line="772"/>
        <source>About</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="747"/>
+        <location filename="browser.hxx" line="773"/>
        <source>%8
 Version: %1
 Builddate: %2
@ -440,58 +451,58 @@ openssl-%7</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="859"/>
+        <location filename="browser.hxx" line="886"/>
        <source>%1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="864"/>
+        <location filename="browser.hxx" line="891"/>
        <source>Info: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="881"/>
+        <location filename="browser.hxx" line="908"/>
        <source>done.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1136"/>
+        <location filename="browser.hxx" line="1163"/>
        <source>%1</source>
        <comment>statusbar for hovered link %1=url</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1312"/>
+        <location filename="browser.hxx" line="1339"/>
        <source>launching application ...</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1378"/>
+        <location filename="browser.hxx" line="1415"/>
        <source>errors</source>
        <comment>show error log</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1395"/>
-        <location filename="browser.hxx" line="1398"/>
+        <location filename="browser.hxx" line="1432"/>
+        <location filename="browser.hxx" line="1435"/>
        <source>background-color: #F77</source>
        <comment>invalid url</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1405"/>
-        <location filename="browser.hxx" line="1408"/>
+        <location filename="browser.hxx" line="1442"/>
+        <location filename="browser.hxx" line="1445"/>
        <source>background-color: white</source>
        <comment>valid url</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1423"/>
+        <location filename="browser.hxx" line="1460"/>
        <source>authentication required</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1435"/>
+        <location filename="browser.hxx" line="1472"/>
        <source>ssl error</source>
        <translation type="unfinished"></translation>
    </message>
@ -804,6 +815,7 @@ openssl-%7</oldsource>
    </message>
    <message>
        <location filename="pinentry.ui" line="85"/>
+        <location filename="pinentry.hxx" line="33"/>
        <source>SuisseID Number:</source>
        <translation type="unfinished"></translation>
    </message>
@ -823,7 +835,13 @@ openssl-%7</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="pinentry.hxx" line="31"/>
+        <location filename="pinentry.hxx" line="37"/>
+        <source>Postzertifikat:</source>
+        <comment>title for postzertificate serial number</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="pinentry.hxx" line="43"/>
        <source>there are %1 PIN attempts left</source>
        <translation type="unfinished"></translation>
    </message>
--- a/swisssurfer/src/swisssurfer_fr.ts
+++ b/swisssurfer/src/swisssurfer_fr.ts
@ -160,7 +160,7 @@
    </message>
    <message>
        <location filename="browser.ui" line="292"/>
-        <location filename="browser.hxx" line="471"/>
+        <location filename="browser.hxx" line="483"/>
        <source>New Tab</source>
        <translation type="unfinished"></translation>
    </message>
@ -322,126 +322,137 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="505"/>
+        <location filename="browser.hxx" line="517"/>
        <source>Checking: %1</source>
        <oldsource>Opening: %1</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="516"/>
+        <location filename="browser.hxx" line="528"/>
        <source>Reading: %1</source>
        <oldsource>Reading: %1%</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="541"/>
+        <location filename="browser.hxx" line="567"/>
        <source>Zoom: %1%</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="518"/>
+        <location filename="browser.hxx" line="530"/>
        <source>Illegal URL: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="601"/>
+        <location filename="browser.hxx" line="547"/>
+        <source>gg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="browser.hxx" line="627"/>
        <source>Print Document</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="622"/>
+        <location filename="browser.hxx" line="648"/>
        <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="864"/>
+        <location filename="browser.hxx" line="891"/>
        <source>Info: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="881"/>
+        <location filename="browser.hxx" line="908"/>
        <source>done.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1136"/>
+        <location filename="browser.hxx" line="1163"/>
        <source>%1</source>
        <comment>statusbar for hovered link %1=url</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="508"/>
+        <location filename="browser.hxx" line="520"/>
        <source>Forbidden: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="186"/>
+        <location filename="browser.hxx" line="147"/>
+        <source>background-color: white</source>
+        <comment>search engines combobox</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="browser.hxx" line="198"/>
        <source>SSL Not Supported</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="187"/>
+        <location filename="browser.hxx" line="199"/>
        <source>SSL is not supported on your system</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="509"/>
+        <location filename="browser.hxx" line="521"/>
        <source>Access Denied</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="510"/>
+        <location filename="browser.hxx" line="522"/>
        <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="558"/>
+        <location filename="browser.hxx" line="548"/>
+        <source>http://www.google.com/search?hl=%2&amp;q=%1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="browser.hxx" line="584"/>
        <source>opening new window</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="641"/>
+        <location filename="browser.hxx" line="667"/>
        <source>%1 - %2</source>
        <comment>statusbar actionForward_hovered %1=url %2=title</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="682"/>
-        <location filename="browser.hxx" line="696"/>
+        <location filename="browser.hxx" line="708"/>
+        <location filename="browser.hxx" line="722"/>
        <source>background-color: white</source>
        <comment>neutral find</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="704"/>
-        <location filename="browser.hxx" line="714"/>
+        <location filename="browser.hxx" line="730"/>
+        <location filename="browser.hxx" line="740"/>
        <source>background-color: #ADA</source>
        <oldsource>background-color: #7F7</oldsource>
        <comment>text found</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="706"/>
-        <location filename="browser.hxx" line="716"/>
+        <location filename="browser.hxx" line="732"/>
+        <location filename="browser.hxx" line="742"/>
        <source>background-color: #F77</source>
        <oldsource>background-color: lightred</oldsource>
        <comment>text not found</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="724"/>
-        <source>http://google.com/search?hl=%2&amp;q=%1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="browser.hxx" line="746"/>
+        <location filename="browser.hxx" line="772"/>
        <source>About</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="747"/>
+        <location filename="browser.hxx" line="773"/>
        <source>%8
 Version: %1
 Builddate: %2
@ -461,42 +472,42 @@ openssl-%7</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="859"/>
+        <location filename="browser.hxx" line="886"/>
        <source>%1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1312"/>
+        <location filename="browser.hxx" line="1339"/>
        <source>launching application ...</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1378"/>
+        <location filename="browser.hxx" line="1415"/>
        <source>errors</source>
        <comment>show error log</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1395"/>
-        <location filename="browser.hxx" line="1398"/>
+        <location filename="browser.hxx" line="1432"/>
+        <location filename="browser.hxx" line="1435"/>
        <source>background-color: #F77</source>
        <comment>invalid url</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1405"/>
-        <location filename="browser.hxx" line="1408"/>
+        <location filename="browser.hxx" line="1442"/>
+        <location filename="browser.hxx" line="1445"/>
        <source>background-color: white</source>
        <comment>valid url</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1423"/>
+        <location filename="browser.hxx" line="1460"/>
        <source>authentication required</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1435"/>
+        <location filename="browser.hxx" line="1472"/>
        <source>ssl error</source>
        <translation type="unfinished"></translation>
    </message>
@ -813,6 +824,7 @@ openssl-%7</oldsource>
    </message>
    <message>
        <location filename="pinentry.ui" line="85"/>
+        <location filename="pinentry.hxx" line="33"/>
        <source>SuisseID Number:</source>
        <translation type="unfinished"></translation>
    </message>
@ -832,7 +844,13 @@ openssl-%7</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="pinentry.hxx" line="31"/>
+        <location filename="pinentry.hxx" line="37"/>
+        <source>Postzertifikat:</source>
+        <comment>title for postzertificate serial number</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="pinentry.hxx" line="43"/>
        <source>there are %1 PIN attempts left</source>
        <translation type="unfinished"></translation>
    </message>
--- a/swisssurfer/src/swisssurfer_it.ts
+++ b/swisssurfer/src/swisssurfer_it.ts
@ -180,7 +180,7 @@
    </message>
    <message>
        <location filename="browser.ui" line="292"/>
-        <location filename="browser.hxx" line="471"/>
+        <location filename="browser.hxx" line="483"/>
        <source>New Tab</source>
        <translation type="unfinished"></translation>
    </message>
@ -320,105 +320,116 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="186"/>
+        <location filename="browser.hxx" line="147"/>
+        <source>background-color: white</source>
+        <comment>search engines combobox</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="browser.hxx" line="198"/>
        <source>SSL Not Supported</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="187"/>
+        <location filename="browser.hxx" line="199"/>
        <source>SSL is not supported on your system</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="505"/>
+        <location filename="browser.hxx" line="517"/>
        <source>Checking: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="508"/>
+        <location filename="browser.hxx" line="520"/>
        <source>Forbidden: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="509"/>
+        <location filename="browser.hxx" line="521"/>
        <source>Access Denied</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="510"/>
+        <location filename="browser.hxx" line="522"/>
        <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="516"/>
+        <location filename="browser.hxx" line="528"/>
        <source>Reading: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="518"/>
+        <location filename="browser.hxx" line="530"/>
        <source>Illegal URL: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="541"/>
+        <location filename="browser.hxx" line="547"/>
+        <source>gg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="browser.hxx" line="548"/>
+        <source>http://www.google.com/search?hl=%2&amp;q=%1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="browser.hxx" line="567"/>
        <source>Zoom: %1%</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="558"/>
+        <location filename="browser.hxx" line="584"/>
        <source>opening new window</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="601"/>
+        <location filename="browser.hxx" line="627"/>
        <source>Print Document</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="622"/>
+        <location filename="browser.hxx" line="648"/>
        <source>%1 - %2</source>
        <comment>statusbar actionBack_hovered %1=url %2=title</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="641"/>
+        <location filename="browser.hxx" line="667"/>
        <source>%1 - %2</source>
        <comment>statusbar actionForward_hovered %1=url %2=title</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="682"/>
-        <location filename="browser.hxx" line="696"/>
+        <location filename="browser.hxx" line="708"/>
+        <location filename="browser.hxx" line="722"/>
        <source>background-color: white</source>
        <comment>neutral find</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="704"/>
-        <location filename="browser.hxx" line="714"/>
+        <location filename="browser.hxx" line="730"/>
+        <location filename="browser.hxx" line="740"/>
        <source>background-color: #ADA</source>
        <comment>text found</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="706"/>
-        <location filename="browser.hxx" line="716"/>
+        <location filename="browser.hxx" line="732"/>
+        <location filename="browser.hxx" line="742"/>
        <source>background-color: #F77</source>
        <comment>text not found</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="724"/>
-        <source>http://google.com/search?hl=%2&amp;q=%1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="browser.hxx" line="746"/>
+        <location filename="browser.hxx" line="772"/>
        <source>About</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="747"/>
+        <location filename="browser.hxx" line="773"/>
        <source>%8
 Version: %1
 Builddate: %2
@ -430,58 +441,58 @@ openssl-%7</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="859"/>
+        <location filename="browser.hxx" line="886"/>
        <source>%1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="864"/>
+        <location filename="browser.hxx" line="891"/>
        <source>Info: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="881"/>
+        <location filename="browser.hxx" line="908"/>
        <source>done.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1136"/>
+        <location filename="browser.hxx" line="1163"/>
        <source>%1</source>
        <comment>statusbar for hovered link %1=url</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1312"/>
+        <location filename="browser.hxx" line="1339"/>
        <source>launching application ...</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1378"/>
+        <location filename="browser.hxx" line="1415"/>
        <source>errors</source>
        <comment>show error log</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1395"/>
-        <location filename="browser.hxx" line="1398"/>
+        <location filename="browser.hxx" line="1432"/>
+        <location filename="browser.hxx" line="1435"/>
        <source>background-color: #F77</source>
        <comment>invalid url</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1405"/>
-        <location filename="browser.hxx" line="1408"/>
+        <location filename="browser.hxx" line="1442"/>
+        <location filename="browser.hxx" line="1445"/>
        <source>background-color: white</source>
        <comment>valid url</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1423"/>
+        <location filename="browser.hxx" line="1460"/>
        <source>authentication required</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="1435"/>
+        <location filename="browser.hxx" line="1472"/>
        <source>ssl error</source>
        <translation type="unfinished"></translation>
    </message>
@ -794,6 +805,7 @@ openssl-%7</source>
    </message>
    <message>
        <location filename="pinentry.ui" line="85"/>
+        <location filename="pinentry.hxx" line="33"/>
        <source>SuisseID Number:</source>
        <translation type="unfinished"></translation>
    </message>
@ -813,7 +825,13 @@ openssl-%7</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="pinentry.hxx" line="31"/>
+        <location filename="pinentry.hxx" line="37"/>
+        <source>Postzertifikat:</source>
+        <comment>title for postzertificate serial number</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="pinentry.hxx" line="43"/>
        <source>there are %1 PIN attempts left</source>
        <translation type="unfinished"></translation>
    </message>