aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAqua-sama <aqua@iserlohn-fortress.net>2018-04-17 16:39:24 +0200
committerAqua-sama <aqua@iserlohn-fortress.net>2018-04-17 16:39:24 +0200
commit190cf0526914da78ef5539110e5945c7677e4b89 (patch)
tree1acfab82280c338cc70fcbf2e701f3ada4b722a9
parentSearch box works again (diff)
downloadsmolbote-190cf0526914da78ef5539110e5945c7677e4b89.tar.xz
Remove LoadingBar
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/mainwindow/widgets/loadingbar.cpp53
-rw-r--r--src/mainwindow/widgets/loadingbar.h30
3 files changed, 0 insertions, 85 deletions
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 <QTimer>
-
-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 <QProgressBar>
-
-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