From 722a79aef15f592be0465b129c04352c2572c41b Mon Sep 17 00:00:00 2001
From: nowrep <nowrep@gmail.com>
Date: Sat, 15 Oct 2011 16:37:32 +0200
Subject: [PATCH] Fixed loading animation sometimes stopped while page still
 loading  + updated positioning of hovered link widget Also when adblock is
 disabled, the statusbar icon is now clickable. When running with different
 profile from command line argument, in preferences will be showed real
 starting profile, not active.

---
 README.md                                 |   3 +
 src/adblock/adblockicon.cpp               |  13 ++++-
 src/adblock/adblockicon.h                 |   1 +
 src/app/qupzilla.cpp                      |  20 +++----
 src/app/qupzilla.h                        |   2 +-
 src/data/icons.qrc                        |   1 +
 src/data/icons/other/adblock-disabled.png | Bin 0 -> 1102 bytes
 src/data/icons/qupzillaupdate.png         | Bin 5300 -> 902 bytes
 src/other/statusbarmessage.cpp            |  67 +++++++++-------------
 src/other/statusbarmessage.h              |   7 +--
 src/preferences/preferences.cpp           |  17 +++---
 src/webview/webview.cpp                   |  14 +++--
 12 files changed, 71 insertions(+), 74 deletions(-)
 create mode 100644 src/data/icons/other/adblock-disabled.png

diff --git a/README.md b/README.md
index 5bf7e85ae..ea1678d96 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,7 @@ Compiling
 
 Before compiling, make sure you have have installed Qt (>=4.7) development libraries and
 you read BUILDING informations.
+
 Then you can start compile by running this commands:
 
     $ cd src/
@@ -33,6 +34,7 @@ Then you can start compile by running this commands:
     $ make
 
 The executable binary can now be found in bin/ directory.
+
 To install QupZilla, run this command: (it may be neccessary to run as root)
 
     $ make install
@@ -53,4 +55,5 @@ FAQ and Changelog
 If you are experiencing some sort of issue, before you open an issue, please read FAQ.
 
 FAQ:       https://github.com/nowrep/QupZilla/blob/master/FAQ
+
 Changelog: https://github.com/nowrep/QupZilla/wiki/Changelog
diff --git a/src/adblock/adblockicon.cpp b/src/adblock/adblockicon.cpp
index 8cfef01b7..5c13d12ee 100644
--- a/src/adblock/adblockicon.cpp
+++ b/src/adblock/adblockicon.cpp
@@ -21,10 +21,9 @@
 #include "webpage.h"
 
 AdBlockIcon::AdBlockIcon(QupZilla *mainClass, QWidget *parent)
-   :ClickableLabel(parent)
-   ,p_QupZilla(mainClass)
+   : ClickableLabel(parent)
+   , p_QupZilla(mainClass)
 {
-    setPixmap(QPixmap(":/icons/other/adblock.png"));
     setMaximumHeight(16);
     setCursor(Qt::PointingHandCursor);
     setToolTip(tr("AdBlock let you block any unwanted content on pages"));
@@ -60,6 +59,14 @@ void AdBlockIcon::learnAboutRules()
     p_QupZilla->tabWidget()->addView(QUrl("http://adblockplus.org/en/filters"), tr("New tab"), TabWidget::NewSelectedTab);
 }
 
+void AdBlockIcon::setEnabled(bool enabled)
+{
+    if (enabled)
+        setPixmap(QPixmap(":icons/other/adblock.png"));
+    else
+        setPixmap(QPixmap(":icons/other/adblock-disabled.png"));
+}
+
 AdBlockIcon::~AdBlockIcon()
 {
 }
diff --git a/src/adblock/adblockicon.h b/src/adblock/adblockicon.h
index 8256fb55c..0d719a8a8 100644
--- a/src/adblock/adblockicon.h
+++ b/src/adblock/adblockicon.h
@@ -34,6 +34,7 @@ public:
 signals:
 
 public slots:
+    void setEnabled(bool enabled);
 
 private slots:
     void showMenu(const QPoint &pos);
diff --git a/src/app/qupzilla.cpp b/src/app/qupzilla.cpp
index 0cf6de4c3..61ea39832 100644
--- a/src/app/qupzilla.cpp
+++ b/src/app/qupzilla.cpp
@@ -78,16 +78,16 @@ const QIcon QupZilla::qupzillaIcon()
     return i;
 }
 
