Merge branch 'v2.0'

2024-09-21 09:42:10 +02:00 · 2016-10-24 20:04:27 +02:00 · 2016-10-24 20:04:27 +02:00 · f7835b7ba8
commit f7835b7ba8
parent b8414e12c5 19ac3667bc
18 changed files with 54 additions and 41 deletions
--- a/12
+++ b/12
@ -1,3 +1,15 @@
+Version 2.0.2
+    * 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
--- 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:
--- 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,
--- a/src/main/Info.plist
+++ b/src/main/Info.plist
@ -7,9 +7,9 @@
    <key>CFBundlePackageType</key>
    <string>APPL</string>
    <key>CFBundleGetInfoString</key>
-    <string>2.0.1</string>
+    <string>2.0.2</string>
    <key>CFBundleVersion</key>
-    <string>2.0.1</string>
+    <string>2.0.2</string>
    <key>CFBundleSignature</key>
    <string>@TYPEINFO@</string>
    <key>CFBundleExecutable</key>
--- 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"
--- a/src/plugins/AccessKeysNavigation/translations/pl_PL.ts
+++ b/src/plugins/AccessKeysNavigation/translations/pl_PL.ts
@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl_PL" version="2.0">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl_PL" version="2.1">
 <context>
    <name>AKN_Settings</name>
    <message>
@ -34,7 +34,7 @@
    <message>
        <location filename="../akn_settings.ui" line="58"/>
        <source>Key for showing access keys:</source>
-        <translation>Klawsz pokazujący klawisze dostępu:</translation>
+        <translation>Klawisz pokazujący klawisze dostępu:</translation>
    </message>
    <message>
        <location filename="../akn_settings.ui" line="103"/>
--- a/src/plugins/AccessKeysNavigation/translations/zh_HK.ts
+++ b/src/plugins/AccessKeysNavigation/translations/zh_HK.ts
@ -4,12 +4,12 @@
    <message>
        <location filename="../akn_settings.ui" line="14"/>
        <source>Access Keys Navigation</source>
-        <translation>訪問密鑰導覽</translation>
+        <translation>鍵盤網頁導覽</translation>
    </message>
    <message>
        <location filename="../akn_settings.ui" line="20"/>
        <source>&lt;h1&gt;Access Keys Navigation&lt;/h1&gt;</source>
-        <translation>&lt;h1&gt;訪問密鑰導覽&lt;/h1&gt;</translation>
+        <translation>&lt;h1&gt;鍵盤網頁導覽&lt;/h1&gt;</translation>
    </message>
    <message>
        <location filename="../akn_settings.ui" line="33"/>
@ -29,12 +29,12 @@
    <message>
        <location filename="../akn_settings.ui" line="51"/>
        <source>Double press</source>
-        <translation>雙按</translation>
+        <translation>按兩下</translation>
    </message>
    <message>
        <location filename="../akn_settings.ui" line="58"/>
        <source>Key for showing access keys:</source>
-        <translation type="unfinished"/>
+        <translation>鍵盤網頁導覽啟用鍵：</translation>
    </message>
    <message>
        <location filename="../akn_settings.ui" line="103"/>
--- a/src/plugins/GreaseMonkey/translations/he_IL.ts
+++ b/src/plugins/GreaseMonkey/translations/he_IL.ts
@ -70,7 +70,7 @@
    <message>
        <location filename="../gm_manager.cpp" line="270"/>
        <source>&apos;%1&apos; is already installed</source>
-        <translation type="unfinished"/>
+        <translation>&apos;%1&apos; כבר מותקן</translation>
    </message>
 </context>
 <context>
@ -179,7 +179,7 @@
    <message>
        <location filename="../settings/gm_settingsscriptinfo.ui" line="65"/>
        <source>Start at:</source>
-        <translation>מתחיל ב:</translation>
+        <translation>מתחיל עם:</translation>
    </message>
    <message>
        <location filename="../settings/gm_settingsscriptinfo.ui" line="45"/>
@ -189,12 +189,12 @@
    <message>
        <location filename="../settings/gm_settingsscriptinfo.ui" line="19"/>
        <source>Runs at:</source>
