Merge branch 'master' of git://github.com/nowrep/QupZilla

AUTHORS

@@ -25,8 +25,10 @@ Nicolas Ourceau       <lamessen@hotmail.fr>             (French)
 Vasilis Tsivikis      <vasitsiv.dev@gmail.com>          (Greek)
 Alexander Maslov      <it@delta-z.ru>                   (Russian)
 Oleg Brezhnev         <oleg-423@yandex.ru>              (Russian)
+Sérgio Marques        <smarquespt@gmail.com>            (Portuguese)
 
 Special thanks:
 
 Jonathan Hooverman    <jonathan.hooverman@gmail.com>  (english language correction)
 Peter Vacula          <pvacula1989@gmail.com>         (for a big support in the beginnigs)
+Radomir Orkac                                         (qupzilla.com domain)

COPYRIGHT

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,6 +15,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * ============================================================ */
+
 ------------------------------------------------------------------------
  AdBlock, LineEdit class and SqueezeLabel class:
 ------------------------------------------------------------------------
@@ -160,6 +161,40 @@
  * Boston, MA  02110-1301  USA
  */
 
+-----------------------------------------------------------------------------
+ CA certificates from Mozilla included in ca-bundle.crt:
+-----------------------------------------------------------------------------
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+
 -----------------------------------------------------------------------------
  QtWin class from
  http://labs.qt.nokia.com/2009/09/15/using-blur-behind-on-windows/

README.md

@@ -1,4 +1,4 @@
-QupZilla Web Browser - http://www.qupzilla.co.cc (http://qupzilla.blogspot.com/)
+QupZilla Web Browser - http://www.qupzilla.com (http://qupzilla.blogspot.com/)
 
 About QupZilla
 ----------------------------------------------------------------------------------------

