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

List:       kde-commits
Subject:    [kcm-grub2] /: Remove 'Reload configuration' tool.
From:       Konstantinos Smanis <konstantinos.smanis () gmail ! com>
Date:       2012-01-06 17:13:04
Message-ID: 20120106171304.D6B60A60B9 () git ! kde ! org
[Download RAW message or body]

Git commit 42071135fca5da59490321b69d974de5fdd847fe by Konstantinos Smanis.
Committed on 06/01/2012 at 17:57.
Pushed by ksmanis into branch 'master'.

Remove 'Reload configuration' tool.

Reset button does the same.

M  +2    -4    src/kcm_grub2.cpp
M  +6    -7    ui/kcm_grub2.ui

http://commits.kde.org/kcm-grub2/42071135fca5da59490321b69d974de5fdd847fe

diff --git a/src/kcm_grub2.cpp b/src/kcm_grub2.cpp
index 7640a23..06dc351 100644
--- a/src/kcm_grub2.cpp
+++ b/src/kcm_grub2.cpp
@@ -701,7 +701,6 @@ void KCMGRUB2::setupObjects()
 
     m_dirtyBits.resize(lastDirtyBit);
 
-    ui.kpushbutton_reload->setIcon(KIcon("view-refresh"));
     ui.kpushbutton_install->setIcon(KIcon("system-software-update"));
     ui.kpushbutton_remove->setIcon(KIcon("list-remove"));
     ui.kpushbutton_remove->setVisible(HAVE_QAPT || HAVE_QPACKAGEKIT);
@@ -817,9 +816,6 @@ void KCMGRUB2::setupConnections()
     connect(ui.checkBox_memtest, SIGNAL(clicked(bool)), this, \
                SLOT(slotMemtestChanged()));
     connect(ui.checkBox_osProber, SIGNAL(clicked(bool)), this, \
SLOT(slotGrubDisableOsProberChanged()));  
-    connect(ui.kpushbutton_reload, SIGNAL(clicked(bool)), this, SLOT(load()));
-    connect(ui.kpushbutton_install, SIGNAL(clicked(bool)), this, \
                SLOT(slotInstallBootloader()));
-
     connect(ui.kcombobox_gfxmode, SIGNAL(activated(int)), this, \
                SLOT(slotGrubGfxmodeChanged()));
     connect(ui.kcombobox_gfxpayload, SIGNAL(activated(int)), this, \
SLOT(slotGrubGfxpayloadLinuxChanged()));  
@@ -854,6 +850,8 @@ void KCMGRUB2::setupConnections()
     connect(ui.klineedit_serial, SIGNAL(textEdited(QString)), this, \
                SLOT(slotGrubSerialCommandChanged()));
     connect(ui.klineedit_initTune, SIGNAL(textEdited(QString)), this, \
                SLOT(slotGrubInitTuneChanged()));
     connect(ui.checkBox_uuid, SIGNAL(clicked(bool)), this, \
SLOT(slotGrubDisableLinuxUuidChanged())); +
+    connect(ui.kpushbutton_install, SIGNAL(clicked(bool)), this, \
SLOT(slotInstallBootloader()));  }
 
 bool KCMGRUB2::check()
diff --git a/ui/kcm_grub2.ui b/ui/kcm_grub2.ui
index 5e85f07..212260f 100644
--- a/ui/kcm_grub2.ui
+++ b/ui/kcm_grub2.ui
@@ -615,14 +615,13 @@
              </property>
              <layout class="QGridLayout" name="gridLayout_8">
               <item row="0" column="0">
-               <widget class="KPushButton" name="kpushbutton_reload">
-                <property name="text">
-                 <string comment="@action:button">Reload Configuration</string>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="1">
                <widget class="KPushButton" name="kpushbutton_install">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
                 <property name="text">
                  <string comment="@action:button">Install/Recover \
Bootloader</string>  </property>


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