bump

1 files changed, 217 insertions, 79 deletions

diff --git a/port_to_kf5.patch b/port_to_kf5.patch
index e9a23266ec91..f6ad59ef126a 100644
--- a/port_to_kf5.patch
+++ b/port_to_kf5.patch
@@ -1,6 +1,6 @@
 diff -Naur a/CMakeLists.txt b/CMakeLists.txt
 --- a/CMakeLists.txt	2013-10-12 18:34:15.000000000 +0800
-+++ b/CMakeLists.txt	2015-11-28 09:17:09.000000000 +0800
++++ b/CMakeLists.txt	2015-11-29 09:29:55.886941767 +0800
 @@ -1,31 +1,48 @@
 +cmake_minimum_required( VERSION 2.8.12 )
 +cmake_policy(SET CMP0002 OLD)
@@ -60,7 +60,7 @@ diff -Naur a/CMakeLists.txt b/CMakeLists.txt
  
 diff -Naur a/cmake/modules/FindMsgfmt.cmake b/cmake/modules/FindMsgfmt.cmake
 --- a/cmake/modules/FindMsgfmt.cmake	1970-01-01 08:00:00.000000000 +0800
-+++ b/cmake/modules/FindMsgfmt.cmake	2015-11-28 09:04:04.000000000 +0800
++++ b/cmake/modules/FindMsgfmt.cmake	2015-11-29 09:29:55.886941767 +0800
 @@ -0,0 +1,28 @@
 +# - Try to find msgfmt 
 +# Once done this will define
@@ -92,7 +92,7 @@ diff -Naur a/cmake/modules/FindMsgfmt.cmake b/cmake/modules/FindMsgfmt.cmake
 +
 diff -Naur a/cmake/modules/MacroLogFeature.cmake b/cmake/modules/MacroLogFeature.cmake
 --- a/cmake/modules/MacroLogFeature.cmake	1970-01-01 08:00:00.000000000 +0800
-+++ b/cmake/modules/MacroLogFeature.cmake	2015-11-28 09:04:04.000000000 +0800
++++ b/cmake/modules/MacroLogFeature.cmake	2015-11-29 09:29:55.887941787 +0800
 @@ -0,0 +1,157 @@
 +# This file defines the Feature Logging macros.
 +#
@@ -253,7 +253,7 @@ diff -Naur a/cmake/modules/MacroLogFeature.cmake b/cmake/modules/MacroLogFeature
 +ENDMACRO(MACRO_DISPLAY_FEATURE_LOG)
 diff -Naur a/other/kcm_grub2.desktop b/other/kcm_grub2.desktop
 --- a/other/kcm_grub2.desktop	2013-10-12 18:34:15.000000000 +0800
-+++ b/other/kcm_grub2.desktop	2015-11-28 09:04:04.000000000 +0800
++++ b/other/kcm_grub2.desktop	2015-11-29 09:29:55.887941787 +0800
 @@ -2,12 +2,12 @@
  Icon=system-reboot
  Type=Service
@@ -271,7 +271,7 @@ diff -Naur a/other/kcm_grub2.desktop b/other/kcm_grub2.desktop
  Name[bs]=GRUB2 pokretač sistemar
 diff -Naur a/src/CMakeLists.txt b/src/CMakeLists.txt
 --- a/src/CMakeLists.txt	2013-10-12 18:34:15.000000000 +0800
-+++ b/src/CMakeLists.txt	2015-11-28 09:04:04.000000000 +0800
++++ b/src/CMakeLists.txt	2015-11-29 09:29:55.887941787 +0800
 @@ -33,7 +33,7 @@
  endif(HAVE_QAPT)
  
@@ -283,7 +283,7 @@ diff -Naur a/src/CMakeLists.txt b/src/CMakeLists.txt
  endif(HAVE_IMAGEMAGICK)
 diff -Naur a/src/convertDlg.cpp b/src/convertDlg.cpp
 --- a/src/convertDlg.cpp	2013-10-12 18:34:15.000000000 +0800
-+++ b/src/convertDlg.cpp	2015-11-28 09:04:04.000000000 +0800
++++ b/src/convertDlg.cpp	2015-11-29 09:40:25.549517459 +0800
 @@ -50,11 +50,11 @@
      QString writeFilter = QString("*%1|%5 (%1)\n*%2|%6 (%2)\n*%3 *%4|%7 (%3 %4)").arg(".png", ".tga", ".jpg", ".jpeg", KMimeType::mimeType("image/png")->comment(), KMimeType::mimeType("image/x-tga")->comment(), KMimeType::mimeType("image/jpeg")->comment());
  
