Skip to content

Commit

Permalink
Remove progress bar in status bar
Browse files Browse the repository at this point in the history
Was buggy on Windows.
  • Loading branch information
rodlie committed Nov 19, 2023
1 parent 527b914 commit 4baf8da
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 29 deletions.
24 changes: 0 additions & 24 deletions src/app/GUI/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ MainWindow::MainWindow(Document& document,
, mTimelineWindowAct(nullptr)
, mRenderWindow(nullptr)
, mRenderWindowAct(nullptr)
, mRenderProgress(nullptr)
{
Q_ASSERT(!sInstance);
sInstance = this;
Expand Down Expand Up @@ -233,11 +232,6 @@ MainWindow::MainWindow(Document& document,
this);
mRenderWidget = new RenderWidget(this);

connect(mRenderWidget, &RenderWidget::progress,
this, &MainWindow::handleRenderProgress);
connect(mRenderWidget, &RenderWidget::rendererFinished,
this, &MainWindow::handleRenderFinished);

const auto alignWidget = new AlignWidget(this);
alignWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
connect(alignWidget, &AlignWidget::alignTriggered,
Expand Down Expand Up @@ -306,12 +300,6 @@ MainWindow::MainWindow(Document& document,

installEventFilter(this);

mRenderProgress = new QProgressBar(this);
mRenderProgress->setFormat(tr("Render %p%"));
mRenderProgress->setMaximumWidth(300);
mRenderProgress->setVisible(false);
statusBar()->addPermanentWidget(mRenderProgress);

connect(&mAudioHandler, &AudioHandler::deviceChanged,
this, [this]() { statusBar()->showMessage(tr("Changed audio output: %1")
.arg(mAudioHandler.getDeviceName()),
Expand Down Expand Up @@ -1344,18 +1332,6 @@ void MainWindow::openRenderQueueWindow(const bool &focus)
mRenderWindow->focusWindow();
}

void MainWindow::handleRenderProgress(int frame, int total)
{
if (!mRenderProgress->isVisible()) { mRenderProgress->setVisible(true); }
mRenderProgress->setRange(0, total);
mRenderProgress->setValue(frame);
}

void MainWindow::handleRenderFinished()
{
mRenderProgress->setVisible(false);
}

void MainWindow::openWelcomeDialog()
{
mStackWidget->setCurrentIndex(mStackIndexWelcome);
Expand Down
5 changes: 0 additions & 5 deletions src/app/GUI/mainwindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
#include <QToolBar>
#include <QComboBox>
#include <QTimer>
#include <QProgressBar>

#include "undoredo.h"
#include "Private/Tasks/taskscheduler.h"
Expand Down Expand Up @@ -400,10 +399,6 @@ class MainWindow : public QMainWindow
QAction *mRenderWindowAct;
void openRenderQueueWindow(const bool &focus = true);

QProgressBar *mRenderProgress;
void handleRenderProgress(int frame, int total);
void handleRenderFinished();

protected:
void keyPressEvent(QKeyEvent *event);
bool eventFilter(QObject *obj, QEvent *e);
Expand Down

0 comments on commit 4baf8da

Please sign in to comment.