ui cleanup in identifyresults - jef can you look if everything is cor…

…rect? git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12066 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Nov 10, 2009 · b215209 · b215209
1 parent 1dacefb
commit b215209
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 49 deletions.
diff --git a/src/app/qgsidentifyresults.cpp b/src/app/qgsidentifyresults.cpp
@@ -91,14 +91,14 @@ QgsIdentifyResults::QgsIdentifyResults( QgsMapCanvas *canvas, QWidget *parent, Q
     mDock->setAllowedAreas( Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea );
     mDock->setWidget( this );
     QgisApp::instance()->addDockWidget( Qt::LeftDockWidgetArea, mDock );
-    buttonCancel->hide();
   }
   lstResults->setColumnCount( 2 );
   setColumnText( 0, tr( "Feature" ) );
   setColumnText( 1, tr( "Value" ) );
 
-  connect( buttonCancel, SIGNAL( clicked() ),
-           this, SLOT( close() ) );
+  connect( buttonBox,SIGNAL( helpRequested() ), this, SLOT( helpClicked() ) );
+
+  connect( buttonBox, SIGNAL( clicked() ), this, SLOT( close() ) );
 
   connect( lstResults, SIGNAL( itemExpanded( QTreeWidgetItem* ) ),
            this, SLOT( itemExpanded( QTreeWidgetItem* ) ) );
@@ -644,8 +644,8 @@ QTreeWidgetItem *QgsIdentifyResults::retrieveAttributes( QTreeWidgetItem *item,
 
   return featItem;
 }
-
-void QgsIdentifyResults::on_buttonHelp_clicked()
+// Slot for showing help
+void QgsIdentifyResults::helpClicked()
 {
   QgsContextHelp::run( context_id );
 }

diff --git a/src/app/qgsidentifyresults.h b/src/app/qgsidentifyresults.h
@@ -84,7 +84,7 @@ class QgsIdentifyResults: public QDialog, private Ui::QgsIdentifyResultsBase
     void featureDeleted( int fid );
 
     //! Context help
-    void on_buttonHelp_clicked();
+    void helpClicked();
 
     /* Called when an item is expanded so that we can ensure that the
        column width if expanded to show it */

diff --git a/src/ui/qgsidentifyresultsbase.ui b/src/ui/qgsidentifyresultsbase.ui
@@ -38,6 +38,13 @@
      </column>
     </widget>
    </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Close|QDialogButtonBox::Help</set>
+     </property>
+    </widget>
+   </item>
    <item>
     <layout class="QHBoxLayout">
      <property name="spacing">
@@ -46,53 +53,28 @@
      <property name="margin">
       <number>0</number>
      </property>
-     <item>
-      <widget class="QPushButton" name="buttonHelp">
-       <property name="text">
-        <string>Help</string>
-       </property>
-       <property name="shortcut">
-        <string>F1</string>
-       </property>
-       <property name="autoDefault">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>0</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="buttonCancel">
-       <property name="text">
-        <string>Close</string>
-       </property>
-       <property name="shortcut">
-        <string/>
-       </property>
-       <property name="autoDefault">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>QgsIdentifyResultsBase</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>261</x>
+     <y>298</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>204</x>
+     <y>313</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>