From 6f395631ad299b60773da817477ed1d2bce16c50 Mon Sep 17 00:00:00 2001 From: nowrep Date: Mon, 17 Oct 2011 09:57:07 +0200 Subject: [PATCH] Updated copyright informations --- AUTHORS | 2 +- BUILDING | 47 ++++++++++--------- COPYRIGHT | 2 +- FAQ | 18 ++++--- TODO | 23 +++++---- src/3rdparty/ecwin7.h | 1 + src/adblock/adblockblockednetworkreply.cpp | 2 +- src/adblock/adblockblockednetworkreply.h | 2 +- src/adblock/adblockdialog.cpp | 2 +- src/adblock/adblockdialog.h | 2 +- src/adblock/adblockicon.cpp | 2 +- src/adblock/adblockicon.h | 2 +- src/adblock/adblockmanager.cpp | 2 +- src/adblock/adblockmanager.h | 2 +- src/adblock/adblocknetwork.cpp | 2 +- src/adblock/adblocknetwork.h | 2 +- src/adblock/adblockrule.cpp | 2 +- src/adblock/adblockrule.h | 2 +- src/adblock/adblocksubscription.cpp | 2 +- src/adblock/adblocksubscription.h | 2 +- src/app/autosaver.cpp | 2 +- src/app/autosaver.h | 2 +- src/app/commandlineoptions.cpp | 2 +- src/app/commandlineoptions.h | 2 +- src/app/mainapplication.cpp | 2 +- src/app/mainapplication.h | 2 +- src/autofill/autofillmodel.cpp | 2 +- src/autofill/autofillmodel.h | 2 +- src/autofill/autofillnotification.cpp | 2 +- src/autofill/autofillnotification.h | 2 +- src/bookmarks/bookmarkicon.cpp | 2 +- src/bookmarks/bookmarkicon.h | 2 +- src/bookmarks/bookmarksmanager.cpp | 2 +- src/bookmarks/bookmarksmanager.h | 2 +- src/bookmarks/bookmarksmodel.cpp | 2 +- src/bookmarks/bookmarksmodel.h | 2 +- src/bookmarks/bookmarkstoolbar.cpp | 2 +- src/bookmarks/bookmarkstoolbar.h | 2 +- src/bookmarks/bookmarkswidget.cpp | 2 +- src/bookmarks/bookmarkswidget.h | 2 +- src/cookies/cookiejar.cpp | 2 +- src/cookies/cookiejar.h | 2 +- src/cookies/cookiemanager.cpp | 2 +- src/cookies/cookiemanager.h | 2 +- src/data/html/copyright | 4 +- src/data/html/errorPage.html | 1 - .../desktopnotification.cpp | 2 +- .../desktopnotification.h | 2 +- .../desktopnotificationsfactory.cpp | 2 +- .../desktopnotificationsfactory.h | 2 +- src/downloads/downloadfilehelper.cpp | 4 +- src/history/historymanager.cpp | 2 +- src/history/historymanager.h | 2 +- src/history/historymodel.cpp | 2 +- src/history/historymodel.h | 2 +- src/history/webhistoryinterface.cpp | 2 +- src/history/webhistoryinterface.h | 2 +- src/main.cpp | 2 +- src/navigation/locationbar.cpp | 2 +- src/navigation/locationbar.h | 2 +- src/navigation/locationbarsettings.cpp | 2 +- src/navigation/locationbarsettings.h | 2 +- src/navigation/locationcompleter.cpp | 2 +- src/navigation/locationcompleter.h | 2 +- src/navigation/locationpopup.cpp | 2 +- src/navigation/locationpopup.h | 2 +- src/navigation/navigationbar.cpp | 21 ++++++--- src/navigation/navigationbar.h | 5 +- src/navigation/reloadstopbutton.cpp | 2 +- src/navigation/reloadstopbutton.h | 2 +- src/navigation/websearchbar.cpp | 2 +- src/navigation/websearchbar.h | 2 +- src/network/networkmanager.cpp | 2 +- src/network/networkmanager.h | 2 +- src/network/networkmanagerproxy.cpp | 2 +- src/network/networkmanagerproxy.h | 2 +- src/network/networkproxyfactory.cpp | 2 +- src/network/networkproxyfactory.h | 2 +- src/network/qupzillaschemehandler.cpp | 2 +- src/network/qupzillaschemehandler.h | 2 +- src/other/aboutdialog.cpp | 2 +- src/other/aboutdialog.h | 2 +- src/other/browsinglibrary.cpp | 2 +- src/other/browsinglibrary.h | 2 +- src/other/clearprivatedata.cpp | 2 +- src/other/clearprivatedata.h | 2 +- src/other/pagescreen.cpp | 2 +- src/other/pagescreen.h | 2 +- src/other/sourceviewer.cpp | 2 +- src/other/sourceviewer.h | 2 +- src/other/sourceviewersearch.cpp | 2 +- src/other/sourceviewersearch.h | 2 +- src/other/updater.cpp | 2 +- src/other/updater.h | 2 +- src/plugins/clicktoflash.cpp | 2 +- src/plugins/clicktoflash.h | 2 +- src/plugins/plugininterface.h | 2 +- src/plugins/pluginproxy.cpp | 2 +- src/plugins/pluginproxy.h | 2 +- src/plugins/plugins.cpp | 2 +- src/plugins/plugins.h | 2 +- src/plugins/webpluginfactory.cpp | 2 +- src/plugins/webpluginfactory.h | 2 +- src/preferences/autofillmanager.cpp | 2 +- src/preferences/autofillmanager.h | 2 +- src/preferences/pluginslist.cpp | 2 +- src/preferences/pluginslist.h | 2 +- src/preferences/preferences.cpp | 20 ++++---- src/preferences/preferences.h | 2 +- src/preferences/sslmanager.cpp | 2 +- src/preferences/sslmanager.h | 2 +- src/preferences/thememanager.cpp | 10 +++- src/preferences/thememanager.h | 2 +- src/rss/rssmanager.cpp | 2 +- src/rss/rssmanager.h | 2 +- src/rss/rssnotification.cpp | 2 +- src/rss/rssnotification.h | 2 +- src/rss/rsswidget.cpp | 2 +- src/rss/rsswidget.h | 2 +- src/sidebar/bookmarkssidebar.cpp | 2 +- src/sidebar/bookmarkssidebar.h | 2 +- src/sidebar/historysidebar.cpp | 2 +- src/sidebar/historysidebar.h | 2 +- src/sidebar/historysidebar.ui | 3 -- src/tools/animatedwidget.cpp | 2 +- src/tools/animatedwidget.h | 2 +- src/tools/buttonbox.cpp | 2 +- src/tools/buttonbox.h | 2 +- src/tools/buttonwithmenu.cpp | 2 +- src/tools/buttonwithmenu.h | 2 +- src/tools/certificateinfowidget.cpp | 2 +- src/tools/certificateinfowidget.h | 2 +- src/tools/clickablelabel.cpp | 2 +- src/tools/clickablelabel.h | 2 +- src/tools/closedtabsmanager.cpp | 2 +- src/tools/closedtabsmanager.h | 2 +- src/tools/docktitlebarwidget.cpp | 2 +- src/tools/docktitlebarwidget.h | 2 +- src/tools/frame.cpp | 2 +- src/tools/frame.h | 2 +- src/tools/globalfunctions.cpp | 4 +- src/tools/globalfunctions.h | 2 +- src/tools/htmlhighlighter.cpp | 2 +- src/tools/htmlhighlighter.h | 2 +- src/tools/iconprovider.cpp | 2 +- src/tools/iconprovider.h | 2 +- src/tools/progressbar.cpp | 2 +- src/tools/progressbar.h | 2 +- src/tools/toolbutton.cpp | 2 +- src/tools/toolbutton.h | 2 +- src/tools/treewidget.cpp | 2 +- src/tools/treewidget.h | 2 +- src/tools/widget.cpp | 2 +- src/tools/widget.h | 2 +- src/webview/searchtoolbar.cpp | 2 +- src/webview/searchtoolbar.h | 2 +- src/webview/siteinfo.cpp | 2 +- src/webview/siteinfo.h | 2 +- src/webview/siteinfowidget.cpp | 2 +- src/webview/siteinfowidget.h | 2 +- src/webview/tabbar.cpp | 2 +- src/webview/tabbar.h | 2 +- src/webview/tabwidget.cpp | 2 +- src/webview/tabwidget.h | 2 +- src/webview/webpage.cpp | 2 +- src/webview/webpage.h | 2 +- src/webview/webtab.cpp | 2 +- src/webview/webtab.h | 2 +- src/webview/webview.cpp | 5 +- src/webview/webview.h | 2 +- 170 files changed, 247 insertions(+), 231 deletions(-) diff --git a/AUTHORS b/AUTHORS index c93d2ffed..a6aafead7 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,6 +1,6 @@ Main developer and maintainer: -nowrep +David Rosca Contributors: diff --git a/BUILDING b/BUILDING index 31a693379..cff6cdc98 100644 --- a/BUILDING +++ b/BUILDING @@ -1,36 +1,36 @@ -####################### -## Building QupZilla ## -####################### - ->> General << ->> << +General +---------------------------------------------------------------------------------- If you can, you should use precompiled packages for your distribution. But if you cannot use them, or they are not available, please read this informations before compiling. After your binary is successfuly compiled, you need to copy bin/ folder from git to specific directory by your system you compiled for. + On Linux, you can easily do it by running make install. If you are unsure where is the right place, you can check it directly from QupZilla by clicking from Help Menu to Informations about program, then in Path section. ->> Microsoft Windows << ->> << +Microsoft Windows +---------------------------------------------------------------------------------- - You need Microsoft Visual C++ Compiler 2008 - or higher in order to build QupZilla. If You want - use JumpLists in Windows TaskBar, then You need - Microsoft Visual C++ Compiler 2010 and define W7API (more info at the bottom) - If you don't meet this, please use precompiled versions, - which are also in smart windows installer. + You need Microsoft Visual C++ Compiler 2008 or higher and Qt Libraries 4.7.0 + or higher in order to build QupZilla. + Building with Microsoft Visual C++ Compiler 2010 is also possible, but as this + version is not yet suported by Qt, created binary can be executed, but is very + likely to unreasonable crash randomly. + Building with MingW is perhaps possible too, but MingW QtWebKit crashes with + every Flash, so MingW is not officially supported. + If you don't meet this, please use precompiled version, which is also in smart + windows installer. ->> Linux / Unix << ->> << +Linux / Unix +---------------------------------------------------------------------------------- There is no extra dependency, you only need Qt tools. ->> OS/2 << ->> << +OS/2 +---------------------------------------------------------------------------------- I cannot provide support for QupZilla on OS/2 as I don't have access to machine with OS/2, but it is possible to get QupZilla working there. @@ -42,11 +42,13 @@ to QupZilla.pro file. -####################### -## Available Defines ## -####################### + +Available Defines +---------------------------------------------------------------------------------- + You can set define directly in project file (QupZilla.pro) or set environment variable by + $ export NAME="true" General: @@ -61,7 +63,8 @@ Windows specific defines W7API Enable Windows 7 API support - Requires Microsoft Visual C++ Compiler 2010 + Requires linking against libraries from Microsoft Visual C++ + Compiler 2010 (disabled by default) Linux / Unix specific defines: diff --git a/COPYRIGHT b/COPYRIGHT index fcc902247..eda3c48d5 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/FAQ b/FAQ index 7e10c4041..5b21dc728 100644 --- a/FAQ +++ b/FAQ @@ -1,24 +1,22 @@ -####################### -## F.A.Q. ## -####################### +FAQ Q: Where are all my profile data stored? - +---------------------------------------------------------------------------------- A: Go to Menu Help -> Informations about application and then scroll to Paths section. -_____________________________________________________________________________ + Q: I have bookmarked a page, the star icon is shining, but I cannot see the bookmark in Menu nor Bookmark Panel. Where is it? - +---------------------------------------------------------------------------------- A: When you add a bookmark from the star icon, it is automatically added to unsorted bookmarks folder. You will see it only in Library (Ctrl+Shift+O). You can move the bookmark to other folder in star icon or in Library. -_____________________________________________________________________________ + Q: I am getting a lot of SSL errors when visiting secured (https) pages. Why is that? - +---------------------------------------------------------------------------------- A: Your system CA Certificates list is probably too small or even missing. You can check it in SSL Manager (Preferences -> Privacy -> SSL Manager). If this is your case, you have to download ca-bundle.crt file from @@ -30,9 +28,9 @@ A: Your system CA Certificates list is probably too small or even missing. directory or in some other place, but then you have to add new certificate path in SSL Manager (last tab - settings). -_____________________________________________________________________________ -Q: I cannot save any bookmark and my history is empty. What to do? +Q: I cannot save any bookmark and my history is empty. What to do? +---------------------------------------------------------------------------------- A: At first, please check that you have installed Qt SQLite plugin. On Debian, this package is called libqt4-sql-sqlite. If you have it installed and you are still experiencing this issue, diff --git a/TODO b/TODO index 7e710008d..a6c99197e 100644 --- a/TODO +++ b/TODO @@ -1,15 +1,14 @@ -####################### -## TODO List ## -####################### +TODO List +---------------------------------------------------------------------------------- There are some features, which I plan to implement in future. -Note: They are not sorted by priority. +The list is not sorted by priority. -1. OpenSearch support -2. Import / Export Bookmarks -3. Speed Dial -4. FTP Protocol support -5. Zoom Widget in statusbar -6. Save more than one account for site + input completer -7. Better SSL Manager -8. Accept-Language dialog + send this header +* OpenSearch support +* Import / Export Bookmarks +* Speed Dial +* FTP Protocol support +* Zoom Widget in statusbar +* Save more than one account for site + input completer +* Accept-Language dialog + send this header +* New LocationBar completer diff --git a/src/3rdparty/ecwin7.h b/src/3rdparty/ecwin7.h index bef0c596b..dc986808f 100644 --- a/src/3rdparty/ecwin7.h +++ b/src/3rdparty/ecwin7.h @@ -32,6 +32,7 @@ #include #include +#include "msvc2008.h" // ******************************************************************** // EcWin7 class - Windows 7 taskbar handling for Qt and MinGW diff --git a/src/adblock/adblockblockednetworkreply.cpp b/src/adblock/adblockblockednetworkreply.cpp index 90e47b233..812ec3ce0 100644 --- a/src/adblock/adblockblockednetworkreply.cpp +++ b/src/adblock/adblockblockednetworkreply.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/adblock/adblockblockednetworkreply.h b/src/adblock/adblockblockednetworkreply.h index a7d4bd5d2..50f1fb51c 100644 --- a/src/adblock/adblockblockednetworkreply.h +++ b/src/adblock/adblockblockednetworkreply.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/adblock/adblockdialog.cpp b/src/adblock/adblockdialog.cpp index 58b774dba..5eca4e922 100644 --- a/src/adblock/adblockdialog.cpp +++ b/src/adblock/adblockdialog.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/adblock/adblockdialog.h b/src/adblock/adblockdialog.h index 68fc09af3..5fc89323a 100644 --- a/src/adblock/adblockdialog.h +++ b/src/adblock/adblockdialog.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/adblock/adblockicon.cpp b/src/adblock/adblockicon.cpp index 26a9dfe17..c792f4151 100644 --- a/src/adblock/adblockicon.cpp +++ b/src/adblock/adblockicon.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/adblock/adblockicon.h b/src/adblock/adblockicon.h index 0d719a8a8..17d0cc07f 100644 --- a/src/adblock/adblockicon.h +++ b/src/adblock/adblockicon.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/adblock/adblockmanager.cpp b/src/adblock/adblockmanager.cpp index fbe9c285c..5200774a9 100644 --- a/src/adblock/adblockmanager.cpp +++ b/src/adblock/adblockmanager.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/adblock/adblockmanager.h b/src/adblock/adblockmanager.h index 9f10c2927..a05b4231d 100644 --- a/src/adblock/adblockmanager.h +++ b/src/adblock/adblockmanager.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/adblock/adblocknetwork.cpp b/src/adblock/adblocknetwork.cpp index 196ee9b19..ac6ee3648 100644 --- a/src/adblock/adblocknetwork.cpp +++ b/src/adblock/adblocknetwork.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/adblock/adblocknetwork.h b/src/adblock/adblocknetwork.h index 37f7febaf..fed8fad8c 100644 --- a/src/adblock/adblocknetwork.h +++ b/src/adblock/adblocknetwork.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/adblock/adblockrule.cpp b/src/adblock/adblockrule.cpp index dca185e33..d36480dac 100644 --- a/src/adblock/adblockrule.cpp +++ b/src/adblock/adblockrule.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/adblock/adblockrule.h b/src/adblock/adblockrule.h index 1ef1b2fc4..3ed5e13a1 100644 --- a/src/adblock/adblockrule.h +++ b/src/adblock/adblockrule.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/adblock/adblocksubscription.cpp b/src/adblock/adblocksubscription.cpp index 6d0159e94..d7a868406 100644 --- a/src/adblock/adblocksubscription.cpp +++ b/src/adblock/adblocksubscription.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/adblock/adblocksubscription.h b/src/adblock/adblocksubscription.h index fad64652e..9c532438d 100644 --- a/src/adblock/adblocksubscription.h +++ b/src/adblock/adblocksubscription.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/app/autosaver.cpp b/src/app/autosaver.cpp index 3913d20aa..2ea1e1165 100644 --- a/src/app/autosaver.cpp +++ b/src/app/autosaver.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/app/autosaver.h b/src/app/autosaver.h index 919710608..e81159e8f 100644 --- a/src/app/autosaver.h +++ b/src/app/autosaver.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/app/commandlineoptions.cpp b/src/app/commandlineoptions.cpp index 6636993b5..595025eb8 100644 --- a/src/app/commandlineoptions.cpp +++ b/src/app/commandlineoptions.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/app/commandlineoptions.h b/src/app/commandlineoptions.h index f9e47fe7d..c57b06ba0 100644 --- a/src/app/commandlineoptions.h +++ b/src/app/commandlineoptions.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/app/mainapplication.cpp b/src/app/mainapplication.cpp index 93693712e..55f527e2a 100644 --- a/src/app/mainapplication.cpp +++ b/src/app/mainapplication.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/app/mainapplication.h b/src/app/mainapplication.h index b420a19ab..8d6d81a00 100644 --- a/src/app/mainapplication.h +++ b/src/app/mainapplication.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/autofill/autofillmodel.cpp b/src/autofill/autofillmodel.cpp index ec407ee0a..c3899877c 100644 --- a/src/autofill/autofillmodel.cpp +++ b/src/autofill/autofillmodel.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/autofill/autofillmodel.h b/src/autofill/autofillmodel.h index ac75fd151..dca78aec5 100644 --- a/src/autofill/autofillmodel.h +++ b/src/autofill/autofillmodel.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/autofill/autofillnotification.cpp b/src/autofill/autofillnotification.cpp index 0b108c06a..e4bd6a435 100644 --- a/src/autofill/autofillnotification.cpp +++ b/src/autofill/autofillnotification.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/autofill/autofillnotification.h b/src/autofill/autofillnotification.h index d85f7e0be..390d116ff 100644 --- a/src/autofill/autofillnotification.h +++ b/src/autofill/autofillnotification.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/bookmarks/bookmarkicon.cpp b/src/bookmarks/bookmarkicon.cpp index 243e7a376..ed400395f 100644 --- a/src/bookmarks/bookmarkicon.cpp +++ b/src/bookmarks/bookmarkicon.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/bookmarks/bookmarkicon.h b/src/bookmarks/bookmarkicon.h index fec71ec37..c2dd063a7 100644 --- a/src/bookmarks/bookmarkicon.h +++ b/src/bookmarks/bookmarkicon.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp index c471ed0b2..d33c4b0d3 100644 --- a/src/bookmarks/bookmarksmanager.cpp +++ b/src/bookmarks/bookmarksmanager.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/bookmarks/bookmarksmanager.h b/src/bookmarks/bookmarksmanager.h index 707a5e43a..ca55d0d4c 100644 --- a/src/bookmarks/bookmarksmanager.h +++ b/src/bookmarks/bookmarksmanager.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/bookmarks/bookmarksmodel.cpp b/src/bookmarks/bookmarksmodel.cpp index 65bd87721..de8b6349e 100644 --- a/src/bookmarks/bookmarksmodel.cpp +++ b/src/bookmarks/bookmarksmodel.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/bookmarks/bookmarksmodel.h b/src/bookmarks/bookmarksmodel.h index f889bd174..64fb36eda 100644 --- a/src/bookmarks/bookmarksmodel.h +++ b/src/bookmarks/bookmarksmodel.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/bookmarks/bookmarkstoolbar.cpp b/src/bookmarks/bookmarkstoolbar.cpp index c8e038e64..1a8d24f5b 100644 --- a/src/bookmarks/bookmarkstoolbar.cpp +++ b/src/bookmarks/bookmarkstoolbar.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/bookmarks/bookmarkstoolbar.h b/src/bookmarks/bookmarkstoolbar.h index 23f9dcd12..41f96a9ea 100644 --- a/src/bookmarks/bookmarkstoolbar.h +++ b/src/bookmarks/bookmarkstoolbar.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/bookmarks/bookmarkswidget.cpp b/src/bookmarks/bookmarkswidget.cpp index 8490bf029..ce501585c 100644 --- a/src/bookmarks/bookmarkswidget.cpp +++ b/src/bookmarks/bookmarkswidget.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/bookmarks/bookmarkswidget.h b/src/bookmarks/bookmarkswidget.h index 5aacf07d8..986a04bcd 100644 --- a/src/bookmarks/bookmarkswidget.h +++ b/src/bookmarks/bookmarkswidget.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/cookies/cookiejar.cpp b/src/cookies/cookiejar.cpp index 14852593e..7a12ad386 100644 --- a/src/cookies/cookiejar.cpp +++ b/src/cookies/cookiejar.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/cookies/cookiejar.h b/src/cookies/cookiejar.h index 6592a69a0..3b219d439 100644 --- a/src/cookies/cookiejar.h +++ b/src/cookies/cookiejar.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/cookies/cookiemanager.cpp b/src/cookies/cookiemanager.cpp index 2fe5a4e34..38b744aec 100644 --- a/src/cookies/cookiemanager.cpp +++ b/src/cookies/cookiemanager.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/cookies/cookiemanager.h b/src/cookies/cookiemanager.h index 6447b5830..bd35c0ac0 100644 --- a/src/cookies/cookiemanager.h +++ b/src/cookies/cookiemanager.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/data/html/copyright b/src/data/html/copyright index fcc902247..bd5e00587 100644 --- a/src/data/html/copyright +++ b/src/data/html/copyright @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 @@ -13,7 +13,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program. If not, see . +* along with this program. If not, see http://www.gnu.org/licenses/. * ============================================================ */ ----------------------------------------------------------- AdBlock, LineEdit class and SqueezeLabel class: diff --git a/src/data/html/errorPage.html b/src/data/html/errorPage.html index d77d40732..d7c6e20ad 100644 --- a/src/data/html/errorPage.html +++ b/src/data/html/errorPage.html @@ -15,7 +15,6 @@ html * { #box { max-width: 650px; - max-height: 330px; overflow:auto; margin: 25px auto 10px auto; padding: 10px 40px; diff --git a/src/desktopnotifications/desktopnotification.cpp b/src/desktopnotifications/desktopnotification.cpp index 482152f8d..ff1816db5 100644 --- a/src/desktopnotifications/desktopnotification.cpp +++ b/src/desktopnotifications/desktopnotification.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/desktopnotifications/desktopnotification.h b/src/desktopnotifications/desktopnotification.h index c15b22807..9ffd57b16 100644 --- a/src/desktopnotifications/desktopnotification.h +++ b/src/desktopnotifications/desktopnotification.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/desktopnotifications/desktopnotificationsfactory.cpp b/src/desktopnotifications/desktopnotificationsfactory.cpp index 34db41e50..2e46bc2e3 100644 --- a/src/desktopnotifications/desktopnotificationsfactory.cpp +++ b/src/desktopnotifications/desktopnotificationsfactory.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/desktopnotifications/desktopnotificationsfactory.h b/src/desktopnotifications/desktopnotificationsfactory.h index f7aa203d5..c297db75f 100644 --- a/src/desktopnotifications/desktopnotificationsfactory.h +++ b/src/desktopnotifications/desktopnotificationsfactory.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/downloads/downloadfilehelper.cpp b/src/downloads/downloadfilehelper.cpp index 04dee90c4..38950ef13 100644 --- a/src/downloads/downloadfilehelper.cpp +++ b/src/downloads/downloadfilehelper.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 @@ -23,6 +23,7 @@ #include "qupzilla.h" #include "downloaditem.h" #include "downloadmanager.h" +#include "globalfunctions.h" DownloadFileHelper::DownloadFileHelper(const QString &lastDownloadPath, const QString &downloadPath, bool useNativeDialog) : QObject() @@ -117,6 +118,7 @@ void DownloadFileHelper::optionsDialogAccepted(int finish) void DownloadFileHelper::fileNameChoosed(const QString &name, bool fileNameAutoGenerated) { m_userFileName = name; + if (m_userFileName.isEmpty()) { m_reply->abort(); if (m_timer) diff --git a/src/history/historymanager.cpp b/src/history/historymanager.cpp index 8560d20b0..ed01bda3f 100644 --- a/src/history/historymanager.cpp +++ b/src/history/historymanager.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/history/historymanager.h b/src/history/historymanager.h index b72569210..e03b24c6f 100644 --- a/src/history/historymanager.h +++ b/src/history/historymanager.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/history/historymodel.cpp b/src/history/historymodel.cpp index e25e80b47..2f00cd5df 100644 --- a/src/history/historymodel.cpp +++ b/src/history/historymodel.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/history/historymodel.h b/src/history/historymodel.h index 19d12f7db..0b27eb7a7 100644 --- a/src/history/historymodel.h +++ b/src/history/historymodel.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/history/webhistoryinterface.cpp b/src/history/webhistoryinterface.cpp index 77391b18e..0d6f34ede 100644 --- a/src/history/webhistoryinterface.cpp +++ b/src/history/webhistoryinterface.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/history/webhistoryinterface.h b/src/history/webhistoryinterface.h index 3177d4940..728c815e9 100644 --- a/src/history/webhistoryinterface.h +++ b/src/history/webhistoryinterface.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/main.cpp b/src/main.cpp index c3a47590b..c437f2366 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/navigation/locationbar.cpp b/src/navigation/locationbar.cpp index 45275dc08..46af55fb2 100644 --- a/src/navigation/locationbar.cpp +++ b/src/navigation/locationbar.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/navigation/locationbar.h b/src/navigation/locationbar.h index 76bc1c477..6b8d165a4 100644 --- a/src/navigation/locationbar.h +++ b/src/navigation/locationbar.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/navigation/locationbarsettings.cpp b/src/navigation/locationbarsettings.cpp index b0ca65c34..95768f0f3 100644 --- a/src/navigation/locationbarsettings.cpp +++ b/src/navigation/locationbarsettings.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/navigation/locationbarsettings.h b/src/navigation/locationbarsettings.h index f3bf5e100..aac891756 100644 --- a/src/navigation/locationbarsettings.h +++ b/src/navigation/locationbarsettings.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/navigation/locationcompleter.cpp b/src/navigation/locationcompleter.cpp index 3974ff1aa..6e4d70a97 100644 --- a/src/navigation/locationcompleter.cpp +++ b/src/navigation/locationcompleter.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/navigation/locationcompleter.h b/src/navigation/locationcompleter.h index ba9e7a836..da9b79798 100644 --- a/src/navigation/locationcompleter.h +++ b/src/navigation/locationcompleter.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/navigation/locationpopup.cpp b/src/navigation/locationpopup.cpp index 5bec11108..1295d00b3 100644 --- a/src/navigation/locationpopup.cpp +++ b/src/navigation/locationpopup.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/navigation/locationpopup.h b/src/navigation/locationpopup.h index ba2a09a58..cf03b9b9e 100644 --- a/src/navigation/locationpopup.h +++ b/src/navigation/locationpopup.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/navigation/navigationbar.cpp b/src/navigation/navigationbar.cpp index 860ea973b..e1983f071 100644 --- a/src/navigation/navigationbar.cpp +++ b/src/navigation/navigationbar.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 @@ -86,11 +86,6 @@ NavigationBar::NavigationBar(QupZilla *mainClass, QWidget *parent) m_navigationSplitter->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum); m_navigationSplitter->setCollapsible(0, false); - int splitterWidth = m_navigationSplitter->width(); - QList sizes; - sizes << (int)((double)splitterWidth * .85) << (int)((double)splitterWidth * .15); - m_navigationSplitter->setSizes(sizes); - m_exitFullscreen = new ToolButton(); m_exitFullscreen->setText(tr("Exit Fullscreen")); m_exitFullscreen->setToolTip(tr("Exit Fullscreen")); @@ -116,6 +111,20 @@ NavigationBar::NavigationBar(QupZilla *mainClass, QWidget *parent) connect(m_exitFullscreen, SIGNAL(clicked(bool)), p_QupZilla, SLOT(fullScreen(bool))); } +void NavigationBar::setSplitterSizes(int locationBar, int websearchBar) +{ + QList sizes; + + if (locationBar == 0) { + int splitterWidth = m_navigationSplitter->width(); + sizes << (int)((double)splitterWidth * .80) << (int)((double)splitterWidth * .20); + } else { + sizes << locationBar << websearchBar; + } + + m_navigationSplitter->setSizes(sizes); +} + void NavigationBar::showReloadButton() { m_reloadStop->showReloadButton(); diff --git a/src/navigation/navigationbar.h b/src/navigation/navigationbar.h index b22b6f33d..13a6c6b84 100644 --- a/src/navigation/navigationbar.h +++ b/src/navigation/navigationbar.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 @@ -34,6 +34,8 @@ public: explicit NavigationBar(QupZilla* mainClass, QWidget *parent = 0); ~NavigationBar(); + void setSplitterSizes(int locationBar, int websearchBar); + void showReloadButton(); void showStopButton(); @@ -44,6 +46,7 @@ public: inline ToolButton* buttonSuperMenu() { return m_supMenu; } inline ToolButton* buttonExitFullscreen() { return m_exitFullscreen; } inline WebSearchBar* searchLine() { return m_searchLine; } + inline QSplitter* splitter() { return m_navigationSplitter; } signals: diff --git a/src/navigation/reloadstopbutton.cpp b/src/navigation/reloadstopbutton.cpp index 52e0970e5..4e02cd957 100644 --- a/src/navigation/reloadstopbutton.cpp +++ b/src/navigation/reloadstopbutton.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/navigation/reloadstopbutton.h b/src/navigation/reloadstopbutton.h index d7ed842d7..cbb165a70 100644 --- a/src/navigation/reloadstopbutton.h +++ b/src/navigation/reloadstopbutton.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/navigation/websearchbar.cpp b/src/navigation/websearchbar.cpp index 74789e4d2..526d9b420 100644 --- a/src/navigation/websearchbar.cpp +++ b/src/navigation/websearchbar.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/navigation/websearchbar.h b/src/navigation/websearchbar.h index 3d7cb7ab1..7d314a14b 100644 --- a/src/navigation/websearchbar.h +++ b/src/navigation/websearchbar.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/network/networkmanager.cpp b/src/network/networkmanager.cpp index e83d61b99..40196795a 100644 --- a/src/network/networkmanager.cpp +++ b/src/network/networkmanager.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/network/networkmanager.h b/src/network/networkmanager.h index b45c6d5df..47666a840 100644 --- a/src/network/networkmanager.h +++ b/src/network/networkmanager.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/network/networkmanagerproxy.cpp b/src/network/networkmanagerproxy.cpp index b0e09d650..996900bc1 100644 --- a/src/network/networkmanagerproxy.cpp +++ b/src/network/networkmanagerproxy.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/network/networkmanagerproxy.h b/src/network/networkmanagerproxy.h index 3680329a8..8aad03f94 100644 --- a/src/network/networkmanagerproxy.h +++ b/src/network/networkmanagerproxy.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/network/networkproxyfactory.cpp b/src/network/networkproxyfactory.cpp index 6d9851b9b..e2f7aea80 100644 --- a/src/network/networkproxyfactory.cpp +++ b/src/network/networkproxyfactory.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/network/networkproxyfactory.h b/src/network/networkproxyfactory.h index 6f69162c7..0fc6d3255 100644 --- a/src/network/networkproxyfactory.h +++ b/src/network/networkproxyfactory.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/network/qupzillaschemehandler.cpp b/src/network/qupzillaschemehandler.cpp index f383e7205..006a0455a 100644 --- a/src/network/qupzillaschemehandler.cpp +++ b/src/network/qupzillaschemehandler.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/network/qupzillaschemehandler.h b/src/network/qupzillaschemehandler.h index ea0a9b15e..2f0a7e513 100644 --- a/src/network/qupzillaschemehandler.h +++ b/src/network/qupzillaschemehandler.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/other/aboutdialog.cpp b/src/other/aboutdialog.cpp index 4e29ca3c5..2b5d01cac 100644 --- a/src/other/aboutdialog.cpp +++ b/src/other/aboutdialog.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/other/aboutdialog.h b/src/other/aboutdialog.h index a97920db9..b84b736af 100644 --- a/src/other/aboutdialog.h +++ b/src/other/aboutdialog.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/other/browsinglibrary.cpp b/src/other/browsinglibrary.cpp index 49796d099..191e76ff7 100644 --- a/src/other/browsinglibrary.cpp +++ b/src/other/browsinglibrary.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/other/browsinglibrary.h b/src/other/browsinglibrary.h index bea62f604..793e36f5a 100644 --- a/src/other/browsinglibrary.h +++ b/src/other/browsinglibrary.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/other/clearprivatedata.cpp b/src/other/clearprivatedata.cpp index 74df20ad5..e07c32a44 100644 --- a/src/other/clearprivatedata.cpp +++ b/src/other/clearprivatedata.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/other/clearprivatedata.h b/src/other/clearprivatedata.h index fffe634be..fcd41816d 100644 --- a/src/other/clearprivatedata.h +++ b/src/other/clearprivatedata.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/other/pagescreen.cpp b/src/other/pagescreen.cpp index 4088fbffb..3ddd00d97 100644 --- a/src/other/pagescreen.cpp +++ b/src/other/pagescreen.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/other/pagescreen.h b/src/other/pagescreen.h index 15ef4fb74..928197c33 100644 --- a/src/other/pagescreen.h +++ b/src/other/pagescreen.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/other/sourceviewer.cpp b/src/other/sourceviewer.cpp index d06847c65..529fd1ac8 100644 --- a/src/other/sourceviewer.cpp +++ b/src/other/sourceviewer.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/other/sourceviewer.h b/src/other/sourceviewer.h index 16dc2b26e..524404f90 100644 --- a/src/other/sourceviewer.h +++ b/src/other/sourceviewer.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/other/sourceviewersearch.cpp b/src/other/sourceviewersearch.cpp index 2d84ad6e4..8bb05edc2 100644 --- a/src/other/sourceviewersearch.cpp +++ b/src/other/sourceviewersearch.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/other/sourceviewersearch.h b/src/other/sourceviewersearch.h index 3c078d73a..36d2ab781 100644 --- a/src/other/sourceviewersearch.h +++ b/src/other/sourceviewersearch.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/other/updater.cpp b/src/other/updater.cpp index e90a0e501..e32880ad5 100644 --- a/src/other/updater.cpp +++ b/src/other/updater.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/other/updater.h b/src/other/updater.h index 7a2f97d1d..259e82c84 100644 --- a/src/other/updater.h +++ b/src/other/updater.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/plugins/clicktoflash.cpp b/src/plugins/clicktoflash.cpp index 19b1fa6fa..ba442be96 100644 --- a/src/plugins/clicktoflash.cpp +++ b/src/plugins/clicktoflash.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/plugins/clicktoflash.h b/src/plugins/clicktoflash.h index 0bcd1c752..23907a891 100644 --- a/src/plugins/clicktoflash.h +++ b/src/plugins/clicktoflash.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/plugins/plugininterface.h b/src/plugins/plugininterface.h index 4d266ffc3..c217d455a 100644 --- a/src/plugins/plugininterface.h +++ b/src/plugins/plugininterface.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/plugins/pluginproxy.cpp b/src/plugins/pluginproxy.cpp index 887a34e7d..8b398a70b 100644 --- a/src/plugins/pluginproxy.cpp +++ b/src/plugins/pluginproxy.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/plugins/pluginproxy.h b/src/plugins/pluginproxy.h index 108a59f00..91ef8f0b4 100644 --- a/src/plugins/pluginproxy.h +++ b/src/plugins/pluginproxy.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/plugins/plugins.cpp b/src/plugins/plugins.cpp index ea1cff281..004be1235 100644 --- a/src/plugins/plugins.cpp +++ b/src/plugins/plugins.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/plugins/plugins.h b/src/plugins/plugins.h index b8fc3179a..1d3e9b904 100644 --- a/src/plugins/plugins.h +++ b/src/plugins/plugins.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/plugins/webpluginfactory.cpp b/src/plugins/webpluginfactory.cpp index 1d70358cc..7e42505d9 100644 --- a/src/plugins/webpluginfactory.cpp +++ b/src/plugins/webpluginfactory.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/plugins/webpluginfactory.h b/src/plugins/webpluginfactory.h index 7415a5065..cfc33483c 100644 --- a/src/plugins/webpluginfactory.h +++ b/src/plugins/webpluginfactory.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/preferences/autofillmanager.cpp b/src/preferences/autofillmanager.cpp index e3ed3cfd0..7a26331d1 100644 --- a/src/preferences/autofillmanager.cpp +++ b/src/preferences/autofillmanager.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/preferences/autofillmanager.h b/src/preferences/autofillmanager.h index 4706512d0..7e9da5c90 100644 --- a/src/preferences/autofillmanager.h +++ b/src/preferences/autofillmanager.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/preferences/pluginslist.cpp b/src/preferences/pluginslist.cpp index f20c6bd4e..60df5e422 100644 --- a/src/preferences/pluginslist.cpp +++ b/src/preferences/pluginslist.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/preferences/pluginslist.h b/src/preferences/pluginslist.h index 1ab0623a9..5efdc43ed 100644 --- a/src/preferences/pluginslist.h +++ b/src/preferences/pluginslist.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/preferences/preferences.cpp b/src/preferences/preferences.cpp index e5144766e..86d2ae5a8 100644 --- a/src/preferences/preferences.cpp +++ b/src/preferences/preferences.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 @@ -364,6 +364,11 @@ void Preferences::chooseDownPath() QString userFileName = QFileDialog::getExistingDirectory(p_QupZilla, tr("Choose download location..."), QDir::homePath()); if (userFileName.isEmpty()) return; +#ifdef Q_WS_WIN //QFileDialog::getExistingDirectory returns path with \ instead of / (??) + userFileName.replace("\\", "/"); +#endif + userFileName += "/"; + ui->downLoc->setText(userFileName); } @@ -570,17 +575,8 @@ void Preferences::saveSettings() settings.beginGroup("DownloadManager"); if (ui->askEverytime->isChecked()) settings.setValue("defaultDownloadPath",""); - else{ - QString text = ui->downLoc->text(); -#ifdef Q_WS_WIN - if (!text.endsWith("\\")) - text+="\\"; -#else - if (!text.endsWith("/")) - text+="/"; -#endif - settings.setValue("defaultDownloadPath",text); - } + else + settings.setValue("defaultDownloadPath", ui->downLoc->text()); settings.setValue("useNativeDialog", ui->downlaodNativeSystemDialog->isChecked()); settings.endGroup(); diff --git a/src/preferences/preferences.h b/src/preferences/preferences.h index dcfa2c2ca..d94e11ac7 100644 --- a/src/preferences/preferences.h +++ b/src/preferences/preferences.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/preferences/sslmanager.cpp b/src/preferences/sslmanager.cpp index 2b89fe6f3..cd09d1b2f 100644 --- a/src/preferences/sslmanager.cpp +++ b/src/preferences/sslmanager.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/preferences/sslmanager.h b/src/preferences/sslmanager.h index 3ad0c62d9..3e9a077a8 100644 --- a/src/preferences/sslmanager.h +++ b/src/preferences/sslmanager.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/preferences/thememanager.cpp b/src/preferences/thememanager.cpp index 1e22278fa..213bc5dd3 100644 --- a/src/preferences/thememanager.cpp +++ b/src/preferences/thememanager.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 @@ -28,7 +28,13 @@ ThemeManager::ThemeManager(QWidget* parent) ui->license->hide(); QSettings settings(mApp->getActiveProfilPath()+"settings.ini", QSettings::IniFormat); settings.beginGroup("Themes"); - m_activeTheme = settings.value("activeTheme", "default").toString(); + m_activeTheme = settings.value("activeTheme", +#ifdef Q_WS_X11 + "linux" +#else + "windows" +#endif + ).toString(); settings.endGroup(); QDir themeDir(mApp->THEMESDIR); diff --git a/src/preferences/thememanager.h b/src/preferences/thememanager.h index 43b6429d8..bbc17fac6 100644 --- a/src/preferences/thememanager.h +++ b/src/preferences/thememanager.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/rss/rssmanager.cpp b/src/rss/rssmanager.cpp index 3821e7cc4..e4212858b 100644 --- a/src/rss/rssmanager.cpp +++ b/src/rss/rssmanager.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/rss/rssmanager.h b/src/rss/rssmanager.h index 4c746a13b..d986e6c6b 100644 --- a/src/rss/rssmanager.h +++ b/src/rss/rssmanager.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/rss/rssnotification.cpp b/src/rss/rssnotification.cpp index 9200b8604..3f0022337 100644 --- a/src/rss/rssnotification.cpp +++ b/src/rss/rssnotification.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/rss/rssnotification.h b/src/rss/rssnotification.h index 3cce76cd5..5eb84ff93 100644 --- a/src/rss/rssnotification.h +++ b/src/rss/rssnotification.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/rss/rsswidget.cpp b/src/rss/rsswidget.cpp index a77418882..c4e479a25 100644 --- a/src/rss/rsswidget.cpp +++ b/src/rss/rsswidget.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/rss/rsswidget.h b/src/rss/rsswidget.h index 44f10c538..5175a59c4 100644 --- a/src/rss/rsswidget.h +++ b/src/rss/rsswidget.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/sidebar/bookmarkssidebar.cpp b/src/sidebar/bookmarkssidebar.cpp index de38f4e20..c6fa6a890 100644 --- a/src/sidebar/bookmarkssidebar.cpp +++ b/src/sidebar/bookmarkssidebar.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/sidebar/bookmarkssidebar.h b/src/sidebar/bookmarkssidebar.h index 2dbbd29a0..17226b1e4 100644 --- a/src/sidebar/bookmarkssidebar.h +++ b/src/sidebar/bookmarkssidebar.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/sidebar/historysidebar.cpp b/src/sidebar/historysidebar.cpp index bbb53f0db..e721f0874 100644 --- a/src/sidebar/historysidebar.cpp +++ b/src/sidebar/historysidebar.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/sidebar/historysidebar.h b/src/sidebar/historysidebar.h index 21b89ce69..4bad5eded 100644 --- a/src/sidebar/historysidebar.h +++ b/src/sidebar/historysidebar.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/sidebar/historysidebar.ui b/src/sidebar/historysidebar.ui index 975672a5c..79d1a01b0 100644 --- a/src/sidebar/historysidebar.ui +++ b/src/sidebar/historysidebar.ui @@ -10,9 +10,6 @@ 457 - - - 1 diff --git a/src/tools/animatedwidget.cpp b/src/tools/animatedwidget.cpp index f3b0ead9b..c0fa7646b 100644 --- a/src/tools/animatedwidget.cpp +++ b/src/tools/animatedwidget.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/tools/animatedwidget.h b/src/tools/animatedwidget.h index 032ca7c77..eb0917249 100644 --- a/src/tools/animatedwidget.h +++ b/src/tools/animatedwidget.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/tools/buttonbox.cpp b/src/tools/buttonbox.cpp index f40e66747..2f6704064 100644 --- a/src/tools/buttonbox.cpp +++ b/src/tools/buttonbox.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/tools/buttonbox.h b/src/tools/buttonbox.h index 89e2bc2ee..20db3a2c4 100644 --- a/src/tools/buttonbox.h +++ b/src/tools/buttonbox.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/tools/buttonwithmenu.cpp b/src/tools/buttonwithmenu.cpp index b822f1dc9..708c584b3 100644 --- a/src/tools/buttonwithmenu.cpp +++ b/src/tools/buttonwithmenu.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/tools/buttonwithmenu.h b/src/tools/buttonwithmenu.h index 28a7214e4..486f98bc0 100644 --- a/src/tools/buttonwithmenu.h +++ b/src/tools/buttonwithmenu.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/tools/certificateinfowidget.cpp b/src/tools/certificateinfowidget.cpp index f55f76696..1d949ed8a 100644 --- a/src/tools/certificateinfowidget.cpp +++ b/src/tools/certificateinfowidget.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/tools/certificateinfowidget.h b/src/tools/certificateinfowidget.h index c0eb6d486..8d7de5663 100644 --- a/src/tools/certificateinfowidget.h +++ b/src/tools/certificateinfowidget.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/tools/clickablelabel.cpp b/src/tools/clickablelabel.cpp index a05518325..9dee2a489 100644 --- a/src/tools/clickablelabel.cpp +++ b/src/tools/clickablelabel.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/tools/clickablelabel.h b/src/tools/clickablelabel.h index 70ee781c3..e010eefde 100644 --- a/src/tools/clickablelabel.h +++ b/src/tools/clickablelabel.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/tools/closedtabsmanager.cpp b/src/tools/closedtabsmanager.cpp index 6c029bfb5..2301b1d88 100644 --- a/src/tools/closedtabsmanager.cpp +++ b/src/tools/closedtabsmanager.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/tools/closedtabsmanager.h b/src/tools/closedtabsmanager.h index a8ddce703..b408e850d 100644 --- a/src/tools/closedtabsmanager.h +++ b/src/tools/closedtabsmanager.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/tools/docktitlebarwidget.cpp b/src/tools/docktitlebarwidget.cpp index 328bbef7a..5dc699937 100644 --- a/src/tools/docktitlebarwidget.cpp +++ b/src/tools/docktitlebarwidget.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/tools/docktitlebarwidget.h b/src/tools/docktitlebarwidget.h index 174fd71c2..f3721aa56 100644 --- a/src/tools/docktitlebarwidget.h +++ b/src/tools/docktitlebarwidget.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/tools/frame.cpp b/src/tools/frame.cpp index 2af70270a..b2dd107c6 100644 --- a/src/tools/frame.cpp +++ b/src/tools/frame.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/tools/frame.h b/src/tools/frame.h index 2960746a7..70df84cb5 100644 --- a/src/tools/frame.h +++ b/src/tools/frame.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/tools/globalfunctions.cpp b/src/tools/globalfunctions.cpp index 3da51b9a5..e0bb8cb88 100644 --- a/src/tools/globalfunctions.cpp +++ b/src/tools/globalfunctions.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 @@ -80,7 +80,7 @@ QUrl qz_makeRelativeUrl(const QUrl &baseUrl, const QUrl &rUrl) slashCount--; rUrlPath.remove(samePart); - rUrlPath.prepend(QString("../").repeated(slashCount)); + rUrlPath.prepend(QString("..""/").repeated(slashCount)); returnUrl = QUrl(rUrlPath); } diff --git a/src/tools/globalfunctions.h b/src/tools/globalfunctions.h index 9ea6cf5c5..32e0e13da 100644 --- a/src/tools/globalfunctions.h +++ b/src/tools/globalfunctions.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/tools/htmlhighlighter.cpp b/src/tools/htmlhighlighter.cpp index e74ee6118..8d3381368 100644 --- a/src/tools/htmlhighlighter.cpp +++ b/src/tools/htmlhighlighter.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/tools/htmlhighlighter.h b/src/tools/htmlhighlighter.h index fe17e439e..f00954ad3 100644 --- a/src/tools/htmlhighlighter.h +++ b/src/tools/htmlhighlighter.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/tools/iconprovider.cpp b/src/tools/iconprovider.cpp index 6e63a92fb..b2da14cca 100644 --- a/src/tools/iconprovider.cpp +++ b/src/tools/iconprovider.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/tools/iconprovider.h b/src/tools/iconprovider.h index 9dc552b9b..05b0b396f 100644 --- a/src/tools/iconprovider.h +++ b/src/tools/iconprovider.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/tools/progressbar.cpp b/src/tools/progressbar.cpp index 217c8cd86..eafbb09ac 100644 --- a/src/tools/progressbar.cpp +++ b/src/tools/progressbar.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/tools/progressbar.h b/src/tools/progressbar.h index 1d1b33a15..cc1cde286 100644 --- a/src/tools/progressbar.h +++ b/src/tools/progressbar.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/tools/toolbutton.cpp b/src/tools/toolbutton.cpp index 7d27c347d..7a09f4636 100644 --- a/src/tools/toolbutton.cpp +++ b/src/tools/toolbutton.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/tools/toolbutton.h b/src/tools/toolbutton.h index 91da73547..552ad32d6 100644 --- a/src/tools/toolbutton.h +++ b/src/tools/toolbutton.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/tools/treewidget.cpp b/src/tools/treewidget.cpp index 084e91e25..1636d59b9 100644 --- a/src/tools/treewidget.cpp +++ b/src/tools/treewidget.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/tools/treewidget.h b/src/tools/treewidget.h index 0d92dc564..8303c1af8 100644 --- a/src/tools/treewidget.h +++ b/src/tools/treewidget.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/tools/widget.cpp b/src/tools/widget.cpp index 18971e868..cbe9e69cb 100644 --- a/src/tools/widget.cpp +++ b/src/tools/widget.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/tools/widget.h b/src/tools/widget.h index 35cf83c65..011af1445 100644 --- a/src/tools/widget.h +++ b/src/tools/widget.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/webview/searchtoolbar.cpp b/src/webview/searchtoolbar.cpp index 8edf08411..c33cfe9bf 100644 --- a/src/webview/searchtoolbar.cpp +++ b/src/webview/searchtoolbar.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/webview/searchtoolbar.h b/src/webview/searchtoolbar.h index 89ad4a5ae..cfd82df90 100644 --- a/src/webview/searchtoolbar.h +++ b/src/webview/searchtoolbar.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/webview/siteinfo.cpp b/src/webview/siteinfo.cpp index b0cb7cbd7..05ab7f4de 100644 --- a/src/webview/siteinfo.cpp +++ b/src/webview/siteinfo.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/webview/siteinfo.h b/src/webview/siteinfo.h index 28f22eb91..45dd7436d 100644 --- a/src/webview/siteinfo.h +++ b/src/webview/siteinfo.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/webview/siteinfowidget.cpp b/src/webview/siteinfowidget.cpp index d09656330..d2bb46114 100644 --- a/src/webview/siteinfowidget.cpp +++ b/src/webview/siteinfowidget.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/webview/siteinfowidget.h b/src/webview/siteinfowidget.h index 7ae046823..19d1f9f21 100644 --- a/src/webview/siteinfowidget.h +++ b/src/webview/siteinfowidget.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/webview/tabbar.cpp b/src/webview/tabbar.cpp index ea3d56317..50bfaf3be 100644 --- a/src/webview/tabbar.cpp +++ b/src/webview/tabbar.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/webview/tabbar.h b/src/webview/tabbar.h index c4614676d..591650a31 100644 --- a/src/webview/tabbar.h +++ b/src/webview/tabbar.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/webview/tabwidget.cpp b/src/webview/tabwidget.cpp index a82f31df5..560b92d64 100644 --- a/src/webview/tabwidget.cpp +++ b/src/webview/tabwidget.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/webview/tabwidget.h b/src/webview/tabwidget.h index a00927bcf..b96b106cb 100644 --- a/src/webview/tabwidget.h +++ b/src/webview/tabwidget.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/webview/webpage.cpp b/src/webview/webpage.cpp index b527fa859..65d76c33f 100644 --- a/src/webview/webpage.cpp +++ b/src/webview/webpage.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/webview/webpage.h b/src/webview/webpage.h index a86f6f24d..b94b04e21 100644 --- a/src/webview/webpage.h +++ b/src/webview/webpage.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/webview/webtab.cpp b/src/webview/webtab.cpp index e4f7d5388..3d54b9d06 100644 --- a/src/webview/webtab.cpp +++ b/src/webview/webtab.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/webview/webtab.h b/src/webview/webtab.h index d7eb4a142..5d3a128a7 100644 --- a/src/webview/webtab.h +++ b/src/webview/webtab.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 diff --git a/src/webview/webview.cpp b/src/webview/webview.cpp index 94b90fd96..2382a4095 100644 --- a/src/webview/webview.cpp +++ b/src/webview/webview.cpp @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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 @@ -211,6 +211,9 @@ void WebView::loadFinished(bool state) { Q_UNUSED(state); + if (mApp->isClosing()) + return; + if (animationLoading(tabIndex(), false)->movie()) animationLoading(tabIndex(), false)->movie()->stop(); diff --git a/src/webview/webview.h b/src/webview/webview.h index 2a4d2e7a0..325dc0170 100644 --- a/src/webview/webview.h +++ b/src/webview/webview.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2011 nowrep +* Copyright (C) 2010-2011 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