[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kcm-grub2/frameworks] src: Use QProgressDialog instead of KProgressDialog
From:       Alexander Volkov <null () kde ! org>
Date:       2018-05-11 16:44:08
Message-ID: E1fHB9M-00065t-Eq () code ! kde ! org
[Download RAW message or body]

Git commit 8e892c1df9aefb20ac7fe1aa56884a3efee96f5c by Alexander Volkov.
Committed on 11/05/2018 at 17:41.
Pushed by volkov into branch 'frameworks'.

Use QProgressDialog instead of KProgressDialog

M  +7    -5    src/installDlg.cpp
M  +7    -5    src/kcm_grub2.cpp
M  +10   -7    src/removeDlg.cpp
M  +3    -2    src/removeDlg.h

https://commits.kde.org/kcm-grub2/8e892c1df9aefb20ac7fe1aa56884a3efee96f5c

diff --git a/src/installDlg.cpp b/src/installDlg.cpp
index d159df7..dfcbc48 100644
--- a/src/installDlg.cpp
+++ b/src/installDlg.cpp
@@ -23,12 +23,12 @@
 #include <QRadioButton>
 #include <QPushButton>
 #include <QIcon>
+#include <QProgressDialog>
 
 //KDE
 #include <KFormat>
 #include <KLocalizedString>
 #include <KMessageBox>
-#include <KProgressDialog>
 #include <KAuthAction>
 #include <KAuthExecuteJob>
 using namespace KAuth;
@@ -109,11 +109,13 @@ void InstallDialog::slotButtonClicked(int button)
             return;
         }
 
-        KProgressDialog progressDlg(this, i18nc("@title:window", "Installing"), \
                i18nc("@info:progress", "Installing GRUB..."));
-        progressDlg.setAllowCancel(false);
+        QProgressDialog progressDlg(this);
+        progressDlg.setWindowTitle(i18nc("@title:window", "Installing"));
+        progressDlg.setLabelText(i18nc("@info:progress", "Installing GRUB..."));
+        progressDlg.setCancelButton(nullptr);
         progressDlg.setModal(true);
-        progressDlg.progressBar()->setMinimum(0);
-        progressDlg.progressBar()->setMaximum(0);
+        progressDlg.setMinimum(0);
+        progressDlg.setMaximum(0);
         progressDlg.show();
         installJob = installAction.execute();
         connect(installJob, SIGNAL(finished(KJob*)), &progressDlg, SLOT(hide()));
diff --git a/src/kcm_grub2.cpp b/src/kcm_grub2.cpp
index 055b132..e1f20b6 100644
--- a/src/kcm_grub2.cpp
+++ b/src/kcm_grub2.cpp
@@ -28,6 +28,7 @@
 #include <QPushButton>
 #include <QIcon>
 #include <QMenu>
+#include <QProgressDialog>
 
 //KDE
 #include <KLocalizedString>
@@ -36,7 +37,6 @@
 #include <KInputDialog>
 #include <KMessageBox>
 #include <KPluginFactory>
-#include <KProgressDialog>
 #include <KAuthAction>
 #include <KAuthExecuteJob>
 
@@ -493,11 +493,13 @@ void KCMGRUB2::save()
     }
     saveJob = saveAction.execute();
 
-    KProgressDialog progressDlg(this, i18nc("@title:window Verb (gerund). Refers to \
                current status.", "Saving"), i18nc("@info:progress", "Saving GRUB \
                settings..."));
-    progressDlg.setAllowCancel(false);
+    QProgressDialog progressDlg(this);
+    progressDlg.setWindowTitle(i18nc("@title:window Verb (gerund). Refers to current \
status.", "Saving")); +    progressDlg.setLabelText(i18nc("@info:progress", "Saving \
GRUB settings...")); +    progressDlg.setCancelButton(nullptr);
     progressDlg.setModal(true);
-    progressDlg.progressBar()->setMinimum(0);
-    progressDlg.progressBar()->setMaximum(0);
+    progressDlg.setMinimum(0);
+    progressDlg.setMaximum(0);
     progressDlg.show();
     connect(saveJob, SIGNAL(finished(KJob*)), &progressDlg, SLOT(hide()));
 
diff --git a/src/removeDlg.cpp b/src/removeDlg.cpp
index 4761ec1..aef5ebd 100644
--- a/src/removeDlg.cpp
+++ b/src/removeDlg.cpp
@@ -26,10 +26,10 @@
 #include <QTextStream>
 #include <QTimer>
 #include <QIcon>
+#include <QProgressDialog>
 
 //KDE
 #include <KMessageBox>
-#include <KProgressDialog>
 
 //Project
 #include "entry.h"
@@ -58,13 +58,15 @@ RemoveDialog::RemoveDialog(const QList<Entry> &entries, QWidget \
*parent, Qt::WFl  #endif
 
     detectCurrentKernelImage();
-    KProgressDialog progressDlg(this, i18nc("@title:window", "Finding Old Entries"), \
                i18nc("@info:progress", "Finding Old Entries..."));
-    progressDlg.setAllowCancel(false);
+    QProgressDialog progressDlg(this);
+    progressDlg.setWindowTitle(i18nc("@title:window", "Finding Old Entries"));
+    progressDlg.setLabelText(i18nc("@info:progress", "Finding Old Entries..."));
+    progressDlg.setCancelButton(nullptr);
     progressDlg.setModal(true);
     progressDlg.show();
     bool found = false;
     for (int i = 0; i < entries.size(); i++) {
-        progressDlg.progressBar()->setValue(100. / entries.size() * (i + 1));
+        progressDlg.setValue(100. / entries.size() * (i + 1));
         QString file = entries.at(i).kernel();
         if (file.isEmpty() || file == m_currentKernelImage) {
             continue;
@@ -146,13 +148,14 @@ void RemoveDialog::slotItemChanged()
 void RemoveDialog::slotProgress(const QString &status, int percentage)
 {
     if (!m_progressDlg) {
-        m_progressDlg = new KProgressDialog(this, i18nc("@title:window", "Removing \
                Old Entries"));
-        m_progressDlg->setAllowCancel(false);
+        m_progressDlg = new QProgressDialog(this);
+        m_progressDlg->setWindowTitle(i18nc("@title:window", "Removing Old \
Entries")); +        m_progressDlg->setCancelButton(nullptr);
         m_progressDlg->setModal(true);
         m_progressDlg->show();
     }
     m_progressDlg->setLabelText(status);
-    m_progressDlg->progressBar()->setValue(percentage);
+    m_progressDlg->setValue(percentage);
 }
 void RemoveDialog::slotFinished(bool success)
 {
diff --git a/src/removeDlg.h b/src/removeDlg.h
index 77b282d..97fa0ed 100644
--- a/src/removeDlg.h
+++ b/src/removeDlg.h
@@ -23,7 +23,8 @@
 
 //KDE
 #include <KDialog>
-class KProgressDialog;
+
+class QProgressDialog;
 
 //Project
 #include <config.h>
@@ -65,7 +66,7 @@ private:
     QPkBackend *m_backend;
 #endif
     QString m_currentKernelImage;
-    KProgressDialog *m_progressDlg;
+    QProgressDialog *m_progressDlg;
     Ui::RemoveDialog *ui;
 };
 


[prev in list] [next in list] [prev in thread] [next in thread]