Changed QComboBox to QEditText for kiosk mode; refs #102

swisssurfer/src/browser.hxx

@@ -39,6 +39,7 @@
 #include <webpage.hxx>
 #include <settings.hxx>
 #include <editbookmarks.hxx>
+#include <pluginfactory.hxx>
 #include <sslclientnetworkmanager.hxx>
 #include <proxyface/proxy.hxx>
 
@@ -85,17 +86,37 @@ class Browser: public QMainWindow, protected Ui::Browser {
       _zoom->setPageStep(10);
       _zoom->setTickPosition(QSlider::TicksAbove);
       assert(connect(_zoom, SIGNAL(valueChanged(int)), SLOT(zoom(int))));
-      _url = new QComboBox(_toolbar);
-      _url->setInsertPolicy(QComboBox::NoInsert);
-      _url->setLineEdit(new ButtonLineEdit(_url));
+      if (!_kiosk) {
+        QComboBox* combo(new QComboBox(_toolbar));
+        _url = combo;
+        combo->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength);
+        combo->setInsertPolicy(QComboBox::NoInsert);
+        combo->setLineEdit(new ButtonLineEdit(combo));
+        combo->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,
+                                         QSizePolicy::Preferred));
+        combo->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength);
+        combo->setEditable(!_kiosk);
+        assert(connect(combo, SIGNAL(currentIndexChanged(const QString&)),
+                       SLOT(load(QString))));
+        assert(connect(combo->lineEdit(), SIGNAL(returnPressed()),
+                       SLOT(load())));
+        assert(connect(combo->lineEdit(), SIGNAL(textChanged(QString)),
+                       SLOT(goodUrl())));
+        dynamic_cast<ButtonLineEdit*>(combo->lineEdit())->add
+          (actionAddBookmark);
+        dynamic_cast<ButtonLineEdit*>(combo->lineEdit())->add
+          (actionClearLocation);
+        _editbookmarks =
+          std::auto_ptr<EditBookmarks>(new EditBookmarks(combo, this));
+      } else {
+        QLineEdit* label(new QLineEdit(_toolbar));
+        _url = label;
+        label->setReadOnly(true);
+      }
       _url->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,
                                       QSizePolicy::Preferred));
-      _url->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength);
-      _url->setEditable(!_kiosk);
       _toolbar->addWidget(_url);
       assert(connect(&_errorLog, SIGNAL(reset()), SLOT(errorReset())));