-QupZilla::QupZilla(bool tryRestore, QUrl startUrl) :
-    QMainWindow(0)
-    ,m_tryRestore(tryRestore)
-    ,m_historyMenuChanged(true)
-    ,m_bookmarksMenuChanged(true)
-    ,m_startingUrl(startUrl)
-    ,m_actionPrivateBrowsing(0)
-    ,m_webInspectorDock(0)
-    ,m_sideBar(0)
-    ,m_statusBarMessage(new StatusBarMessage(this))
+QupZilla::QupZilla(bool tryRestore, QUrl startUrl)
+    : QMainWindow(0)
+    , m_tryRestore(tryRestore)
+    , m_historyMenuChanged(true)
+    , m_bookmarksMenuChanged(true)
+    , m_startingUrl(startUrl)
+    , m_actionPrivateBrowsing(0)
+    , m_webInspectorDock(0)
+    , m_sideBar(0)
+    , m_statusBarMessage(new StatusBarMessage(this))
 {
     setObjectName("mainwindow");
     setAttribute(Qt::WA_DeleteOnClose);
diff --git a/src/app/qupzilla.h b/src/app/qupzilla.h
index e77793f2c..c34c35b10 100644
--- a/src/app/qupzilla.h
+++ b/src/app/qupzilla.h
@@ -223,7 +223,7 @@ private:
     QAction* m_actionRestoreTab;
 
     QLabel* m_privateBrowsing;
-    ClickableLabel* m_adblockIcon;
+    AdBlockIcon* m_adblockIcon;
     QPointer<WebInspectorDockWidget> m_webInspectorDock;
 
     BookmarksToolbar* m_bookmarksToolbar;
diff --git a/src/data/icons.qrc b/src/data/icons.qrc
index a10015f1d..ea1b8505f 100644
--- a/src/data/icons.qrc
+++ b/src/data/icons.qrc
@@ -65,5 +65,6 @@
         <file>icons/exeicons/qupzilla256.png</file>
         <file>icons/menu/informations.png</file>
         <file>icons/faenza/user-bookmarks.png</file>
+        <file>icons/other/adblock-disabled.png</file>
     </qresource>
 </RCC>
diff --git a/src/data/icons/other/adblock-disabled.png b/src/data/icons/other/adblock-disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..cdab1a00d0a073265d19caa7c74f3ea371115c5a
GIT binary patch
literal 1102
zcmV-U1hM;xP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00004b3#c}2nYxW
zd<bNS00009a7bBm000XU000XU0RWnu7ytkR@JU2LR5*=wl}%_IWf;f*?=v6!F}vGX
z%d+kYX=(x?4YuUN2uAQGUM+gbp-`cap440-xfaR69D>w?c=RJ4tYE-PLPOLNmnMg@
z(kP`3Zc<z|n`C!0nVp&UeO?dyk#-XY<}mN@|IPFK-~aoJz$w?t%8F@O)@U>uH38_3
z*P>pp%dW1jjlsdepi^s}2DD7NnSCMi!I9?)5~97%y1`B*6R6dyUjVq#sTG|Ih5PqE
zF-&9X(WA$(Z41l{B7$L>(994-P*NhB&4LX2d|+U3QV78<Jv|M(m(PDJ44T^9+|-Wa
zfQXPxCXvl%F+4PcBhLeg#@hDwww9s1p3mn$)mj@TfQ3R~F6P8P`h9Z~@pxR+4r@4j
z_AG{nha2rOqp!CYeSN*CR4Pa$5~5TpA!1uM9z6K%v$lup>+6>1xi^KthZ`FkI+aR^
zy6+>IOv3m5WB<6(6%m1%5riQu%f_F@qV73={`$tfd$M|XI7ML?j^(ns_w&Ez;l$%Y
zNeKXWeS932)$p(dYk`9>gpv|r7{H0g#pA6loas7qJrXhAFm2n8R4Ns!`*p;E7>Ec&
z1Sut$bsH$91nb7Lk`k`#!Z1zPmIWe$>$-x7BBaAmGcz<Ze7_E<WTT28fKn1c5VWC6
zN+_k^x-PoAyYXT!2ha1MWJ9ARG)VwbDgeNd=OGLNNU6ZgNT<_aW@IuM5E0VpG-|aP
zVzC(d`}?tfZ~y?1QX&XK_`VNPzK<|G4!rBSkV-;I3CD2|1i>?#0suWdJvcZxK&ez}
z+My7J0TdKW2|$M-m^F-Mh*}#Xr3BG&RGAs)&Yc4hp;+8T*!)<nRznbEpj7kdg{slA
zZdM_PV4A0%%0|{q6HlJ(pziyq`+mCspb1PRQ%_Z)p_yUZ_WweIAi%%7yKNhkV(mB%
zD%C1zZEbDiuTp7g^p#QgexQj24qX?_jA%3p+qR#%6Nv<Nc6QqB%24Xz;UTfNSH8Qx
zzJAwOUS9SM!&tn0`O@VJ7hdWs7K>ojh){2DFAT$g5CYV+p<1ot&Ycw~R$!&{$jFEQ
z#OimqzrQj&J6kpYpin6Iu~_`aTrT(W#ft-dTU%SYT;3D=`+LY_GKfSX&|0HdEMjSC
z2}hm>8A?4i_Nwqa@8=&D7vGtmpWg*K#@FQJ<a1ZAUi~T-jl8wG`V*KLrfI-&97x#+
zv}qbpiuL&TYl4JW{qpN?-kqD9`=`Y?F%KsuCQ|QRyS9+aW#4pNw>=D6@nL4fVlnKN
z%fBoveEasTTer$j>rVgyV0wD``JtgpS4=ZvYpptd0R*iS|MBqQ?U|XGzdN=60b3F&
UF6P?X!vFvP07*qoM6N<$f^$y<KL7v#

literal 0
HcmV?d00001

diff --git a/src/data/icons/qupzillaupdate.png b/src/data/icons/qupzillaupdate.png
index 4873d4b4846dc00a26dc12d271453966dfce21d1..4937ebf85f01f3346e500dfc28edbd9aa2f1cc2e 100644
GIT binary patch
delta 890
zcmdm@*~UIWvYwfNfx%@-*D)Z)lJ4m1$iT4vggI;1OCVpe#5JNMI6tkVJh3R1!7(L2
zDOJHUH!(dmC^a#qvhZZ84N%dv0G|-oPphH|uD$Pi^?T0hnLlQz|NH;{@A<w1r_Q|o
z_4iDM@a=DZ=fC{@txIzA+uvtC|4F#~e(&DBeb=7HY&rI|zK*Tr;kV<jKQF!hcw>L!
z<TKYwH|@SwB%5*kPRR4`leQn&USfRh!?*7X?T$ZvyYtEWpS!bPzj%B$f&KiATL(Y>
zc{IU!$)~?dAAK-ddgxKTn&08Oz0(^0eEax(V;j(I$HG6=0x6@CAiv=M*g-vZVUQ>T
zZ@`TA3=B*bo-U3d6}NIGb5CETAkzAAYQuURL(|~H2iXIS|NgfxKYwu6%-!$qdLMlH
z??!{%iO<uSE?(ZZ=kB~$&t-qs?dlF<)2R9?@tgfc{`R;yU4a_26wAB+*qR)si0n!G
z`KzAegi&8keTCN2dkjywtZ(ReAHHGH<6^kk<ULD4iu@NFj(rIqEG8u$$V<^@5D#-w
zuGnC__&xu={<8+FcsFQIpHlR;!{78*KCg564@Q@H)_s%pdm2pNl}T(_!OnF18q1B=
z<2;g&ZrpGDBcU{lkKxYUm^+LwZW#P9<Y0VLn>59@zTob+d6s-E3I=c1C~zrBcs4iO
zzis9`*FQ%xj^$gM?Kze-f#*8K0tK6*et!JO(fy(S_>GbcIV>f7+nUSE!X7lV=jKGr
zQ&uoN`q7VDxRRIU$h1c9P_YY6A`%zY<(3(3G-Nw_?1<s#Q<DN#EiFr&9C>jYYjRg9
z*PdmsX9O(|np_{35fE~qys1*|>(9E%4L4ToTBkp6xvF50+r&Pl?FU5eyncAW^bKQO
z=(M0o%OhgVop!ng-Z&q4b=B(CtC*s>KE1hqwO5EG#wB28_|w!CTSb`uvCh9<>NiQe
zNlU>n^7JL&%X0PR?=P3k({1$FqIU9Ym2b(`Z+q9a&-^4ZK_&8SQ1PV9S%+#hTqYIm
zn<{gkV-EX@%ziHCgO;`8x>KaxliW1!<R5vq|5V)~vm;KOQ#fKY|JD{9;^(+I!{n)e
z(cVAr7ngIYpI-2SW!sPEAL70>?3w!Sc?omT%p51J`n`XY4=~j4N?0S8_;@cc88Udf
L`njxgN@xNACm_}o

literal 5300
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
GLSTaLJTf}~

diff --git a/src/other/statusbarmessage.cpp b/src/other/statusbarmessage.cpp
index 8ddf279fe..d2113851c 100644
--- a/src/other/statusbarmessage.cpp
+++ b/src/other/statusbarmessage.cpp
@@ -21,10 +21,6 @@
 
 TipLabel::TipLabel(QupZilla* parent) : SqueezeLabelV1(parent) , p_QupZilla(parent)
 {
-    m_timer = new QTimer();
-    m_timer->setInterval(300);
-    connect(m_timer, SIGNAL(timeout()), this, SLOT(checkMainWindowFocus()));
-
     setWindowFlags(Qt::ToolTip);
     setForegroundRole(QPalette::ToolTipText);
     setBackgroundRole(QPalette::ToolTipBase);
@@ -45,52 +41,43 @@ void TipLabel::paintEvent(QPaintEvent *ev)
     SqueezeLabelV1::paintEvent(ev);
 }
 
-void TipLabel::show()
-{
-    if (!p_QupZilla->weView()->hasFocus())
-        return;
-
-    m_timer->start();
-    SqueezeLabelV1::show();
-}
-
-void TipLabel::hide()
-{
-    m_timer->stop();
-    SqueezeLabelV1::hide();
-}
-
-void TipLabel::checkMainWindowFocus()
-{
-    if (!p_QupZilla->weView()->hasFocus())
-        hide();
-}
-
-
-
 StatusBarMessage::StatusBarMessage(QupZilla* mainClass)
-    : QObject()
+    : QObject(mainClass)
     , p_QupZilla(mainClass)
+    , m_statusBarText(new TipLabel(mainClass))
 {
-    m_statusBarText = new TipLabel(mainClass);
 }
 
-#define STATUS_Y_OFFSET -35
-#define STATUS_X_OFFSET +3
-#define STATUS_TOOLTIP_WIDTH_OFFSET -20
-
 void StatusBarMessage::showMessage(const QString &message)
 {
-    if (p_QupZilla->statusBar()->isVisible()) {
+    if (p_QupZilla->statusBar()->isVisible())
         p_QupZilla->statusBar()->showMessage(message);
-    } else {
-        QPoint position = p_QupZilla->weView()->mapToGlobal(p_QupZilla->weView()->pos());
-        position.setY( p_QupZilla->weView()->size().height() + position.y() STATUS_Y_OFFSET);
-        position.setX(position.x() STATUS_X_OFFSET);
-        m_statusBarText->move(position);
-        m_statusBarText->setMaximumWidth(p_QupZilla->size().width() STATUS_TOOLTIP_WIDTH_OFFSET);
+    else {
+        WebView* view = p_QupZilla->weView();
+        QWebFrame* mainFrame = view->page()->mainFrame();
+
+        int horizontalScrollSize = 0;
+        int verticalScrollSize = 0;
+        const int scrollbarSize = p_QupZilla->style()->pixelMetric(QStyle::PM_ScrollBarExtent);
+
+        if (mainFrame->scrollBarMaximum(Qt::Horizontal))
+            horizontalScrollSize = scrollbarSize;
+        if (mainFrame->scrollBarMaximum(Qt::Vertical))
+            verticalScrollSize = scrollbarSize;
+
         m_statusBarText->setText(message);
         m_statusBarText->resize(m_statusBarText->sizeHint());
+        m_statusBarText->setMaximumWidth(view->width() - verticalScrollSize);
+
+        QPoint position;
+        position.setY(view->height() - horizontalScrollSize - m_statusBarText->height());
+
+        QRect statusRect = QRect(view->mapToGlobal(QPoint(0, position.y())), m_statusBarText->size());
+
+        if (statusRect.contains(QCursor::pos()))
+            position.setY(position.y() - m_statusBarText->height());
+
+        m_statusBarText->move(view->mapToGlobal(position));
         m_statusBarText->show();
     }
 }
diff --git a/src/other/statusbarmessage.h b/src/other/statusbarmessage.h
index 1a0380747..63127467d 100644
--- a/src/other/statusbarmessage.h
+++ b/src/other/statusbarmessage.h
@@ -21,6 +21,7 @@
 #include <QObject>
 #include <QToolTip>
 #include "squeezelabelv1.h"
+#include "animatedwidget.h"
 
 class QupZilla;
 class TipLabel;
@@ -31,14 +32,8 @@ class TipLabel : public SqueezeLabelV1 {
 public:
     TipLabel(QupZilla* parent);
     void paintEvent(QPaintEvent *ev);
-    void show();
-    void hide();
-
-private slots:
-    void checkMainWindowFocus();
 
 private:
-    QTimer* m_timer;
     QupZilla* p_QupZilla;
 };
 
diff --git a/src/preferences/preferences.cpp b/src/preferences/preferences.cpp
index fcee61c55..e5144766e 100644
--- a/src/preferences/preferences.cpp
+++ b/src/preferences/preferences.cpp
@@ -101,12 +101,13 @@ Preferences::Preferences(QupZilla* mainClass, QWidget* parent) :
     connect(ui->newTabUseActual, SIGNAL(clicked()), this, SLOT(useActualNewTab()));
 
     //PROFILES
-    m_actProfileName = mApp->getActiveProfilPath();
-    m_actProfileName = m_actProfileName.left(m_actProfileName.length()-1);
-    m_actProfileName = m_actProfileName.mid(m_actProfileName.lastIndexOf("/"));
-    m_actProfileName.remove("/");
+    QString homePath = QDir::homePath();
+    homePath += "/.qupzilla/";
+    QSettings profileSettings(homePath + "profiles/profiles.ini", QSettings::IniFormat);
+    m_actProfileName = profileSettings.value("Profiles/startProfile", "default").toString();
+
     ui->startProfile->addItem(m_actProfileName);
-    QDir profilesDir(QDir::homePath()+"/.qupzilla/profiles/");
+    QDir profilesDir(QDir::homePath() + "/.qupzilla/profiles/");
     QStringList list_ = profilesDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
     foreach (QString name, list_) {
         if (m_actProfileName == name)
@@ -675,9 +676,9 @@ void Preferences::saveSettings()
 
     //Profiles
     QString homePath = QDir::homePath();
-    homePath+="/.qupzilla/";
-    QSettings profileSettings(homePath+"profiles/profiles.ini", QSettings::IniFormat);
-    profileSettings.setValue("Profiles/startProfile",ui->startProfile->currentText());
+    homePath += "/.qupzilla/";
+    QSettings profileSettings(homePath + "profiles/profiles.ini", QSettings::IniFormat);
+    profileSettings.setValue("Profiles/startProfile", ui->startProfile->currentText());
 
     m_pluginsList->save();
     m_themesManager->save();
diff --git a/src/webview/webview.cpp b/src/webview/webview.cpp
index 8971a35d7..23f3ae326 100644
--- a/src/webview/webview.cpp
+++ b/src/webview/webview.cpp
@@ -255,11 +255,11 @@ void WebView::titleChanged()
     QString title2 = title_;
     tabWidget()->setTabToolTip(tabIndex(),title2);
 
-    title2+=" - QupZilla";
+    title2 += " - QupZilla";
     if (isCurrent())
         p_QupZilla->setWindowTitle(title2);
 
-    tabWidget()->setTabText(tabIndex(),title_);
+    tabWidget()->setTabText(tabIndex(), title_);
 }
 
 void WebView::iconChanged()
@@ -267,15 +267,17 @@ void WebView::iconChanged()
     if (mApp->isClosing())
         return;
 
-//    QIcon icon_ = icon();
+    if (isCurrent())
+        emit siteIconChanged();
+
+    if (m_isLoading)
+        return;
+
     QIcon icon_ = siteIcon();
     if (!icon_.isNull())
         animationLoading(tabIndex(), false)->setPixmap(icon_.pixmap(16,16));
     else
         animationLoading(tabIndex(), false)->setPixmap(IconProvider::fromTheme("text-plain").pixmap(16,16));
-
-    if (isCurrent())
-        emit siteIconChanged();
 }
 
 QIcon WebView::siteIcon()