-        <translation>רץ אצל:</translation>
+        <translation>רץ בתחום:</translation>
    </message>
    <message>
        <location filename="../settings/gm_settingsscriptinfo.ui" line="128"/>
        <source>Does not run at:</source>
-        <translation>לא רץ אצל:</translation>
+        <translation>לא רץ בתחום:</translation>
    </message>
    <message>
        <location filename="../settings/gm_settingsscriptinfo.cpp" line="45"/>
--- a/src/plugins/GreaseMonkey/translations/nl_NL.ts
+++ b/src/plugins/GreaseMonkey/translations/nl_NL.ts
@ -70,7 +70,7 @@
    <message>
        <location filename="../gm_manager.cpp" line="270"/>
        <source>&apos;%1&apos; is already installed</source>
-        <translation type="unfinished"/>
+        <translation>&apos;%1&apos; is al geïnstalleerd</translation>
    </message>
 </context>
 <context>
--- a/src/plugins/GreaseMonkey/translations/pl_PL.ts
+++ b/src/plugins/GreaseMonkey/translations/pl_PL.ts
@ -70,7 +70,7 @@
    <message>
        <location filename="../gm_manager.cpp" line="270"/>
        <source>&apos;%1&apos; is already installed</source>
-        <translation type="unfinished"/>
+        <translation>&apos;%1&apos; jest już zainstalowany</translation>
    </message>
 </context>
 <context>
@ -126,7 +126,7 @@
    <message>
        <location filename="../settings/gm_settings.ui" line="203"/>
        <source>New user script</source>
-        <translation type="unfinished"/>
+        <translation>Nowy skrypt użytkownika</translation>
    </message>
    <message>
        <location filename="../settings/gm_settings.cpp" line="90"/>
@ -141,12 +141,12 @@
    <message>
        <location filename="../settings/gm_settings.cpp" line="121"/>
        <source>Add script</source>
-        <translation type="unfinished"/>
+        <translation>Dodaj skrypt</translation>
    </message>
    <message>
        <location filename="../settings/gm_settings.cpp" line="121"/>
        <source>Choose name for script:</source>
-        <translation type="unfinished"/>
+        <translation>Podaj nazwę dla skryptu:</translation>
    </message>
 </context>
 <context>
--- 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 <nowrep@gmail.com>
+* Copyright (C) 2013-2016 David Rosca <nowrep@gmail.com>
 *
 * 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
@ -184,10 +184,11 @@ void MouseGestures::downGestured()
        return;

    TabWidget* tabWidget = window->tabWidget();
-    tabWidget->addView(QUrl(), Qz::NT_SelectedNewEmptyTab);
-    
-    LocationBar* locationBar = window->locationBar();
-    locationBar->setFocus();
+    tabWidget->addView(QUrl(), Qz::NT_SelectedNewEmptyTab, true);
+    tabWidget->setCurrentTabFresh(true);
+
+    if (window->isFullScreen())
+        window->showNavigationWithFullScreen();
 }

 void MouseGestures::leftGestured()
--- a/src/plugins/MouseGestures/translations/ca_ES.ts
+++ b/src/plugins/MouseGestures/translations/ca_ES.ts
@ -94,7 +94,7 @@
    <message>
        <location filename="../mousegesturessettingsdialog.ui" line="313"/>
        <source>&lt;b&gt;Duplicate&lt;/b&gt;&lt;br/&gt;Duplicate current tab</source>
-        <translation type="unfinished"/>
+        <translation>&lt;b&gt;Duplica&lt;/b&gt;&lt;br/&gt;Duplica la pestanya actual</translation>
    </message>
    <message>
        <location filename="../mousegesturessettingsdialog.ui" line="337"/>
--- a/src/plugins/MouseGestures/translations/pl_PL.ts
+++ b/src/plugins/MouseGestures/translations/pl_PL.ts
@ -94,7 +94,7 @@
    <message>
        <location filename="../mousegesturessettingsdialog.ui" line="313"/>
        <source>&lt;b&gt;Duplicate&lt;/b&gt;&lt;br/&gt;Duplicate current tab</source>
