From 7808408cc8b4bcb4abd382b2a16d012ccaf58348 Mon Sep 17 00:00:00 2001 From: nowrep Date: Wed, 9 Nov 2011 16:58:25 +0100 Subject: [PATCH] Final updates for 1.0.0 stable release. Containing small fixes: - updated windows installer - small modification to linux default theme (new tab button) --- bin/themes/linux/main.css | 4 ++-- linux/applications/qupzilla.desktop | 1 + src/3rdparty/ecwin7.cpp | 2 +- src/3rdparty/qtwin.cpp | 13 ++++++------- src/app/qupzilla.cpp | 10 +++++++++- src/appicon.rc | 4 ++-- src/main.cpp | 9 +++++---- src/network/networkmanager.cpp | 8 ++------ src/plugins/plugins.cpp | 2 +- src/webview/tabwidget.cpp | 2 +- windows/installer.nsi | 5 +++-- 11 files changed, 33 insertions(+), 27 deletions(-) diff --git a/bin/themes/linux/main.css b/bin/themes/linux/main.css index 02af09313..675e59fe0 100644 --- a/bin/themes/linux/main.css +++ b/bin/themes/linux/main.css @@ -82,13 +82,13 @@ #tabwidget-button-opentabs { qproperty-icon: url(images/tabs-list-button.png); - qproperty-fixedsize: 20px 27px; + qproperty-fixedsize: 20px 25px; } #tabwidget-button-addtab { qproperty-themeIcon: "list-add"; - qproperty-fixedsize: 25px 27px; + qproperty-fixedsize: 22px 25px; } #tabwidget-button-opentabs::menu-indicator diff --git a/linux/applications/qupzilla.desktop b/linux/applications/qupzilla.desktop index 674af0f4b..dd6dbaf40 100644 --- a/linux/applications/qupzilla.desktop +++ b/linux/applications/qupzilla.desktop @@ -18,4 +18,5 @@ MimeType=text/html;application/xhtml+xml; Terminal=false Type=Application Icon=qupzilla.png +StartupNotify=true Categories=Network;WebBrowser; diff --git a/src/3rdparty/ecwin7.cpp b/src/3rdparty/ecwin7.cpp index b0f2f8086..e5e5813f5 100644 --- a/src/3rdparty/ecwin7.cpp +++ b/src/3rdparty/ecwin7.cpp @@ -26,8 +26,8 @@ DEFINE_GUID(IID_ITaskbarList3, 0xea1afb91, 0x9e28, 0x4b86, 0x90, 0xE9, 0x9e, 0x9 // Constructor: variabiles initialization EcWin7::EcWin7() -, mTaskBar(NULL) { + mTaskbar = NULL; mOverlayIcon = NULL; } diff --git a/src/3rdparty/qtwin.cpp b/src/3rdparty/qtwin.cpp index c763a5f44..f212213a9 100644 --- a/src/3rdparty/qtwin.cpp +++ b/src/3rdparty/qtwin.cpp @@ -49,13 +49,12 @@ typedef struct _DWM_BLURBEHIND { BOOL fTransitionOnMaximized; } DWM_BLURBEHIND, *PDWM_BLURBEHIND; -//typedef struct _MARGINS -//{ -// int cxLeftWidth; -// int cxRightWidth; -// int cyTopHeight; -// int cyBottomHeight; -//} MARGINS, *PMARGINS; +typedef struct _MARGINS { + int cxLeftWidth; + int cxRightWidth; + int cyTopHeight; + int cyBottomHeight; +} MARGINS, *PMARGINS; typedef HRESULT(WINAPI* PtrDwmIsCompositionEnabled)(BOOL* pfEnabled); typedef HRESULT(WINAPI* PtrDwmExtendFrameIntoClientArea)(HWND hWnd, const MARGINS* pMarInset); diff --git a/src/app/qupzilla.cpp b/src/app/qupzilla.cpp index 30fd0d70c..724e67066 100644 --- a/src/app/qupzilla.cpp +++ b/src/app/qupzilla.cpp @@ -61,7 +61,7 @@ #include "globalfunctions.h" #include "webhistorywrapper.h" -const QString QupZilla::VERSION = "1.0.0-rc1"; +const QString QupZilla::VERSION = "1.0.0"; const QString QupZilla::BUILDTIME = __DATE__" "__TIME__; const QString QupZilla::AUTHOR = "David Rosca"; const QString QupZilla::COPYRIGHT = "2010-2011"; @@ -205,6 +205,14 @@ void QupZilla::setupUi() } else { setGeometry(settings.value("WindowGeometry", QRect(20, 20, 800, 550)).toRect()); + if (m_startBehaviour == NewWindow) { + // Moving window +40 x,y to be visible that this is new window + QPoint p = pos(); + p.setX(p.x() + 40); + p.setY(p.y() + 40); + + move(p); + } } locationBarWidth = settings.value("LocationBarWidth", 0).toInt(); diff --git a/src/appicon.rc b/src/appicon.rc index b88fb1c93..23afd90bc 100644 --- a/src/appicon.rc +++ b/src/appicon.rc @@ -18,12 +18,12 @@ BEGIN BEGIN VALUE "CompanyName", "QupZilla Association" VALUE "FileDescription", "QupZilla Web Browser" - VALUE "FileVersion", "1.0.0.rc1" + VALUE "FileVersion", "1.0.0" VALUE "LegalCopyright", "Copyright (C) 2010-2011 David Rosca" VALUE "InternalName", "qupzilla" VALUE "OriginalFilename", "qupzilla.exe" VALUE "ProductName", "QupZilla" - VALUE "ProductVersion", "1.0.0.rc1" + VALUE "ProductVersion", "1.0.0" END END BLOCK "VarFileInfo" diff --git a/src/main.cpp b/src/main.cpp index b8a3a2bce..b73d7f4c9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -51,10 +51,11 @@ int main(int argc, char* argv[]) MainApplication app(cmdActions, argc, argv); if (app.isExited()) { - if (argc == 1) { - std::cout << "QupZilla already running - activating existing window" << std::endl; - } - return 1; +// Not showing any output, otherwise XFCE shows "Failed to execute default browser. I/O error" error +// if (argc == 1) { +// std::cout << "QupZilla already running - activating existing window" << std::endl; +// } + return 0; } int result = app.exec(); diff --git a/src/network/networkmanager.cpp b/src/network/networkmanager.cpp index f78c4c137..46136fcc2 100644 --- a/src/network/networkmanager.cpp +++ b/src/network/networkmanager.cpp @@ -77,13 +77,9 @@ void NetworkManager::loadSettings() void NetworkManager::setSSLConfiguration(QNetworkReply* reply) { - if (reply->property("downReply").toBool()) { - return; - } - if (!reply->sslConfiguration().isNull()) { QSslCertificate cert = reply->sslConfiguration().peerCertificate(); - if (!cert.isValid()) { + if (!cert.isValid() || reply->property("downReply").toBool()) { return; } @@ -96,7 +92,7 @@ void NetworkManager::setSSLConfiguration(QNetworkReply* reply) return; } - if (webView->url().host() == reply->url().host()) { + if (webView->url().host() == reply->url().host()) { webPage->setSSLCertificate(cert); } } diff --git a/src/plugins/plugins.cpp b/src/plugins/plugins.cpp index 6597f6fdb..eac9b208a 100644 --- a/src/plugins/plugins.cpp +++ b/src/plugins/plugins.cpp @@ -70,7 +70,7 @@ void Plugins::loadPlugins() } } - std::cout << loadedPlugins.count() << "plugins loaded" << std::endl; + std::cout << loadedPlugins.count() << " plugins loaded" << std::endl; } PluginInterface* Plugins::getPlugin(QString pluginFileName) diff --git a/src/webview/tabwidget.cpp b/src/webview/tabwidget.cpp index 34640b844..a7d81fea8 100644 --- a/src/webview/tabwidget.cpp +++ b/src/webview/tabwidget.cpp @@ -166,7 +166,7 @@ void TabWidget::resizeEvent(QResizeEvent* e) QTabWidget::resizeEvent(e); } -void TabWidget::createKeyPressEvent(QKeyEvent *event) +void TabWidget::createKeyPressEvent(QKeyEvent* event) { QTabWidget::keyPressEvent(event); } diff --git a/windows/installer.nsi b/windows/installer.nsi index 9b7290e98..482ef42f3 100644 --- a/windows/installer.nsi +++ b/windows/installer.nsi @@ -3,7 +3,7 @@ RequestExecutionLevel admin SetCompressor /SOLID /FINAL lzma !define PRODUCT_NAME "QupZilla" -!define /date PRODUCT_VERSION "1.0.0-rc1" +!define /date PRODUCT_VERSION "1.0.0" !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" @@ -33,8 +33,9 @@ SetCompressor /SOLID /FINAL lzma !insertmacro MUI_LANGUAGE "Czech" !insertmacro MUI_LANGUAGE "Slovak" !insertmacro MUI_LANGUAGE "Dutch" -!insertmacro MUI_LANGUAGE "French" !insertmacro MUI_LANGUAGE "German" + +!insertmacro MUI_LANGUAGE "French" !insertmacro MUI_LANGUAGE "Korean" !insertmacro MUI_LANGUAGE "Russian" !insertmacro MUI_LANGUAGE "Spanish"