reduce dependencies to Manhattan style

replace Manhattan::ProgressBar by QProgressBar

GUI/coregui/Views/JobWidgets/JobProgressAssistant.cpp

@@ -16,7 +16,7 @@
 #include "GUI/coregui/Models/JobModel.h"
 #include "GUI/coregui/Models/JobQueueData.h"
 #include "GUI/coregui/mainwindow/mainwindow.h"
-#include <qt-manhattan-style/progressbar.h>
+#include <QProgressBar>
 
 JobProgressAssistant::JobProgressAssistant(MainWindow* mainWindow)
     : QObject(mainWindow), m_mainWindow(mainWindow) {
@@ -29,12 +29,10 @@ JobProgressAssistant::JobProgressAssistant(MainWindow* mainWindow)
 
 void JobProgressAssistant::onGlobalProgress(int progress) {
     ASSERT(m_mainWindow->progressBar());
-    if (progress < 0 || progress >= 100) {
-        m_mainWindow->progressBar()->setFinished(true);
+    if (progress < 0 || progress >= 100)
         m_mainWindow->progressBar()->hide();
-    } else {
+    else {
         m_mainWindow->progressBar()->show();
-        m_mainWindow->progressBar()->setFinished(false);
         m_mainWindow->progressBar()->setValue(progress);
     }
 }

GUI/coregui/mainwindow/mainwindow.cpp

@@ -33,9 +33,9 @@
 #include <QApplication>
 #include <QCloseEvent>
 #include <QMessageBox>
+#include <QProgressBar>
 #include <QSettings>
 #include <qt-manhattan-style/fancytabwidget.h>
-#include <qt-manhattan-style/progressbar.h>
 #include <qt-manhattan-style/stylehelper.h>
 
 MainWindow* MainWindow::s_instance = nullptr;
@@ -43,7 +43,7 @@ MainWindow* MainWindow::s_instance = nullptr;
 MainWindow::MainWindow()
     : Manhattan::FancyMainWindow(nullptr)
     , m_tabWidget(new Manhattan::FancyTabWidget(this))
-    , m_progressBar(new Manhattan::ProgressBar(this))
+    , m_progressBar(new QProgressBar)
     , m_applicationModels(new ApplicationModels(this))
     , m_projectManager(new ProjectManager(this))
     , m_actionManager(new ActionManager(this))
@@ -100,7 +100,7 @@ ApplicationModels* MainWindow::models() {
     return m_applicationModels;
 }
 
-Manhattan::ProgressBar* MainWindow::progressBar() {
+QProgressBar* MainWindow::progressBar() {
     return m_progressBar;
 }
 
@@ -192,8 +192,11 @@ void MainWindow::initApplication() {
 }
 
 void MainWindow::initProgressBar() {
-    m_tabWidget->addBottomCornerWidget(m_progressBar);
     m_progressBar->hide();
+    m_progressBar->setTextVisible(false);
+    m_progressBar->setFixedHeight(10);
+    m_progressBar->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed);
+    m_tabWidget->addBottomCornerWidget(m_progressBar);
 }
 
 void MainWindow::initViews() {

GUI/coregui/mainwindow/mainwindow.h

@@ -19,7 +19,6 @@
 
 namespace Manhattan {
 class FancyTabWidget;
-class ProgressBar;
 } // namespace Manhattan
 
 class WelcomeView;
@@ -40,6 +39,7 @@ class ProjectManager;
 class ActionManager;
 class ToolTipDataBase;
 class UpdateNotifier;
+class QProgressBar;
 
 class MainWindow : public Manhattan::FancyMainWindow {
     Q_OBJECT
@@ -60,7 +60,7 @@ public:
     JobModel* jobModel();
     ApplicationModels* models();
 
-    Manhattan::ProgressBar* progressBar();
+    QProgressBar* progressBar();
     QStatusBar* statusBar();
 
     ProjectManager* projectManager();
@@ -85,7 +85,7 @@ private:
     void initConnections();
 
     Manhattan::FancyTabWidget* m_tabWidget;
-    Manhattan::ProgressBar* m_progressBar;
+    QProgressBar* m_progressBar;
 
     ApplicationModels* m_applicationModels;
     ProjectManager* m_projectManager;