diff --git a/qt/patch/qt-sources-patch.diff b/qt/patch/qt-sources-patch.diff index 588c74a..949f59d 100644 --- a/qt/patch/qt-sources-patch.diff +++ b/qt/patch/qt-sources-patch.diff @@ -1,17 +1,26 @@ diff -ru qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qhttpnetworkconnectionchannel.cpp qt-everywhere-opensource-src-4.6.3.mrw/src/network/access/qhttpnetworkconnectionchannel.cpp --- qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qhttpnetworkconnectionchannel.cpp 2010-06-02 04:03:17.000000000 +0200 +++ qt-everywhere-opensource-src-4.6.3.mrw/src/network/access/qhttpnetworkconnectionchannel.cpp 2011-01-13 17:44:14.984841004 +0100 -@@ -130,6 +130,9 @@ +@@ -46,6 +46,8 @@ + #include + #include + ++#include ++ + #ifndef QT_NO_HTTP + + #ifndef QT_NO_OPENSSL +@@ -130,6 +132,9 @@ QObject::connect(sslSocket, SIGNAL(encryptedBytesWritten(qint64)), this, SLOT(_q_encryptedBytesWritten(qint64)), Qt::DirectConnection); -+ QObject::connect(sslSocket, SIGNAL(extendedContextInitialization(ssl_ctx_st*)), ++ assert(QObject::connect(sslSocket, SIGNAL(extendedContextInitialization(ssl_ctx_st*)), + this, SLOT(_q_extendedContextInitialization(ssl_ctx_st*)), -+ Qt::DirectConnection); ++ Qt::DirectConnection)); } #endif } -@@ -1019,6 +1022,13 @@ +@@ -1019,6 +1024,13 @@ emit connection->sslErrors(errors); } @@ -89,31 +98,49 @@ diff -ru qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkacce QT_BEGIN_NAMESPACE class QAuthenticator; -@@ -185,7 +189,8 @@ +@@ -185,7 +189,7 @@ void redirectionRequested(const QUrl &destination); void sslErrors(const QList &errors); void emitReplyUploadProgress(qint64 bytesSent, qint64 bytesTotal); +- + void extendedContextInitialization(ssl_ctx_st* ctx); - private: friend class QNetworkAccessManager; friend class QNetworkAccessManagerPrivate; diff -ru qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkaccesshttpbackend.cpp qt-everywhere-opensource-src-4.6.3.mrw/src/network/access/qnetworkaccesshttpbackend.cpp --- qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkaccesshttpbackend.cpp 2010-06-02 04:03:17.000000000 +0200 +++ qt-everywhere-opensource-src-4.6.3.mrw/src/network/access/qnetworkaccesshttpbackend.cpp 2011-01-13 17:31:39.044840998 +0100 -@@ -349,6 +349,8 @@ +@@ -52,6 +52,8 @@ + #include "QtCore/qdatetime.h" + #include "QtNetwork/qsslconfiguration.h" + ++#include ++ + #ifndef QT_NO_HTTP + + #include // for strchr +@@ -349,6 +351,8 @@ #ifndef QT_NO_OPENSSL connect(http, SIGNAL(sslErrors(QList)), SLOT(sslErrors(QList))); -+ connect(http, SIGNAL(extendedContextInitialization(ssl_ctx_st*)), -+ SLOT(extendedContextInitialization(ssl_ctx_st*))); ++ assert(connect(http, SIGNAL(extendedContextInitialization(ssl_ctx_st*)), ++ SLOT(extendedContextInitialization(ssl_ctx_st*)))); #endif } diff -ru qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkaccessmanager.cpp qt-everywhere-opensource-src-4.6.3.mrw/src/network/access/qnetworkaccessmanager.cpp --- qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkaccessmanager.cpp 2010-06-02 04:03:17.000000000 +0200 +++ qt-everywhere-opensource-src-4.6.3.mrw/src/network/access/qnetworkaccessmanager.cpp 2011-01-13 17:31:56.404841001 +0100 -@@ -777,6 +777,16 @@ +@@ -60,6 +60,8 @@ + #include "QtNetwork/qauthenticator.h" + #include "QtNetwork/qsslconfiguration.h" + ++#include ++ + QT_BEGIN_NAMESPACE + + #ifndef QT_NO_HTTP +@@ -777,6 +779,16 @@ #endif } @@ -130,11 +157,11 @@ diff -ru qt-everywhere-opensource-src-4.6.3.orig/src/network/access/qnetworkacce QNetworkReply *QNetworkAccessManagerPrivate::postProcess(QNetworkReply *reply) { Q_Q(QNetworkAccessManager); -@@ -786,6 +796,7 @@ +@@ -786,6 +798,7 @@ /* In case we're compiled without SSL support, we don't have this signal and we need to * avoid getting a connection error. */ q->connect(reply, SIGNAL(sslErrors(QList)), SLOT(_q_replySslErrors(QList))); -+ q->connect(reply, SIGNAL(extendedContextInitialization(ssl_ctx_st*)), SLOT(_q_extendedContextInitialization(ssl_ctx_st*))); ++ assert(q->connect(reply, SIGNAL(extendedContextInitialization(ssl_ctx_st*)), SLOT(_q_extendedContextInitialization(ssl_ctx_st*)))); #endif return reply; diff --git a/swisssurfer/src/browser.hxx b/swisssurfer/src/browser.hxx index 3b77a6f..985c668 100644 --- a/swisssurfer/src/browser.hxx +++ b/swisssurfer/src/browser.hxx @@ -17,6 +17,9 @@ #include #include #include +#include +#include +#include #include #include #include @@ -42,9 +45,6 @@ class SslClientAuthNetworkAccessManager: public QNetworkAccessManager { SslClientAuthNetworkAccessManager(QObject* parent = 0): QNetworkAccessManager(parent) { LOG; - assert - (connect(this, SIGNAL(extendedContextInitialization(ssl_ctx_st*)), - &_scAuth, SLOT(extendedContextInitialization(ssl_ctx_st*)))); } virtual ~SslClientAuthNetworkAccessManager() { @@ -72,7 +72,8 @@ class Browser: public QMainWindow, protected Ui::Browser { public: - Browser(const QString& url, bool kiosk = false, bool proxydetection = false): + Browser(const QString& url, bool kiosk = false, + bool proxydetection = false): _url(0), _home(url), _proxy(0), _kiosk(kiosk) { LOG<setEnabled(proxydetection); if (proxydetection) { _proxy = new gui::Proxy(url, this); @@ -97,6 +99,12 @@ class Browser: public QMainWindow, protected Ui::Browser { _toolbar->addWidget(_url = new QLineEdit(_toolbar)); _url->setText(url); assert(connect(_url, SIGNAL(returnPressed()), SLOT(load()))); + assert(connect(&_networkManager, + SIGNAL(extendedContextInitialization(ssl_ctx_st*, + QSslSocket*)), + &_scAuth, + SLOT(extendedContextInitialization(ssl_ctx_st*, + QSslSocket*)))); if (_kiosk) { _menu->hide(); _url->setEnabled(false); @@ -107,248 +115,6 @@ class Browser: public QMainWindow, protected Ui::Browser { _zoom->setMaximum(100); _zoom->setValue(10); assert(connect(_zoom, SIGNAL(valueChanged(int)), SLOT(zoom(int)))); - _browser->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks); - _browser->page()->setNetworkAccessManager - (new SslClientAuthNetworkAccessManager); - // QWebPage WebAction - connect(_browser->pageAction(QWebPage::OpenLink), - SIGNAL(triggered(bool)), - SLOT(triggeredOpenLink(bool))); - connect(_browser->pageAction(QWebPage::OpenLinkInNewWindow), - SIGNAL(triggered(bool)), - SLOT(triggeredOpenLinkInNewWindow(bool))); - connect(_browser->pageAction(QWebPage::OpenFrameInNewWindow), - SIGNAL(triggered(bool)), - SLOT(triggeredOpenFrameInNewWindow(bool))); - connect(_browser->pageAction(QWebPage::DownloadLinkToDisk), - SIGNAL(triggered(bool)), - SLOT(triggeredDownloadLinkToDisk(bool))); - connect(_browser->pageAction(QWebPage::CopyLinkToClipboard), - SIGNAL(triggered(bool)), - SLOT(triggeredCopyLinkToClipboard(bool))); - connect(_browser->pageAction(QWebPage::OpenImageInNewWindow), - SIGNAL(triggered(bool)), - SLOT(triggeredOpenImageInNewWindow(bool))); - connect(_browser->pageAction(QWebPage::DownloadImageToDisk), - SIGNAL(triggered(bool)), - SLOT(triggeredDownloadImageToDisk(bool))); - connect(_browser->pageAction(QWebPage::CopyImageToClipboard), - SIGNAL(triggered(bool)), - SLOT(triggeredCopyImageToClipboard(bool))); - connect(_browser->pageAction(QWebPage::Back), - SIGNAL(triggered(bool)), - SLOT(triggeredBack(bool))); - connect(_browser->pageAction(QWebPage::Forward), - SIGNAL(triggered(bool)), - SLOT(triggeredForward(bool))); - connect(_browser->pageAction(QWebPage::Stop), - SIGNAL(triggered(bool)), - SLOT(triggeredStop(bool))); - connect(_browser->pageAction(QWebPage::Reload), - SIGNAL(triggered(bool)), - SLOT(triggeredReload(bool))); - connect(_browser->pageAction(QWebPage::Cut), - SIGNAL(triggered(bool)), - SLOT(triggeredCut(bool))); - connect(_browser->pageAction(QWebPage::Copy), - SIGNAL(triggered(bool)), - SLOT(triggeredCopy(bool))); - connect(_browser->pageAction(QWebPage::Paste), - SIGNAL(triggered(bool)), - SLOT(triggeredPaste(bool))); - connect(_browser->pageAction(QWebPage::Undo), - SIGNAL(triggered(bool)), - SLOT(triggeredUndo(bool))); - connect(_browser->pageAction(QWebPage::Redo), - SIGNAL(triggered(bool)), - SLOT(triggeredRedo(bool))); - connect(_browser->pageAction(QWebPage::MoveToNextChar), - SIGNAL(triggered(bool)), - SLOT(triggeredMoveToNextChar(bool))); - connect(_browser->pageAction(QWebPage::MoveToPreviousChar), - SIGNAL(triggered(bool)), - SLOT(triggeredMoveToPreviousChar(bool))); - connect(_browser->pageAction(QWebPage::MoveToNextWord), - SIGNAL(triggered(bool)), - SLOT(triggeredMoveToNextWord(bool))); - connect(_browser->pageAction(QWebPage::MoveToPreviousWord), - SIGNAL(triggered(bool)), - SLOT(triggeredMoveToPreviousWord(bool))); - connect(_browser->pageAction(QWebPage::MoveToNextLine), - SIGNAL(triggered(bool)), - SLOT(triggeredMoveToNextLine(bool))); - connect(_browser->pageAction(QWebPage::MoveToPreviousLine), - SIGNAL(triggered(bool)), - SLOT(triggeredMoveToPreviousLine(bool))); - connect(_browser->pageAction(QWebPage::MoveToStartOfLine), - SIGNAL(triggered(bool)), - SLOT(triggeredMoveToStartOfLine(bool))); - connect(_browser->pageAction(QWebPage::MoveToEndOfLine), - SIGNAL(triggered(bool)), - SLOT(triggeredMoveToEndOfLine(bool))); - connect(_browser->pageAction(QWebPage::MoveToStartOfBlock), - SIGNAL(triggered(bool)), - SLOT(triggeredMoveToStartOfBlock(bool))); - connect(_browser->pageAction(QWebPage::MoveToEndOfBlock), - SIGNAL(triggered(bool)), - SLOT(triggeredMoveToEndOfBlock(bool))); - connect(_browser->pageAction(QWebPage::MoveToStartOfDocument), - SIGNAL(triggered(bool)), - SLOT(triggeredMoveToStartOfDocument(bool))); - connect(_browser->pageAction(QWebPage::MoveToEndOfDocument), - SIGNAL(triggered(bool)), - SLOT(triggeredMoveToEndOfDocument(bool))); - connect(_browser->pageAction(QWebPage::SelectNextChar), - SIGNAL(triggered(bool)), - SLOT(triggeredSelectNextChar(bool))); - connect(_browser->pageAction(QWebPage::SelectPreviousChar), - SIGNAL(triggered(bool)), - SLOT(triggeredSelectPreviousChar(bool))); - connect(_browser->pageAction(QWebPage::SelectNextWord), - SIGNAL(triggered(bool)), - SLOT(triggeredSelectNextWord(bool))); - connect(_browser->pageAction(QWebPage::SelectPreviousWord), - SIGNAL(triggered(bool)), - SLOT(triggeredSelectPreviousWord(bool))); - connect(_browser->pageAction(QWebPage::SelectNextLine), - SIGNAL(triggered(bool)), - SLOT(triggeredSelectNextLine(bool))); - connect(_browser->pageAction(QWebPage::SelectPreviousLine), - SIGNAL(triggered(bool)), - SLOT(triggeredSelectPreviousLine(bool))); - connect(_browser->pageAction(QWebPage::SelectStartOfLine), - SIGNAL(triggered(bool)), - SLOT(triggeredSelectStartOfLine(bool))); - connect(_browser->pageAction(QWebPage::SelectEndOfLine), - SIGNAL(triggered(bool)), - SLOT(triggeredSelectEndOfLine(bool))); - connect(_browser->pageAction(QWebPage::SelectStartOfBlock), - SIGNAL(triggered(bool)), - SLOT(triggeredSelectStartOfBlock(bool))); - connect(_browser->pageAction(QWebPage::SelectEndOfBlock), - SIGNAL(triggered(bool)), - SLOT(triggeredSelectEndOfBlock(bool))); - connect(_browser->pageAction(QWebPage::SelectStartOfDocument), - SIGNAL(triggered(bool)), - SLOT(triggeredSelectStartOfDocument(bool))); - connect(_browser->pageAction(QWebPage::SelectEndOfDocument), - SIGNAL(triggered(bool)), - SLOT(triggeredSelectEndOfDocument(bool))); - connect(_browser->pageAction(QWebPage::DeleteStartOfWord), - SIGNAL(triggered(bool)), - SLOT(triggeredDeleteStartOfWord(bool))); - connect(_browser->pageAction(QWebPage::DeleteEndOfWord), - SIGNAL(triggered(bool)), - SLOT(triggeredDeleteEndOfWord(bool))); - connect(_browser->pageAction(QWebPage::SetTextDirectionDefault), - SIGNAL(triggered(bool)), - SLOT(triggeredSetTextDirectionDefault(bool))); - connect(_browser->pageAction(QWebPage::SetTextDirectionLeftToRight), - SIGNAL(triggered(bool)), - SLOT(triggeredSetTextDirectionLeftToRight(bool))); - connect(_browser->pageAction(QWebPage::SetTextDirectionRightToLeft), - SIGNAL(triggered(bool)), - SLOT(triggeredSetTextDirectionRightToLeft(bool))); - connect(_browser->pageAction(QWebPage::ToggleBold), - SIGNAL(triggered(bool)), - SLOT(triggeredToggleBold(bool))); - connect(_browser->pageAction(QWebPage::ToggleItalic), - SIGNAL(triggered(bool)), - SLOT(triggeredToggleItalic(bool))); - connect(_browser->pageAction(QWebPage::ToggleUnderline), - SIGNAL(triggered(bool)), - SLOT(triggeredToggleUnderline(bool))); - connect(_browser->pageAction(QWebPage::InspectElement), - SIGNAL(triggered(bool)), - SLOT(triggeredInspectElement(bool))); - connect(_browser->pageAction(QWebPage::InsertParagraphSeparator), - SIGNAL(triggered(bool)), - SLOT(triggeredInsertParagraphSeparator(bool))); - connect(_browser->pageAction(QWebPage::InsertLineSeparator), - SIGNAL(triggered(bool)), - SLOT(triggeredInsertLineSeparator(bool))); - connect(_browser->pageAction(QWebPage::SelectAll), - SIGNAL(triggered(bool)), - SLOT(triggeredSelectAll(bool))); - // QWebPage - assert(connect(_browser->page(), SIGNAL(contentsChanged()), - SLOT(contentsChanged()))); - assert(connect(_browser->page(), - SIGNAL(databaseQuotaExceeded(QWebFrame*, QString)), - SLOT(databaseQuotaExceeded(QWebFrame*, QString)))); - assert(connect(_browser->page(), - SIGNAL(downloadRequested(const QNetworkRequest&)), - SLOT(downloadRequested(const QNetworkRequest&)))); - assert(connect(_browser->page(), SIGNAL(frameCreated(QWebFrame*)), - SLOT(frameCreated(QWebFrame*)))); - assert(connect(_browser->page(), - SIGNAL(geometryChangeRequested(const QRect&)), - SLOT(geometryChangeRequested(const QRect&)))); - assert(connect(_browser->page(), SIGNAL(linkClicked(const QUrl&)), - SLOT(linkClicked(const QUrl&)))); - assert(connect(_browser->page(), - SIGNAL(linkHovered(const QString&, const QString&, - const QString&)), - SLOT(linkHovered(const QString&, const QString&, - const QString&)))); - assert(connect(_browser->page(), SIGNAL(loadFinished(bool)), - SLOT(loadFinished(bool)))); - assert(connect(_browser->page(), SIGNAL(loadProgress(int)), - SLOT(loadProgress(int)))); - assert(connect(_browser->page(), SIGNAL(loadStarted()), - SLOT(loadStarted()))); - assert(connect(_browser->page(), - SIGNAL(menuBarVisibilityChangeRequested(bool)), - SLOT(menuBarVisibilityChangeRequested(bool)))); - assert(connect(_browser->page(), SIGNAL(microFocusChanged()), - SLOT(microFocusChanged()))); - assert(connect(_browser->page(), SIGNAL(printRequested(QWebFrame*)), - SLOT(printRequested(QWebFrame*)))); - assert(connect(_browser->page(), SIGNAL(repaintRequested(const QRect&)), - SLOT(repaintRequested(const QRect&)))); - assert(connect(_browser->page(), - SIGNAL(restoreFrameStateRequested(QWebFrame*)), - SLOT(restoreFrameStateRequested(QWebFrame*)))); - assert(connect(_browser->page(), - SIGNAL(saveFrameStateRequested(QWebFrame*, - QWebHistoryItem*)), - SLOT(saveFrameStateRequested(QWebFrame*, - QWebHistoryItem*)))); - assert(connect(_browser->page(), - SIGNAL(scrollRequested(int, int, const QRect&)), - SLOT(scrollRequested(int, int, const QRect&)))); - assert(connect(_browser->page(), SIGNAL(selectionChanged()), - SLOT(selectionChanged()))); - assert(connect(_browser->page(), SIGNAL(statusBarMessage(const QString&)), - SLOT(statusBarMessage(const QString&)))); - assert(connect(_browser->page(), - SIGNAL(statusBarVisibilityChangeRequested(bool)), - SLOT(statusBarVisibilityChangeRequested(bool)))); - assert(connect(_browser->page(), - SIGNAL(toolBarVisibilityChangeRequested(bool)), - SLOT(toolBarVisibilityChangeRequested(bool)))); - assert(connect(_browser->page(), - SIGNAL(unsupportedContent(QNetworkReply*)), - SLOT(unsupportedContent(QNetworkReply*)))); - assert(connect(_browser->page(), SIGNAL(windowCloseRequested()), - SLOT(windowCloseRequested()))); - // QNetworkAccessManager - assert(connect(_browser->page()->networkAccessManager(), - SIGNAL(authenticationRequired(QNetworkReply*, - QAuthenticator*)), - SLOT(authenticationRequired(QNetworkReply*, - QAuthenticator*)))); - assert(connect(_browser->page()->networkAccessManager(), - SIGNAL(finished(QNetworkReply*)), - SLOT(finished(QNetworkReply*)))); - assert(connect(_browser->page()->networkAccessManager(), - SIGNAL(proxyAuthenticationRequired(const QNetworkProxy&, - QAuthenticator*)), - SLOT(proxyAuthenticationRequired(const QNetworkProxy&, - QAuthenticator*)))); - assert(connect(_browser->page()->networkAccessManager(), - SIGNAL(sslErrors(QNetworkReply*, const QList&)), - SLOT(sslErrors(QNetworkReply*, const QList&)))); load(url); } @@ -480,7 +246,7 @@ class Browser: public QMainWindow, protected Ui::Browser { return; } //if (url.scheme()=="") url.setScheme("http"); - _browser->load(url); + dynamic_cast(_tabs->currentWidget())->load(url); } void reply_error(QNetworkReply::NetworkError err) { @@ -510,13 +276,13 @@ class Browser: public QMainWindow, protected Ui::Browser { _error = tr("

