mirror of
https://invent.kde.org/network/falkon.git
synced 2024-12-24 04:36:34 +01:00
Final updates for 1.0.0 stable release.
Containing small fixes: - updated windows installer - small modification to linux default theme (new tab button)
This commit is contained in:
parent
8791b9cf50
commit
7808408cc8
@ -82,13 +82,13 @@
|
|||||||
#tabwidget-button-opentabs
|
#tabwidget-button-opentabs
|
||||||
{
|
{
|
||||||
qproperty-icon: url(images/tabs-list-button.png);
|
qproperty-icon: url(images/tabs-list-button.png);
|
||||||
qproperty-fixedsize: 20px 27px;
|
qproperty-fixedsize: 20px 25px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#tabwidget-button-addtab
|
#tabwidget-button-addtab
|
||||||
{
|
{
|
||||||
qproperty-themeIcon: "list-add";
|
qproperty-themeIcon: "list-add";
|
||||||
qproperty-fixedsize: 25px 27px;
|
qproperty-fixedsize: 22px 25px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#tabwidget-button-opentabs::menu-indicator
|
#tabwidget-button-opentabs::menu-indicator
|
||||||
|
@ -18,4 +18,5 @@ MimeType=text/html;application/xhtml+xml;
|
|||||||
Terminal=false
|
Terminal=false
|
||||||
Type=Application
|
Type=Application
|
||||||
Icon=qupzilla.png
|
Icon=qupzilla.png
|
||||||
|
StartupNotify=true
|
||||||
Categories=Network;WebBrowser;
|
Categories=Network;WebBrowser;
|
||||||
|
2
src/3rdparty/ecwin7.cpp
vendored
2
src/3rdparty/ecwin7.cpp
vendored
@ -26,8 +26,8 @@ DEFINE_GUID(IID_ITaskbarList3, 0xea1afb91, 0x9e28, 0x4b86, 0x90, 0xE9, 0x9e, 0x9
|
|||||||
|
|
||||||
// Constructor: variabiles initialization
|
// Constructor: variabiles initialization
|
||||||
EcWin7::EcWin7()
|
EcWin7::EcWin7()
|
||||||
, mTaskBar(NULL)
|
|
||||||
{
|
{
|
||||||
|
mTaskbar = NULL;
|
||||||
mOverlayIcon = NULL;
|
mOverlayIcon = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
13
src/3rdparty/qtwin.cpp
vendored
13
src/3rdparty/qtwin.cpp
vendored
@ -49,13 +49,12 @@ typedef struct _DWM_BLURBEHIND {
|
|||||||
BOOL fTransitionOnMaximized;
|
BOOL fTransitionOnMaximized;
|
||||||
} DWM_BLURBEHIND, *PDWM_BLURBEHIND;
|
} DWM_BLURBEHIND, *PDWM_BLURBEHIND;
|
||||||
|
|
||||||
//typedef struct _MARGINS
|
typedef struct _MARGINS {
|
||||||
//{
|
int cxLeftWidth;
|
||||||
// int cxLeftWidth;
|
int cxRightWidth;
|
||||||
// int cxRightWidth;
|
int cyTopHeight;
|
||||||
// int cyTopHeight;
|
int cyBottomHeight;
|
||||||
// int cyBottomHeight;
|
} MARGINS, *PMARGINS;
|
||||||
//} MARGINS, *PMARGINS;
|
|
||||||
|
|
||||||
typedef HRESULT(WINAPI* PtrDwmIsCompositionEnabled)(BOOL* pfEnabled);
|
typedef HRESULT(WINAPI* PtrDwmIsCompositionEnabled)(BOOL* pfEnabled);
|
||||||
typedef HRESULT(WINAPI* PtrDwmExtendFrameIntoClientArea)(HWND hWnd, const MARGINS* pMarInset);
|
typedef HRESULT(WINAPI* PtrDwmExtendFrameIntoClientArea)(HWND hWnd, const MARGINS* pMarInset);
|
||||||
|
@ -61,7 +61,7 @@
|
|||||||
#include "globalfunctions.h"
|
#include "globalfunctions.h"
|
||||||
#include "webhistorywrapper.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::BUILDTIME = __DATE__" "__TIME__;
|
||||||
const QString QupZilla::AUTHOR = "David Rosca";
|
const QString QupZilla::AUTHOR = "David Rosca";
|
||||||
const QString QupZilla::COPYRIGHT = "2010-2011";
|
const QString QupZilla::COPYRIGHT = "2010-2011";
|
||||||
@ -205,6 +205,14 @@ void QupZilla::setupUi()
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
setGeometry(settings.value("WindowGeometry", QRect(20, 20, 800, 550)).toRect());
|
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();
|
locationBarWidth = settings.value("LocationBarWidth", 0).toInt();
|
||||||
|
@ -18,12 +18,12 @@ BEGIN
|
|||||||
BEGIN
|
BEGIN
|
||||||
VALUE "CompanyName", "QupZilla Association"
|
VALUE "CompanyName", "QupZilla Association"
|
||||||
VALUE "FileDescription", "QupZilla Web Browser"
|
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 "LegalCopyright", "Copyright (C) 2010-2011 David Rosca"
|
||||||
VALUE "InternalName", "qupzilla"
|
VALUE "InternalName", "qupzilla"
|
||||||
VALUE "OriginalFilename", "qupzilla.exe"
|
VALUE "OriginalFilename", "qupzilla.exe"
|
||||||
VALUE "ProductName", "QupZilla"
|
VALUE "ProductName", "QupZilla"
|
||||||
VALUE "ProductVersion", "1.0.0.rc1"
|
VALUE "ProductVersion", "1.0.0"
|
||||||
END
|
END
|
||||||
END
|
END
|
||||||
BLOCK "VarFileInfo"
|
BLOCK "VarFileInfo"
|
||||||
|
@ -51,10 +51,11 @@ int main(int argc, char* argv[])
|
|||||||
|
|
||||||
MainApplication app(cmdActions, argc, argv);
|
MainApplication app(cmdActions, argc, argv);
|
||||||
if (app.isExited()) {
|
if (app.isExited()) {
|
||||||
if (argc == 1) {
|
// Not showing any output, otherwise XFCE shows "Failed to execute default browser. I/O error" error
|
||||||
std::cout << "QupZilla already running - activating existing window" << std::endl;
|
// if (argc == 1) {
|
||||||
}
|
// std::cout << "QupZilla already running - activating existing window" << std::endl;
|
||||||
return 1;
|
// }
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int result = app.exec();
|
int result = app.exec();
|
||||||
|
@ -77,13 +77,9 @@ void NetworkManager::loadSettings()
|
|||||||
|
|
||||||
void NetworkManager::setSSLConfiguration(QNetworkReply* reply)
|
void NetworkManager::setSSLConfiguration(QNetworkReply* reply)
|
||||||
{
|
{
|
||||||
if (reply->property("downReply").toBool()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!reply->sslConfiguration().isNull()) {
|
if (!reply->sslConfiguration().isNull()) {
|
||||||
QSslCertificate cert = reply->sslConfiguration().peerCertificate();
|
QSslCertificate cert = reply->sslConfiguration().peerCertificate();
|
||||||
if (!cert.isValid()) {
|
if (!cert.isValid() || reply->property("downReply").toBool()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@ RequestExecutionLevel admin
|
|||||||
SetCompressor /SOLID /FINAL lzma
|
SetCompressor /SOLID /FINAL lzma
|
||||||
|
|
||||||
!define PRODUCT_NAME "QupZilla"
|
!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_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\qupzilla.exe"
|
||||||
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
|
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
|
||||||
!define PRODUCT_UNINST_ROOT_KEY "HKLM"
|
!define PRODUCT_UNINST_ROOT_KEY "HKLM"
|
||||||
@ -33,8 +33,9 @@ SetCompressor /SOLID /FINAL lzma
|
|||||||
!insertmacro MUI_LANGUAGE "Czech"
|
!insertmacro MUI_LANGUAGE "Czech"
|
||||||
!insertmacro MUI_LANGUAGE "Slovak"
|
!insertmacro MUI_LANGUAGE "Slovak"
|
||||||
!insertmacro MUI_LANGUAGE "Dutch"
|
!insertmacro MUI_LANGUAGE "Dutch"
|
||||||
!insertmacro MUI_LANGUAGE "French"
|
|
||||||
!insertmacro MUI_LANGUAGE "German"
|
!insertmacro MUI_LANGUAGE "German"
|
||||||
|
|
||||||
|
!insertmacro MUI_LANGUAGE "French"
|
||||||
!insertmacro MUI_LANGUAGE "Korean"
|
!insertmacro MUI_LANGUAGE "Korean"
|
||||||
!insertmacro MUI_LANGUAGE "Russian"
|
!insertmacro MUI_LANGUAGE "Russian"
|
||||||
!insertmacro MUI_LANGUAGE "Spanish"
|
!insertmacro MUI_LANGUAGE "Spanish"
|
||||||
|
Loading…
Reference in New Issue
Block a user