From 57fa0ea1091a3115e2d169c80feb7400d25335fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Wed, 21 Sep 2011 12:00:34 +0000 Subject: [PATCH] Changed QComboBox to QEditText for kiosk mode - fixed key-shortcuts + close tab; refs #102 --- swisssurfer/src/browser.hxx | 6 +- swisssurfer/src/browser.ui | 18 +++- swisssurfer/src/swisssurfer_de.ts | 161 ++++++++++++++++-------------- swisssurfer/src/swisssurfer_en.ts | 161 ++++++++++++++++-------------- swisssurfer/src/swisssurfer_fr.ts | 161 ++++++++++++++++-------------- swisssurfer/src/swisssurfer_it.ts | 161 ++++++++++++++++-------------- 6 files changed, 359 insertions(+), 309 deletions(-) diff --git a/swisssurfer/src/browser.hxx b/swisssurfer/src/browser.hxx index c2d90d5..ad20b30 100644 --- a/swisssurfer/src/browser.hxx +++ b/swisssurfer/src/browser.hxx @@ -140,7 +140,7 @@ class Browser: public QMainWindow, protected Ui::Browser { actionNew->setVisible(false); actionNewTab->setEnabled(false); actionNewTab->setVisible(false); - } else { + actionCloseTab->setVisible(false); } if (!_kiosk && _settings.flag("SaveWindowState") && _settings()) loadWin(urls.size()); @@ -518,6 +518,10 @@ class Browser: public QMainWindow, protected Ui::Browser { newTab(); } + void on_actionCloseTab_triggered() { + on__tabs_tabCloseRequested(_tabs->currentIndex()); + } + void on__tabs_currentChanged(int index) { if (qobject_cast(_url)) qobject_cast(_url)->setEditText diff --git a/swisssurfer/src/browser.ui b/swisssurfer/src/browser.ui index 6f77368..ddad1a8 100644 --- a/swisssurfer/src/browser.ui +++ b/swisssurfer/src/browser.ui @@ -82,6 +82,7 @@ + @@ -217,10 +218,7 @@ :/icons/close:/icons/close - &Close - - - Ctrl+W + &Quit @@ -434,6 +432,18 @@ clear find bar + + + + :/icons/close:/icons/close + + + &Close Tab + + + Ctrl+W + + diff --git a/swisssurfer/src/swisssurfer_de.ts b/swisssurfer/src/swisssurfer_de.ts index db5a5de..794257b 100644 --- a/swisssurfer/src/swisssurfer_de.ts +++ b/swisssurfer/src/swisssurfer_de.ts @@ -49,240 +49,249 @@ - + Edit - + Info - + History - + neu laden - + F5 - + stoppen - + zurückkehren - + weitergehen - + Startseite - + Ctrl+Home - + &New Browser - + New Browser Window - + Ctrl+N - - &Close + + Ctrl+W - - Ctrl+W + + &Proxy... - - &Proxy... + + &Quit - + 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 ... - + Clear Location - + clear location bar - + Add Bookmark - + add bookmark to location bar - + Ctrl+D - + &Bookmarks - + Clear Find - + clear find bar - - - + + &Close Tab + + + + + Esc - + find in page - + Ctrl+F - + Print ... - + Quick &Print &Print - + Print Pre&view ... @@ -309,29 +318,29 @@ - + Print Document - + %1 - %2 Back to %1 - %2 statusbar actionBack_hovered %1=url %2=title - + Info: %1 - + done. - + %1 statusbar for hovered link %1=url @@ -362,42 +371,42 @@ - + %1 - %2 statusbar actionForward_hovered %1=url %2=title - - - + + + background-color: white neutral find - - + + background-color: #ADA background-color: #7F7 text found - - + + background-color: #F77 background-color: lightred text not found - + About - + %8 Version: %1 Builddate: %2 @@ -417,42 +426,42 @@ openssl-%7 - + %1 - + Save File As ... - + errors show error log - - + + background-color: #F77 invalid url - - + + background-color: white valid url - + authentication required - + ssl error diff --git a/swisssurfer/src/swisssurfer_en.ts b/swisssurfer/src/swisssurfer_en.ts index 380a1b4..36b6def 100644 --- a/swisssurfer/src/swisssurfer_en.ts +++ b/swisssurfer/src/swisssurfer_en.ts @@ -48,242 +48,251 @@ - + Edit - + History - + Info - + neu laden - + F5 - + stoppen - - - + + Esc - + zurückkehren - + weitergehen - + Startseite - + Ctrl+Home - + &New Browser - + New Browser Window - + Ctrl+N - - &Close + + Ctrl+W - - Ctrl+W + + &Proxy... - - &Proxy... + + &Quit - + 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 ... - + Clear Location - + clear location bar - + Add Bookmark - + add bookmark to location bar - + Ctrl+D - + &Bookmarks - + Clear Find - + clear find bar + + + &Close Tab + + Checking: %1 @@ -330,53 +339,53 @@ - + Print Document - + %1 - %2 statusbar actionBack_hovered %1=url %2=title - + %1 - %2 statusbar actionForward_hovered %1=url %2=title - - - + + + background-color: white neutral find - - + + background-color: #ADA background-color: #7F7 text found - - + + background-color: #F77 background-color: lightred text not found - + About - + %8 Version: %1 Builddate: %2 @@ -396,58 +405,58 @@ openssl-%7 - + %1 - + Info: %1 - + done. - + %1 statusbar for hovered link %1=url - + Save File As ... - + errors show error log - - + + background-color: #F77 invalid url - - + + background-color: white valid url - + authentication required - + ssl error diff --git a/swisssurfer/src/swisssurfer_fr.ts b/swisssurfer/src/swisssurfer_fr.ts index db5a5de..794257b 100644 --- a/swisssurfer/src/swisssurfer_fr.ts +++ b/swisssurfer/src/swisssurfer_fr.ts @@ -49,240 +49,249 @@ - + Edit - + Info - + History - + neu laden - + F5 - + stoppen - + zurückkehren - + weitergehen - + Startseite - + Ctrl+Home - + &New Browser - + New Browser Window - + Ctrl+N - - &Close + + Ctrl+W - - Ctrl+W + + &Proxy... - - &Proxy... + + &Quit - + 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 ... - + Clear Location - + clear location bar - + Add Bookmark - + add bookmark to location bar - + Ctrl+D - + &Bookmarks - + Clear Find - + clear find bar - - - + + &Close Tab + + + + + Esc - + find in page - + Ctrl+F - + Print ... - + Quick &Print &Print - + Print Pre&view ... @@ -309,29 +318,29 @@ - + Print Document - + %1 - %2 Back to %1 - %2 statusbar actionBack_hovered %1=url %2=title - + Info: %1 - + done. - + %1 statusbar for hovered link %1=url @@ -362,42 +371,42 @@ - + %1 - %2 statusbar actionForward_hovered %1=url %2=title - - - + + + background-color: white neutral find - - + + background-color: #ADA background-color: #7F7 text found - - + + background-color: #F77 background-color: lightred text not found - + About - + %8 Version: %1 Builddate: %2 @@ -417,42 +426,42 @@ openssl-%7 - + %1 - + Save File As ... - + errors show error log - - + + background-color: #F77 invalid url - - + + background-color: white valid url - + authentication required - + ssl error diff --git a/swisssurfer/src/swisssurfer_it.ts b/swisssurfer/src/swisssurfer_it.ts index 8a8b0e7..0347156 100644 --- a/swisssurfer/src/swisssurfer_it.ts +++ b/swisssurfer/src/swisssurfer_it.ts @@ -48,242 +48,251 @@ - + Edit - + History - + Info - + neu laden - + F5 - + stoppen - - - + + Esc - + zurückkehren - + weitergehen - + Startseite - + Ctrl+Home - + &New Browser - + New Browser Window - + Ctrl+N - - &Close + + Ctrl+W - - Ctrl+W + + &Proxy... - - &Proxy... + + &Quit - + 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 ... - + Clear Location - + clear location bar - + Add Bookmark - + add bookmark to location bar - + Ctrl+D - + &Bookmarks - + Clear Find - + clear find bar + + + &Close Tab + + SSL Not Supported @@ -330,51 +339,51 @@ - + Print Document - + %1 - %2 statusbar actionBack_hovered %1=url %2=title - + %1 - %2 statusbar actionForward_hovered %1=url %2=title - - - + + + background-color: white neutral find - - + + background-color: #ADA text found - - + + background-color: #F77 text not found - + About - + %8 Version: %1 Builddate: %2 @@ -386,58 +395,58 @@ openssl-%7 - + %1 - + Info: %1 - + done. - + %1 statusbar for hovered link %1=url - + Save File As ... - + errors show error log - - + + background-color: #F77 invalid url - - + + background-color: white valid url - + authentication required - + ssl error