-      assert(connect(_url, SIGNAL(currentIndexChanged(const QString&)),
-                     SLOT(load(QString))));
       assert(connect(&_networkManager, SIGNAL(finished(QNetworkReply*)),
                      SLOT(finished(QNetworkReply*))));
       assert(connect(&_networkManager, SIGNAL(created(QNetworkReply*)),
@@ -120,20 +141,6 @@ class Browser: public QMainWindow, protected Ui::Browser {
         actionNewTab->setEnabled(false);
         actionNewTab->setVisible(false);
       } else {
-        assert(connect(_url->lineEdit(), SIGNAL(returnPressed()),
-                       SLOT(load())));
-        assert(connect(_url->lineEdit(), SIGNAL(textChanged(QString)),
-                       SLOT(goodUrl())));
-        
-        dynamic_cast<ButtonLineEdit*>(_url->lineEdit())->add
-          (actionAddBookmark);
-        
-        dynamic_cast<ButtonLineEdit*>(_url->lineEdit())->add
-          (actionClearLocation);
-        assert(connect(actionClearLocation, SIGNAL(triggered()),
-                       _url, SLOT(clearEditText())));
-        assert(connect(actionClearLocation, SIGNAL(triggered()),
-                       _url, SLOT(setFocus())));
       }
       if (!_kiosk && _settings.flag("SaveWindowState") && _settings())
         loadWin(urls.size());
@@ -142,8 +149,6 @@ class Browser: public QMainWindow, protected Ui::Browser {
       if (!QSslSocket::supportsSsl())
         QMessageBox::critical(this, tr("SSL Not Supported"),
                               tr("SSL is not supported on your system"));
-      _editbookmarks =
-        std::auto_ptr<EditBookmarks>(new EditBookmarks(_url, this));
     }
 
     ~Browser() {
@@ -167,6 +172,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
     QWebView* newTab() {
       QWebView* browser(new QWebView);
       browser->setPage(new WebPage(this, browser));
+      browser->page()->setPluginFactory(new PluginFactory);
       browser->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
       browser->page()->setNetworkAccessManager(&_networkManager);
       browser->page()->setForwardUnsupportedContent(true);
@@ -442,7 +448,10 @@ class Browser: public QMainWindow, protected Ui::Browser {
       
     void load() {
       LOG;
-      load(_url->currentText());
+      if (qobject_cast<QComboBox*>(_url))
+        load(qobject_cast<QComboBox*>(_url)->currentText());
+      else
+        load(qobject_cast<QLineEdit*>(_url)->text());
     }
     
     void load(QString page) {
@@ -474,7 +483,9 @@ class Browser: public QMainWindow, protected Ui::Browser {
     }
 
     void on_actionAddBookmark_triggered() {
-      _url->addItem(_url->currentText());
+      if (qobject_cast<QComboBox*>(_url))
+        qobject_cast<QComboBox*>(_url)->addItem
+          (qobject_cast<QComboBox*>(_url)->currentText());
     }
     
     void on_actionEditBookmarks_triggered() {
@@ -508,7 +519,13 @@ class Browser: public QMainWindow, protected Ui::Browser {
     }
 
     void on__tabs_currentChanged(int index) {
-      _url->setEditText(qobject_cast<QWebView*>(_tabs->currentWidget())
+      if (qobject_cast<QComboBox*>(_url))
+        qobject_cast<QComboBox*>(_url)->setEditText
+          (qobject_cast<QWebView*>(_tabs->currentWidget())
+           ->url().toString());
+      else
+        qobject_cast<QLineEdit*>(_url)->setText
+          (qobject_cast<QWebView*>(_tabs->currentWidget())
            ->url().toString());
       activateTab();
     }
@@ -593,26 +610,43 @@ class Browser: public QMainWindow, protected Ui::Browser {
     }
 
     void on__find_textChanged(QString) {
-      _find->setStyleSheet(tr("background-color: white", "neutral find"));
+      _find->changeStyleSheet(tr("background-color: white", "neutral find"));
+    }
+
+
+    void on_actionClearLocation_triggered() {
+      if (!qobject_cast<QComboBox*>(_url)) return;
+      qobject_cast<QComboBox*>(_url)->clearEditText();
+      qobject_cast<QComboBox*>(_url)->setFocus();
+    }
+
+    void on_actionClearFind_triggered() {
+      if (!_find) return;
+      _find->clear();
+      _find->setFocus();
     }
 
     void on_actionFind_triggered() {
       if (!_find) {
-        statusBar()->addPermanentWidget(_find = new QLineEdit);
+        statusBar()->addPermanentWidget(_find = new ButtonLineEdit);
         _find->setText(qobject_cast<QWebView*>(_tabs->currentWidget())
                        ->selectedText());
+        _find->addAction(actionUnFind);
+        _find->addAction(actionClearFind);
       }
       disconnect(_find, SIGNAL(returnPressed()), this, SLOT(rfind()));
       disconnect(_find, SIGNAL(textEdited(QString)), this, SLOT(rfind()));
       assert(connect(_find, SIGNAL(returnPressed()), SLOT(find())));
       assert(connect(_find, SIGNAL(textEdited(QString)), SLOT(find())));
-      _find->setStyleSheet(tr("background-color: white", "neutral find"));
+      _find->changeStyleSheet(tr("background-color: white", "neutral find"));
       _find->setFocus();
     }
 
     void on_actionReverseFind_triggered() {
       if (!_find) {
-        statusBar()->addPermanentWidget(_find = new QLineEdit);
+        statusBar()->addPermanentWidget(_find = new ButtonLineEdit);
+        _find->add(actionUnFind);
+        _find->add(actionClearFind);
         _find->setText(qobject_cast<QWebView*>(_tabs->currentWidget())
                        ->selectedText());
       }
@@ -620,7 +654,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
       disconnect(_find, SIGNAL(textEdited(QString)), this, SLOT(find()));
       assert(connect(_find, SIGNAL(returnPressed()), SLOT(rfind())));
       assert(connect(_find, SIGNAL(textEdited(QString)), SLOT(rfind())));
-      _find->setStyleSheet(tr("background-color: white", "neutral find"));
+      _find->changeStyleSheet(tr("background-color: white", "neutral find"));
       _find->setFocus();
     }
 
@@ -628,9 +662,9 @@ class Browser: public QMainWindow, protected Ui::Browser {
       if (qobject_cast<QWebView*>(_tabs->currentWidget())->findText
           (_find->text(),
            QWebPage::FindWrapsAroundDocument))
-        _find->setStyleSheet(tr("background-color: #ADA", "text found"));
+        _find->changeStyleSheet(tr("background-color: #ADA", "text found"));
       else
-        _find->setStyleSheet(tr("background-color: #F77", "text not found"));
+        _find->changeStyleSheet(tr("background-color: #F77", "text not found"));
     }
 
     void rfind(const QString& txt=QString()) {
@@ -638,9 +672,9 @@ class Browser: public QMainWindow, protected Ui::Browser {
          (_find->text(),
           QWebPage::FindWrapsAroundDocument
           |QWebPage::FindBackward))
-        _find->setStyleSheet(tr("background-color: #ADA", "text found"));
+        _find->changeStyleSheet(tr("background-color: #ADA", "text found"));
       else
-        _find->setStyleSheet(tr("background-color: #F77", "text not found"));
+        _find->changeStyleSheet(tr("background-color: #F77", "text not found"));
     }
 
     void on_actionUnFind_triggered() {
@@ -690,7 +724,10 @@ class Browser: public QMainWindow, protected Ui::Browser {
       LOG<<url.toString();
       if (sender()!=_tabs->currentWidget()) return;
       LOG<<"signal on current tab";
-      if (_url) _url->setEditText(url.toString());
+      if (qobject_cast<QComboBox*>(_url))
+        qobject_cast<QComboBox*>(_url)->setEditText(url.toString());
+      else
+        qobject_cast<QLineEdit*>(_url)->setText(url.toString());
     }
     
     void linkClicked(const QUrl& url) {
@@ -1201,15 +1238,23 @@ class Browser: public QMainWindow, protected Ui::Browser {
     }
 
     void badUrl() {
-      if (_url && _url->lineEdit())
-        dynamic_cast<ButtonLineEdit*>(_url->lineEdit())
+      if (qobject_cast<QComboBox*>(_url))
+        dynamic_cast<ButtonLineEdit*>
+          (qobject_cast<QComboBox*>(_url)->lineEdit())
           ->changeStyleSheet(tr("background-color: #F77", "invalid url"));
+      else
+        qobject_cast<QLineEdit*>(_url)
+          ->setStyleSheet(tr("background-color: #F77", "invalid url"));
     }
 
     void goodUrl() {
-      if (_url && _url->lineEdit())
-        dynamic_cast<ButtonLineEdit*>(_url->lineEdit())
+      if (qobject_cast<QComboBox*>(_url))
+        dynamic_cast<ButtonLineEdit*>
+          (qobject_cast<QComboBox*>(_url)->lineEdit())
           ->changeStyleSheet(tr("background-color: white", "valid url"));
+      else
+        qobject_cast<QLineEdit*>(_url)
+          ->setStyleSheet(tr("background-color: white", "valid url"));
     }
 
     void downloadError(QString error) {
@@ -1246,8 +1291,9 @@ class Browser: public QMainWindow, protected Ui::Browser {
     void saveWin() {
       LOG<<"Save Window State";
       QStringList urls;
-      for (int i(0); i<_url->count(); ++i)
-        urls<<_url->itemText(i);
+      if (qobject_cast<QComboBox*>(_url))
+        for (int i(0); i<qobject_cast<QComboBox*>(_url)->count(); ++i)
+          urls<<qobject_cast<QComboBox*>(_url)->itemText(i);
       _settings()->setValue("Window/Urls", urls);
       QStringList tabs;
       for (int i(0); i<_tabs->count(); ++i)
@@ -1262,7 +1308,8 @@ class Browser: public QMainWindow, protected Ui::Browser {
       QStringList urls(_settings()->value("Window/Urls").toStringList());
       urls.sort();
       urls.removeDuplicates();
-      _url->addItems(urls);
+      if (qobject_cast<QComboBox*>(_url))
+        qobject_cast<QComboBox*>(_url)->addItems(urls);
       QStringList tabs(_settings()->value("Window/Tabs").toStringList());
       if (!noRrestoreTabs)
         for (QStringList::iterator it(tabs.begin()); it!=tabs.end(); ++it)
@@ -1276,7 +1323,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
 
     void activateTab() {
       iconChanged();
-      QWebHistory* history(dynamic_cast<QWebView*>(_tabs->currentWidget())
+      QWebHistory* history(qobject_cast<QWebView*>(_tabs->currentWidget())
                           ->history());
       actionForward->setEnabled(history->canGoForward());
       actionBack->setEnabled(history->canGoBack());
@@ -1293,14 +1340,18 @@ class Browser: public QMainWindow, protected Ui::Browser {
 
     class ButtonLineEdit: public QLineEdit {
       public:
-        ButtonLineEdit(QWidget* p): QLineEdit(p) {}
+        ButtonLineEdit(QWidget* p=0): QLineEdit(p) {
+          LOG;
+        }
         QToolButton* add(QAction* a) {
+          LOG;
           QToolButton* b(new QToolButton(this));
           b->setDefaultAction(a);
           add(b);
           return b;
         }
         ButtonLineEdit& add(QToolButton* b) {
+          LOG;
           b->setParent(this);
           b->setStyleSheet("QToolButton { border: none; padding: 0; }");
           b->setCursor(Qt::ArrowCursor);
@@ -1309,6 +1360,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
           return *this;
         }
         ButtonLineEdit& changeStyleSheet(QString s) {
+          LOG;
           _style = s;
           resizeEvent(0);
           return *this;
@@ -1336,8 +1388,8 @@ class Browser: public QMainWindow, protected Ui::Browser {
 
   private:
     
-    QComboBox* _url;
-    QLineEdit* _find;
+    QWidget* _url;
+    ButtonLineEdit* _find;
     QSlider* _zoom;
     QProgressBar* _progress;
     QString _home;

swisssurfer/src/browser.ui

@@ -219,6 +219,9 @@
    <property name="text">
     <string>&amp;Close</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+W</string>
+   </property>
   </action>
   <action name="actionProxySettings">
    <property name="icon">
@@ -287,7 +290,7 @@
     <string>Add New Tab</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+T</string>
+    <string>Esc</string>
    </property>
   </action>
   <action name="actionFind">
@@ -419,6 +422,18 @@
     <string>&amp;Bookmarks</string>
    </property>
   </action>
+  <action name="actionClearFind">
+   <property name="icon">
+    <iconset resource="resources.qrc">
+     <normaloff>:/icons/clearlocation</normaloff>:/icons/clearlocation</iconset>
+   </property>
+   <property name="text">
+    <string>Clear Find</string>
+   </property>
+   <property name="toolTip">
+    <string>clear find bar</string>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="resources.qrc"/>

swisssurfer/src/main.cxx

@@ -386,11 +386,6 @@ int main(int argv, char** argc) try {
       return 1;
     }
   QSslConfiguration::setDefaultConfiguration(sslConfig);
-  assert(QSslConfiguration::defaultConfiguration().caCertificates().contains(SWISSSIGN_EV_GOLD_CA_2009_G2));
-  assert(QSslConfiguration::defaultConfiguration().caCertificates().contains(SWISSSIGN_GOLD_CA_G2));
-  //assert(QSslConfiguration::defaultConfiguration().caCertificates().contains(SWISSSIGN_SERVER_GOLD_CA_2008_G2))));
-  assert(QSslConfiguration::defaultConfiguration().caCertificates().contains(SWISSSIGN_SILVER_CA_G2));
-  assert(QSslConfiguration::defaultConfiguration().caCertificates().contains(SWISSSIGN_PLATINUM_CA_G2));
   //............................................................................
   Browser browser(actlib, urls, settings.get(), mimetypes, silent, login);
   browser.show();

swisssurfer/src/qmake.pro.in

@@ -1,6 +1,7 @@
 QT += webkit network gui
 CONFIG += no_keywords
-QMAKE_LIBS += -lproxyface -lcryptoki++ -lssl -lcrypto
+QMAKE_LIBS += -lproxyface -lcryptoki++ -lssl -lcrypto -lpoppler-qt4
+QMAKE_CXXFLAGS += -std=c++0x
 
 unix {
   !macx {
@@ -36,7 +37,8 @@ SOURCES = main.cxx webpage.cxx
 HEADERS = browser.hxx smartcardauth.hxx pinentry.hxx \
           downloadmanager.hxx settings.hxx sslclientnetworkmanager.hxx \
           authentication.hxx webpage.hxx errorlog.hxx \
-          certificate.hxx logincertificate.hxx editbookmarks.hxx
+          certificate.hxx logincertificate.hxx editbookmarks.hxx \
+          pluginfactory.hxx pdfdisplay.hpp
 
 FORMS = browser.ui settings.ui pinentry.ui authentication.ui errorlog.ui \
         certificate.ui logincertificate.ui editbookmarks.ui

swisssurfer/src/swisssurfer_de.ts

@@ -119,274 +119,285 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="229"/>
+        <location filename="browser.ui" line="223"/>
+        <source>Ctrl+W</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="browser.ui" line="232"/>
         <source>&amp;Proxy...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="259"/>
+        <location filename="browser.ui" line="262"/>
         <source>Ctrl+P</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="264"/>
+        <location filename="browser.ui" line="267"/>
         <source>Next Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="267"/>
+        <location filename="browser.ui" line="270"/>
         <source>Shift+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="272"/>
+        <location filename="browser.ui" line="275"/>
         <source>Previous Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="275"/>
+        <location filename="browser.ui" line="278"/>
         <source>Shift+Left</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="browser.ui" line="284"/>
-        <source>New Tab</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="browser.ui" line="287"/>
-        <source>Add New Tab</source>
+        <source>New Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="browser.ui" line="290"/>
-        <source>Ctrl+T</source>
+        <source>Add New Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="299"/>
+        <location filename="browser.ui" line="302"/>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="314"/>
+        <location filename="browser.ui" line="317"/>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="326"/>
+        <location filename="browser.ui" line="329"/>
         <source>&amp;About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="338"/>
+        <location filename="browser.ui" line="341"/>
         <source>&amp;Settings ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="350"/>
+        <location filename="browser.ui" line="353"/>
         <source>&amp;Reverse Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="353"/>
+        <location filename="browser.ui" line="356"/>
         <source>Ctrl+R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="362"/>
+        <location filename="browser.ui" line="365"/>
         <source>Error Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="365"/>
+        <location filename="browser.ui" line="368"/>
         <source>show error logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="374"/>
+        <location filename="browser.ui" line="377"/>
         <source>User Login Certificate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="383"/>
+        <location filename="browser.ui" line="386"/>
         <source>&amp;Proxy ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="392"/>
+        <location filename="browser.ui" line="395"/>
         <source>Clear Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="395"/>
+        <location filename="browser.ui" line="398"/>
         <source>clear location bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="404"/>
+        <location filename="browser.ui" line="407"/>
         <source>Add Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="407"/>
+        <location filename="browser.ui" line="410"/>
         <source>add bookmark to location bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="410"/>
+        <location filename="browser.ui" line="413"/>
         <source>Ctrl+D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="419"/>
+        <location filename="browser.ui" line="422"/>
         <source>&amp;Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="browser.ui" line="431"/>
+        <source>Clear Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="browser.ui" line="434"/>
+        <source>clear find bar</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="browser.ui" line="145"/>
-        <location filename="browser.ui" line="317"/>
+        <location filename="browser.ui" line="293"/>
+        <location filename="browser.ui" line="320"/>
         <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="302"/>
+        <location filename="browser.ui" line="305"/>
         <source>find in page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="305"/>
+        <location filename="browser.ui" line="308"/>
         <source>Ctrl+F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="238"/>
+        <location filename="browser.ui" line="241"/>
         <source>Print ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="256"/>
+        <location filename="browser.ui" line="259"/>
         <source>Quick &amp;Print</source>
         <oldsource>&amp;Print</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="247"/>
+        <location filename="browser.ui" line="250"/>
         <source>Print Pre&amp;view ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="456"/>
+        <location filename="browser.hxx" line="465"/>
         <source>Checking: %1</source>
         <oldsource>Opening: %1</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="467"/>
+        <location filename="browser.hxx" line="476"/>
         <source>Reading: %1</source>
         <oldsource>Reading: %1%</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="486"/>
+        <location filename="browser.hxx" line="497"/>
         <source>Zoom: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="469"/>
+        <location filename="browser.hxx" line="478"/>
         <source>Illegal URL: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="535"/>
+        <location filename="browser.hxx" line="552"/>
         <source>Print Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="556"/>
+        <location filename="browser.hxx" line="573"/>
         <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="725"/>
+        <location filename="browser.hxx" line="762"/>
         <source>Info: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="739"/>
+        <location filename="browser.hxx" line="776"/>
         <source>done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="994"/>
+        <location filename="browser.hxx" line="1031"/>
         <source>%1</source>
         <comment>statusbar for hovered link %1=url</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="459"/>
+        <location filename="browser.hxx" line="468"/>
         <source>Forbidden: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="143"/>
+        <location filename="browser.hxx" line="150"/>
         <source>SSL Not Supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="144"/>
+        <location filename="browser.hxx" line="151"/>
         <source>SSL is not supported on your system</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="460"/>
+        <location filename="browser.hxx" line="469"/>
         <source>Access Denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="461"/>
+        <location filename="browser.hxx" line="470"/>
         <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="575"/>
+        <location filename="browser.hxx" line="592"/>
         <source>%1 - %2</source>
         <comment>statusbar actionForward_hovered %1=url %2=title</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="596"/>
-        <location filename="browser.hxx" line="609"/>
-        <location filename="browser.hxx" line="623"/>
+        <location filename="browser.hxx" line="613"/>
+        <location filename="browser.hxx" line="641"/>
+        <location filename="browser.hxx" line="657"/>
         <source>background-color: white</source>
         <comment>neutral find</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="631"/>
-        <location filename="browser.hxx" line="641"/>
+        <location filename="browser.hxx" line="665"/>
+        <location filename="browser.hxx" line="675"/>
         <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="633"/>
-        <location filename="browser.hxx" line="643"/>
+        <location filename="browser.hxx" line="667"/>
+        <location filename="browser.hxx" line="677"/>
         <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="663"/>
+        <location filename="browser.hxx" line="697"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="664"/>
+        <location filename="browser.hxx" line="698"/>
         <source>%8
 Version: %1
 Builddate: %2
@@ -406,40 +417,42 @@ openssl-%7</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="720"/>
+        <location filename="browser.hxx" line="757"/>
         <source>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="1130"/>
+        <location filename="browser.hxx" line="1167"/>
         <source>Save File As ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="1190"/>
+        <location filename="browser.hxx" line="1227"/>
         <source>errors</source>
         <comment>show error log</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="1206"/>
+        <location filename="browser.hxx" line="1244"/>
+        <location filename="browser.hxx" line="1247"/>
         <source>background-color: #F77</source>
         <comment>invalid url</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="1212"/>
+        <location filename="browser.hxx" line="1254"/>
+        <location filename="browser.hxx" line="1257"/>
         <source>background-color: white</source>
         <comment>valid url</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="1227"/>
+        <location filename="browser.hxx" line="1272"/>
         <source>authentication required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="1239"/>
+        <location filename="browser.hxx" line="1284"/>
         <source>ssl error</source>
         <translation type="unfinished"></translation>
     </message>

swisssurfer/src/swisssurfer_en.ts

@@ -79,7 +79,8 @@
     </message>
     <message>
         <location filename="browser.ui" line="145"/>
-        <location filename="browser.ui" line="317"/>
+        <location filename="browser.ui" line="293"/>
+        <location filename="browser.ui" line="320"/>
         <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
@@ -124,248 +125,258 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="229"/>
+        <location filename="browser.ui" line="223"/>
+        <source>Ctrl+W</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="browser.ui" line="232"/>
         <source>&amp;Proxy...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="238"/>
+        <location filename="browser.ui" line="241"/>
         <source>Print ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="247"/>
+        <location filename="browser.ui" line="250"/>
         <source>Print Pre&amp;view ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="256"/>
+        <location filename="browser.ui" line="259"/>
         <source>Quick &amp;Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="259"/>
+        <location filename="browser.ui" line="262"/>
         <source>Ctrl+P</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="264"/>
+        <location filename="browser.ui" line="267"/>
         <source>Next Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="267"/>
+        <location filename="browser.ui" line="270"/>
         <source>Shift+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="272"/>
+        <location filename="browser.ui" line="275"/>
         <source>Previous Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="275"/>
+        <location filename="browser.ui" line="278"/>
         <source>Shift+Left</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="browser.ui" line="284"/>
-        <source>New Tab</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="browser.ui" line="287"/>
-        <source>Add New Tab</source>
+        <source>New Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="browser.ui" line="290"/>
-        <source>Ctrl+T</source>
+        <source>Add New Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="299"/>
+        <location filename="browser.ui" line="302"/>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="302"/>
+        <location filename="browser.ui" line="305"/>
         <source>find in page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="305"/>
+        <location filename="browser.ui" line="308"/>
         <source>Ctrl+F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="314"/>
+        <location filename="browser.ui" line="317"/>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="326"/>
+        <location filename="browser.ui" line="329"/>
         <source>&amp;About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="338"/>
+        <location filename="browser.ui" line="341"/>
         <source>&amp;Settings ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="350"/>
+        <location filename="browser.ui" line="353"/>
         <source>&amp;Reverse Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="353"/>
+        <location filename="browser.ui" line="356"/>
         <source>Ctrl+R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="362"/>
+        <location filename="browser.ui" line="365"/>
         <source>Error Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="365"/>
+        <location filename="browser.ui" line="368"/>
         <source>show error logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="374"/>
+        <location filename="browser.ui" line="377"/>
         <source>User Login Certificate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="383"/>
+        <location filename="browser.ui" line="386"/>
         <source>&amp;Proxy ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="392"/>
+        <location filename="browser.ui" line="395"/>
         <source>Clear Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="395"/>
+        <location filename="browser.ui" line="398"/>
         <source>clear location bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="404"/>
+        <location filename="browser.ui" line="407"/>
         <source>Add Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="407"/>
+        <location filename="browser.ui" line="410"/>
         <source>add bookmark to location bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="410"/>
+        <location filename="browser.ui" line="413"/>
         <source>Ctrl+D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="419"/>
+        <location filename="browser.ui" line="422"/>
         <source>&amp;Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="456"/>
+        <location filename="browser.ui" line="431"/>
+        <source>Clear Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="browser.ui" line="434"/>
+        <source>clear find bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="browser.hxx" line="465"/>
         <source>Checking: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="143"/>
+        <location filename="browser.hxx" line="150"/>
         <source>SSL Not Supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="144"/>
+        <location filename="browser.hxx" line="151"/>
         <source>SSL is not supported on your system</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="459"/>
+        <location filename="browser.hxx" line="468"/>
         <source>Forbidden: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="460"/>
+        <location filename="browser.hxx" line="469"/>
         <source>Access Denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="461"/>
+        <location filename="browser.hxx" line="470"/>
         <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="467"/>
+        <location filename="browser.hxx" line="476"/>
         <source>Reading: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="469"/>
+        <location filename="browser.hxx" line="478"/>
         <source>Illegal URL: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="486"/>
+        <location filename="browser.hxx" line="497"/>
         <source>Zoom: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="535"/>
+        <location filename="browser.hxx" line="552"/>
         <source>Print Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="556"/>
+        <location filename="browser.hxx" line="573"/>
         <source>%1 - %2</source>
         <comment>statusbar actionBack_hovered %1=url %2=title</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="575"/>
+        <location filename="browser.hxx" line="592"/>
         <source>%1 - %2</source>
         <comment>statusbar actionForward_hovered %1=url %2=title</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="596"/>
-        <location filename="browser.hxx" line="609"/>
-        <location filename="browser.hxx" line="623"/>
+        <location filename="browser.hxx" line="613"/>
+        <location filename="browser.hxx" line="641"/>
+        <location filename="browser.hxx" line="657"/>
         <source>background-color: white</source>
         <comment>neutral find</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="631"/>
-        <location filename="browser.hxx" line="641"/>
+        <location filename="browser.hxx" line="665"/>
+        <location filename="browser.hxx" line="675"/>
         <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="633"/>
-        <location filename="browser.hxx" line="643"/>
+        <location filename="browser.hxx" line="667"/>
+        <location filename="browser.hxx" line="677"/>
         <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="663"/>
+        <location filename="browser.hxx" line="697"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="664"/>
+        <location filename="browser.hxx" line="698"/>
         <source>%8
 Version: %1
 Builddate: %2
@@ -385,56 +396,58 @@ openssl-%7</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="720"/>
+        <location filename="browser.hxx" line="757"/>
         <source>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="725"/>
+        <location filename="browser.hxx" line="762"/>
         <source>Info: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="739"/>
+        <location filename="browser.hxx" line="776"/>
         <source>done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="994"/>
+        <location filename="browser.hxx" line="1031"/>
         <source>%1</source>
         <comment>statusbar for hovered link %1=url</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="1130"/>
+        <location filename="browser.hxx" line="1167"/>
         <source>Save File As ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="1190"/>
+        <location filename="browser.hxx" line="1227"/>
         <source>errors</source>
         <comment>show error log</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="1206"/>
+        <location filename="browser.hxx" line="1244"/>
+        <location filename="browser.hxx" line="1247"/>
         <source>background-color: #F77</source>
         <comment>invalid url</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="1212"/>
+        <location filename="browser.hxx" line="1254"/>
+        <location filename="browser.hxx" line="1257"/>
         <source>background-color: white</source>
         <comment>valid url</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="1227"/>
+        <location filename="browser.hxx" line="1272"/>
         <source>authentication required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="1239"/>
+        <location filename="browser.hxx" line="1284"/>
         <source>ssl error</source>
         <translation type="unfinished"></translation>
     </message>

swisssurfer/src/swisssurfer_fr.ts

@@ -119,274 +119,285 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="229"/>
+        <location filename="browser.ui" line="223"/>
+        <source>Ctrl+W</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="browser.ui" line="232"/>
         <source>&amp;Proxy...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="259"/>
+        <location filename="browser.ui" line="262"/>
         <source>Ctrl+P</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="264"/>
+        <location filename="browser.ui" line="267"/>
         <source>Next Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="267"/>
+        <location filename="browser.ui" line="270"/>
         <source>Shift+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="272"/>
+        <location filename="browser.ui" line="275"/>
         <source>Previous Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="275"/>
+        <location filename="browser.ui" line="278"/>
         <source>Shift+Left</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="browser.ui" line="284"/>
-        <source>New Tab</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="browser.ui" line="287"/>
-        <source>Add New Tab</source>
+        <source>New Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="browser.ui" line="290"/>
-        <source>Ctrl+T</source>
+        <source>Add New Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="299"/>
+        <location filename="browser.ui" line="302"/>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="314"/>
+        <location filename="browser.ui" line="317"/>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="326"/>
+        <location filename="browser.ui" line="329"/>
         <source>&amp;About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="338"/>
+        <location filename="browser.ui" line="341"/>
         <source>&amp;Settings ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="350"/>
+        <location filename="browser.ui" line="353"/>
         <source>&amp;Reverse Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="353"/>
+        <location filename="browser.ui" line="356"/>
         <source>Ctrl+R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="362"/>
+        <location filename="browser.ui" line="365"/>
         <source>Error Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="365"/>
+        <location filename="browser.ui" line="368"/>
         <source>show error logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="374"/>
+        <location filename="browser.ui" line="377"/>
         <source>User Login Certificate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="383"/>
+        <location filename="browser.ui" line="386"/>
         <source>&amp;Proxy ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="392"/>
+        <location filename="browser.ui" line="395"/>
         <source>Clear Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="395"/>
+        <location filename="browser.ui" line="398"/>
         <source>clear location bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="404"/>
+        <location filename="browser.ui" line="407"/>
         <source>Add Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="407"/>
+        <location filename="browser.ui" line="410"/>
         <source>add bookmark to location bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="410"/>
+        <location filename="browser.ui" line="413"/>
         <source>Ctrl+D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="419"/>
+        <location filename="browser.ui" line="422"/>
         <source>&amp;Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="browser.ui" line="431"/>
+        <source>Clear Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="browser.ui" line="434"/>
+        <source>clear find bar</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="browser.ui" line="145"/>
-        <location filename="browser.ui" line="317"/>
+        <location filename="browser.ui" line="293"/>
+        <location filename="browser.ui" line="320"/>
         <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="302"/>
+        <location filename="browser.ui" line="305"/>
         <source>find in page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="305"/>
+        <location filename="browser.ui" line="308"/>
         <source>Ctrl+F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="238"/>
+        <location filename="browser.ui" line="241"/>
         <source>Print ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="256"/>
+        <location filename="browser.ui" line="259"/>
         <source>Quick &amp;Print</source>
         <oldsource>&amp;Print</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="247"/>
+        <location filename="browser.ui" line="250"/>
         <source>Print Pre&amp;view ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="456"/>
+        <location filename="browser.hxx" line="465"/>
         <source>Checking: %1</source>
         <oldsource>Opening: %1</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="467"/>
+        <location filename="browser.hxx" line="476"/>
         <source>Reading: %1</source>
         <oldsource>Reading: %1%</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="486"/>
+        <location filename="browser.hxx" line="497"/>
         <source>Zoom: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="469"/>
+        <location filename="browser.hxx" line="478"/>
         <source>Illegal URL: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="535"/>
+        <location filename="browser.hxx" line="552"/>
         <source>Print Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="556"/>
+        <location filename="browser.hxx" line="573"/>
         <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="725"/>
+        <location filename="browser.hxx" line="762"/>
         <source>Info: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="739"/>
+        <location filename="browser.hxx" line="776"/>
         <source>done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="994"/>
+        <location filename="browser.hxx" line="1031"/>
         <source>%1</source>
         <comment>statusbar for hovered link %1=url</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="459"/>
+        <location filename="browser.hxx" line="468"/>
         <source>Forbidden: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="143"/>
+        <location filename="browser.hxx" line="150"/>
         <source>SSL Not Supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="144"/>
+        <location filename="browser.hxx" line="151"/>
         <source>SSL is not supported on your system</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="460"/>
+        <location filename="browser.hxx" line="469"/>
         <source>Access Denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="461"/>
+        <location filename="browser.hxx" line="470"/>
         <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="575"/>
+        <location filename="browser.hxx" line="592"/>
         <source>%1 - %2</source>
         <comment>statusbar actionForward_hovered %1=url %2=title</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="596"/>
-        <location filename="browser.hxx" line="609"/>
-        <location filename="browser.hxx" line="623"/>
+        <location filename="browser.hxx" line="613"/>
+        <location filename="browser.hxx" line="641"/>
+        <location filename="browser.hxx" line="657"/>
         <source>background-color: white</source>
         <comment>neutral find</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="631"/>
-        <location filename="browser.hxx" line="641"/>
+        <location filename="browser.hxx" line="665"/>
+        <location filename="browser.hxx" line="675"/>
         <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="633"/>
-        <location filename="browser.hxx" line="643"/>
+        <location filename="browser.hxx" line="667"/>
+        <location filename="browser.hxx" line="677"/>
         <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="663"/>
+        <location filename="browser.hxx" line="697"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="664"/>
+        <location filename="browser.hxx" line="698"/>
         <source>%8
 Version: %1
 Builddate: %2
@@ -406,40 +417,42 @@ openssl-%7</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="720"/>
+        <location filename="browser.hxx" line="757"/>
         <source>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="1130"/>
+        <location filename="browser.hxx" line="1167"/>
         <source>Save File As ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="1190"/>
+        <location filename="browser.hxx" line="1227"/>
         <source>errors</source>
         <comment>show error log</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="1206"/>
+        <location filename="browser.hxx" line="1244"/>
+        <location filename="browser.hxx" line="1247"/>
         <source>background-color: #F77</source>
         <comment>invalid url</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="1212"/>
+        <location filename="browser.hxx" line="1254"/>
+        <location filename="browser.hxx" line="1257"/>
         <source>background-color: white</source>
         <comment>valid url</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="1227"/>
+        <location filename="browser.hxx" line="1272"/>
         <source>authentication required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="1239"/>
+        <location filename="browser.hxx" line="1284"/>
         <source>ssl error</source>
         <translation type="unfinished"></translation>
     </message>

swisssurfer/src/swisssurfer_it.ts

@@ -79,7 +79,8 @@
     </message>
     <message>
         <location filename="browser.ui" line="145"/>
-        <location filename="browser.ui" line="317"/>
+        <location filename="browser.ui" line="293"/>
+        <location filename="browser.ui" line="320"/>
         <source>Esc</source>
         <translation type="unfinished"></translation>
     </message>
@@ -124,246 +125,256 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="229"/>
+        <location filename="browser.ui" line="223"/>
+        <source>Ctrl+W</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="browser.ui" line="232"/>
         <source>&amp;Proxy...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="238"/>
+        <location filename="browser.ui" line="241"/>
         <source>Print ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="247"/>
+        <location filename="browser.ui" line="250"/>
         <source>Print Pre&amp;view ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="256"/>
+        <location filename="browser.ui" line="259"/>
         <source>Quick &amp;Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="259"/>
+        <location filename="browser.ui" line="262"/>
         <source>Ctrl+P</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="264"/>
+        <location filename="browser.ui" line="267"/>
         <source>Next Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="267"/>
+        <location filename="browser.ui" line="270"/>
         <source>Shift+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="272"/>
+        <location filename="browser.ui" line="275"/>
         <source>Previous Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="275"/>
+        <location filename="browser.ui" line="278"/>
         <source>Shift+Left</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="browser.ui" line="284"/>
-        <source>New Tab</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="browser.ui" line="287"/>
-        <source>Add New Tab</source>
+        <source>New Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="browser.ui" line="290"/>
-        <source>Ctrl+T</source>
+        <source>Add New Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="299"/>
+        <location filename="browser.ui" line="302"/>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="302"/>
+        <location filename="browser.ui" line="305"/>
         <source>find in page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="305"/>
+        <location filename="browser.ui" line="308"/>
         <source>Ctrl+F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="314"/>
+        <location filename="browser.ui" line="317"/>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="326"/>
+        <location filename="browser.ui" line="329"/>
         <source>&amp;About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="338"/>
+        <location filename="browser.ui" line="341"/>
         <source>&amp;Settings ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="350"/>
+        <location filename="browser.ui" line="353"/>
         <source>&amp;Reverse Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="353"/>
+        <location filename="browser.ui" line="356"/>
         <source>Ctrl+R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="362"/>
+        <location filename="browser.ui" line="365"/>
         <source>Error Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="365"/>
+        <location filename="browser.ui" line="368"/>
         <source>show error logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="374"/>
+        <location filename="browser.ui" line="377"/>
         <source>User Login Certificate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="383"/>
+        <location filename="browser.ui" line="386"/>
         <source>&amp;Proxy ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="392"/>
+        <location filename="browser.ui" line="395"/>
         <source>Clear Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="395"/>
+        <location filename="browser.ui" line="398"/>
         <source>clear location bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="404"/>
+        <location filename="browser.ui" line="407"/>
         <source>Add Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="407"/>
+        <location filename="browser.ui" line="410"/>
         <source>add bookmark to location bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="410"/>
+        <location filename="browser.ui" line="413"/>
         <source>Ctrl+D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.ui" line="419"/>
+        <location filename="browser.ui" line="422"/>
         <source>&amp;Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="143"/>
+        <location filename="browser.ui" line="431"/>
+        <source>Clear Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="browser.ui" line="434"/>
+        <source>clear find bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="browser.hxx" line="150"/>
         <source>SSL Not Supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="144"/>
+        <location filename="browser.hxx" line="151"/>
         <source>SSL is not supported on your system</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="456"/>
+        <location filename="browser.hxx" line="465"/>
         <source>Checking: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="459"/>
+        <location filename="browser.hxx" line="468"/>
         <source>Forbidden: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="460"/>
+        <location filename="browser.hxx" line="469"/>
         <source>Access Denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="461"/>
+        <location filename="browser.hxx" line="470"/>
         <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="467"/>
+        <location filename="browser.hxx" line="476"/>
         <source>Reading: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="469"/>
+        <location filename="browser.hxx" line="478"/>
         <source>Illegal URL: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="486"/>
+        <location filename="browser.hxx" line="497"/>
         <source>Zoom: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="535"/>
+        <location filename="browser.hxx" line="552"/>
         <source>Print Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="556"/>
+        <location filename="browser.hxx" line="573"/>
         <source>%1 - %2</source>
         <comment>statusbar actionBack_hovered %1=url %2=title</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="575"/>
+        <location filename="browser.hxx" line="592"/>
         <source>%1 - %2</source>
         <comment>statusbar actionForward_hovered %1=url %2=title</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="596"/>
-        <location filename="browser.hxx" line="609"/>
-        <location filename="browser.hxx" line="623"/>
+        <location filename="browser.hxx" line="613"/>
+        <location filename="browser.hxx" line="641"/>
+        <location filename="browser.hxx" line="657"/>
         <source>background-color: white</source>
         <comment>neutral find</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="631"/>
-        <location filename="browser.hxx" line="641"/>
+        <location filename="browser.hxx" line="665"/>
+        <location filename="browser.hxx" line="675"/>
         <source>background-color: #ADA</source>
         <comment>text found</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="633"/>
-        <location filename="browser.hxx" line="643"/>
+        <location filename="browser.hxx" line="667"/>
+        <location filename="browser.hxx" line="677"/>
         <source>background-color: #F77</source>
         <comment>text not found</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="663"/>
+        <location filename="browser.hxx" line="697"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="664"/>
+        <location filename="browser.hxx" line="698"/>
         <source>%8
 Version: %1
 Builddate: %2
@@ -375,56 +386,58 @@ openssl-%7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="720"/>
+        <location filename="browser.hxx" line="757"/>
         <source>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="725"/>
+        <location filename="browser.hxx" line="762"/>
         <source>Info: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="739"/>
+        <location filename="browser.hxx" line="776"/>
         <source>done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="994"/>
+        <location filename="browser.hxx" line="1031"/>
         <source>%1</source>
         <comment>statusbar for hovered link %1=url</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="1130"/>
+        <location filename="browser.hxx" line="1167"/>
         <source>Save File As ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="1190"/>
+        <location filename="browser.hxx" line="1227"/>
         <source>errors</source>
         <comment>show error log</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="1206"/>
+        <location filename="browser.hxx" line="1244"/>
+        <location filename="browser.hxx" line="1247"/>
         <source>background-color: #F77</source>
         <comment>invalid url</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="1212"/>
+        <location filename="browser.hxx" line="1254"/>
+        <location filename="browser.hxx" line="1257"/>
         <source>background-color: white</source>
         <comment>valid url</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="1227"/>
+        <location filename="browser.hxx" line="1272"/>
         <source>authentication required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browser.hxx" line="1239"/>
+        <location filename="browser.hxx" line="1284"/>
         <source>ssl error</source>
         <translation type="unfinished"></translation>
     </message>

swisssurfer/src/webpage.hxx

@@ -11,6 +11,11 @@
 #include <QtWebKit/QWebPage>
 #include <QtCore/QProcessEnvironment>
 
+#include <QtCore/QDebug>
+#ifndef LOG
+#define LOG qDebug()<<__PRETTY_FUNCTION__
+#endif
+
 class Browser;
 
 class WebPage: public QWebPage {
@@ -23,6 +28,15 @@ class WebPage: public QWebPage {
                   .value("SWISSSURFER_USERAGENT"));
       return QWebPage::userAgentForUrl(url)+(add.size()?" "+add:QString());
     }
+    QObject* createPlugin(const QString& classid, const QUrl& url,
+                          const QStringList& paramNames,
+                          const QStringList& paramValues) {
+      LOG<<"classid:"<<classid
+         <<"url:"<<url
+         <<"paramNames:"<<paramNames.join(", ")
+         <<"paramValues:"<<paramValues.join(", ");
+      return QWebPage::createPlugin(classid, url, paramNames, paramValues);
+    }
   private:
     Browser* _browser;
 };