From 10557a9964066e4cdaead89665764239c358e8a0 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Sun, 14 Feb 2016 10:58:40 +0100 Subject: [PATCH] PopupLocationbar: Remove loading animation --- src/lib/popupwindow/popuplocationbar.cpp | 15 --------------- src/lib/popupwindow/popuplocationbar.h | 4 +--- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/src/lib/popupwindow/popuplocationbar.cpp b/src/lib/popupwindow/popuplocationbar.cpp index a47cea868..5fbf4a134 100644 --- a/src/lib/popupwindow/popuplocationbar.cpp +++ b/src/lib/popupwindow/popuplocationbar.cpp @@ -24,9 +24,6 @@ #include "autofillicon.h" #include "webpage.h" -#include -#include - class QUPZILLA_EXPORT PopupSiteIcon : public QWidget { public: @@ -56,18 +53,12 @@ PopupLocationBar::PopupLocationBar(QWidget* parent) m_bookmarkIcon = new BookmarksIcon(this); m_autofillIcon = new AutoFillIcon(this); - m_loadingAnimation = new QLabel(this); - QMovie* movie = new QMovie(":icons/other/progress.gif", QByteArray(), m_loadingAnimation); - m_loadingAnimation->setMovie(movie); - m_loadingAnimation->setFixedSize(16, 26); - QWidget* rightSpacer = new QWidget(this); rightSpacer->setFixedWidth(3); addWidget(m_siteIcon, LineEdit::LeftSide); addWidget(m_autofillIcon, LineEdit::RightSide); addWidget(m_bookmarkIcon, LineEdit::RightSide); - addWidget(m_loadingAnimation, LineEdit::RightSide); addWidget(rightSpacer, LineEdit::RightSide); setLeftMargin(24); @@ -88,9 +79,6 @@ void PopupLocationBar::setView(PopupWebView* view) void PopupLocationBar::startLoading() { - m_loadingAnimation->show(); - m_loadingAnimation->movie()->start(); - m_autofillIcon->hide(); updateTextMargins(); @@ -98,9 +86,6 @@ void PopupLocationBar::startLoading() void PopupLocationBar::stopLoading() { - m_loadingAnimation->hide(); - m_loadingAnimation->movie()->stop(); - m_bookmarkIcon->checkBookmark(m_view->url()); WebPage* page = qobject_cast(m_view->page()); diff --git a/src/lib/popupwindow/popuplocationbar.h b/src/lib/popupwindow/popuplocationbar.h index 96abdf604..1ef7ded1e 100644 --- a/src/lib/popupwindow/popuplocationbar.h +++ b/src/lib/popupwindow/popuplocationbar.h @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2014 David Rosca +* Copyright (C) 2010-2016 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 @@ -22,7 +22,6 @@ #include "lineedit.h" class QUrl; -class QLabel; class PopupSiteIcon; class PopupWebView; @@ -50,7 +49,6 @@ public slots: private: PopupWebView* m_view; - QLabel* m_loadingAnimation; PopupSiteIcon* m_siteIcon; AutoFillIcon* m_autofillIcon;