From 7fff4b627b7c2248d5a4da1038313d55fcefa664 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Wed, 19 Oct 2016 09:43:56 +0200 Subject: [PATCH 1/4] MouseGestures: Use same code to create new tab as BrowserWindow Closes #2089 --- src/plugins/MouseGestures/mousegestures.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/plugins/MouseGestures/mousegestures.cpp b/src/plugins/MouseGestures/mousegestures.cpp index cb0b127cf..021c1c7ff 100644 --- a/src/plugins/MouseGestures/mousegestures.cpp +++ b/src/plugins/MouseGestures/mousegestures.cpp @@ -1,6 +1,6 @@ /* ============================================================ * Mouse Gestures plugin for QupZilla -* Copyright (C) 2013-2014 David Rosca +* Copyright (C) 2013-2016 David Rosca * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -183,7 +183,11 @@ void MouseGestures::downGestured() return; TabWidget* tabWidget = window->tabWidget(); - tabWidget->addView(QUrl(), Qz::NT_SelectedNewEmptyTab); + tabWidget->addView(QUrl(), Qz::NT_SelectedNewEmptyTab, true); + tabWidget->setCurrentTabFresh(true); + + if (window->isFullScreen()) + window->showNavigationWithFullScreen(); } void MouseGestures::leftGestured() From 5d60037e71062a23cf5982f24b24c7d9de0bd3f8 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Mon, 24 Oct 2016 17:25:44 +0200 Subject: [PATCH 2/4] Update translations --- src/plugins/AccessKeysNavigation/translations/pl_PL.ts | 4 ++-- src/plugins/AccessKeysNavigation/translations/zh_HK.ts | 8 ++++---- src/plugins/GreaseMonkey/translations/he_IL.ts | 8 ++++---- src/plugins/GreaseMonkey/translations/nl_NL.ts | 2 +- src/plugins/GreaseMonkey/translations/pl_PL.ts | 8 ++++---- src/plugins/MouseGestures/translations/ca_ES.ts | 2 +- src/plugins/MouseGestures/translations/pl_PL.ts | 2 +- src/plugins/MouseGestures/translations/sk_SK.ts | 2 +- src/plugins/StatusBarIcons/translations/ca_ES.ts | 6 +++--- src/plugins/StatusBarIcons/translations/pl_PL.ts | 6 +++--- src/plugins/StatusBarIcons/translations/sk_SK.ts | 6 +++--- 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/plugins/AccessKeysNavigation/translations/pl_PL.ts b/src/plugins/AccessKeysNavigation/translations/pl_PL.ts index 5fe61f2f3..cc3885c38 100644 --- a/src/plugins/AccessKeysNavigation/translations/pl_PL.ts +++ b/src/plugins/AccessKeysNavigation/translations/pl_PL.ts @@ -1,4 +1,4 @@ - + AKN_Settings @@ -34,7 +34,7 @@ Key for showing access keys: - Klawsz pokazujący klawisze dostępu: + Klawisz pokazujący klawisze dostępu: diff --git a/src/plugins/AccessKeysNavigation/translations/zh_HK.ts b/src/plugins/AccessKeysNavigation/translations/zh_HK.ts index 94a341a2c..99be90849 100644 --- a/src/plugins/AccessKeysNavigation/translations/zh_HK.ts +++ b/src/plugins/AccessKeysNavigation/translations/zh_HK.ts @@ -4,12 +4,12 @@ Access Keys Navigation - 訪問密鑰導覽 + 鍵盤網頁導覽 <h1>Access Keys Navigation</h1> - <h1>訪問密鑰導覽</h1> + <h1>鍵盤網頁導覽</h1> @@ -29,12 +29,12 @@ Double press - 雙按 + 按兩下 Key for showing access keys: - + 鍵盤網頁導覽啟用鍵： diff --git a/src/plugins/GreaseMonkey/translations/he_IL.ts b/src/plugins/GreaseMonkey/translations/he_IL.ts index 798a076fd..ebafd43c0 100644 --- a/src/plugins/GreaseMonkey/translations/he_IL.ts +++ b/src/plugins/GreaseMonkey/translations/he_IL.ts @@ -70,7 +70,7 @@ '%1' is already installed - + '%1' כבר מותקן @@ -179,7 +179,7 @@ Start at: - מתחיל ב: + מתחיל עם: @@ -189,12 +189,12 @@ Runs at: - רץ אצל: + רץ בתחום: Does not run at: - לא רץ אצל: + לא רץ בתחום: diff --git a/src/plugins/GreaseMonkey/translations/nl_NL.ts b/src/plugins/GreaseMonkey/translations/nl_NL.ts index bf50917d9..46f70b886 100644 --- a/src/plugins/GreaseMonkey/translations/nl_NL.ts +++ b/src/plugins/GreaseMonkey/translations/nl_NL.ts @@ -70,7 +70,7 @@ '%1' is already installed - + '%1' is al geïnstalleerd diff --git a/src/plugins/GreaseMonkey/translations/pl_PL.ts b/src/plugins/GreaseMonkey/translations/pl_PL.ts index a89d5bc00..79c247da6 100644 --- a/src/plugins/GreaseMonkey/translations/pl_PL.ts +++ b/src/plugins/GreaseMonkey/translations/pl_PL.ts @@ -70,7 +70,7 @@ '%1' is already installed - + '%1' jest już zainstalowany @@ -126,7 +126,7 @@ New user script - + Nowy skrypt użytkownika @@ -141,12 +141,12 @@ Add script - + Dodaj skrypt Choose name for script: - + Podaj nazwę dla skryptu: diff --git a/src/plugins/MouseGestures/translations/ca_ES.ts b/src/plugins/MouseGestures/translations/ca_ES.ts index 4b40234e0..8272f1180 100644 --- a/src/plugins/MouseGestures/translations/ca_ES.ts +++ b/src/plugins/MouseGestures/translations/ca_ES.ts @@ -94,7 +94,7 @@ <b>Duplicate</b><br/>Duplicate current tab - + <b>Duplica</b><br/>Duplica la pestanya actual diff --git a/src/plugins/MouseGestures/translations/pl_PL.ts b/src/plugins/MouseGestures/translations/pl_PL.ts index f047fa678..c395d4dc6 100644 --- a/src/plugins/MouseGestures/translations/pl_PL.ts +++ b/src/plugins/MouseGestures/translations/pl_PL.ts @@ -94,7 +94,7 @@ <b>Duplicate</b><br/>Duplicate current tab - + <b>Duplikuj</b><br/>Duplikuje aktualną kartę diff --git a/src/plugins/MouseGestures/translations/sk_SK.ts b/src/plugins/MouseGestures/translations/sk_SK.ts index b5242cf1e..d18084836 100644 --- a/src/plugins/MouseGestures/translations/sk_SK.ts +++ b/src/plugins/MouseGestures/translations/sk_SK.ts @@ -94,7 +94,7 @@ <b>Duplicate</b><br/>Duplicate current tab - + <b>Duplikovať</b><br/>Duplikovať aktuálnu kartu diff --git a/src/plugins/StatusBarIcons/translations/ca_ES.ts b/src/plugins/StatusBarIcons/translations/ca_ES.ts index 0b5792b64..28966c4f2 100644 --- a/src/plugins/StatusBarIcons/translations/ca_ES.ts +++ b/src/plugins/StatusBarIcons/translations/ca_ES.ts @@ -164,7 +164,7 @@ Are you sure you want to remove current proxy? - + Esteu segur que voleu suprimir el servidor intermediari actual? @@ -202,12 +202,12 @@ S&ystem proxy configuration - + Configuració del servidor intermediari del s&istema &Manual configuration - + Configuració &manual diff --git a/src/plugins/StatusBarIcons/translations/pl_PL.ts b/src/plugins/StatusBarIcons/translations/pl_PL.ts index a0340fc5f..fc28e7a5b 100644 --- a/src/plugins/StatusBarIcons/translations/pl_PL.ts +++ b/src/plugins/StatusBarIcons/translations/pl_PL.ts @@ -164,7 +164,7 @@ Are you sure you want to remove current proxy? - + Na pewno chcesz usunąć aktualne proxy? @@ -202,12 +202,12 @@ S&ystem proxy configuration - + S&ystemowe ustawienia proxy &Manual configuration - + &Ręczna konfiguracja diff --git a/src/plugins/StatusBarIcons/translations/sk_SK.ts b/src/plugins/StatusBarIcons/translations/sk_SK.ts index 328db3e1f..b517d16e9 100644 --- a/src/plugins/StatusBarIcons/translations/sk_SK.ts +++ b/src/plugins/StatusBarIcons/translations/sk_SK.ts @@ -164,7 +164,7 @@ Are you sure you want to remove current proxy? - + Ste si istý, že chcete odstrániť aktuálne proxy? @@ -202,12 +202,12 @@ S&ystem proxy configuration - + S&ystémové nastavenia proxy &Manual configuration - + &Ručné nastavenie From dd388cdf1f75f89281532c8eed573e28416a25c7 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Mon, 24 Oct 2016 17:35:49 +0200 Subject: [PATCH 3/4] Version 2.0.2 --- CHANGELOG | 12 ++++++++++++ README.md | 2 +- haiku/QupZilla.rdef | 2 +- src/defines.pri | 2 +- src/main/Info.plist | 4 ++-- src/main/appicon.rc | 8 ++++---- windows/installer.nsi | 2 +- 7 files changed, 22 insertions(+), 10 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index c8d7f8fab..65c510edc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,15 @@ +Version 2.0.1 + * released 24 October 2016 + * update default user-agent strings + * add short command line variant for all options + * show navigation bar when adding new tab in fullscreen + * supermenu button is no longer hidden in fullscreen + * fix overwriting speed dial title when loading fails + * fix positions of speed dials in rtl + * fix context menu actions when site specifies base href + * fix issue with tabbar sometimes being invisible when leaving fullscreen + * Windows: fix background radient in browsing library + Version 2.0.1 * released 8 June 2016 * don't force enabling HighDPI scaling by default diff --git a/README.md b/README.md index 9c7ed3f5b..e95ee69dd 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ You need to specify path to `macdeployqt` only if it is not in PATH. Current version ---------------------------------------------------------------------------------------- -The current stable version of QupZilla is 2.0.1. You can download precompiled packages +The current stable version of QupZilla is 2.0.2. You can download precompiled packages and the sources from the download section at [homepage](http://www.qupzilla.com/download). However, if you want the latest revision, just take the latest code snapshot either by downloading a tarball or running: diff --git a/haiku/QupZilla.rdef b/haiku/QupZilla.rdef index 1e59dd500..ca7e896ae 100644 --- a/haiku/QupZilla.rdef +++ b/haiku/QupZilla.rdef @@ -3,7 +3,7 @@ resource app_flags B_SINGLE_LAUNCH; resource app_version { major = 2, middle = 0, - minor = 1, + minor = 2, /* Application "variety" can be set to one of the following: * B_APPV_DEVELOPMENT, diff --git a/src/defines.pri b/src/defines.pri index 7e62638d8..f13f6e224 100644 --- a/src/defines.pri +++ b/src/defines.pri @@ -8,7 +8,7 @@ UI_DIR = $$PWD/../build # workaround for #849: see https://bugreports.qt-project.org/browse/QTBUG-23196 mocinclude.CONFIG *= fix_target -QZ_VERSION = 2.0.1 +QZ_VERSION = 2.0.2 unix: VERSION = $$QZ_VERSION DEFINES *= QUPZILLA_VERSION=\\\"""$$QZ_VERSION"\\\"" diff --git a/src/main/Info.plist b/src/main/Info.plist index 493d1d97f..0590b9a64 100644 --- a/src/main/Info.plist +++ b/src/main/Info.plist @@ -7,9 +7,9 @@ CFBundlePackageType APPL CFBundleGetInfoString - 2.0.1 + 2.0.2 CFBundleVersion - 2.0.1 + 2.0.2 CFBundleSignature @TYPEINFO@ CFBundleExecutable diff --git a/src/main/appicon.rc b/src/main/appicon.rc index f059d4637..f3c240541 100644 --- a/src/main/appicon.rc +++ b/src/main/appicon.rc @@ -4,8 +4,8 @@ IDI_ICON1 ICON DISCARDABLE "..\lib\data\icons\exeicons\qupzilla.ico" IDI_ICON2 ICON DISCARDABLE "..\lib\data\icons\exeicons\page.ico" VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,0,0,1 - PRODUCTVERSION 2,0,0,1 + FILEVERSION 2,0,0,2 + PRODUCTVERSION 2,0,0,2 FILEFLAGS 0x0L FILEFLAGSMASK 0x3fL FILEOS 0x00040004L @@ -18,12 +18,12 @@ BEGIN BEGIN VALUE "CompanyName", "QupZilla Team" VALUE "FileDescription", "QupZilla Web Browser" - VALUE "FileVersion", "2.0.1" + VALUE "FileVersion", "2.0.2" VALUE "LegalCopyright", "Copyright (C) 2010-2014 David Rosca" VALUE "InternalName", "qupzilla" VALUE "OriginalFilename", "qupzilla.exe" VALUE "ProductName", "QupZilla" - VALUE "ProductVersion", "2.0.1" + VALUE "ProductVersion", "2.0.2" END END BLOCK "VarFileInfo" diff --git a/windows/installer.nsi b/windows/installer.nsi index 775347533..5cf471703 100644 --- a/windows/installer.nsi +++ b/windows/installer.nsi @@ -24,7 +24,7 @@ RequestExecutionLevel admin SetCompressor /SOLID /FINAL lzma !define PRODUCT_NAME "QupZilla" -!define /date PRODUCT_VERSION "2.0.1" +!define /date PRODUCT_VERSION "2.0.2" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\qupzilla.exe" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_ROOT_KEY "HKLM" From 19ac3667bcdf788a6490d972c83f06cae7368c84 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Mon, 24 Oct 2016 17:41:37 +0200 Subject: [PATCH 4/4] Fix typo in CHANGELOG --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 65c510edc..2af36be21 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -Version 2.0.1 +Version 2.0.2 * released 24 October 2016 * update default user-agent strings * add short command line variant for all options