@@ -304,7 +304,7 @@ diff -Naur a/src/convertDlg.cpp b/src/convertDlg.cpp
  
  void ConvertDialog::slotButtonClicked(int button)
  {
-+    QRegularExpression getdirectory("\S*/");
++    QRegularExpression getdirectory("\\S*/");
      if (button == KDialog::Ok) {
          if (ui->kurlrequester_image->text().isEmpty() || ui->kurlrequester_converted->text().isEmpty()) {
              KMessageBox::information(this, i18nc("@info", "Please fill in both <interface>Image</interface> and <interface>Convert To</interface> fields."));
@@ -319,7 +319,7 @@ diff -Naur a/src/convertDlg.cpp b/src/convertDlg.cpp
          }
 diff -Naur a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt
 --- a/src/helper/CMakeLists.txt	2013-10-12 18:34:15.000000000 +0800
-+++ b/src/helper/CMakeLists.txt	2015-11-28 09:04:04.000000000 +0800
++++ b/src/helper/CMakeLists.txt	2015-11-29 09:29:55.888941807 +0800
 @@ -8,7 +8,7 @@
  set(kcmgrub2helper_SRCS helper.cpp)
  
@@ -341,8 +341,27 @@ diff -Naur a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt
 +kauth_install_actions(org.kde.kcontrol.kcmgrub2 kcmgrub2.actions)
 diff -Naur a/src/helper/helper.cpp b/src/helper/helper.cpp
 --- a/src/helper/helper.cpp	2013-10-12 18:34:15.000000000 +0800
-+++ b/src/helper/helper.cpp	2015-11-28 09:04:04.000000000 +0800
-@@ -59,8 +59,9 @@
++++ b/src/helper/helper.cpp	2015-11-29 09:31:09.083398179 +0800
+@@ -26,7 +26,7 @@
+ 
+ //KDE
+ #include <KDebug>
+-#include <KGlobal>
++//#include <KGlobal>
+ #include <KLocale>
+ #include <KProcess>
+ #include <KAuth/HelperSupport>
+@@ -44,7 +44,8 @@
+ 
+ Helper::Helper()
+ {
+-    KGlobal::locale()->insertCatalog("kcm-grub2");
++    //TO BE FIXED
++    //KGlobal::locale()->insertCatalog("kcm-grub2");
+     qputenv("PATH", path.toLatin1());
+ }
+ 
+@@ -59,8 +60,9 @@
  
      ActionReply reply;
      if (exitCode != 0) {
@@ -354,7 +373,7 @@ diff -Naur a/src/helper/helper.cpp b/src/helper/helper.cpp
      }
      reply.addData("command", command);
      reply.addData("output", process.readAll());
-@@ -75,17 +76,17 @@
+@@ -75,17 +77,17 @@
      QString originalConfigFileName = configFileName + ".original";
  
      if (!QFile::exists(originalConfigFileName)) {
@@ -375,7 +394,7 @@ diff -Naur a/src/helper/helper.cpp b/src/helper/helper.cpp
          reply.addData("errorDescription", i18nc("@info", "Cannot copy original configuration file <filename>%1</filename> to <filename>%2</filename>.", originalConfigFileName, configFileName));
          return reply;
      }
-@@ -101,7 +102,7 @@
+@@ -101,7 +103,7 @@
      if (mountPoint.isEmpty()) {
          for (int i = 0; QDir(mountPoint = QString("%1/kcm-grub2-%2").arg(QDir::tempPath(), QString::number(i))).exists(); i++);
          if (!QDir().mkpath(mountPoint)) {
@@ -384,7 +403,7 @@ diff -Naur a/src/helper/helper.cpp b/src/helper/helper.cpp
              reply.addData("errorDescription", i18nc("@info", "Failed to create temporary mount point."));
              return reply;
          }
-@@ -145,7 +146,7 @@
+@@ -145,7 +147,7 @@
  
      QFile file(fileName);
      if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
@@ -393,7 +412,7 @@ diff -Naur a/src/helper/helper.cpp b/src/helper/helper.cpp
          reply.addData("errorDescription", file.errorString());
          return reply;
      }
-@@ -190,7 +191,7 @@
+@@ -190,7 +192,7 @@
      hd_free_hd_data(&hd_data);
      reply.addData("gfxmodes", gfxmodes);
  #else
@@ -402,7 +421,7 @@ diff -Naur a/src/helper/helper.cpp b/src/helper/helper.cpp
  #endif
  
      return reply;
-@@ -207,7 +208,7 @@
+@@ -207,7 +209,7 @@
  
      QFile file(configFileName);
      if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
@@ -411,7 +430,7 @@ diff -Naur a/src/helper/helper.cpp b/src/helper/helper.cpp
          reply.addData("errorDescription", file.errorString());
          return reply;
      }
-@@ -237,4 +238,4 @@
+@@ -237,4 +239,4 @@
      return grub_mkconfigReply;
  }
  
@@ -419,27 +438,54 @@ diff -Naur a/src/helper/helper.cpp b/src/helper/helper.cpp
 +KAUTH_HELPER_MAIN("org.kde.kcontrol.kcmgrub2", Helper)
 diff -Naur a/src/installDlg.cpp b/src/installDlg.cpp
 --- a/src/installDlg.cpp	2013-10-12 18:34:15.000000000 +0800
