From 190cf0526914da78ef5539110e5945c7677e4b89 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Tue, 17 Apr 2018 16:39:24 +0200 Subject: Remove LoadingBar --- src/CMakeLists.txt | 2 -- src/mainwindow/widgets/loadingbar.cpp | 53 ----------------------------------- src/mainwindow/widgets/loadingbar.h | 30 -------------------- 3 files changed, 85 deletions(-) delete mode 100644 src/mainwindow/widgets/loadingbar.cpp delete mode 100644 src/mainwindow/widgets/loadingbar.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index edc8f49..965f494 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -22,8 +22,6 @@ add_executable(poi mainwindow/mainwindow.h mainwindow/window.cpp mainwindow/window.h - #mainwindow/widgets/loadingbar.cpp - #mainwindow/widgets/loadingbar.h mainwindow/widgets/navigationbar.cpp mainwindow/widgets/navigationbar.h mainwindow/widgets/searchform.cpp diff --git a/src/mainwindow/widgets/loadingbar.cpp b/src/mainwindow/widgets/loadingbar.cpp deleted file mode 100644 index 61e3eae..0000000 --- a/src/mainwindow/widgets/loadingbar.cpp +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of smolbote. It's copyrighted by the contributors recorded - * in the version control history of the file, available from its original - * location: https://neueland.iserlohn-fortress.net/smolbote.hg - * - * SPDX-License-Identifier: GPL-3.0 - */ - -#include "loadingbar.h" -#include "webengine/webview.h" -#include - -LoadingBar::LoadingBar(QWidget *parent) - : QProgressBar(parent) -{ - setMaximum(100); -} - -void LoadingBar::connectWebView(WebView *view) -{ - Q_CHECK_PTR(view); - - disconnect(loadStartedConnection); - disconnect(loadProgressConnection); - disconnect(loadedConnection); - disconnect(loadFinishedConnection); - - if(view->isLoaded()) { - this->hide(); - } else { - loadStarted(); - setValue(view->loadProgress()); - } - - loadStartedConnection = connect(view, &QWebEngineView::loadStarted, this, &LoadingBar::loadStarted); - loadProgressConnection = connect(view, &QWebEngineView::loadProgress, this, &QProgressBar::setValue); - loadedConnection = connect(view, &WebView::loaded, this, [this]() { - QTimer::singleShot(2000, this, &LoadingBar::hide); - }); - loadFinishedConnection = connect(view, &QWebEngineView::loadFinished, this, &LoadingBar::loadFinished); -} - -void LoadingBar::loadStarted() -{ - resetFormat(); - show(); - setValue(0); -} - -void LoadingBar::loadFinished(bool ok) -{ - setFormat(QString("%p% %1").arg(ok ? tr("Finished") : tr("Failed"))); -} diff --git a/src/mainwindow/widgets/loadingbar.h b/src/mainwindow/widgets/loadingbar.h deleted file mode 100644 index f75e72b..0000000 --- a/src/mainwindow/widgets/loadingbar.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * This file is part of smolbote. It's copyrighted by the contributors recorded - * in the version control history of the file, available from its original - * location: https://neueland.iserlohn-fortress.net/smolbote.hg - * - * SPDX-License-Identifier: GPL-3.0 - */ - -#ifndef LOADINGBAR_H -#define LOADINGBAR_H - -#include - -class WebView; -class LoadingBar : public QProgressBar -{ - Q_OBJECT -public: - explicit LoadingBar(QWidget *parent = nullptr); - void connectWebView(WebView *view); - -private slots: - void loadStarted(); - void loadFinished(bool ok); - -private: - QMetaObject::Connection loadStartedConnection, loadProgressConnection, loadedConnection, loadFinishedConnection; -}; - -#endif // LOADINGBAR_H -- cgit v1.2.1