From 1693f94607678d892439ca02c08ac768aec3f46a Mon Sep 17 00:00:00 2001 From: Arno Date: Wed, 13 Jun 2018 10:24:21 +0200 Subject: Remove useless ProgressBar No need for the ProgressBar in the status line any more... --- shemovcleaner.cpp | 6 ------ shemovcleaner.h | 1 - torrentwidget.cpp | 5 ----- torrentwidget.h | 3 --- 4 files changed, 15 deletions(-) diff --git a/shemovcleaner.cpp b/shemovcleaner.cpp index e31545f..65153d8 100644 --- a/shemovcleaner.cpp +++ b/shemovcleaner.cpp @@ -43,13 +43,11 @@ ShemovCleaner::ShemovCleaner(QWidget *parent, Qt::WindowFlags f) : QMainWindow(p qApp->processEvents(); mTab = new QTabWidget; mTorrentTab = new TorrentWidget; - mTorrentTab->setProgressBar(mProgressBar); mTorrentTab->gatherData(); splash.showMessage(tr("Gathering files..."), Qt::AlignHCenter, Qt::darkGreen); qApp->processEvents(); mFileTab = new FileWidget; - mFileTab->setProgressBar(mProgressBar); mFileTab->gatherData(); splash.showMessage(tr("Finalizing..."), Qt::AlignHCenter, Qt::darkGreen); @@ -177,9 +175,6 @@ void ShemovCleaner::createStatusBar(){ QLabel *l2 = new QLabel(tr("Dur.")); mDuration = new QLabel("00:00:00"); mDuration->setFrameStyle(QFrame::Panel | QFrame::Sunken); - mProgressBar = new QProgressBar; - mProgressBar->setMaximumWidth(150); - mProgressBar->setMaximumHeight(10); mDrive = new QLabel(tr("C:")); mFree = new QLabel; mFree->setFrameStyle(QFrame::Panel | QFrame::Sunken); @@ -189,7 +184,6 @@ void ShemovCleaner::createStatusBar(){ f.setBold(true); QFontMetrics fm(f); mFree->setMaximumHeight(fm.height() + 6); - statusBar()->addPermanentWidget(mProgressBar); statusBar()->addPermanentWidget(l1); statusBar()->addPermanentWidget(mSelected); statusBar()->addPermanentWidget(l2); diff --git a/shemovcleaner.h b/shemovcleaner.h index 1a28246..802f442 100644 --- a/shemovcleaner.h +++ b/shemovcleaner.h @@ -42,7 +42,6 @@ class ShemovCleaner : public QMainWindow { QLabel *mDuration; QLabel *mDrive; QLabel *mFree; - QProgressBar *mProgressBar; QTabWidget *mTab; TorrentWidget *mTorrentTab; FileWidget *mFileTab; diff --git a/torrentwidget.cpp b/torrentwidget.cpp index 8cdbca1..a118df1 100644 --- a/torrentwidget.cpp +++ b/torrentwidget.cpp @@ -166,9 +166,6 @@ void TorrentWidget::gatherData(){ q.prepare("SELECT COUNT(*) FROM metadata WHERE tsubject = :fn"); QDir d(mDir->text()); QFileInfoList fl = d.entryInfoList(QStringList() << mExt, QDir::Files, QDir::Name); - mProgressBar->reset(); - mProgressBar->setMinimum(0); - mProgressBar->setMaximum(fl.count() - 1); if(fl.count() > 100){ QString msg = QString(tr("

Looking at %1 files could take a while

Do you really want to continue

")).arg(QString::number(fl.count())); int retval = QMessageBox::question(this, tr("Continue"), msg); @@ -176,7 +173,6 @@ void TorrentWidget::gatherData(){ return; } } - int count = 0; mFileView->setSortingEnabled(false); mModel->clear(); QStandardItem *root = mModel->invisibleRootItem(); @@ -213,7 +209,6 @@ void TorrentWidget::gatherData(){ fData[NameColumn]->setForeground(redBrush); } root->appendRow(fData); - mProgressBar->setValue(++count); } qApp->processEvents(); mFileView->setSortingEnabled(true); diff --git a/torrentwidget.h b/torrentwidget.h index ad8387c..004380c 100644 --- a/torrentwidget.h +++ b/torrentwidget.h @@ -13,7 +13,6 @@ class QLabel; class QToolBar; class QMenuBar; class QKeyEvent; -class QProgressBar; class FileSorter; class TorrentDisplay; @@ -28,7 +27,6 @@ class TorrentWidget : public QWidget { QMenuBar *menuBar() { return mMenuBar; } TorrentDisplay *torrentDisplay() { return mTorrentDisplay; } QTreeView *torrentFileView() { return mFileView; } - void setProgressBar(QProgressBar *progressBar) { mProgressBar = progressBar; } const QString currentDir() const { return mDir->text(); } ~TorrentWidget(); @@ -72,7 +70,6 @@ class TorrentWidget : public QWidget { QTreeView *mFileView; QToolBar *mToolBar; QMenuBar *mMenuBar; - QProgressBar *mProgressBar; QAction *mRefreshA; QAction *mDeleteA; QAction *mMoveA; -- cgit v1.2.3-70-g09d2