From dcfa0a5c3414d0eb91d6151b64b5b135f776194a Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Mon, 17 Feb 2020 02:05:11 +1100 Subject: [PATCH] files: renamed LoadSaveDialog to ProgressDialog --- app/dialog/{loadsave => progress}/CMakeLists.txt | 4 ++-- .../{loadsave/loadsave.cpp => progress/progress.cpp} | 8 ++++---- .../{loadsave/loadsave.h => progress/progress.h} | 11 ++++++----- 3 files changed, 12 insertions(+), 11 deletions(-) rename app/dialog/{loadsave => progress}/CMakeLists.txt (92%) rename app/dialog/{loadsave/loadsave.cpp => progress/progress.cpp} (79%) rename app/dialog/{loadsave/loadsave.h => progress/progress.h} (53%) diff --git a/app/dialog/loadsave/CMakeLists.txt b/app/dialog/progress/CMakeLists.txt similarity index 92% rename from app/dialog/loadsave/CMakeLists.txt rename to app/dialog/progress/CMakeLists.txt index a7f7e0ea0..99c331702 100644 --- a/app/dialog/loadsave/CMakeLists.txt +++ b/app/dialog/progress/CMakeLists.txt @@ -16,7 +16,7 @@ set(OLIVE_SOURCES ${OLIVE_SOURCES} - dialog/loadsave/loadsave.h - dialog/loadsave/loadsave.cpp + dialog/progress/progress.h + dialog/progress/progress.cpp PARENT_SCOPE ) diff --git a/app/dialog/loadsave/loadsave.cpp b/app/dialog/progress/progress.cpp similarity index 79% rename from app/dialog/loadsave/loadsave.cpp rename to app/dialog/progress/progress.cpp index 05062f2ec..134255af3 100644 --- a/app/dialog/loadsave/loadsave.cpp +++ b/app/dialog/progress/progress.cpp @@ -1,10 +1,10 @@ -#include "loadsave.h" +#include "progress.h" #include #include #include -LoadSaveDialog::LoadSaveDialog(const QString& message, const QString& title, QWidget *parent) : +ProgressDialog::ProgressDialog(const QString& message, const QString& title, QWidget *parent) : QDialog(parent) { if (!title.isEmpty()) { @@ -28,13 +28,13 @@ LoadSaveDialog::LoadSaveDialog(const QString& message, const QString& title, QWi cancel_layout->addStretch(); QPushButton* cancel_btn = new QPushButton(tr("Cancel")); - connect(cancel_btn, &QPushButton::clicked, this, &LoadSaveDialog::Cancelled); + connect(cancel_btn, &QPushButton::clicked, this, &ProgressDialog::Cancelled); cancel_layout->addWidget(cancel_btn); cancel_layout->addStretch(); } -void LoadSaveDialog::SetProgress(int value) +void ProgressDialog::SetProgress(int value) { bar_->setValue(value); } diff --git a/app/dialog/loadsave/loadsave.h b/app/dialog/progress/progress.h similarity index 53% rename from app/dialog/loadsave/loadsave.h rename to app/dialog/progress/progress.h index 6b640fe68..5f0d4be97 100644 --- a/app/dialog/loadsave/loadsave.h +++ b/app/dialog/progress/progress.h @@ -1,14 +1,14 @@ -#ifndef LOADSAVEDIALOG_H -#define LOADSAVEDIALOG_H +#ifndef PROGRESSDIALOG_H +#define PROGRESSDIALOG_H #include #include -class LoadSaveDialog : public QDialog +class ProgressDialog : public QDialog { Q_OBJECT public: - LoadSaveDialog(const QString &message, const QString &title, QWidget* parent = nullptr); + ProgressDialog(const QString &message, const QString &title, QWidget* parent = nullptr); public slots: void SetProgress(int value); @@ -18,6 +18,7 @@ signals: private: QProgressBar* bar_; + }; -#endif // LOADSAVEDIALOG_H +#endif // PROGRESSDIALOG_H