scripts/make-ca-bundle.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
-cat /usr/share/ca-certificates/*/*.crt > ../other/ca-bundle.crt
+# It will probably work only for Debian based distros
+
+cat /usr/share/ca-certificates/*/*.crt > ../src/data/data/ca-bundle.crt
+cat /etc/ssl/certs/*.pem >> ../src/data/data/ca-bundle.crt
 
 read -p "Press [ENTER] to close terminal"
 exit

src/3rdparty/qtwin.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -115,8 +115,9 @@ bool QtWin::isRunningWindows7()
 {
 #ifdef Q_WS_WIN
     return QSysInfo::windowsVersion() == QSysInfo::WV_WINDOWS7;
-#endif
+#else
     return false;
+#endif
 }
 
 /*!

src/3rdparty/qtwin.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/adblock/adblockblockednetworkreply.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/adblock/adblockblockednetworkreply.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/adblock/adblockdialog.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -63,7 +63,7 @@ AdBlockDialog::AdBlockDialog(QWidget* parent)
     connect(addButton, SIGNAL(clicked()), this, SLOT(addCustomRule()));
     connect(reloadButton, SIGNAL(clicked()), this, SLOT(updateSubscription()));
     connect(search, SIGNAL(textChanged(QString)), treeWidget, SLOT(filterString(QString)));
-    connect(m_manager->subscription(), SIGNAL(changed()), this, SLOT(refreshAfterUpdate()));
+    connect(m_manager->subscription(), SIGNAL(rulesUpdated()), this, SLOT(refreshAfterUpdate()));
     connect(treeWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(customContextMenuRequested()));
 
 //    QTimer::singleShot(0, this, SLOT(firstRefresh()));

src/adblock/adblockdialog.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/adblock/adblockicon.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/adblock/adblockicon.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/adblock/adblockmanager.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -108,11 +108,25 @@ void AdBlockManager::load()
     QSettings settings(mApp->getActiveProfilPath() + "settings.ini", QSettings::IniFormat);
     settings.beginGroup("AdBlock");
     m_enabled = settings.value("enabled", m_enabled).toBool();
+    QDateTime lastUpdate = settings.value("lastUpdate", QDateTime()).toDateTime();
     settings.endGroup();
 
-    m_subscription = new AdBlockSubscription(this);
+    m_subscription = new AdBlockSubscription();
     connect(m_subscription, SIGNAL(rulesChanged()), this, SIGNAL(rulesChanged()));
-    connect(m_subscription, SIGNAL(changed()), this, SIGNAL(rulesChanged()));
+    connect(m_subscription, SIGNAL(rulesUpdated()), this, SLOT(rulesUpdated()));
+
+    if (lastUpdate.addDays(3) < QDateTime::currentDateTime()) {
+        m_subscription->scheduleUpdate();
+    }
+}
+
+void AdBlockManager::rulesUpdated()
+{
+    QSettings settings(mApp->getActiveProfilPath() + "settings.ini", QSettings::IniFormat);
+    settings.beginGroup("AdBlock");
+    settings.setValue("lastUpdate", QDateTime::currentDateTime());
+
+    emit rulesChanged();
 }
 
 void AdBlockManager::save()

src/adblock/adblockmanager.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -81,6 +81,9 @@ public slots:
     AdBlockDialog* showDialog();
     void showRule();
 
+private slots:
+    void rulesUpdated();
+
 private:
     static AdBlockManager* s_adBlockManager;
 

src/adblock/adblocknetwork.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -81,7 +81,7 @@ QNetworkReply* AdBlockNetwork::block(const QNetworkRequest &request)
 
     if (blockedRule) {
         QVariant v = request.attribute((QNetworkRequest::Attribute)(QNetworkRequest::User + 100));
-        WebPage* webPage = (WebPage*)(v.value<void*>());
+        WebPage* webPage = static_cast<WebPage*>(v.value<void*>());
         if (webPage) {
             webPage->addAdBlockRule(blockedRule->filter(), request.url());
         }

src/adblock/adblocknetwork.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/adblock/adblockrule.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/adblock/adblockrule.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/adblock/adblocksubscription.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -82,6 +82,16 @@ void AdBlockSubscription::loadRules()
             }
         }
     }
+
+    if (m_rules.isEmpty()) {
+        // Initial update
+        QTimer::singleShot(0, this, SLOT(updateNow()));
+    }
+}
+
+void AdBlockSubscription::scheduleUpdate()
+{
+    QTimer::singleShot(1000 * 30, this, SLOT(updateNow()));
 }
 
 void AdBlockSubscription::updateNow()
@@ -128,7 +138,7 @@ void AdBlockSubscription::rulesDownloaded()
     foreach(const AdBlockRule & rule, allRules()) {
         if (rule.filter().contains("*******- user custom filters")) {
             customRules = true;
-            response.append("! *******- user custom filters -*************\n");
+            response.append("\n! *******- user custom filters -*************\n");
             continue;
         }
         if (!customRules) {
@@ -137,10 +147,14 @@ void AdBlockSubscription::rulesDownloaded()
         response.append(rule.filter() + "\n");
     }
 
+    if (!customRules) {
+        response.append("\n! *******- user custom filters -*************\n");
+    }
+
     file.write(response);
     file.close();
     loadRules();
-    emit changed();
+    emit rulesUpdated();
     m_downloading = 0;
 }
 

src/adblock/adblocksubscription.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -55,6 +55,7 @@
 #include <QNetworkReply>
 #include <QTextStream>
 #include <QFileInfo>
+#include <QTimer>
 
 class QNetworkReply;
 class QUrl;
@@ -62,19 +63,13 @@ class AdBlockSubscription : public QObject
 {
     Q_OBJECT
 
-signals:
-    void changed();
-    void rulesChanged();
-
 public:
     AdBlockSubscription(QObject* parent = 0);
 
     QString title() const { return m_title; }
     void setTitle(const QString &title) { m_title = title; }
 
-    void updateNow();
-    QDateTime lastUpdate() const;
-
+    void scheduleUpdate();
     void saveRules();
 
     const AdBlockRule* allow(const QString &urlString) const;
@@ -86,17 +81,21 @@ public:
     void removeRule(int offset);
     void replaceRule(const AdBlockRule &rule, int offset);
 
+signals:
+    void rulesUpdated();
+    void rulesChanged();
+
+public slots:
+    void updateNow();
+
 private slots:
+    void loadRules();
     void rulesDownloaded();
 
 private:
     void populateCache();
-    QString rulesFileName() const;
-    void parseUrl(const QUrl &url);
-    void loadRules();
 
     QString m_title;
-    bool m_enabled;
 
     QNetworkReply* m_downloading;
     QList<AdBlockRule> m_rules;

src/app/autosaver.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/app/autosaver.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/app/commandlineoptions.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -37,7 +37,7 @@ void CommandLineOptions::showHelp()
                        "    -a or --authors               print QupZilla authors \n"
                        "    -v or --version               print QupZilla version \n"
                        "\n"
-                       "    -p or --profile=PROFILE       start with specified profile \n"
+                       "    -p or --profile=<profile>     start with specified profile \n"
                        "    -np or --no-plugins           start without plugins \n"
                        "\n"
                        " Options to control running QupZilla:\n"

src/app/commandlineoptions.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/app/mainapplication.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -115,15 +115,18 @@ MainApplication::MainApplication(const QList<CommandLineOptions::ActionPair> &cm
                 break;
             case CommandLineOptions::NewTab:
                 messages.append("ACTION:NewTab");
+                m_postLaunchActions.append(OpenNewTab);
                 break;
             case CommandLineOptions::NewWindow:
                 messages.append("ACTION:NewWindow");
                 break;
             case CommandLineOptions::ShowDownloadManager:
                 messages.append("ACTION:ShowDownloadManager");
+                m_postLaunchActions.append(OpenDownloadManager);
                 break;
             case CommandLineOptions::StartPrivateBrowsing:
                 messages.append("ACTION:StartPrivateBrowsing");
+                m_postLaunchActions.append(PrivateBrowsing);
                 break;
             case CommandLineOptions::OpenUrl:
                 startUrl = pair.text;
@@ -208,8 +211,26 @@ MainApplication::MainApplication(const QList<CommandLineOptions::ActionPair> &cm
     plugins()->loadPlugins();
     loadSettings();
 
+    QTimer::singleShot(0, this, SLOT(postLaunch()));
     QTimer::singleShot(2000, this, SLOT(restoreCursor()));
+#ifdef Q_WS_WIN
     QTimer::singleShot(10 * 1000, this, SLOT(setupJumpList()));
+#endif
+}
+
+void MainApplication::postLaunch()
+{
+    if (m_postLaunchActions.contains(PrivateBrowsing)) {
+        togglePrivateBrowsingMode(true);
+    }
+
+    if (m_postLaunchActions.contains(OpenDownloadManager)) {
+        downManager()->show();
+    }
+
+    if (m_postLaunchActions.contains(OpenNewTab)) {
+        getWindow()->tabWidget()->addView();
+    }
 }
 
 void MainApplication::loadSettings()
@@ -356,6 +377,15 @@ bool MainApplication::isStateChanged()
     return false;
 }
 
+void MainApplication::togglePrivateBrowsingMode(bool state)
+{
+    webSettings()->setAttribute(QWebSettings::PrivateBrowsingEnabled, state);
+    history()->setSaving(!state);
+    cookieJar()->turnPrivateJar(state);
+
+    emit message(MainApplication::CheckPrivateBrowsing, state);
+}
+
 void MainApplication::sendMessages(MainApplication::MessageType mes, bool state)
 {
     emit message(mes, state);
@@ -674,6 +704,10 @@ bool MainApplication::saveStateSlot()
 
 bool MainApplication::restoreStateSlot(QupZilla* window)
 {
+    if (m_postLaunchActions.contains(PrivateBrowsing)) {
+        return false;
+    }
+
     m_isRestoring = true;
     QSettings settings(m_activeProfil + "settings.ini", QSettings::IniFormat);
     int afterStart = settings.value("Web-URL-Settings/afterLaunch", 1).toInt();

src/app/mainapplication.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -82,9 +82,10 @@ public:
     inline int windowCount() { return m_mainWindows.count(); }
 
     bool checkSettingsDir();
-
     int defaultZoom() { return m_defaultZoom; }
 
+    void togglePrivateBrowsingMode(bool state);
+
     QupZilla* getWindow();
     CookieManager* cookieManager();
     BrowsingLibrary* browsingLibrary();
@@ -116,10 +117,13 @@ signals:
     void message(MainApplication::MessageType mes, bool state);
 
 private slots:
+    void postLaunch();
     void setupJumpList();
     void restoreCursor();
 
 private:
+    enum PostLaunchAction { PrivateBrowsing, OpenDownloadManager, OpenNewTab };
+
     void translateApp();
     void restoreOtherWindows();
 
@@ -154,6 +158,7 @@ private:
     bool m_isRestoring;
 
     bool m_databaseConnected;
+    QList<PostLaunchAction> m_postLaunchActions;
 };
 
 #endif // MAINAPPLICATION_H

src/app/profileupdater.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/app/profileupdater.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/app/qupzilla.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -65,8 +65,8 @@
 const QString QupZilla::VERSION = "1.1.0";
 const QString QupZilla::BUILDTIME =  __DATE__" "__TIME__;
 const QString QupZilla::AUTHOR = "David Rosca";
-const QString QupZilla::COPYRIGHT = "2010-2011";
-const QString QupZilla::WWWADDRESS = "http://qupzilla.co.cc";
+const QString QupZilla::COPYRIGHT = "2010-2012";
+const QString QupZilla::WWWADDRESS = "http://qupzilla.com";
 const QString QupZilla::WIKIADDRESS = "https://github.com/nowrep/QupZilla/wiki";
 const QString QupZilla::WEBKITVERSION = qWebKitVersion();
 
@@ -1039,9 +1039,13 @@ void QupZilla::showPreferences()
     prefs->show();
 }
 
-void QupZilla::showSource(const QString &selectedHtml)
+void QupZilla::showSource(QWebFrame* frame, const QString &selectedHtml)
 {
-    SourceViewer* source = new SourceViewer(weView()->page(), selectedHtml);
+    if (!frame) {
+        frame = weView()->page()->mainFrame();
+    }
+
+    SourceViewer* source = new SourceViewer(frame, selectedHtml);
     qz_centerWidgetToParent(source, this);
     source->show();
 }
@@ -1281,10 +1285,17 @@ void QupZilla::sendLink()
     QDesktopServices::openUrl(url);
 }
 
-void QupZilla::printPage()
+void QupZilla::printPage(QWebFrame* frame)
 {
     QPrintPreviewDialog* dialog = new QPrintPreviewDialog(this);
-    connect(dialog, SIGNAL(paintRequested(QPrinter*)), weView(), SLOT(print(QPrinter*)));
+
+    if (!frame) {
+        connect(dialog, SIGNAL(paintRequested(QPrinter*)), weView(), SLOT(print(QPrinter*)));
+    }
+    else {
+        connect(dialog, SIGNAL(paintRequested(QPrinter*)), frame, SLOT(print(QPrinter*)));
+    }
+
     dialog->exec();
 
     dialog->deleteLater();
@@ -1326,10 +1337,14 @@ void QupZilla::startPrivate(bool state)
         }
     }
 
-    mApp->webSettings()->setAttribute(QWebSettings::PrivateBrowsingEnabled, state);
-    mApp->history()->setSaving(!state);
-    mApp->cookieJar()->turnPrivateJar(state);
-    emit message(MainApplication::CheckPrivateBrowsing, state);
+    mApp->togglePrivateBrowsingMode(state);
+}
+
+void QupZilla::resizeEvent(QResizeEvent* event)
+{
+    m_bookmarksToolbar->setMaximumWidth(width());
+
+    QMainWindow::resizeEvent(event);
 }
 
 void QupZilla::keyPressEvent(QKeyEvent* event)

src/app/qupzilla.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -130,7 +130,8 @@ public slots:
 
     void bookmarkPage();
     void loadAddress(const QUrl &url);
-    void showSource(const QString &selectedHtml = "");
+    void showSource(QWebFrame* frame = 0, const QString &selectedHtml = "");
+    void printPage(QWebFrame* frame = 0);
     void showPageInfo();
     void receiveMessage(MainApplication::MessageType mes, bool state);
 
@@ -146,7 +147,6 @@ private slots:
     void urlEnter();
     void aboutQupZilla();
     void addTab() { m_tabWidget->addView(QUrl(), tr("New tab"), TabWidget::NewTab, true); }
-    void printPage();
     void savePageScreen();
 
     void aboutToShowFileMenu();
@@ -201,6 +201,7 @@ private slots:
     bool quitApp();
 
 private:
+    void resizeEvent(QResizeEvent* event);
     void keyPressEvent(QKeyEvent* event);
     void mousePressEvent(QMouseEvent* event);
     void closeEvent(QCloseEvent* event);

src/appicon.rc

@@ -19,7 +19,7 @@ BEGIN
             VALUE "CompanyName", "QupZilla Team"
             VALUE "FileDescription", "QupZilla Web Browser"
             VALUE "FileVersion", "1.1.0"
-            VALUE "LegalCopyright", "Copyright (C) 2010-2011 David Rosca"
+            VALUE "LegalCopyright", "Copyright (C) 2010-2012 David Rosca"
             VALUE "InternalName", "qupzilla"
             VALUE "OriginalFilename", "qupzilla.exe"
             VALUE "ProductName", "QupZilla"

src/autofill/autofillmodel.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -182,9 +182,9 @@ void AutoFillModel::post(const QNetworkRequest &request, const QByteArray &outgo
     m_lastOutgoingData = outgoingData;
 
     QVariant v = request.attribute((QNetworkRequest::Attribute)(QNetworkRequest::User + 100));
-    QWebPage* webPage = (QWebPage*)(v.value<void*>());
+    QWebPage* webPage = static_cast<QWebPage*>(v.value<void*>());
     v = request.attribute((QNetworkRequest::Attribute)(QNetworkRequest::User + 102));
-    WebView* webView = (WebView*)(v.value<void*>());
+    WebView* webView = static_cast<WebView*>(v.value<void*>());
     if (!webPage || !webView) {
         return;
     }

src/autofill/autofillmodel.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/autofill/autofillnotification.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/autofill/autofillnotification.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/bookmarks/bookmarkicon.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/bookmarks/bookmarkicon.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/bookmarks/bookmarksmanager.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/bookmarks/bookmarksmanager.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/bookmarks/bookmarksmodel.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/bookmarks/bookmarksmodel.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/bookmarks/bookmarkstoolbar.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -48,6 +48,8 @@ BookmarksToolbar::BookmarksToolbar(QupZilla* mainClass, QWidget* parent)
     connect(m_bookmarksModel, SIGNAL(folderDeleted(QString)), this, SLOT(folderDeleted(QString)));
     connect(m_bookmarksModel, SIGNAL(folderRenamed(QString, QString)), this, SLOT(folderRenamed(QString, QString)));
 
+    setMaximumWidth(p_QupZilla->width());
+
 //    QTimer::singleShot(0, this, SLOT(refreshBookmarks()));
     refreshBookmarks();
 }
@@ -100,7 +102,7 @@ void BookmarksToolbar::moveRight()
         return;
     }
 
-    ToolButton* button = (ToolButton*) act->data().value<void*>();
+    ToolButton* button = static_cast<ToolButton*>(act->data().value<void*>());
 
     int index = m_layout->indexOf(button);
     if (index == m_layout->count() - 1) {
@@ -137,7 +139,7 @@ void BookmarksToolbar::moveLeft()
         return;
     }
 
-    ToolButton* button = (ToolButton*) act->data().value<void*>();
+    ToolButton* button = static_cast<ToolButton*>(act->data().value<void*>());
 
     int index = m_layout->indexOf(button);
     if (index == 0) {
@@ -174,7 +176,7 @@ void BookmarksToolbar::removeButton()
         return;
     }
 
-    ToolButton* button = (ToolButton*) act->data().value<void*>();
+    ToolButton* button = static_cast<ToolButton*>(act->data().value<void*>());
     if (!button) {
         return;
     }

src/bookmarks/bookmarkstoolbar.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/bookmarks/bookmarkswidget.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/bookmarks/bookmarkswidget.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/bookmarksimport/bookmarksimportdialog.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/bookmarksimport/bookmarksimportdialog.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/bookmarksimport/chromeimporter.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/bookmarksimport/chromeimporter.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/bookmarksimport/firefoximporter.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/bookmarksimport/firefoximporter.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/bookmarksimport/operaimporter.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/bookmarksimport/operaimporter.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/cookies/cookiejar.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/cookies/cookiejar.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/cookies/cookiemanager.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/cookies/cookiemanager.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/data/data.qrc

@@ -2,5 +2,6 @@
     <qresource prefix="/">
         <file>data/browsedata.db</file>
         <file>data/profiles.ini</file>
+        <file>data/ca-bundle.crt</file>
     </qresource>
 </RCC>

src/data/html/copyright

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,6 +15,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * ============================================================ */
+
 ------------------------------------------------------------------------
  AdBlock, LineEdit class and SqueezeLabel class:
 ------------------------------------------------------------------------
