Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 09:32:12 +01:00
Code Releases Activity

PopupLocationbar: Remove loading animation

Browse Source
This commit is contained in:
David Rosca 2016-02-14 10:58:40 +01:00
parent 8e93a76ca2
commit 10557a9964
2 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lib/popupwindow/popuplocationbar.cpp
View File

@ -24,9 +24,6 @@
#include "autofillicon.h" #include "autofillicon.h"
#include "webpage.h" #include "webpage.h"
#include <QMovie>
#include <QLabel>
class QUPZILLA_EXPORT PopupSiteIcon : public QWidget class QUPZILLA_EXPORT PopupSiteIcon : public QWidget
{ {
public: public:
@ -56,18 +53,12 @@ PopupLocationBar::PopupLocationBar(QWidget* parent)
m_bookmarkIcon = new BookmarksIcon(this); m_bookmarkIcon = new BookmarksIcon(this);
m_autofillIcon = new AutoFillIcon(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); QWidget* rightSpacer = new QWidget(this);
rightSpacer->setFixedWidth(3); rightSpacer->setFixedWidth(3);
addWidget(m_siteIcon, LineEdit::LeftSide); addWidget(m_siteIcon, LineEdit::LeftSide);
addWidget(m_autofillIcon, LineEdit::RightSide); addWidget(m_autofillIcon, LineEdit::RightSide);
addWidget(m_bookmarkIcon, LineEdit::RightSide); addWidget(m_bookmarkIcon, LineEdit::RightSide);
addWidget(m_loadingAnimation, LineEdit::RightSide);
addWidget(rightSpacer, LineEdit::RightSide); addWidget(rightSpacer, LineEdit::RightSide);
setLeftMargin(24); setLeftMargin(24);
@ -88,9 +79,6 @@ void PopupLocationBar::setView(PopupWebView* view)
void PopupLocationBar::startLoading() void PopupLocationBar::startLoading()
{ {
m_loadingAnimation->show();
m_loadingAnimation->movie()->start();
m_autofillIcon->hide(); m_autofillIcon->hide();
updateTextMargins(); updateTextMargins();
@ -98,9 +86,6 @@ void PopupLocationBar::startLoading()
void PopupLocationBar::stopLoading() void PopupLocationBar::stopLoading()
{ {
m_loadingAnimation->hide();
m_loadingAnimation->movie()->stop();
m_bookmarkIcon->checkBookmark(m_view->url()); m_bookmarkIcon->checkBookmark(m_view->url());
WebPage* page = qobject_cast<WebPage*>(m_view->page()); WebPage* page = qobject_cast<WebPage*>(m_view->page());

4
src/lib/popupwindow/popuplocationbar.h
View File

@ -1,6 +1,6 @@
/* ============================================================ /* ============================================================
* QupZilla - WebKit based browser * QupZilla - WebKit based browser
* Copyright (C) 2010-2014 David Rosca <nowrep@gmail.com> * Copyright (C) 2010-2016 David Rosca <nowrep@gmail.com>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -22,7 +22,6 @@
#include "lineedit.h" #include "lineedit.h"
class QUrl; class QUrl;
class QLabel;
class PopupSiteIcon; class PopupSiteIcon;
class PopupWebView; class PopupWebView;
@ -50,7 +49,6 @@ public slots:
private: private:
PopupWebView* m_view; PopupWebView* m_view;
QLabel* m_loadingAnimation;
PopupSiteIcon* m_siteIcon; PopupSiteIcon* m_siteIcon;
AutoFillIcon* m_autofillIcon; AutoFillIcon* m_autofillIcon;