-+++ b/src/installDlg.cpp	2015-11-28 09:30:15.226612873 +0800
-@@ -27,11 +27,17 @@
++++ b/src/installDlg.cpp	2015-11-29 10:14:08.595003734 +0800
+@@ -26,24 +26,30 @@
+ #include <kdeversion.h>
  #include <KMessageBox>
  #include <KProgressDialog>
- #include <KAuth/ActionWatcher>
+-#include <KAuth/ActionWatcher>
 -using namespace KAuth;
 +
++#include <KFormat>
++
  #include <Solid/Device>
  #include <Solid/StorageAccess>
  #include <Solid/StorageVolume>
  
-+#include <KIcon>
-+#include <KGlobal>
++//#include <KGlobal>
 +#include <KAuth>
-+//#include <KAuthAction>
 +using namespace KAuth;
 +
  //Ui
  #include "ui_installDlg.h"
  
-@@ -84,7 +90,7 @@
+ InstallDialog::InstallDialog(QWidget *parent, Qt::WFlags flags) : KDialog(parent, flags)
+ {
+     QWidget *widget = new QWidget(this);
++    KFormat format;
+     ui = new Ui::InstallDialog;
+     ui->setupUi(widget);
+     setMainWidget(widget);
+     enableButtonOk(false);
+     setWindowTitle(i18nc("@title:window", "Install/Recover Bootloader"));
+-    setWindowIcon(KIcon("system-software-update"));
++    setWindowIcon(QIcon("system-software-update"));
+     if (parent) {
+         setInitialSize(parent->size());
+     }
+@@ -66,8 +72,9 @@
+ 
+         QString uuidDir = "/dev/disk/by-uuid/", uuid = volume->uuid(), name;
+         name = (QFile::exists((name = uuidDir + uuid)) || QFile::exists((name = uuidDir + uuid.toLower())) || QFile::exists((name = uuidDir + uuid.toUpper())) ? QFile::symLinkTarget(name) : QString());
+-        QTreeWidgetItem *item = new QTreeWidgetItem(ui->treeWidget_recover, QStringList() << QString() << name << partition->filePath() << volume->label() << volume->fsType() << KGlobal::locale()->formatByteSize(volume->size()));
+-        item->setIcon(1, KIcon(device.icon()));
++        //TO BE FIXED
++        QTreeWidgetItem *item = new QTreeWidgetItem(ui->treeWidget_recover, QStringList() << QString() << name << partition->filePath() << volume->label() << volume->fsType() << format.formatByteSize(volume->size())); //KGlobal::locale()->
++        item->setIcon(1, QIcon(device.icon()));
+         item->setTextAlignment(5, Qt::AlignRight | Qt::AlignVCenter);
+         ui->treeWidget_recover->addTopLevelItem(item);
+         QRadioButton *radio = new QRadioButton(ui->treeWidget_recover);
+@@ -84,7 +91,7 @@
  {
      if (button == KDialog::Ok) {
          Action installAction("org.kde.kcontrol.kcmgrub2.install");
@@ -448,56 +494,89 @@ diff -Naur a/src/installDlg.cpp b/src/installDlg.cpp
          for (int i = 0; i < ui->treeWidget_recover->topLevelItemCount(); i++) {
              QRadioButton *radio = qobject_cast<QRadioButton *>(ui->treeWidget_recover->itemWidget(ui->treeWidget_recover->topLevelItem(i), 0));
              if (radio && radio->isChecked()) {
-@@ -102,7 +108,4 @@
-         installAction.setParentWidget(this);
- #endif
+@@ -98,33 +105,26 @@
+             KMessageBox::sorry(this, i18nc("@info", "Sorry, you have to select a partition with a proper name!"));
+             return;
+         }
+-#if KDE_IS_VERSION(4,6,0)
+-        installAction.setParentWidget(this);
+-#endif
  
 -        if (installAction.authorize() != Action::Authorized) {
 -            return;
 -        }
  
-@@ -112,19 +119,21 @@
-         progressDlg.progressBar()->setMinimum(0);
-         progressDlg.progressBar()->setMaximum(0);
+-        KProgressDialog progressDlg(this, i18nc("@title:window", "Installing"), i18nc("@info:progress", "Installing GRUB..."));
+-        progressDlg.setAllowCancel(false);
++        QProgressDialog progressDlg(this, Qt::Dialog);
++        progressDlg.setWindowTitle(i18nc("@title:window", "Installing"));
++        progressDlg.setLabelText(i18nc("@info:progress", "Installing GRUB..."));
++        progressDlg.setCancelButton(0);
+         progressDlg.setModal(true);
+-        progressDlg.progressBar()->setMinimum(0);
+-        progressDlg.progressBar()->setMaximum(0);
++        progressDlg.setRange(0,0);
          progressDlg.show();
 -        connect(installAction.watcher(), SIGNAL(actionPerformed(ActionReply)), &progressDlg, SLOT(hide()));
  
 -        ActionReply reply = installAction.execute();
 -        if (reply.succeeded()) {
+-            KDialog *dialog = new KDialog(this, Qt::Dialog);
+-            dialog->setCaption(i18nc("@title:window", "Information"));
+-            dialog->setButtons(KDialog::Ok | KDialog::Details);
 +        ExecuteJob* reply = installAction.execute();
 +        connect(reply, SIGNAL(actionPerformed(ActionReply)), &progressDlg, SLOT(hide()));
 +        if (reply->exec()) {
-             KDialog *dialog = new KDialog(this, Qt::Dialog);
-             dialog->setCaption(i18nc("@title:window", "Information"));
--            dialog->setButtons(KDialog::Ok | KDialog::Details);
-+            dialog->setButtons(KDialog::None);
++            QDialog *dialog = new QDialog(this, Qt::Dialog);
++            dialog->setWindowTitle(i18nc("@title:window", "Information"));
              dialog->setModal(true);
-             dialog->setDefaultButton(KDialog::Ok);
-             dialog->setEscapeButton(KDialog::Ok);
+-            dialog->setDefaultButton(KDialog::Ok);
+-            dialog->setEscapeButton(KDialog::Ok);
 -            KMessageBox::createKMessageBox(dialog, QMessageBox::Information, i18nc("@info", "Successfully installed GRUB."), QStringList(), QString(), 0, KMessageBox::Notify, reply.data().value("output").toString()); // krazy:exclude=qclasses
 +            QDialogButtonBox *btnbox = new QDialogButtonBox(QDialogButtonBox::Ok);
 +            KMessageBox::createKMessageBox(dialog, btnbox, QMessageBox::Information, i18nc("@info", "Successfully installed GRUB."), QStringList(), QString(), 0, KMessageBox::Notify, reply->data().value("output").toString()); // krazy:exclude=qclasses
-+            
          } else {
 -            KMessageBox::detailedError(this, i18nc("@info", "Failed to install GRUB."), KDE_IS_VERSION(4,7,0) ? reply.errorDescription() : reply.data().value("errorDescription").toString());
 +            KMessageBox::detailedError(this, i18nc("@info", "Failed to install GRUB."), reply->data().value("errorDescription").toString());
          }
      }
      KDialog::slotButtonClicked(button);
+diff -Naur a/src/installDlg.h b/src/installDlg.h
+--- a/src/installDlg.h	2013-10-12 18:34:15.000000000 +0800
++++ b/src/installDlg.h	2015-11-29 10:14:54.648987913 +0800
+@@ -21,6 +21,7 @@
+ //KDE
+ #include <KDialog>
+ 
++#include <QProgressDialog>
+ //Ui
+ namespace Ui
+ {
 diff -Naur a/src/kcm_grub2.cpp b/src/kcm_grub2.cpp
 --- a/src/kcm_grub2.cpp	2013-10-12 18:34:15.000000000 +0800
-+++ b/src/kcm_grub2.cpp	2015-11-28 09:44:31.334294700 +0800
-@@ -35,7 +35,9 @@
++++ b/src/kcm_grub2.cpp	2015-11-29 10:37:18.246178328 +0800
+@@ -25,17 +25,18 @@
+ #include <QDesktopWidget>
+ #include <QStandardItemModel>
+ #include <QTreeView>
++#include <QMenu>
+ 
+ //KDE
+ #include <KAboutData>
+ #include <KDebug>
+ #include <KInputDialog>
+-#include <KMenu>
+ #include <KMessageBox>
  #include <kmountpoint.h>
  #include <KPluginFactory>
  #include <KProgressDialog>
+-#include <KAuth/ActionWatcher>
 +#include <KAuth>
- #include <KAuth/ActionWatcher>
 +using namespace KAuth;
  
  //Project
  #include "common.h"
-@@ -54,13 +56,21 @@
+@@ -54,13 +55,21 @@
  K_PLUGIN_FACTORY(GRUB2Factory, registerPlugin<KCMGRUB2>();)
  K_EXPORT_PLUGIN(GRUB2Factory("kcmgrub2"))
  
@@ -523,7 +602,7 @@ diff -Naur a/src/kcm_grub2.cpp b/src/kcm_grub2.cpp
      setAboutData(about);
  
      ui = new Ui::KCMGRUB2;
-@@ -76,20 +86,15 @@
+@@ -76,20 +85,15 @@
  void KCMGRUB2::defaults()
  {
      Action defaultsAction("org.kde.kcontrol.kcmgrub2.defaults");
@@ -550,7 +629,7 @@ diff -Naur a/src/kcm_grub2.cpp b/src/kcm_grub2.cpp
  }
  void KCMGRUB2::load()
  {
-@@ -455,41 +460,37 @@
+@@ -455,41 +459,40 @@
      }
  
      Action saveAction("org.kde.kcontrol.kcmgrub2.save");
@@ -570,13 +649,12 @@ diff -Naur a/src/kcm_grub2.cpp b/src/kcm_grub2.cpp
          return;
      }
 -
-+*/
-     KProgressDialog progressDlg(this, i18nc("@title:window Verb (gerund). Refers to current status.", "Saving"), i18nc("@info:progress", "Saving GRUB settings..."));
-     progressDlg.setAllowCancel(false);
-     progressDlg.setModal(true);
-     progressDlg.progressBar()->setMinimum(0);
-     progressDlg.progressBar()->setMaximum(0);
-     progressDlg.show();
+-    KProgressDialog progressDlg(this, i18nc("@title:window Verb (gerund). Refers to current status.", "Saving"), i18nc("@info:progress", "Saving GRUB settings..."));
+-    progressDlg.setAllowCancel(false);
+-    progressDlg.setModal(true);
+-    progressDlg.progressBar()->setMinimum(0);
+-    progressDlg.progressBar()->setMaximum(0);
+-    progressDlg.show();
 -    connect(saveAction.watcher(), SIGNAL(actionPerformed(ActionReply)), &progressDlg, SLOT(hide()));
 -
 -    ActionReply reply = saveAction.execute();
@@ -585,6 +663,16 @@ diff -Naur a/src/kcm_grub2.cpp b/src/kcm_grub2.cpp
 -        KDialog *dialog = new KDialog(this, Qt::Dialog);
 -        dialog->setCaption(i18nc("@title:window", "Information"));
 -        dialog->setButtons(KDialog::Ok | KDialog::Details);
++*/
++    QProgressDialog progressDlg(this, Qt::Dialog);
++        progressDlg.setWindowTitle(i18nc("@title:window Verb (gerund). Refers to current status.", "Saving"));
++        progressDlg.setLabelText(i18nc("@info:progress", "Saving GRUB settings..."));
++        progressDlg.setCancelButton(0);
++        progressDlg.setModal(true);
++        progressDlg.setRange(0,0);
++        progressDlg.show();
++    
++    
 +    ExecuteJob *reply = saveAction.execute();
 +    connect(reply, SIGNAL(actionPerformed(ActionReply)), &progressDlg, SLOT(hide()));
 +    if (reply->exec()) {
@@ -606,7 +694,7 @@ diff -Naur a/src/kcm_grub2.cpp b/src/kcm_grub2.cpp
      }
  }
  
-@@ -770,8 +771,8 @@
+@@ -770,8 +773,8 @@
      view->setRootIsDecorated(false);
      ui->kcombobox_default->setView(view);
  
@@ -617,7 +705,7 @@ diff -Naur a/src/kcm_grub2.cpp b/src/kcm_grub2.cpp
      ui->kpushbutton_remove->setVisible(HAVE_QAPT || HAVE_QPACKAGEKIT);
  
      QPixmap black(16, 16), transparent(16, 16);
-@@ -825,11 +826,11 @@
+@@ -825,12 +828,12 @@
      ui->kcombobox_highlightForeground->setCurrentIndex(ui->kcombobox_highlightForeground->findData("black"));
      ui->kcombobox_highlightBackground->setCurrentIndex(ui->kcombobox_highlightBackground->findData("light-gray"));
  
@@ -628,43 +716,51 @@ diff -Naur a/src/kcm_grub2.cpp b/src/kcm_grub2.cpp
      ui->kpushbutton_create->setVisible(HAVE_IMAGEMAGICK);
  
 -    ui->kpushbutton_cmdlineDefaultSuggestions->setIcon(KIcon("tools-wizard"));
+-    ui->kpushbutton_cmdlineDefaultSuggestions->setMenu(new KMenu(ui->kpushbutton_cmdlineDefaultSuggestions));
 +    ui->kpushbutton_cmdlineDefaultSuggestions->setIcon(QIcon("tools-wizard"));
-     ui->kpushbutton_cmdlineDefaultSuggestions->setMenu(new KMenu(ui->kpushbutton_cmdlineDefaultSuggestions));
++    ui->kpushbutton_cmdlineDefaultSuggestions->setMenu(new QMenu(ui->kpushbutton_cmdlineDefaultSuggestions));
      ui->kpushbutton_cmdlineDefaultSuggestions->menu()->addAction(i18nc("@action:inmenu", "Quiet Boot"))->setData("quiet");
      ui->kpushbutton_cmdlineDefaultSuggestions->menu()->addAction(i18nc("@action:inmenu", "Show Splash Screen"))->setData("splash");
-@@ -838,7 +839,7 @@
+     ui->kpushbutton_cmdlineDefaultSuggestions->menu()->addAction(i18nc("@action:inmenu", "Disable Plymouth"))->setData("noplymouth");
+@@ -838,8 +841,8 @@
      ui->kpushbutton_cmdlineDefaultSuggestions->menu()->addAction(i18nc("@action:inmenu", "Turn Off APIC"))->setData("noapic");
      ui->kpushbutton_cmdlineDefaultSuggestions->menu()->addAction(i18nc("@action:inmenu", "Turn Off Local APIC"))->setData("nolapic");
      ui->kpushbutton_cmdlineDefaultSuggestions->menu()->addAction(i18nc("@action:inmenu", "Single User Mode"))->setData("single");
 -    ui->kpushbutton_cmdlineSuggestions->setIcon(KIcon("tools-wizard"));
+-    ui->kpushbutton_cmdlineSuggestions->setMenu(new KMenu(ui->kpushbutton_cmdlineSuggestions));
 +    ui->kpushbutton_cmdlineSuggestions->setIcon(QIcon("tools-wizard"));
-     ui->kpushbutton_cmdlineSuggestions->setMenu(new KMenu(ui->kpushbutton_cmdlineSuggestions));
++    ui->kpushbutton_cmdlineSuggestions->setMenu(new QMenu(ui->kpushbutton_cmdlineSuggestions));
      ui->kpushbutton_cmdlineSuggestions->menu()->addAction(i18nc("@action:inmenu", "Quiet Boot"))->setData("quiet");
      ui->kpushbutton_cmdlineSuggestions->menu()->addAction(i18nc("@action:inmenu", "Show Splash Screen"))->setData("splash");
-@@ -847,19 +848,19 @@
+     ui->kpushbutton_cmdlineSuggestions->menu()->addAction(i18nc("@action:inmenu", "Disable Plymouth"))->setData("noplymouth");
+@@ -847,20 +850,20 @@
      ui->kpushbutton_cmdlineSuggestions->menu()->addAction(i18nc("@action:inmenu", "Turn Off APIC"))->setData("noapic");
      ui->kpushbutton_cmdlineSuggestions->menu()->addAction(i18nc("@action:inmenu", "Turn Off Local APIC"))->setData("nolapic");
      ui->kpushbutton_cmdlineSuggestions->menu()->addAction(i18nc("@action:inmenu", "Single User Mode"))->setData("single");
 -    ui->kpushbutton_terminalSuggestions->setIcon(KIcon("tools-wizard"));
+-    ui->kpushbutton_terminalSuggestions->setMenu(new KMenu(ui->kpushbutton_terminalSuggestions));
 +    ui->kpushbutton_terminalSuggestions->setIcon(QIcon("tools-wizard"));
-     ui->kpushbutton_terminalSuggestions->setMenu(new KMenu(ui->kpushbutton_terminalSuggestions));
++    ui->kpushbutton_terminalSuggestions->setMenu(new QMenu(ui->kpushbutton_terminalSuggestions));
      ui->kpushbutton_terminalSuggestions->menu()->addAction(i18nc("@action:inmenu", "PC BIOS && EFI Console"))->setData("console");
      ui->kpushbutton_terminalSuggestions->menu()->addAction(i18nc("@action:inmenu", "Serial Terminal"))->setData("serial");
      ui->kpushbutton_terminalSuggestions->menu()->addAction(i18nc("@action:inmenu 'Open' is an adjective here, not a verb. 'Open Firmware' is a former IEEE standard.", "Open Firmware Console"))->setData("ofconsole");
 -    ui->kpushbutton_terminalInputSuggestions->setIcon(KIcon("tools-wizard"));
+-    ui->kpushbutton_terminalInputSuggestions->setMenu(new KMenu(ui->kpushbutton_terminalInputSuggestions));
 +    ui->kpushbutton_terminalInputSuggestions->setIcon(QIcon("tools-wizard"));
-     ui->kpushbutton_terminalInputSuggestions->setMenu(new KMenu(ui->kpushbutton_terminalInputSuggestions));
++    ui->kpushbutton_terminalInputSuggestions->setMenu(new QMenu(ui->kpushbutton_terminalInputSuggestions));
      ui->kpushbutton_terminalInputSuggestions->menu()->addAction(i18nc("@action:inmenu", "PC BIOS && EFI Console"))->setData("console");
      ui->kpushbutton_terminalInputSuggestions->menu()->addAction(i18nc("@action:inmenu", "Serial Terminal"))->setData("serial");
      ui->kpushbutton_terminalInputSuggestions->menu()->addAction(i18nc("@action:inmenu 'Open' is an adjective here, not a verb. 'Open Firmware' is a former IEEE standard.", "Open Firmware Console"))->setData("ofconsole");
      ui->kpushbutton_terminalInputSuggestions->menu()->addAction(i18nc("@action:inmenu", "PC AT Keyboard (Coreboot)"))->setData("at_keyboard");
      ui->kpushbutton_terminalInputSuggestions->menu()->addAction(i18nc("@action:inmenu", "USB Keyboard (HID Boot Protocol)"))->setData("usb_keyboard");
 -    ui->kpushbutton_terminalOutputSuggestions->setIcon(KIcon("tools-wizard"));
+-    ui->kpushbutton_terminalOutputSuggestions->setMenu(new KMenu(ui->kpushbutton_terminalOutputSuggestions));
 +    ui->kpushbutton_terminalOutputSuggestions->setIcon(QIcon("tools-wizard"));
-     ui->kpushbutton_terminalOutputSuggestions->setMenu(new KMenu(ui->kpushbutton_terminalOutputSuggestions));
++    ui->kpushbutton_terminalOutputSuggestions->setMenu(new QMenu(ui->kpushbutton_terminalOutputSuggestions));
      ui->kpushbutton_terminalOutputSuggestions->menu()->addAction(i18nc("@action:inmenu", "PC BIOS && EFI Console"))->setData("console");
      ui->kpushbutton_terminalOutputSuggestions->menu()->addAction(i18nc("@action:inmenu", "Serial Terminal"))->setData("serial");
-@@ -956,18 +957,13 @@
+     ui->kpushbutton_terminalOutputSuggestions->menu()->addAction(i18nc("@action:inmenu 'Open' is an adjective here, not a verb. 'Open Firmware' is a former IEEE standard.", "Open Firmware Console"))->setData("ofconsole");
+@@ -956,18 +959,13 @@
      return fileName;
  }
  
@@ -686,7 +782,7 @@ diff -Naur a/src/kcm_grub2.cpp b/src/kcm_grub2.cpp
  }
  QString KCMGRUB2::readFile(GrubFile grubFile)
  {
-@@ -992,13 +988,13 @@
+@@ -992,13 +990,13 @@
          return stream.readAll();
      }
  
@@ -704,7 +800,7 @@ diff -Naur a/src/kcm_grub2.cpp b/src/kcm_grub2.cpp
  }
  void KCMGRUB2::readEntries()
  {
-@@ -1030,15 +1026,15 @@
+@@ -1030,15 +1028,15 @@
          return;
      }
  