@@ -160,6 +161,40 @@
  * Boston, MA  02110-1301  USA
  */
  
+-----------------------------------------------------------------------------
+ CA certificates from Mozilla included in ca-bundle.crt:
+-----------------------------------------------------------------------------
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+
 -----------------------------------------------------------------------------
  QtWin class from
  http://labs.qt.nokia.com/2009/09/15/using-blur-behind-on-windows/

src/data/html/reportbug.html

@@ -36,7 +36,7 @@ function checkFields()
   <p style="display:none" id="result"> </p>
   <p>
 <table>
-<form action="http://qupzilla.co.cc/reportbug.php" onsubmit="return checkFields()" method="POST">
+<form action="http://qupzilla.com/reportbug.php" onsubmit="return checkFields()" method="POST">
 <tr><td>%EMAIL%*:</td><td><input type="text" id="mail" name="mail" required> </tr>
 <tr><td>%TYPE%:</td><td><input type="text" id="type" name="type" required> </tr>
 <tr><td>%DESCRIPTION%:</td><td><textarea id="text" name="text" required></textarea> </tr>

src/desktopnotifications/desktopnotification.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/desktopnotifications/desktopnotification.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/desktopnotifications/desktopnotificationsfactory.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/desktopnotifications/desktopnotificationsfactory.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/downloads/downloadfilehelper.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -64,7 +64,7 @@ void DownloadFileHelper::handleUnsupportedContent(QNetworkReply* reply, bool ask
 
     // Close Empty Tab
     if (m_webPage) {
-        if (!m_webPage->mainFrame()->url().isEmpty()) {
+        if (!m_webPage->mainFrame()->url().isEmpty() && m_webPage->mainFrame()->url().toString() != "about:blank") {
             m_downloadPage = m_webPage->mainFrame()->url();
         }
         else if (m_webPage->history()->canGoBack()) {

src/downloads/downloadfilehelper.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/downloads/downloaditem.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 #include "webpage.h"
 #include "downloadmanager.h"
 #include "iconprovider.h"
+#include "networkmanager.h"
 
 //#define DOWNMANAGER_DEBUG
 
@@ -60,6 +61,21 @@ DownloadItem::DownloadItem(QListWidgetItem* item, QNetworkReply* reply, const QS
 
     setContextMenuPolicy(Qt::CustomContextMenu);
     connect(this, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(customContextMenuRequested(QPoint)));
+    connect(ui->button, SIGNAL(clicked(QPoint)), this, SLOT(stop()));
+    connect(manager, SIGNAL(resized(QSize)), this, SLOT(parentResized(QSize)));
+
+    startDownloading();
+}
+
+void DownloadItem::startDownloading()
+{
+    QUrl locationHeader = m_reply->header(QNetworkRequest::LocationHeader).toUrl();
+    if (locationHeader.isValid()) {
+        m_reply->close();
+        m_reply->deleteLater();
+
+        m_reply = mApp->networkManager()->get(QNetworkRequest(locationHeader));
+    }
 
     m_reply->setParent(this);
     connect(m_reply, SIGNAL(finished()), this, SLOT(finished()));
@@ -67,8 +83,6 @@ DownloadItem::DownloadItem(QListWidgetItem* item, QNetworkReply* reply, const QS
     connect(m_reply, SIGNAL(downloadProgress(qint64, qint64)), this, SLOT(downloadProgress(qint64, qint64)));
     connect(m_reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(error(QNetworkReply::NetworkError)));
     connect(m_reply, SIGNAL(metaDataChanged()), this, SLOT(metaDataChanged()));
-    connect(ui->button, SIGNAL(clicked(QPoint)), this, SLOT(stop()));
-    connect(manager, SIGNAL(resized(QSize)), this, SLOT(parentResized(QSize)));
 
     m_downloading = true;
     m_timer.start(1000, this);
@@ -91,15 +105,14 @@ void DownloadItem::parentResized(const QSize &size)
 
 void DownloadItem::metaDataChanged()
 {
-//    http://www.olympus.cz/consumer/images/XD-Picture_card_1GB_Hand_CROP(1).jpg
-//    << download this picture emits metaDataChanged signal, but image is downloaded correctly
+    QUrl locationHeader = m_reply->header(QNetworkRequest::LocationHeader).toUrl();
+    if (locationHeader.isValid()) {
+        m_reply->close();
+        m_reply->deleteLater();
 
-    QVariant locationHeader = m_reply->header(QNetworkRequest::LocationHeader);
-    if (!locationHeader.toUrl().isEmpty()) {
-        qWarning("DownloadManager: metaDataChanged << URL: %s", qPrintable(locationHeader.toString()));
+        m_reply = mApp->networkManager()->get(QNetworkRequest(locationHeader));
+        startDownloading();
     }
-
-//    QMessageBox::information(m_item->listWidget()->parentWidget(), "Meta Data Changed", QString("Meta data changed feature unimplemented yet, sorry.\n URL: '%̈́'").arg(locationHeader.toUrl().toString()));
 }
 
 void DownloadItem::finished()

src/downloads/downloaditem.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -78,6 +78,8 @@ private slots:
     void copyDownloadLink();
 
 private:
+    void startDownloading();
+
     void timerEvent(QTimerEvent* event);
     void updateDownloadInfo(double currSpeed, qint64 received, qint64 total);
     void mouseDoubleClickEvent(QMouseEvent* e);

src/downloads/downloadmanager.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/downloads/downloadmanager.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/downloads/downloadoptionsdialog.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/downloads/downloadoptionsdialog.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/history/historymanager.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -283,32 +283,31 @@ void HistoryManager::refreshTable()
 void HistoryManager::search(const QString &searchText)
 {
     ui->historyTree->filterString(searchText);
-    return;
-    if (searchText.isEmpty()) {
-        refreshTable();
-        return;
-    }
+//    if (searchText.isEmpty()) {
+//        refreshTable();
+//        return;
+//    }
 
-    refreshTable();
-    ui->historyTree->setUpdatesEnabled(false);
+//    refreshTable();
+//    ui->historyTree->setUpdatesEnabled(false);
 
-    QList<QTreeWidgetItem*> items = ui->historyTree->findItems("*" + searchText + "*", Qt::MatchRecursive | Qt::MatchWildcard);
+//    QList<QTreeWidgetItem*> items = ui->historyTree->findItems("*" + searchText + "*", Qt::MatchRecursive | Qt::MatchWildcard);
 
-    QList<QTreeWidgetItem*> foundItems;
-    foreach(QTreeWidgetItem * fitem, items) {
-        if (fitem->text(1).isEmpty()) {
-            continue;
-        }
-        QTreeWidgetItem* item = new QTreeWidgetItem();
-        item->setText(0, fitem->text(0));
-        item->setText(1, fitem->text(1));
-        item->setWhatsThis(1, fitem->whatsThis(1));
-        item->setIcon(0, _iconForUrl(fitem->text(1)));
-        foundItems.append(item);
-    }
-    ui->historyTree->clear();
-    ui->historyTree->addTopLevelItems(foundItems);
-    ui->historyTree->setUpdatesEnabled(true);
+//    QList<QTreeWidgetItem*> foundItems;
+//    foreach(QTreeWidgetItem * fitem, items) {
+//        if (fitem->text(1).isEmpty()) {
+//            continue;
+//        }
+//        QTreeWidgetItem* item = new QTreeWidgetItem();
+//        item->setText(0, fitem->text(0));
+//        item->setText(1, fitem->text(1));
+//        item->setWhatsThis(1, fitem->whatsThis(1));
+//        item->setIcon(0, _iconForUrl(fitem->text(1)));
+//        foundItems.append(item);
+//    }
+//    ui->historyTree->clear();
+//    ui->historyTree->addTopLevelItems(foundItems);
+//    ui->historyTree->setUpdatesEnabled(true);
 }
 
 void HistoryManager::optimizeDb()

src/history/historymanager.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/history/historymodel.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/history/historymodel.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/history/webhistoryinterface.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/history/webhistoryinterface.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/main.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/navigation/locationbar.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/navigation/locationbar.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/navigation/locationbarsettings.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/navigation/locationbarsettings.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/navigation/locationcompleter.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/navigation/locationcompleter.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/navigation/locationpopup.cpp

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by

src/navigation/locationpopup.h

@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2011  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by