[QGIS Commit] r9024 - in trunk/qgis/src: gui ui

[svn_qgis at osgeo.org]

Author: timlinux
Date: 2008-08-07 18:14:05 -0400 (Thu, 07 Aug 2008)
New Revision: 9024

Modified:
   trunk/qgis/src/gui/qgsgenericprojectionselector.cpp
   trunk/qgis/src/ui/qgsgenericprojectionselectorbase.ui
Log:
Added cancel button to generic projection selector (and switched to using QButtonBox)

Modified: trunk/qgis/src/gui/qgsgenericprojectionselector.cpp
===================================================================
--- trunk/qgis/src/gui/qgsgenericprojectionselector.cpp	2008-08-07 22:10:23 UTC (rev 9023)
+++ trunk/qgis/src/gui/qgsgenericprojectionselector.cpp	2008-08-07 22:14:05 UTC (rev 9024)
@@ -28,12 +28,8 @@
   : QDialog(parent, fl)
 {
   setupUi(this);
-  
-
-  connect(pbnOK, SIGNAL(clicked()), this, SLOT( accept()));
   //we will show this only when a message is set
   textEdit->hide();
-  QApplication::restoreOverrideCursor();
 }
 
 void QgsGenericProjectionSelector::setMessage(QString theMessage)

Modified: trunk/qgis/src/ui/qgsgenericprojectionselectorbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsgenericprojectionselectorbase.ui	2008-08-07 22:10:23 UTC (rev 9023)
+++ trunk/qgis/src/ui/qgsgenericprojectionselectorbase.ui	2008-08-07 22:14:05 UTC (rev 9024)
@@ -19,28 +19,7 @@
    <bool>true</bool>
   </property>
   <layout class="QGridLayout" >
-   <property name="leftMargin" >
-    <number>9</number>
-   </property>
-   <property name="topMargin" >
-    <number>9</number>
-   </property>
-   <property name="rightMargin" >
-    <number>9</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>9</number>
-   </property>
-   <property name="horizontalSpacing" >
-    <number>6</number>
-   </property>
-   <property name="verticalSpacing" >
-    <number>6</number>
-   </property>
-   <item row="1" column="0" colspan="2" >
-    <widget class="QgsProjectionSelector" native="1" name="projectionSelector" />
-   </item>
-   <item row="0" column="0" colspan="2" >
+   <item row="0" column="0" >
     <widget class="QTextEdit" name="textEdit" >
      <property name="sizePolicy" >
       <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
@@ -68,27 +47,14 @@
      </property>
     </widget>
    </item>
+   <item row="1" column="0" >
+    <widget class="QgsProjectionSelector" native="1" name="projectionSelector" />
+   </item>
    <item row="2" column="0" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
      </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>221</width>
-       <height>21</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="2" column="1" >
-    <widget class="QPushButton" name="pbnOK" >
-     <property name="text" >
-      <string>OK</string>
-     </property>
     </widget>
    </item>
   </layout>
@@ -103,5 +69,38 @@
   </customwidget>
  </customwidgets>
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>QgsGenericProjectionSelectorBase</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>475</x>
+     <y>534</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>493</x>
+     <y>523</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>QgsGenericProjectionSelectorBase</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>566</x>
+     <y>534</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>600</x>
+     <y>530</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>