-        <translation type="unfinished"/>
+        <translation>&lt;b&gt;Duplikuj&lt;/b&gt;&lt;br/&gt;Duplikuje aktualną kartę</translation>
    </message>
    <message>
        <location filename="../mousegesturessettingsdialog.ui" line="337"/>
--- a/src/plugins/MouseGestures/translations/sk_SK.ts
+++ b/src/plugins/MouseGestures/translations/sk_SK.ts
@ -94,7 +94,7 @@
    <message>
        <location filename="../mousegesturessettingsdialog.ui" line="313"/>
        <source>&lt;b&gt;Duplicate&lt;/b&gt;&lt;br/&gt;Duplicate current tab</source>
-        <translation type="unfinished"/>
+        <translation>&lt;b&gt;Duplikovať&lt;/b&gt;&lt;br/&gt;Duplikovať aktuálnu kartu</translation>
    </message>
    <message>
        <location filename="../mousegesturessettingsdialog.ui" line="337"/>
--- a/src/plugins/StatusBarIcons/translations/ca_ES.ts
+++ b/src/plugins/StatusBarIcons/translations/ca_ES.ts
@ -164,7 +164,7 @@
    <message>
        <location filename="../sbi_networkicondialog.cpp" line="70"/>
        <source>Are you sure you want to remove current proxy?</source>
-        <translation type="unfinished"/>
+        <translation>Esteu segur que voleu suprimir el servidor intermediari actual?</translation>
    </message>
 </context>
 <context>
@ -202,12 +202,12 @@
    <message>
        <location filename="../sbi_proxywidget.ui" line="111"/>
        <source>S&amp;ystem proxy configuration</source>
-        <translation type="unfinished"/>
+        <translation>Configuració del servidor intermediari del s&amp;istema</translation>
    </message>
    <message>
        <location filename="../sbi_proxywidget.ui" line="118"/>
        <source>&amp;Manual configuration</source>
-        <translation type="unfinished"/>
+        <translation>Configuració &amp;manual</translation>
    </message>
 </context>
 <context>
--- a/src/plugins/StatusBarIcons/translations/pl_PL.ts
+++ b/src/plugins/StatusBarIcons/translations/pl_PL.ts
@ -164,7 +164,7 @@
    <message>
        <location filename="../sbi_networkicondialog.cpp" line="70"/>
        <source>Are you sure you want to remove current proxy?</source>
-        <translation type="unfinished"/>
+        <translation>Na pewno chcesz usunąć aktualne proxy?</translation>
    </message>
 </context>
 <context>
@ -202,12 +202,12 @@
    <message>
        <location filename="../sbi_proxywidget.ui" line="111"/>
        <source>S&amp;ystem proxy configuration</source>
-        <translation type="unfinished"/>
+        <translation>S&amp;ystemowe ustawienia proxy</translation>
    </message>
    <message>
        <location filename="../sbi_proxywidget.ui" line="118"/>
        <source>&amp;Manual configuration</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Ręczna konfiguracja</translation>
    </message>
 </context>
 <context>
--- a/src/plugins/StatusBarIcons/translations/sk_SK.ts
+++ b/src/plugins/StatusBarIcons/translations/sk_SK.ts
@ -164,7 +164,7 @@
    <message>
        <location filename="../sbi_networkicondialog.cpp" line="70"/>
        <source>Are you sure you want to remove current proxy?</source>
-        <translation type="unfinished"/>
+        <translation>Ste si istý, že chcete odstrániť aktuálne proxy?</translation>
    </message>
 </context>
 <context>
@ -202,12 +202,12 @@
    <message>
        <location filename="../sbi_proxywidget.ui" line="111"/>
        <source>S&amp;ystem proxy configuration</source>
-        <translation type="unfinished"/>
+        <translation>S&amp;ystémové nastavenia proxy</translation>
    </message>
    <message>
        <location filename="../sbi_proxywidget.ui" line="118"/>
        <source>&amp;Manual configuration</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Ručné nastavenie</translation>
    </message>
 </context>
 <context>
--- 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"