confirmshutdowndlg.ui cleanup

shutdownconfirm.cpp cleanup

src/gui/confirmshutdowndlg.ui

@@ -6,64 +6,46 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>463</width>
-    <height>128</height>
+    <width>407</width>
+    <height>103</height>
    </rect>
   </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <property name="spacing">
-      <number>20</number>
-     </property>
-     <item>
-      <layout class="QVBoxLayout" name="verticalLayout">
    <property name="topMargin">
-        <number>6</number>
+    <number>15</number>
    </property>
    <item>
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="0" column="0" rowspan="2">
       <widget class="QLabel" name="warningLabel">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
        <property name="text">
-          <string notr="true">warning icon goes here</string>
+        <string notr="true">warning icon</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
        </property>
       </widget>
      </item>
-       <item>
-        <spacer name="verticalSpacer">
+     <item row="0" column="1">
+      <spacer name="horizontalSpacer">
        <property name="orientation">
-          <enum>Qt::Vertical</enum>
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>20</width>
-           <height>40</height>
+         <height>0</height>
         </size>
        </property>
       </spacer>
      </item>
-      </layout>
-     </item>
-     <item>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <property name="topMargin">
-        <number>6</number>
-       </property>
-       <item>
+     <item row="0" column="2">
       <widget class="QLabel" name="shutdownText">
        <property name="sizePolicy">
-          <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -71,40 +53,39 @@
        <property name="text">
         <string notr="true">shutdown message goes here</string>
        </property>
-         <property name="alignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-         </property>
        <property name="wordWrap">
         <bool>true</bool>
        </property>
       </widget>
      </item>
-       <item>
+     <item row="1" column="2">
       <widget class="QCheckBox" name="neverShowAgainCheckbox">
        <property name="text">
         <string>Don't show again</string>
        </property>
       </widget>
      </item>
+    </layout>
+   </item>
    <item>
-        <spacer name="verticalSpacer_2">
+    <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
-           <width>20</width>
-           <height>40</height>
+       <width>0</width>
+       <height>0</height>
       </size>
      </property>
     </spacer>
    </item>
-      </layout>
-     </item>
-    </layout>
-   </item>
    <item>
-    <widget class="QDialogButtonBox" name="buttonBox"/>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
    </item>
   </layout>
  </widget>

src/gui/shutdownconfirm.cpp

@@ -52,30 +52,30 @@ ShutdownConfirmDlg::ShutdownConfirmDlg(const ShutdownAction &action)
 {
     ui->setupUi(this);
 
-    QIcon warningIcon(style()->standardIcon(QStyle::SP_MessageBoxWarning, 0, this));
-    ui->warningLabel->setPixmap(warningIcon.pixmap(warningIcon.actualSize(QSize(32, 32))));
+    QIcon warningIcon(style()->standardIcon(QStyle::SP_MessageBoxWarning));
+    ui->warningLabel->setPixmap(warningIcon.pixmap(32));
     updateText();
     // Never show again checkbox, Title, and button
+    QPushButton *okButton = ui->buttonBox->button(QDialogButtonBox::Ok);
     if (m_action == ShutdownAction::None) {
         setWindowTitle(tr("Exit confirmation"));
-        ui->buttonBox->addButton(new QPushButton(tr("Exit Now"), this), QDialogButtonBox::AcceptRole);
+        okButton->setText(tr("E&xit Now"));
     }
     else {
         setWindowTitle(tr("Shutdown confirmation"));
-        ui->buttonBox->addButton(new QPushButton(tr("Shutdown Now"), this), QDialogButtonBox::AcceptRole);
+        okButton->setText(tr("&Shutdown Now"));
         ui->neverShowAgainCheckbox->setVisible(false);
     }
     // Cancel Button
-    QPushButton *cancelButton = ui->buttonBox->addButton(QDialogButtonBox::Cancel);
+    QPushButton *cancelButton = ui->buttonBox->button(QDialogButtonBox::Cancel);
+    cancelButton->setFocus();
     cancelButton->setDefault(true);
     // Always on top
     setWindowFlags(windowFlags()|Qt::WindowStaysOnTopHint);
-    // Set 'Cancel' as default button.
     m_timer.setInterval(1000); // 1sec
     connect(&m_timer, SIGNAL(timeout()), this, SLOT(updateSeconds()));
     // Move to center
     move(Utils::Misc::screenCenter(this));
-    cancelButton->setFocus();
 }
 
 void ShutdownConfirmDlg::showEvent(QShowEvent *event)