%1

%2

") .arg(tr("Connection Cannot Be Established")) .arg(networkError(err)) + _error; - on__browser_loadFinished(false); +// on__browser_loadFinished(false); //! @todo } void zoom(int i) { LOG<<100.0*i/10.0; statusBar()->showMessage(tr("Zoom: %1%").arg(100.0*i/10.0)); - _browser->setZoomFactor(i/10.0); + dynamic_cast(_tabs->currentWidget())->setZoomFactor(i/10.0); } void on_actionHome_activated() { @@ -524,90 +290,343 @@ class Browser: public QMainWindow, protected Ui::Browser { load(_home); } - void on__browser_urlChanged(const QUrl& url) { - LOG<setText(url.toString()); - } - - void on__browser_linkClicked(const QUrl& url) { - LOG<icon()); - } - - void on__browser_titleChanged(const QString& text) { - LOG<showMessage(tr("Info: %1").arg(text)); - } - - void on__browser_loadProgress(int i) { - LOG<setValue(i); - } - - void on__browser_loadStarted() { - LOG; - _progress->setValue(0); - _progress->setMaximum(100); - _progress->show(); - actionStop->setEnabled(true); - actionForward->setEnabled(false); - actionBack->setEnabled(false); - actionReload->setEnabled(false); - actionHome->setEnabled(false); - } - - void on__browser_loadFinished(bool ok) { - LOG<<(ok?"success":"error"); - if (!ok) { - _browser->setHtml(tr("Page Load Error" - "

