Skip to content

Commit

Permalink
ui cleanup in identifyresults - jef can you look if everything is cor…
Browse files Browse the repository at this point in the history
…rect?

git-svn-id: http://svn.osgeo.org/qgis/trunk@12066 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
macho committed Nov 10, 2009
1 parent 96c1048 commit 3570ad4
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 49 deletions.
10 changes: 5 additions & 5 deletions src/app/qgsidentifyresults.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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* ) ) );
Expand Down Expand Up @@ -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 );
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsidentifyresults.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
68 changes: 25 additions & 43 deletions src/ui/qgsidentifyresultsbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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>

0 comments on commit 3570ad4

Please sign in to comment.