diff --git a/CHANGELOG b/CHANGELOG index f9c095fc0..ed2673bd0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,8 @@ Version 1.3.1 - * not yet released + * 16 July 2012 * Ctrl+= shortcut for + zoom in webview * Ctrl+Enter shortcut in PIM plugin now also works with enter on numpad + * don't append QupZilla string to changed user agent * fixed ' and " chars in speed dial's input fields * fixed zooming with Ctrl+Wheel for some users * fixed issues with cookies filtering diff --git a/README.md b/README.md index 94448312d..356f7885c 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ You need to specify path to `macdeployqt` only if it is not in PATH. Current version ---------------------------------------------------------------------------------------- -The current released version of QupZilla is 1.3.0. You can download precompiled packages +The current released version of QupZilla is 1.3.1. 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/src/defines.pri b/src/defines.pri index 32e1b82f9..6d38ef51b 100644 --- a/src/defines.pri +++ b/src/defines.pri @@ -3,7 +3,7 @@ OBJECTS_DIR = $$PWD/../build MOC_DIR = $$PWD/../build RCC_DIR = $$PWD/../build UI_DIR = $$PWD/../build -unix: VERSION = 1.3.0 +unix: VERSION = 1.3.1 # Please read BUILD information # #DEFINES *= NO_SYSTEM_DATAPATH diff --git a/src/lib/app/profileupdater.cpp b/src/lib/app/profileupdater.cpp index 3168285c3..2b52445a2 100644 --- a/src/lib/app/profileupdater.cpp +++ b/src/lib/app/profileupdater.cpp @@ -73,6 +73,7 @@ void ProfileUpdater::updateProfile(const QString ¤t, const QString &profil update100(); update118(); update120(); + update130(); return; } @@ -81,6 +82,7 @@ void ProfileUpdater::updateProfile(const QString ¤t, const QString &profil update100(); update118(); update120(); + update130(); return; } @@ -88,29 +90,39 @@ void ProfileUpdater::updateProfile(const QString ¤t, const QString &profil update100(); update118(); update120(); + update130(); return; } if (profileVersion == Updater::parseVersionFromString("1.1.0")) { update118(); update120(); + update130(); return; } if (profileVersion == Updater::parseVersionFromString("1.1.5")) { update118(); update120(); + update130(); return; } if (profileVersion == Updater::parseVersionFromString("1.1.8")) { update118(); update120(); + update130(); return; } if (profileVersion == Updater::parseVersionFromString("1.2.0")) { update120(); + update130(); + return; + } + + if (profileVersion == Updater::parseVersionFromString("1.3.0")) { + update130(); return; } @@ -202,3 +214,12 @@ void ProfileUpdater::update120() db.commit(); } + +void ProfileUpdater::update130() +{ + std::cout << "QupZilla: Upgrading profile version from 1.3.0..." << std::endl; + mApp->connectDatabase(); + + QSqlQuery query; + query.exec("ALTER TABLE bookmarks ADD COLUMN keyword TEXT"); +} diff --git a/src/lib/app/profileupdater.h b/src/lib/app/profileupdater.h index e95ceadea..c088f5d92 100644 --- a/src/lib/app/profileupdater.h +++ b/src/lib/app/profileupdater.h @@ -37,6 +37,7 @@ private: void update100(); void update118(); void update120(); + void update130(); QString m_profilePath; }; diff --git a/src/lib/app/qupzilla.cpp b/src/lib/app/qupzilla.cpp index 87646849b..29f6f9791 100644 --- a/src/lib/app/qupzilla.cpp +++ b/src/lib/app/qupzilla.cpp @@ -79,7 +79,7 @@ #include #include -const QString QupZilla::VERSION = "1.3.0"; +const QString QupZilla::VERSION = "1.3.1"; const QString QupZilla::BUILDTIME = __DATE__" "__TIME__; const QString QupZilla::AUTHOR = "David Rosca"; const QString QupZilla::COPYRIGHT = "2010-2012"; diff --git a/src/main/appicon.rc b/src/main/appicon.rc index fd16ec620..bd849b59b 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 1,3,0,0 - PRODUCTVERSION 1,3,0,0 + FILEVERSION 1,3,1,0 + PRODUCTVERSION 1,3,1,0 FILEFLAGS 0x0L FILEFLAGSMASK 0x3fL FILEOS 0x00040004L @@ -18,12 +18,12 @@ BEGIN BEGIN VALUE "CompanyName", "QupZilla Team" VALUE "FileDescription", "QupZilla Web Browser" - VALUE "FileVersion", "1.3.0" + VALUE "FileVersion", "1.3.1" VALUE "LegalCopyright", "Copyright (C) 2010-2012 David Rosca" VALUE "InternalName", "qupzilla" VALUE "OriginalFilename", "qupzilla.exe" VALUE "ProductName", "QupZilla" - VALUE "ProductVersion", "1.3.0" + VALUE "ProductVersion", "1.3.1" END END BLOCK "VarFileInfo" diff --git a/src/plugins/AccessKeysNavigation/akn_plugin.cpp b/src/plugins/AccessKeysNavigation/akn_plugin.cpp index 757ef51db..abc787ca3 100644 --- a/src/plugins/AccessKeysNavigation/akn_plugin.cpp +++ b/src/plugins/AccessKeysNavigation/akn_plugin.cpp @@ -60,7 +60,7 @@ bool AKN_Plugin::testPlugin() { // Let's be sure, require latest version of QupZilla - return (QupZilla::VERSION == "1.3.0"); + return (QupZilla::VERSION == "1.3.1"); } QTranslator* AKN_Plugin::getTranslator(const QString &locale) diff --git a/src/plugins/GreaseMonkey/gm_plugin.cpp b/src/plugins/GreaseMonkey/gm_plugin.cpp index 8cdca9233..81c59cd33 100644 --- a/src/plugins/GreaseMonkey/gm_plugin.cpp +++ b/src/plugins/GreaseMonkey/gm_plugin.cpp @@ -62,7 +62,7 @@ void GM_Plugin::unload() bool GM_Plugin::testPlugin() { - return (QupZilla::VERSION == "1.3.0"); + return (QupZilla::VERSION == "1.3.1"); } QTranslator* GM_Plugin::getTranslator(const QString &locale) diff --git a/src/plugins/MouseGestures/mousegesturesplugin.cpp b/src/plugins/MouseGestures/mousegesturesplugin.cpp index be580cfc0..767d954fb 100644 --- a/src/plugins/MouseGestures/mousegesturesplugin.cpp +++ b/src/plugins/MouseGestures/mousegesturesplugin.cpp @@ -63,7 +63,7 @@ bool MouseGesturesPlugin::testPlugin() { // Let's be sure, require latest version of QupZilla - return (QupZilla::VERSION == "1.3.0"); + return (QupZilla::VERSION == "1.3.1"); } QTranslator* MouseGesturesPlugin::getTranslator(const QString &locale) diff --git a/src/plugins/PIM/PIM_plugin.cpp b/src/plugins/PIM/PIM_plugin.cpp index c1a303cc3..9f0cfe206 100644 --- a/src/plugins/PIM/PIM_plugin.cpp +++ b/src/plugins/PIM/PIM_plugin.cpp @@ -64,7 +64,7 @@ bool PIM_Plugin::testPlugin() { // Let's be sure, require latest version of QupZilla - return (QupZilla::VERSION == "1.3.0"); + return (QupZilla::VERSION == "1.3.1"); } QTranslator* PIM_Plugin::getTranslator(const QString &locale) diff --git a/src/plugins/TestPlugin/testplugin.cpp b/src/plugins/TestPlugin/testplugin.cpp index 129430d8c..a2aa65b29 100644 --- a/src/plugins/TestPlugin/testplugin.cpp +++ b/src/plugins/TestPlugin/testplugin.cpp @@ -89,7 +89,7 @@ bool TestPlugin::testPlugin() //There should be some testing if plugin is loaded correctly //If this function returns false, plugin is automatically unloaded - return (QupZilla::VERSION == "1.3.0"); + return (QupZilla::VERSION == "1.3.1"); } QTranslator* TestPlugin::getTranslator(const QString &locale) diff --git a/windows/installer.nsi b/windows/installer.nsi index bcf13602c..730a2b337 100644 --- a/windows/installer.nsi +++ b/windows/installer.nsi @@ -3,7 +3,7 @@ SetCompressor /SOLID /FINAL lzma !define PRODUCT_NAME "QupZilla" -!define /date PRODUCT_VERSION "1.3.0" +!define /date PRODUCT_VERSION "1.3.1" !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"