From 3cdaf7d4dc20f908b18bc12040947dab2666ee9a Mon Sep 17 00:00:00 2001
From: kirilma <kirilma@localhost>
Date: Tue, 4 May 2010 05:58:05 +0000
Subject: [PATCH] UI tune: use buttonBox instead of single buttons to comply
 with platform conventions

maemo5 does not print "Cancel" buttons, and names "OK" differently
just use buttonBox, and it will behave properly at each platform
---
 src/gui/conferenceeditor.cpp |  1 +
 src/gui/conferenceeditor.ui  | 41 ++++++++++++++++++++++++
 src/gui/settingsdialog.cpp   |  2 +-
 src/gui/settingsdialog.ui    | 61 ++++++++++--------------------------
 4 files changed, 59 insertions(+), 46 deletions(-)

diff --git a/src/gui/conferenceeditor.cpp b/src/gui/conferenceeditor.cpp
index 7d65484..34eb7e3 100644
--- a/src/gui/conferenceeditor.cpp
+++ b/src/gui/conferenceeditor.cpp
@@ -49,6 +49,7 @@ ConferenceEditor::ConferenceEditor(ConferenceModel* model, QWidget* parent)
     connect(changeUrl, SIGNAL(clicked()), SLOT(changeUrlClicked()));
     connect(refreshBtn, SIGNAL(clicked()), SLOT(refreshClicked()));
     connect(showMapButton, SIGNAL(clicked()), SLOT(conferenceMapClicked()));
+    connect(buttonBox, SIGNAL(rejected()), SLOT(close()));
 
     // it's OK to emit selection signals here
     // because they are not yet connected to anybody
diff --git a/src/gui/conferenceeditor.ui b/src/gui/conferenceeditor.ui
index 2f3a9ed..8ee3908 100644
--- a/src/gui/conferenceeditor.ui
+++ b/src/gui/conferenceeditor.ui
@@ -253,6 +253,12 @@
           </item>
           <item>
            <widget class="QWidget" name="widget_5" native="true">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
             <layout class="QHBoxLayout" name="horizontalLayout_3">
              <item>
               <widget class="QPushButton" name="refreshBtn">
@@ -285,6 +291,41 @@
                </property>
               </spacer>
              </item>
+             <item>
+              <widget class="QWidget" name="widget" native="true">
+               <layout class="QVBoxLayout" name="verticalLayout">
+                <property name="spacing">
+                 <number>0</number>
+                </property>
+                <property name="margin">
+                 <number>0</number>
+                </property>
+                <item>
+                 <spacer name="verticalSpacer">
+                  <property name="orientation">
+                   <enum>Qt::Vertical</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0">
+                   <size>
+                    <width>20</width>
+                    <height>40</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+                <item>
+                 <widget class="QDialogButtonBox" name="buttonBox">
+                  <property name="standardButtons">
+                   <set>QDialogButtonBox::Close</set>
+                  </property>
+                  <property name="centerButtons">
+                   <bool>false</bool>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </widget>
+             </item>
             </layout>
            </widget>
           </item>
diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
index 2e47556..1fa81d7 100644
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -31,7 +31,7 @@ SettingsDialog::SettingsDialog(QWidget *aParent)
     port->setValue(AppSettings::proxyPort());
     directConnection->setChecked(AppSettings::isDirectConnection());
 
-    connect(okButton, SIGNAL(clicked()), SLOT(saveDialogData()));
+    connect(buttonBox, SIGNAL(accepted()), SLOT(saveDialogData()));
     connect(directConnection, SIGNAL(clicked(bool)), SLOT(connectionTypeChanged(bool)));
 
     if(directConnection->isChecked())
diff --git a/src/gui/settingsdialog.ui b/src/gui/settingsdialog.ui
index 2c6a1ca..940b03c 100644
--- a/src/gui/settingsdialog.ui
+++ b/src/gui/settingsdialog.ui
@@ -2,20 +2,18 @@
 <ui version="4.0">
  <class>SettingsDialog</class>
  <widget class="QDialog" name="SettingsDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>469</width>
-    <height>195</height>
-   </rect>
-  </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
+  <property name="minimumSize">
+   <size>
+    <width>500</width>
+    <height>0</height>
+   </size>
+  </property>
   <property name="windowTitle">
    <string>Settings</string>
   </property>
@@ -69,46 +67,19 @@
         </layout>
        </widget>
       </item>
-      <item>
-       <spacer name="verticalSpacer">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>24</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <item>
-         <spacer name="horizontalSpacer">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QPushButton" name="okButton">
-          <property name="text">
-           <string>OK</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
      </layout>
     </widget>
    </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>
-- 
2.39.5