Page Load Error

%1" - "") - .arg(_error), - _errorUrl); - statusBar()->showMessage(tr("download error")); - } else { - statusBar()->showMessage(tr("done.")); - } - _error.clear(); - _progress->hide(); - on__browser_iconChanged(); - actionStop->setEnabled(false); - actionForward->setEnabled(_browser->history()->canGoForward()); - actionBack->setEnabled(_browser->history()->canGoBack()); - actionReload->setEnabled(true); - actionHome->setEnabled(true); - } +// void on__browser_urlChanged(const QUrl& url) { //!@todo +// LOG<setText(url.toString()); +// } + +// void on__browser_linkClicked(const QUrl& url) { //!@todo +// LOG<icon()); +// } + +// void on__browser_titleChanged(const QString& text) { //!@todo +// LOG<showMessage(tr("Info: %1").arg(text)); +// } + +// void on__browser_loadProgress(int i) { +// LOG<setValue(i); +// } + +// void on__browser_loadStarted() { +// LOG; +// _progress->setValue(0); +// _progress->setMaximum(100); +// _progress->show(); +// actionStop->setEnabled(true); +// actionForward->setEnabled(false); +// actionBack->setEnabled(false); +// actionReload->setEnabled(false); +// actionHome->setEnabled(false); +// } + +// void on__browser_loadFinished(bool ok) { +// LOG<<(ok?"success":"error"); +// if (!ok) { +// _browser->setHtml(tr("Page Load Error" +// "