@@ -725,7 +821,7 @@ diff -Naur a/src/kcm_grub2.cpp b/src/kcm_grub2.cpp
      }
  }
  void KCMGRUB2::readDevices()
-@@ -1051,28 +1047,24 @@
+@@ -1051,28 +1049,29 @@
      }
  
      Action probeAction("org.kde.kcontrol.kcmgrub2.probe");
@@ -738,23 +834,33 @@ diff -Naur a/src/kcm_grub2.cpp b/src/kcm_grub2.cpp
 -    if (probeAction.authorize() != Action::Authorized) {
 -        return;
 -    }
-+    //TO BE FIXED
-+    //if (probeAction.authorize() != Action::Authorized) {
-+    //    return;
-+    //}
- 
-     KProgressDialog progressDlg(this, i18nc("@title:window", "Probing devices"), i18nc("@info:progress", "Probing devices for their GRUB names..."));
-     progressDlg.setAllowCancel(false);
-     progressDlg.setModal(true);
-     progressDlg.show();
+-
+-    KProgressDialog progressDlg(this, i18nc("@title:window", "Probing devices"), i18nc("@info:progress", "Probing devices for their GRUB names..."));
+-    progressDlg.setAllowCancel(false);
+-    progressDlg.setModal(true);
+-    progressDlg.show();
 -    connect(probeAction.watcher(), SIGNAL(progressStep(int)), progressDlg.progressBar(), SLOT(setValue(int)));
 -
 -    ActionReply reply = probeAction.execute();
 -    processReply(reply);
 -    if (reply.failed()) {
 -        KMessageBox::detailedError(this, i18nc("@info", "Failed to get GRUB device names."), reply.errorDescription());
++    //TO BE FIXED
++    //if (probeAction.authorize() != Action::Authorized) {
++    //    return;
++    //}
++
++    QProgressDialog progressDlg(this, Qt::Dialog);
++        progressDlg.setWindowTitle(i18nc("@title:window", "Probing devices"));
++        progressDlg.setLabelText(i18nc("@info:progress", "Probing devices for their GRUB names..."));
++        progressDlg.setCancelButton(0);
++        progressDlg.setModal(true);
++        QProgressBar * mProgressBar = new QProgressBar(this);
++        progressDlg.setBar(mProgressBar);
++        progressDlg.show();
++        
 +    ExecuteJob *reply = probeAction.execute();
-+    connect(reply, SIGNAL(progressStep(int)), progressDlg.progressBar(), SLOT(setValue(int)));
++    connect(reply, SIGNAL(progressStep(int)), mProgressBar, SLOT(setValue(int)));
 +    if (!reply->exec()) {
 +        KMessageBox::detailedError(this, i18nc("@info", "Failed to get GRUB device names."), reply->errorString());
          return;
@@ -764,7 +870,7 @@ diff -Naur a/src/kcm_grub2.cpp b/src/kcm_grub2.cpp
      if (mountPoints.size() != grubPartitions.size()) {
          KMessageBox::error(this, i18nc("@info", "Helper returned malformed device list."));
          return;
-@@ -1086,19 +1078,15 @@
+@@ -1086,19 +1085,15 @@
  void KCMGRUB2::readResolutions()
  {
      Action probeVbeAction("org.kde.kcontrol.kcmgrub2.probevbe");
@@ -788,7 +894,7 @@ diff -Naur a/src/kcm_grub2.cpp b/src/kcm_grub2.cpp
  }
  
  void KCMGRUB2::sortResolutions()
-@@ -1140,7 +1128,7 @@
+@@ -1140,7 +1135,7 @@
          ui->kcombobox_gfxpayload->addItem(resolution, resolution);
      }
  }
@@ -797,7 +903,7 @@ diff -Naur a/src/kcm_grub2.cpp b/src/kcm_grub2.cpp
  void KCMGRUB2::processReply(ActionReply &reply)
  {
      if (reply.type() == ActionReply::Success || reply.type() == ActionReply::KAuthError) {
-@@ -1171,6 +1159,7 @@
+@@ -1171,6 +1166,7 @@
      reply.addData(QLatin1String("errorMessage"), errorMessage);
      reply.setErrorDescription(i18nc("@info", "Command: <command>%1</command><nl/>Error code: <numid>%2</numid><nl/>Error message:<nl/><message>%3</message>", reply.data().value(QLatin1String("command")).toStringList().join(QLatin1String(" ")), reply.errorCode(), errorMessage));
  }
@@ -807,9 +913,13 @@ diff -Naur a/src/kcm_grub2.cpp b/src/kcm_grub2.cpp
      QChar ch;
 diff -Naur a/src/kcm_grub2.h b/src/kcm_grub2.h
 --- a/src/kcm_grub2.h	2013-10-12 18:34:15.000000000 +0800
-+++ b/src/kcm_grub2.h	2015-11-28 09:44:34.802372938 +0800
-@@ -23,6 +23,7 @@
++++ b/src/kcm_grub2.h	2015-11-29 10:16:04.984488183 +0800
+@@ -20,9 +20,10 @@
  
+ //Qt
+ #include <QBitArray>
+-
++#include <QProgressDialog>
  //KDE
  #include <KCModule>
 +
@@ -827,7 +937,16 @@ diff -Naur a/src/kcm_grub2.h b/src/kcm_grub2.h
      void readSettings();
 diff -Naur a/ui/kcm_grub2.ui b/ui/kcm_grub2.ui
 --- a/ui/kcm_grub2.ui	2013-10-12 18:34:15.000000000 +0800
-+++ b/ui/kcm_grub2.ui	2015-11-28 09:04:04.000000000 +0800
++++ b/ui/kcm_grub2.ui	2015-11-29 09:55:25.564830744 +0800
+@@ -12,7 +12,7 @@
+   </property>
+   <layout class="QGridLayout" name="gridLayout_6">
+    <item row="0" column="0">
+-    <widget class="KTabWidget" name="ktabwidget">
++    <widget class="QTabWidget" name="ktabwidget">
+      <property name="currentIndex">
+       <number>0</number>
+      </property>
 @@ -219,7 +219,7 @@
               </widget>
              </item>
@@ -863,6 +982,15 @@ diff -Naur a/ui/kcm_grub2.ui b/ui/kcm_grub2.ui
                <property name="text">
                 <string comment="@action:button">Suggestions</string>
                </property>
+@@ -445,7 +445,7 @@
+              <widget class="KLineEdit" name="klineedit_cmdline"/>
+             </item>
+             <item>
+-             <widget class="KPushButton" name="kpushbutton_cmdlineSuggestions">
++             <widget class="QPushButton" name="kpushbutton_cmdlineSuggestions">
+               <property name="text">
+                <string comment="@action:button">Suggestions</string>
+               </property>
 @@ -475,7 +475,7 @@
               <widget class="KLineEdit" name="klineedit_terminal"/>
              </item>
@@ -899,7 +1027,7 @@ diff -Naur a/ui/kcm_grub2.ui b/ui/kcm_grub2.ui
              <property name="sizePolicy">
               <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
                <horstretch>0</horstretch>
-@@ -630,11 +630,6 @@
+@@ -630,21 +630,10 @@
     <header>klineedit.h</header>
    </customwidget>
    <customwidget>
@@ -911,3 +1039,13 @@ diff -Naur a/ui/kcm_grub2.ui b/ui/kcm_grub2.ui
     <class>KUrlRequester</class>
     <extends>QFrame</extends>
     <header>kurlrequester.h</header>
+   </customwidget>
+-  <customwidget>
+-   <class>KTabWidget</class>
+-   <extends>QTabWidget</extends>
+-   <header>ktabwidget.h</header>
+-   <container>1</container>
+-  </customwidget>
+  </customwidgets>
+  <resources/>
+  <connections/>