From 96a3f1e4fe3a8e56b0af08f65111a3ce8d6b343f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Thu, 9 Jun 2011 08:58:01 +0000 Subject: [PATCH] closes #65 --- swisssurfer/src/browser.hxx | 10 ++- swisssurfer/src/browser.ui | 6 ++ swisssurfer/src/qmake.pro.in | 2 +- swisssurfer/src/swisssurfer_de.ts | 125 ++++++++++++++++-------------- swisssurfer/src/swisssurfer_en.ts | 125 ++++++++++++++++-------------- swisssurfer/src/swisssurfer_fr.ts | 125 ++++++++++++++++-------------- swisssurfer/src/swisssurfer_it.ts | 125 ++++++++++++++++-------------- 7 files changed, 275 insertions(+), 243 deletions(-) diff --git a/swisssurfer/src/browser.hxx b/swisssurfer/src/browser.hxx index d7c41cc..06b6fca 100644 --- a/swisssurfer/src/browser.hxx +++ b/swisssurfer/src/browser.hxx @@ -38,6 +38,7 @@ #include #include #include +#include #include #include @@ -60,7 +61,8 @@ class Browser: public QMainWindow, protected Ui::Browser { _url(0), _clearUrl(0), _addBookmark(0), _find(0), _kiosk(kiosk), _settings(mimeTypes, this, settings, !kiosk), - _errorLog(this), _logincertificate(this) { + _errorLog(this), _logincertificate(this), + _proxy("http://swisssign.com", this) { LOG<addPermanentWidget(_progress = new QProgressBar()); _progress -> setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); @@ -616,6 +617,10 @@ class Browser: public QMainWindow, protected Ui::Browser { delete _find; _find=0; } + void on_actionProxy_triggered() { + _proxy.show(); + } + void on_actionLoginCertificate_triggered() { _logincertificate.show(); } @@ -1228,6 +1233,7 @@ class Browser: public QMainWindow, protected Ui::Browser { Settings _settings; ErrorLog _errorLog; LoginCertificate _logincertificate; + gui::Proxy _proxy; }; #endif diff --git a/swisssurfer/src/browser.ui b/swisssurfer/src/browser.ui index 7d3aac5..b08261f 100644 --- a/swisssurfer/src/browser.ui +++ b/swisssurfer/src/browser.ui @@ -93,6 +93,7 @@ + @@ -315,6 +316,11 @@ User Login Certificate + + + &Proxy ... + + diff --git a/swisssurfer/src/qmake.pro.in b/swisssurfer/src/qmake.pro.in index f91c400..1f5dab7 100644 --- a/swisssurfer/src/qmake.pro.in +++ b/swisssurfer/src/qmake.pro.in @@ -7,7 +7,7 @@ unix { CONFIG += debug QMAKE_INCDIR += /usr/include/PCSC QMAKE_INCDIR += /usr/local/include/PCSC - QMAKE_LIBS += -lpcsclite + QMAKE_LIBS += -lpcsclite -lproxy } } macx { diff --git a/swisssurfer/src/swisssurfer_de.ts b/swisssurfer/src/swisssurfer_de.ts index 960f26b..e17a2f6 100644 --- a/swisssurfer/src/swisssurfer_de.ts +++ b/swisssurfer/src/swisssurfer_de.ts @@ -54,285 +54,290 @@ - + Info - + History - + neu laden - + F5 - + stoppen - + zurückkehren - + weitergehen - + Startseite - + Ctrl+Home - + &New Browser - + New Browser Window - + Ctrl+N - + &Close - + &Proxy... - + Ctrl+P - + Next Tab - + Shift+Right - + Previous Tab - + Shift+Left - + New Tab - + Add New Tab - + Ctrl+T - + Find - + Close Find - + &About - + &Settings ... - + &Reverse Find - + Ctrl+R - + Error Log - + show error logs - + User Login Certificate - - + + &Proxy ... + + + + + Esc - + find in page - + Ctrl+F - + Print ... - + Quick &Print &Print - + Print Pre&view ... - + Checking: %1 Opening: %1 - + Reading: %1 Reading: %1% - + Zoom: %1% - + Illegal URL: %1 - + Print Document - + %1 - %2 Back to %1 - %2 statusbar actionBack_hovered %1=url %2=title - + Info: %1 - + done. - + page load error. - + %1 statusbar for hovered link %1=url - + Forbidden: %1 - + SSL Not Supported - + SSL is not supported on your system - + Access Denied - + <p>Access denied due to security considerations.</p><p>You are not allowed to connect to %1. - + %1 - %2 statusbar actionForward_hovered %1=url %2=title - + About - + SwissSurfer %1 (%2) %3 @@ -346,22 +351,22 @@ Compiled: qt-%5 - + %1 - + Save File As ... - + authentication required - + ssl error diff --git a/swisssurfer/src/swisssurfer_en.ts b/swisssurfer/src/swisssurfer_en.ts index a45dd45..294ee1b 100644 --- a/swisssurfer/src/swisssurfer_en.ts +++ b/swisssurfer/src/swisssurfer_en.ts @@ -53,260 +53,265 @@ - + History - + Info - + neu laden - + F5 - + stoppen - - + + Esc - + zurückkehren - + weitergehen - + Startseite - + Ctrl+Home - + &New Browser - + New Browser Window - + Ctrl+N - + &Close - + &Proxy... - + Print ... - + Print Pre&view ... - + Quick &Print - + Ctrl+P - + Next Tab - + Shift+Right - + Previous Tab - + Shift+Left - + New Tab - + Add New Tab - + Ctrl+T - + Find - + find in page - + Ctrl+F - + Close Find - + &About - + &Settings ... - + &Reverse Find - + Ctrl+R - + Error Log - + show error logs - + User Login Certificate - + + &Proxy ... + + + + Checking: %1 - + SSL Not Supported - + SSL is not supported on your system - + Forbidden: %1 - + Access Denied - + <p>Access denied due to security considerations.</p><p>You are not allowed to connect to %1. - + Reading: %1 - + Illegal URL: %1 - + Zoom: %1% - + Print Document - + %1 - %2 statusbar actionBack_hovered %1=url %2=title - + %1 - %2 statusbar actionForward_hovered %1=url %2=title - + About - + SwissSurfer %1 (%2) %3 @@ -315,43 +320,43 @@ Compiled: qt-%5 - + %1 - + Info: %1 - + done. - + page load error. - + %1 statusbar for hovered link %1=url - + Save File As ... - + authentication required - + ssl error diff --git a/swisssurfer/src/swisssurfer_fr.ts b/swisssurfer/src/swisssurfer_fr.ts index 960f26b..e17a2f6 100644 --- a/swisssurfer/src/swisssurfer_fr.ts +++ b/swisssurfer/src/swisssurfer_fr.ts @@ -54,285 +54,290 @@ - + Info - + History - + neu laden - + F5 - + stoppen - + zurückkehren - + weitergehen - + Startseite - + Ctrl+Home - + &New Browser - + New Browser Window - + Ctrl+N - + &Close - + &Proxy... - + Ctrl+P - + Next Tab - + Shift+Right - + Previous Tab - + Shift+Left - + New Tab - + Add New Tab - + Ctrl+T - + Find - + Close Find - + &About - + &Settings ... - + &Reverse Find - + Ctrl+R - + Error Log - + show error logs - + User Login Certificate - - + + &Proxy ... + + + + + Esc - + find in page - + Ctrl+F - + Print ... - + Quick &Print &Print - + Print Pre&view ... - + Checking: %1 Opening: %1 - + Reading: %1 Reading: %1% - + Zoom: %1% - + Illegal URL: %1 - + Print Document - + %1 - %2 Back to %1 - %2 statusbar actionBack_hovered %1=url %2=title - + Info: %1 - + done. - + page load error. - + %1 statusbar for hovered link %1=url - + Forbidden: %1 - + SSL Not Supported - + SSL is not supported on your system - + Access Denied - + <p>Access denied due to security considerations.</p><p>You are not allowed to connect to %1. - + %1 - %2 statusbar actionForward_hovered %1=url %2=title - + About - + SwissSurfer %1 (%2) %3 @@ -346,22 +351,22 @@ Compiled: qt-%5 - + %1 - + Save File As ... - + authentication required - + ssl error diff --git a/swisssurfer/src/swisssurfer_it.ts b/swisssurfer/src/swisssurfer_it.ts index 960f26b..e17a2f6 100644 --- a/swisssurfer/src/swisssurfer_it.ts +++ b/swisssurfer/src/swisssurfer_it.ts @@ -54,285 +54,290 @@ - + Info - + History - + neu laden - + F5 - + stoppen - + zurückkehren - + weitergehen - + Startseite - + Ctrl+Home - + &New Browser - + New Browser Window - + Ctrl+N - + &Close - + &Proxy... - + Ctrl+P - + Next Tab - + Shift+Right - + Previous Tab - + Shift+Left - + New Tab - + Add New Tab - + Ctrl+T - + Find - + Close Find - + &About - + &Settings ... - + &Reverse Find - + Ctrl+R - + Error Log - + show error logs - + User Login Certificate - - + + &Proxy ... + + + + + Esc - + find in page - + Ctrl+F - + Print ... - + Quick &Print &Print - + Print Pre&view ... - + Checking: %1 Opening: %1 - + Reading: %1 Reading: %1% - + Zoom: %1% - + Illegal URL: %1 - + Print Document - + %1 - %2 Back to %1 - %2 statusbar actionBack_hovered %1=url %2=title - + Info: %1 - + done. - + page load error. - + %1 statusbar for hovered link %1=url - + Forbidden: %1 - + SSL Not Supported - + SSL is not supported on your system - + Access Denied - + <p>Access denied due to security considerations.</p><p>You are not allowed to connect to %1. - + %1 - %2 statusbar actionForward_hovered %1=url %2=title - + About - + SwissSurfer %1 (%2) %3 @@ -346,22 +351,22 @@ Compiled: qt-%5 - + %1 - + Save File As ... - + authentication required - + ssl error