Page Load Error

%1" +// "") +// .arg(_error), +// _errorUrl); +// statusBar()->showMessage(tr("download error")); +// } else { +// statusBar()->showMessage(tr("done.")); +// } +// _error.clear(); +// _progress->hide(); +// on__browser_iconChanged(); +// actionStop->setEnabled(false); +// actionForward->setEnabled(_browser->history()->canGoForward()); +// actionBack->setEnabled(_browser->history()->canGoBack()); +// actionReload->setEnabled(true); +// actionHome->setEnabled(true); +// } - void on_actionNew_triggered() { - LOG; - (new Browser(_browser->url().toString(), _kiosk, false))->show(); +// //!@todo ^^^ + +// void on_actionNew_triggered() { //@!todo exec new process +// LOG; +// (new Browser(dynamic_cast(_tabs->currentWidget())->url().toString(), _kiosk, false))->show(); +// } + + void on_actionNewTab_triggered() { + QWebView* browser(new QWebView); + browser->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks); + browser->page()->setNetworkAccessManager(&_networkManager); + // QWebPage WebAction + connect(browser->pageAction(QWebPage::OpenLink), + SIGNAL(triggered(bool)), + SLOT(triggeredOpenLink(bool))); + connect(browser->pageAction(QWebPage::OpenLinkInNewWindow), + SIGNAL(triggered(bool)), + SLOT(triggeredOpenLinkInNewWindow(bool))); + connect(browser->pageAction(QWebPage::OpenFrameInNewWindow), + SIGNAL(triggered(bool)), + SLOT(triggeredOpenFrameInNewWindow(bool))); + connect(browser->pageAction(QWebPage::DownloadLinkToDisk), + SIGNAL(triggered(bool)), + SLOT(triggeredDownloadLinkToDisk(bool))); + connect(browser->pageAction(QWebPage::CopyLinkToClipboard), + SIGNAL(triggered(bool)), + SLOT(triggeredCopyLinkToClipboard(bool))); + connect(browser->pageAction(QWebPage::OpenImageInNewWindow), + SIGNAL(triggered(bool)), + SLOT(triggeredOpenImageInNewWindow(bool))); + connect(browser->pageAction(QWebPage::DownloadImageToDisk), + SIGNAL(triggered(bool)), + SLOT(triggeredDownloadImageToDisk(bool))); + connect(browser->pageAction(QWebPage::CopyImageToClipboard), + SIGNAL(triggered(bool)), + SLOT(triggeredCopyImageToClipboard(bool))); + connect(browser->pageAction(QWebPage::Back), + SIGNAL(triggered(bool)), + SLOT(triggeredBack(bool))); + connect(browser->pageAction(QWebPage::Forward), + SIGNAL(triggered(bool)), + SLOT(triggeredForward(bool))); + connect(browser->pageAction(QWebPage::Stop), + SIGNAL(triggered(bool)), + SLOT(triggeredStop(bool))); + connect(browser->pageAction(QWebPage::Reload), + SIGNAL(triggered(bool)), + SLOT(triggeredReload(bool))); + connect(browser->pageAction(QWebPage::Cut), + SIGNAL(triggered(bool)), + SLOT(triggeredCut(bool))); + connect(browser->pageAction(QWebPage::Copy), + SIGNAL(triggered(bool)), + SLOT(triggeredCopy(bool))); + connect(browser->pageAction(QWebPage::Paste), + SIGNAL(triggered(bool)), + SLOT(triggeredPaste(bool))); + connect(browser->pageAction(QWebPage::Undo), + SIGNAL(triggered(bool)), + SLOT(triggeredUndo(bool))); + connect(browser->pageAction(QWebPage::Redo), + SIGNAL(triggered(bool)), + SLOT(triggeredRedo(bool))); + connect(browser->pageAction(QWebPage::MoveToNextChar), + SIGNAL(triggered(bool)), + SLOT(triggeredMoveToNextChar(bool))); + connect(browser->pageAction(QWebPage::MoveToPreviousChar), + SIGNAL(triggered(bool)), + SLOT(triggeredMoveToPreviousChar(bool))); + connect(browser->pageAction(QWebPage::MoveToNextWord), + SIGNAL(triggered(bool)), + SLOT(triggeredMoveToNextWord(bool))); + connect(browser->pageAction(QWebPage::MoveToPreviousWord), + SIGNAL(triggered(bool)), + SLOT(triggeredMoveToPreviousWord(bool))); + connect(browser->pageAction(QWebPage::MoveToNextLine), + SIGNAL(triggered(bool)), + SLOT(triggeredMoveToNextLine(bool))); + connect(browser->pageAction(QWebPage::MoveToPreviousLine), + SIGNAL(triggered(bool)), + SLOT(triggeredMoveToPreviousLine(bool))); + connect(browser->pageAction(QWebPage::MoveToStartOfLine), + SIGNAL(triggered(bool)), + SLOT(triggeredMoveToStartOfLine(bool))); + connect(browser->pageAction(QWebPage::MoveToEndOfLine), + SIGNAL(triggered(bool)), + SLOT(triggeredMoveToEndOfLine(bool))); + connect(browser->pageAction(QWebPage::MoveToStartOfBlock), + SIGNAL(triggered(bool)), + SLOT(triggeredMoveToStartOfBlock(bool))); + connect(browser->pageAction(QWebPage::MoveToEndOfBlock), + SIGNAL(triggered(bool)), + SLOT(triggeredMoveToEndOfBlock(bool))); + connect(browser->pageAction(QWebPage::MoveToStartOfDocument), + SIGNAL(triggered(bool)), + SLOT(triggeredMoveToStartOfDocument(bool))); + connect(browser->pageAction(QWebPage::MoveToEndOfDocument), + SIGNAL(triggered(bool)), + SLOT(triggeredMoveToEndOfDocument(bool))); + connect(browser->pageAction(QWebPage::SelectNextChar), + SIGNAL(triggered(bool)), + SLOT(triggeredSelectNextChar(bool))); + connect(browser->pageAction(QWebPage::SelectPreviousChar), + SIGNAL(triggered(bool)), + SLOT(triggeredSelectPreviousChar(bool))); + connect(browser->pageAction(QWebPage::SelectNextWord), + SIGNAL(triggered(bool)), + SLOT(triggeredSelectNextWord(bool))); + connect(browser->pageAction(QWebPage::SelectPreviousWord), + SIGNAL(triggered(bool)), + SLOT(triggeredSelectPreviousWord(bool))); + connect(browser->pageAction(QWebPage::SelectNextLine), + SIGNAL(triggered(bool)), + SLOT(triggeredSelectNextLine(bool))); + connect(browser->pageAction(QWebPage::SelectPreviousLine), + SIGNAL(triggered(bool)), + SLOT(triggeredSelectPreviousLine(bool))); + connect(browser->pageAction(QWebPage::SelectStartOfLine), + SIGNAL(triggered(bool)), + SLOT(triggeredSelectStartOfLine(bool))); + connect(browser->pageAction(QWebPage::SelectEndOfLine), + SIGNAL(triggered(bool)), + SLOT(triggeredSelectEndOfLine(bool))); + connect(browser->pageAction(QWebPage::SelectStartOfBlock), + SIGNAL(triggered(bool)), + SLOT(triggeredSelectStartOfBlock(bool))); + connect(browser->pageAction(QWebPage::SelectEndOfBlock), + SIGNAL(triggered(bool)), + SLOT(triggeredSelectEndOfBlock(bool))); + connect(browser->pageAction(QWebPage::SelectStartOfDocument), + SIGNAL(triggered(bool)), + SLOT(triggeredSelectStartOfDocument(bool))); + connect(browser->pageAction(QWebPage::SelectEndOfDocument), + SIGNAL(triggered(bool)), + SLOT(triggeredSelectEndOfDocument(bool))); + connect(browser->pageAction(QWebPage::DeleteStartOfWord), + SIGNAL(triggered(bool)), + SLOT(triggeredDeleteStartOfWord(bool))); + connect(browser->pageAction(QWebPage::DeleteEndOfWord), + SIGNAL(triggered(bool)), + SLOT(triggeredDeleteEndOfWord(bool))); + connect(browser->pageAction(QWebPage::SetTextDirectionDefault), + SIGNAL(triggered(bool)), + SLOT(triggeredSetTextDirectionDefault(bool))); + connect(browser->pageAction(QWebPage::SetTextDirectionLeftToRight), + SIGNAL(triggered(bool)), + SLOT(triggeredSetTextDirectionLeftToRight(bool))); + connect(browser->pageAction(QWebPage::SetTextDirectionRightToLeft), + SIGNAL(triggered(bool)), + SLOT(triggeredSetTextDirectionRightToLeft(bool))); + connect(browser->pageAction(QWebPage::ToggleBold), + SIGNAL(triggered(bool)), + SLOT(triggeredToggleBold(bool))); + connect(browser->pageAction(QWebPage::ToggleItalic), + SIGNAL(triggered(bool)), + SLOT(triggeredToggleItalic(bool))); + connect(browser->pageAction(QWebPage::ToggleUnderline), + SIGNAL(triggered(bool)), + SLOT(triggeredToggleUnderline(bool))); + connect(browser->pageAction(QWebPage::InspectElement), + SIGNAL(triggered(bool)), + SLOT(triggeredInspectElement(bool))); + connect(browser->pageAction(QWebPage::InsertParagraphSeparator), + SIGNAL(triggered(bool)), + SLOT(triggeredInsertParagraphSeparator(bool))); + connect(browser->pageAction(QWebPage::InsertLineSeparator), + SIGNAL(triggered(bool)), + SLOT(triggeredInsertLineSeparator(bool))); + connect(browser->pageAction(QWebPage::SelectAll), + SIGNAL(triggered(bool)), + SLOT(triggeredSelectAll(bool))); + // QWebPage + assert(connect(browser->page(), SIGNAL(contentsChanged()), + SLOT(contentsChanged()))); + assert(connect(browser->page(), + SIGNAL(databaseQuotaExceeded(QWebFrame*, QString)), + SLOT(databaseQuotaExceeded(QWebFrame*, QString)))); + assert(connect(browser->page(), + SIGNAL(downloadRequested(const QNetworkRequest&)), + SLOT(downloadRequested(const QNetworkRequest&)))); + assert(connect(browser->page(), SIGNAL(frameCreated(QWebFrame*)), + SLOT(frameCreated(QWebFrame*)))); + assert(connect(browser->page(), + SIGNAL(geometryChangeRequested(const QRect&)), + SLOT(geometryChangeRequested(const QRect&)))); + assert(connect(browser->page(), SIGNAL(linkClicked(const QUrl&)), + SLOT(linkClicked(const QUrl&)))); + assert(connect(browser->page(), + SIGNAL(linkHovered(const QString&, const QString&, + const QString&)), + SLOT(linkHovered(const QString&, const QString&, + const QString&)))); + assert(connect(browser->page(), SIGNAL(loadFinished(bool)), + SLOT(loadFinished(bool)))); + assert(connect(browser->page(), SIGNAL(loadProgress(int)), + SLOT(loadProgress(int)))); + assert(connect(browser->page(), SIGNAL(loadStarted()), + SLOT(loadStarted()))); + assert(connect(browser->page(), + SIGNAL(menuBarVisibilityChangeRequested(bool)), + SLOT(menuBarVisibilityChangeRequested(bool)))); + assert(connect(browser->page(), SIGNAL(microFocusChanged()), + SLOT(microFocusChanged()))); + assert(connect(browser->page(), SIGNAL(printRequested(QWebFrame*)), + SLOT(printRequested(QWebFrame*)))); + assert(connect(browser->page(), SIGNAL(repaintRequested(const QRect&)), + SLOT(repaintRequested(const QRect&)))); + assert(connect(browser->page(), + SIGNAL(restoreFrameStateRequested(QWebFrame*)), + SLOT(restoreFrameStateRequested(QWebFrame*)))); + assert(connect(browser->page(), + SIGNAL(saveFrameStateRequested(QWebFrame*, + QWebHistoryItem*)), + SLOT(saveFrameStateRequested(QWebFrame*, + QWebHistoryItem*)))); + assert(connect(browser->page(), + SIGNAL(scrollRequested(int, int, const QRect&)), + SLOT(scrollRequested(int, int, const QRect&)))); + assert(connect(browser->page(), SIGNAL(selectionChanged()), + SLOT(selectionChanged()))); + assert(connect(browser->page(), SIGNAL(statusBarMessage(const QString&)), + SLOT(statusBarMessage(const QString&)))); + assert(connect(browser->page(), + SIGNAL(statusBarVisibilityChangeRequested(bool)), + SLOT(statusBarVisibilityChangeRequested(bool)))); + assert(connect(browser->page(), + SIGNAL(toolBarVisibilityChangeRequested(bool)), + SLOT(toolBarVisibilityChangeRequested(bool)))); + assert(connect(browser->page(), + SIGNAL(unsupportedContent(QNetworkReply*)), + SLOT(unsupportedContent(QNetworkReply*)))); + assert(connect(browser->page(), SIGNAL(windowCloseRequested()), + SLOT(windowCloseRequested()))); + // QNetworkAccessManager + assert(connect(browser->page()->networkAccessManager(), + SIGNAL(authenticationRequired(QNetworkReply*, + QAuthenticator*)), + SLOT(authenticationRequired(QNetworkReply*, + QAuthenticator*)))); + assert(connect(browser->page()->networkAccessManager(), + SIGNAL(finished(QNetworkReply*)), + SLOT(finished(QNetworkReply*)))); + assert(connect(browser->page()->networkAccessManager(), + SIGNAL(proxyAuthenticationRequired(const QNetworkProxy&, + QAuthenticator*)), + SLOT(proxyAuthenticationRequired(const QNetworkProxy&, + QAuthenticator*)))); + assert(connect(browser->page()->networkAccessManager(), + SIGNAL(sslErrors(QNetworkReply*, const QList&)), + SLOT(sslErrors(QNetworkReply*, const QList&)))); + _tabs->setCurrentIndex(_tabs->addTab(browser, "*empty*")); + _tabs->setTabsClosable(_tabs->count()>1); } - void on_actionClose_triggered() { - LOG; - close(); + void on__tabs_currentChanged(int index) { + } + + void on__tabs_tabCloseRequested(int index) { + _tabs->removeTab(index); + _tabs->setTabsClosable(_tabs->count()>1); } void on_actionPrintPreview_triggered() { QPrintPreviewDialog preview(&_printer, this); connect(&preview, SIGNAL(paintRequested(QPrinter*)), - _browser, SLOT(print(QPrinter*))); + dynamic_cast(_tabs->currentWidget()), + SLOT(print(QPrinter*))); preview.exec(); } void on_actionInstantPrint_triggered() { - _browser->print(&_printer); + dynamic_cast(_tabs->currentWidget())->print(&_printer); } void on_actionPrint_triggered() { @@ -617,6 +636,11 @@ class Browser: public QMainWindow, protected Ui::Browser { on_actionInstantPrint_triggered(); } + void on_actionClose_triggered() { + LOG; + close(); + } + void on_actionProxySettings_triggered() { LOG; if (_proxy) _proxy->show(); @@ -1006,6 +1030,7 @@ class Browser: public QMainWindow, protected Ui::Browser { QString _error; QUrl _errorUrl; QPrinter _printer; + SslClientAuthNetworkAccessManager _networkManager; }; diff --git a/swisssurfer/src/browser.ui b/swisssurfer/src/browser.ui index 1638ecd..34ad779 100644 --- a/swisssurfer/src/browser.ui +++ b/swisssurfer/src/browser.ui @@ -18,7 +18,7 @@ - 0 + -1 Qt::ElideMiddle @@ -32,16 +32,6 @@ true - - - Tab 1 - - - - - - - @@ -83,6 +73,7 @@ &File + @@ -96,26 +87,9 @@ - - - &View - - - - - - - &Proxy Configuration - - - - - Proxy Password - - false @@ -217,44 +191,53 @@ &Proxy... - - Ctrl+P + + + + Print ... - + - Activate Next Subwindow + Print Pre&view ... - - Activate Next Subwindow + + + + Quick &Print - Ctrl+Right + Ctrl+P - + - Print ... + Next Tab + + + Shift+Right - + - Print Pre&view ... + Previous Tab + + + Shift+Left - + - Quick &Print + New Tab + + + Add New Tab + + + Ctrl+T - - - QWebView - QWidget -
QtWebKit/QWebView
- - diff --git a/swisssurfer/src/smartcardauth.cxx b/swisssurfer/src/smartcardauth.cxx index 50fcb5d..1cf8eea 100644 --- a/swisssurfer/src/smartcardauth.cxx +++ b/swisssurfer/src/smartcardauth.cxx @@ -4,10 +4,12 @@ #include "engine_sct.h" #include +#include +#include #include +#include #include -#include ENGINE* e=0; enum_certs_s* certs_found=0; @@ -51,8 +53,26 @@ SmartCardAuth::~SmartCardAuth() { ENGINE_cleanup(); } -int client_cert_cb(SSL*, X509 **x509, EVP_PKEY **pkey) -{ +std::map sockets; + +int client_cert_cb(SSL* ssl, X509 **x509, EVP_PKEY **pkey) { + static std::set allowedUrls; + std::map::iterator it(sockets.find(ssl->ctx)); + if (it!=sockets.end()) { + if (allowedUrls.find(it->second->peerName())==allowedUrls.end()) { + if (QMessageBox::question(0, QObject::tr("Send Authentication?"), + QObject::tr("Do you want to authenticate yourself to" + " %1?") + .arg(it->second->peerName()), + QMessageBox::Yes|QMessageBox::No) + == QMessageBox::Yes) + allowedUrls.insert(it->second->peerName()); + else + return 0; + } + sockets.erase(it); + } + while (!_mutex.tryLock()) QCoreApplication::processEvents(); // NB: Keep in mind that this function is called for EVERY SSL connection to be opened. @@ -128,7 +148,8 @@ int client_cert_cb(SSL*, X509 **x509, EVP_PKEY **pkey) return 1; } -void SmartCardAuth::extendedContextInitialization(SSL_CTX *ctx) +void SmartCardAuth::extendedContextInitialization(ssl_ctx_st *ctx, + QSslSocket *socket) { bool result = false; @@ -154,5 +175,6 @@ void SmartCardAuth::extendedContextInitialization(SSL_CTX *ctx) } #endif + sockets[ctx] = socket; SSL_CTX_set_client_cert_cb(ctx, client_cert_cb); } diff --git a/swisssurfer/src/smartcardauth.hxx b/swisssurfer/src/smartcardauth.hxx index 58f9864..f82811b 100644 --- a/swisssurfer/src/smartcardauth.hxx +++ b/swisssurfer/src/smartcardauth.hxx @@ -2,11 +2,9 @@ #define SMARTCARDAUTH_H #include -#include +#include -class QWidget; - -int client_cert_cb(SSL *ssl, X509 **x509, EVP_PKEY **pkey); +#include class SmartCardAuth: public QObject { Q_OBJECT; @@ -18,7 +16,7 @@ class SmartCardAuth: public QObject { private Q_SLOTS: - void extendedContextInitialization(ssl_ctx_st* ctx); + void extendedContextInitialization(ssl_ctx_st*, QSslSocket*); }; diff --git a/swisssurfer/src/swisssurfer_de.ts b/swisssurfer/src/swisssurfer_de.ts index f49dd7f..52c2cb6 100644 --- a/swisssurfer/src/swisssurfer_de.ts +++ b/swisssurfer/src/swisssurfer_de.ts @@ -11,411 +11,389 @@ - - Tab 1 - - - - + toolBar - + &File - + &Settings - - &View - - - - - &Proxy Configuration - - - - - Proxy Password - - - - + neu laden - + stoppen - + zurückkehren - + weitergehen - + Startseite - + &New Browser - + New Browser Window - + Ctrl+N - + &Close - + Ctrl+W - + &Proxy... - + Ctrl+P + + + Next Tab + + + + + Shift+Right + + + + + Previous Tab + + - - Activate Next Subwindow + Shift+Left + + + + + New Tab - - Ctrl+Right + + Add New Tab + Ctrl+T + + + + Print ... - + Quick &Print &Print - + Print Pre&view ... - + The connection to the proxy server was refused (the proxy server is not accepting requests). the connection to the proxy timed out or the proxy did not reply in time to the request sent - + The proxy requires authentication in order to honour the request but did not accept any credentials offered (if any). the Network Access API cannot honor the request because the protocol is not known - + Checking: %1 Opening: %1 - + Reading: %1 Reading: %1% - - + + <h2>%1</h2><p>%2</p> - + Reply Error - + Network Error - + Zoom: %1% - - %1 - SwissSurfer - - - - - <html><title>Page Load Error</title><body><h1>Page Load Error</h1>%1</body></html> - - - - - - + + + <h2>%1</h2><p>URL: %3</p><p>%2</p> - + <h2>%1</h2><p>URL: %4</p><p>%2</p><h3>SSL Errors</h3><p><ul>%3</ul></p> <h2>%1</h2><p>URL: %3</p><p>%2</p><h3>SSL Errors</h3><p><ul>%3</ul></p> - + Unsuported Content - + access to URL %1 not allowed - + Network connection successful, remote host can be reached. - + The remote server refused the connection (the server is not accepting requests). - + The remote server closed the connection prematurely, before the entire reply was received and processed. - + The remote host name was not found (invalid hostname). - + The connection to the remote server timed out. - + The operation was canceled via calls to abort() or close() before it was finished. - + The SSL/TLS handshake failed and the encrypted channel could not be established. The sslErrors() signal should have been emitted. - + The proxy server closed the connection prematurely, before the entire reply was received and processed. - + The proxy host name was not found (invalid proxy hostname). - + The connection to the proxy timed out or the proxy did not reply in time to the request sent. - + The access to the remote content was denied (similar to HTTP error 401). - + The operation requested on the remote content is not permitted. - + The remote content was not found at the server (similar to HTTP error 404). - + The remote server requires authentication to serve the content but the credentials provided were not accepted (if any). - + The Network Access API cannot honor the request because the protocol is not known. - + The requested operation is invalid for this protocol. - + An unknown network-related error was detected. - + An unknown proxy-related error was detected. - + An unknonwn error related to the remote content was detected. - + A breakdown in protocol was detected (parsing error, invalid or unexpected responses, etc.). - + <strong>Unknown network error (code: %1).</string> - + Illegal URL: %1 - + network error - - + + proxy error - + <h2>%1</h2><p>Proxy: %3</p><p>%2</p><p>%4</p> - + Possible Proxy Failed - + Connection Cannot Be Established - - Info: %1 - - - - - download error - donload error - - - - - done. - - - - + Print Document - + %1 statusbar for hovered link %1=url - + unsupported content - + Forbidden: %1 - + Access Denied - + <p>Access denied due to security considerations.</p><p>You are not allowed to connect to %1. - + authentication required - + Authentication Required - + ssl error - + <li>%1</li> single ssl error - + SSL Error @@ -502,5 +480,15 @@ Try: %1 --help http://swisssign.com + + + Send Authentication? + + + + + Do you want to authenticate yourself to %1? + + diff --git a/swisssurfer/src/swisssurfer_en.ts b/swisssurfer/src/swisssurfer_en.ts index f49dd7f..52c2cb6 100644 --- a/swisssurfer/src/swisssurfer_en.ts +++ b/swisssurfer/src/swisssurfer_en.ts @@ -11,411 +11,389 @@ - - Tab 1 - - - - + toolBar - + &File - + &Settings - - &View - - - - - &Proxy Configuration - - - - - Proxy Password - - - - + neu laden - + stoppen - + zurückkehren - + weitergehen - + Startseite - + &New Browser - + New Browser Window - + Ctrl+N - + &Close - + Ctrl+W - + &Proxy... - + Ctrl+P + + + Next Tab + + + + + Shift+Right + + + + + Previous Tab + + - - Activate Next Subwindow + Shift+Left + + + + + New Tab - - Ctrl+Right + + Add New Tab + Ctrl+T + + + + Print ... - + Quick &Print &Print - + Print Pre&view ... - + The connection to the proxy server was refused (the proxy server is not accepting requests). the connection to the proxy timed out or the proxy did not reply in time to the request sent - + The proxy requires authentication in order to honour the request but did not accept any credentials offered (if any). the Network Access API cannot honor the request because the protocol is not known - + Checking: %1 Opening: %1 - + Reading: %1 Reading: %1% - - + + <h2>%1</h2><p>%2</p> - + Reply Error - + Network Error - + Zoom: %1% - - %1 - SwissSurfer - - - - - <html><title>Page Load Error</title><body><h1>Page Load Error</h1>%1</body></html> - - - - - - + + + <h2>%1</h2><p>URL: %3</p><p>%2</p> - + <h2>%1</h2><p>URL: %4</p><p>%2</p><h3>SSL Errors</h3><p><ul>%3</ul></p> <h2>%1</h2><p>URL: %3</p><p>%2</p><h3>SSL Errors</h3><p><ul>%3</ul></p> - + Unsuported Content - + access to URL %1 not allowed - + Network connection successful, remote host can be reached. - + The remote server refused the connection (the server is not accepting requests). - + The remote server closed the connection prematurely, before the entire reply was received and processed. - + The remote host name was not found (invalid hostname). - + The connection to the remote server timed out. - + The operation was canceled via calls to abort() or close() before it was finished. - + The SSL/TLS handshake failed and the encrypted channel could not be established. The sslErrors() signal should have been emitted. - + The proxy server closed the connection prematurely, before the entire reply was received and processed. - + The proxy host name was not found (invalid proxy hostname). - + The connection to the proxy timed out or the proxy did not reply in time to the request sent. - + The access to the remote content was denied (similar to HTTP error 401). - + The operation requested on the remote content is not permitted. - + The remote content was not found at the server (similar to HTTP error 404). - + The remote server requires authentication to serve the content but the credentials provided were not accepted (if any). - + The Network Access API cannot honor the request because the protocol is not known. - + The requested operation is invalid for this protocol. - + An unknown network-related error was detected. - + An unknown proxy-related error was detected. - + An unknonwn error related to the remote content was detected. - + A breakdown in protocol was detected (parsing error, invalid or unexpected responses, etc.). - + <strong>Unknown network error (code: %1).</string> - + Illegal URL: %1 - + network error - - + + proxy error - + <h2>%1</h2><p>Proxy: %3</p><p>%2</p><p>%4</p> - + Possible Proxy Failed - + Connection Cannot Be Established - - Info: %1 - - - - - download error - donload error - - - - - done. - - - - + Print Document - + %1 statusbar for hovered link %1=url - + unsupported content - + Forbidden: %1 - + Access Denied - + <p>Access denied due to security considerations.</p><p>You are not allowed to connect to %1. - + authentication required - + Authentication Required - + ssl error - + <li>%1</li> single ssl error - + SSL Error @@ -502,5 +480,15 @@ Try: %1 --help http://swisssign.com + + + Send Authentication? + + + + + Do you want to authenticate yourself to %1? + + diff --git a/swisssurfer/src/swisssurfer_fr.ts b/swisssurfer/src/swisssurfer_fr.ts index f49dd7f..52c2cb6 100644 --- a/swisssurfer/src/swisssurfer_fr.ts +++ b/swisssurfer/src/swisssurfer_fr.ts @@ -11,411 +11,389 @@ - - Tab 1 - - - - + toolBar - + &File - + &Settings - - &View - - - - - &Proxy Configuration - - - - - Proxy Password - - - - + neu laden - + stoppen - + zurückkehren - + weitergehen - + Startseite - + &New Browser - + New Browser Window - + Ctrl+N - + &Close - + Ctrl+W - + &Proxy... - + Ctrl+P + + + Next Tab + + + + + Shift+Right + + + + + Previous Tab + + - - Activate Next Subwindow + Shift+Left + + + + + New Tab - - Ctrl+Right + + Add New Tab + Ctrl+T + + + + Print ... - + Quick &Print &Print - + Print Pre&view ... - + The connection to the proxy server was refused (the proxy server is not accepting requests). the connection to the proxy timed out or the proxy did not reply in time to the request sent - + The proxy requires authentication in order to honour the request but did not accept any credentials offered (if any). the Network Access API cannot honor the request because the protocol is not known - + Checking: %1 Opening: %1 - + Reading: %1 Reading: %1% - - + + <h2>%1</h2><p>%2</p> - + Reply Error - + Network Error - + Zoom: %1% - - %1 - SwissSurfer - - - - - <html><title>Page Load Error</title><body><h1>Page Load Error</h1>%1</body></html> - - - - - - + + + <h2>%1</h2><p>URL: %3</p><p>%2</p> - + <h2>%1</h2><p>URL: %4</p><p>%2</p><h3>SSL Errors</h3><p><ul>%3</ul></p> <h2>%1</h2><p>URL: %3</p><p>%2</p><h3>SSL Errors</h3><p><ul>%3</ul></p> - + Unsuported Content - + access to URL %1 not allowed - + Network connection successful, remote host can be reached. - + The remote server refused the connection (the server is not accepting requests). - + The remote server closed the connection prematurely, before the entire reply was received and processed. - + The remote host name was not found (invalid hostname). - + The connection to the remote server timed out. - + The operation was canceled via calls to abort() or close() before it was finished. - + The SSL/TLS handshake failed and the encrypted channel could not be established. The sslErrors() signal should have been emitted. - + The proxy server closed the connection prematurely, before the entire reply was received and processed. - + The proxy host name was not found (invalid proxy hostname). - + The connection to the proxy timed out or the proxy did not reply in time to the request sent. - + The access to the remote content was denied (similar to HTTP error 401). - + The operation requested on the remote content is not permitted. - + The remote content was not found at the server (similar to HTTP error 404). - + The remote server requires authentication to serve the content but the credentials provided were not accepted (if any). - + The Network Access API cannot honor the request because the protocol is not known. - + The requested operation is invalid for this protocol. - + An unknown network-related error was detected. - + An unknown proxy-related error was detected. - + An unknonwn error related to the remote content was detected. - + A breakdown in protocol was detected (parsing error, invalid or unexpected responses, etc.). - + <strong>Unknown network error (code: %1).</string> - + Illegal URL: %1 - + network error - - + + proxy error - + <h2>%1</h2><p>Proxy: %3</p><p>%2</p><p>%4</p> - + Possible Proxy Failed - + Connection Cannot Be Established - - Info: %1 - - - - - download error - donload error - - - - - done. - - - - + Print Document - + %1 statusbar for hovered link %1=url - + unsupported content - + Forbidden: %1 - + Access Denied - + <p>Access denied due to security considerations.</p><p>You are not allowed to connect to %1. - + authentication required - + Authentication Required - + ssl error - + <li>%1</li> single ssl error - + SSL Error @@ -502,5 +480,15 @@ Try: %1 --help http://swisssign.com + + + Send Authentication? + + + + + Do you want to authenticate yourself to %1? + + diff --git a/swisssurfer/src/swisssurfer_it.ts b/swisssurfer/src/swisssurfer_it.ts index f49dd7f..52c2cb6 100644 --- a/swisssurfer/src/swisssurfer_it.ts +++ b/swisssurfer/src/swisssurfer_it.ts @@ -11,411 +11,389 @@ - - Tab 1 - - - - + toolBar - + &File - + &Settings - - &View - - - - - &Proxy Configuration - - - - - Proxy Password - - - - + neu laden - + stoppen - + zurückkehren - + weitergehen - + Startseite - + &New Browser - + New Browser Window - + Ctrl+N - + &Close - + Ctrl+W - + &Proxy... - + Ctrl+P + + + Next Tab + + + + + Shift+Right + + + + + Previous Tab + + - - Activate Next Subwindow + Shift+Left + + + + + New Tab - - Ctrl+Right + + Add New Tab + Ctrl+T + + + + Print ... - + Quick &Print &Print - + Print Pre&view ... - + The connection to the proxy server was refused (the proxy server is not accepting requests). the connection to the proxy timed out or the proxy did not reply in time to the request sent - + The proxy requires authentication in order to honour the request but did not accept any credentials offered (if any). the Network Access API cannot honor the request because the protocol is not known - + Checking: %1 Opening: %1 - + Reading: %1 Reading: %1% - - + + <h2>%1</h2><p>%2</p> - + Reply Error - + Network Error - + Zoom: %1% - - %1 - SwissSurfer - - - - - <html><title>Page Load Error</title><body><h1>Page Load Error</h1>%1</body></html> - - - - - - + + + <h2>%1</h2><p>URL: %3</p><p>%2</p> - + <h2>%1</h2><p>URL: %4</p><p>%2</p><h3>SSL Errors</h3><p><ul>%3</ul></p> <h2>%1</h2><p>URL: %3</p><p>%2</p><h3>SSL Errors</h3><p><ul>%3</ul></p> - + Unsuported Content - + access to URL %1 not allowed - + Network connection successful, remote host can be reached. - + The remote server refused the connection (the server is not accepting requests). - + The remote server closed the connection prematurely, before the entire reply was received and processed. - + The remote host name was not found (invalid hostname). - + The connection to the remote server timed out. - + The operation was canceled via calls to abort() or close() before it was finished. - + The SSL/TLS handshake failed and the encrypted channel could not be established. The sslErrors() signal should have been emitted. - + The proxy server closed the connection prematurely, before the entire reply was received and processed. - + The proxy host name was not found (invalid proxy hostname). - + The connection to the proxy timed out or the proxy did not reply in time to the request sent. - + The access to the remote content was denied (similar to HTTP error 401). - + The operation requested on the remote content is not permitted. - + The remote content was not found at the server (similar to HTTP error 404). - + The remote server requires authentication to serve the content but the credentials provided were not accepted (if any). - + The Network Access API cannot honor the request because the protocol is not known. - + The requested operation is invalid for this protocol. - + An unknown network-related error was detected. - + An unknown proxy-related error was detected. - + An unknonwn error related to the remote content was detected. - + A breakdown in protocol was detected (parsing error, invalid or unexpected responses, etc.). - + <strong>Unknown network error (code: %1).</string> - + Illegal URL: %1 - + network error - - + + proxy error - + <h2>%1</h2><p>Proxy: %3</p><p>%2</p><p>%4</p> - + Possible Proxy Failed - + Connection Cannot Be Established - - Info: %1 - - - - - download error - donload error - - - - - done. - - - - + Print Document - + %1 statusbar for hovered link %1=url - + unsupported content - + Forbidden: %1 - + Access Denied - + <p>Access denied due to security considerations.</p><p>You are not allowed to connect to %1. - + authentication required - + Authentication Required - + ssl error - + <li>%1</li> single ssl error - + SSL Error @@ -502,5 +480,15 @@ Try: %1 --help http://swisssign.com + + + Send Authentication? + + + + + Do you want to authenticate yourself to %1? + +