From 49ee5ed6e80b8f06337f92d14e2cab1c1512c1e3 Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Fri, 19 Jan 2018 02:10:31 +0100
Subject: Refactoring MainWindow

- Added NavigationBar object that manages the navigation buttons
- Removed NavigationButton class that it obsoleted
---
 src/widgets/loadingbar.cpp        | 39 ---------------------------------------
 src/widgets/loadingbar.h          | 29 -----------------------------
 src/widgets/mainwindowmenubar.cpp |  2 +-
 src/widgets/mainwindowtabbar.cpp  |  2 +-
 4 files changed, 2 insertions(+), 70 deletions(-)
 delete mode 100644 src/widgets/loadingbar.cpp
 delete mode 100644 src/widgets/loadingbar.h

(limited to 'src/widgets')

diff --git a/src/widgets/loadingbar.cpp b/src/widgets/loadingbar.cpp
deleted file mode 100644
index e72c5bb..0000000
--- a/src/widgets/loadingbar.cpp
+++ /dev/null
@@ -1,39 +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: git://neueland.iserlohn-fortress.net/smolbote.git
- *
- * SPDX-License-Identifier: GPL-3.0
- */
-
-#include "loadingbar.h"
-#include <QTimer>
-#include <QWebEngineView>
-
-LoadingBar::LoadingBar(QWidget *parent)
-    : QProgressBar(parent)
-{
-    setMaximum(100);
-}
-
-void LoadingBar::connectWebView(QWebEngineView *view)
-{
-    disconnect(this);
-
-    connect(view, SIGNAL(loadStarted()), this, SLOT(loadStarted()));
-    connect(view, SIGNAL(loadProgress(int)), this, SLOT(setValue(int)));
-    connect(view, SIGNAL(loadFinished(bool)), this, SLOT(loadFinished(bool)));
-}
-
-void LoadingBar::loadStarted()
-{
-    resetFormat();
-    show();
-    setValue(0);
-}
-
-void LoadingBar::loadFinished(bool ok)
-{
-    setFormat(QString("%p% %1").arg(ok ? tr("Finished") : tr("Failed")));
-    QTimer::singleShot(2000, this, SLOT(hide()));
-}
diff --git a/src/widgets/loadingbar.h b/src/widgets/loadingbar.h
deleted file mode 100644
index e281628..0000000
--- a/src/widgets/loadingbar.h
+++ /dev/null
@@ -1,29 +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: git://neueland.iserlohn-fortress.net/smolbote.git
- *
- * SPDX-License-Identifier: GPL-3.0
- */
-
-#ifndef LOADINGBAR_H
-#define LOADINGBAR_H
-
-#include <QProgressBar>
-
-class QWebEngineView;
-class LoadingBar : public QProgressBar
-{
-    Q_OBJECT
-public:
-    explicit LoadingBar(QWidget *parent = 0);
-    void connectWebView(QWebEngineView *view);
-
-signals:
-
-public slots:
-    void loadStarted();
-    void loadFinished(bool ok);
-};
-
-#endif // LOADINGBAR_H
diff --git a/src/widgets/mainwindowmenubar.cpp b/src/widgets/mainwindowmenubar.cpp
index f8275c0..bc86e77 100644
--- a/src/widgets/mainwindowmenubar.cpp
+++ b/src/widgets/mainwindowmenubar.cpp
@@ -8,7 +8,7 @@
 
 #include "mainwindowmenubar.h"
 #include "downloads/downloadswidget.h"
-#include "mainwindow.h"
+#include "src/mainwindow/mainwindow.h"
 #include <QInputDialog>
 
 MainWindowMenuBar::MainWindowMenuBar(std::shared_ptr<Configuration> config, MainWindow *parent)
diff --git a/src/widgets/mainwindowtabbar.cpp b/src/widgets/mainwindowtabbar.cpp
index 5cf360d..e669bf6 100644
--- a/src/widgets/mainwindowtabbar.cpp
+++ b/src/widgets/mainwindowtabbar.cpp
@@ -11,7 +11,7 @@
 #include <QShortcut>
 #include <settings/configuration.h>
 
-#include "mainwindow.h"
+#include "src/mainwindow/mainwindow.h"
 
 MainWindowTabBar::MainWindowTabBar(const std::shared_ptr<Configuration> &config, MainWindow *parent)
     : QTabBar(parent)
-- 
cgit v1.2.1