[QGIS Commit] r12079 - in trunk/qgis/src: app ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Tue Nov 10 16:27:20 EST 2009
Author: macho
Date: 2009-11-10 16:27:18 -0500 (Tue, 10 Nov 2009)
New Revision: 12079
Modified:
trunk/qgis/src/app/qgsmapserverexport.cpp
trunk/qgis/src/app/qgsmapserverexport.h
trunk/qgis/src/app/qgsnewconnection.cpp
trunk/qgis/src/app/qgsnewconnection.h
trunk/qgis/src/app/qgsspatialitesourceselect.cpp
trunk/qgis/src/app/qgsspatialitesourceselect.h
trunk/qgis/src/ui/qgsmapserverexportbase.ui
trunk/qgis/src/ui/qgsmessageviewer.ui
trunk/qgis/src/ui/qgsspatialitesourceselectbase.ui
Log:
ui cleanup to buttonbox
Modified: trunk/qgis/src/app/qgsmapserverexport.cpp
===================================================================
--- trunk/qgis/src/app/qgsmapserverexport.cpp 2009-11-10 20:27:39 UTC (rev 12078)
+++ trunk/qgis/src/app/qgsmapserverexport.cpp 2009-11-10 21:27:18 UTC (rev 12079)
@@ -19,6 +19,7 @@
#include "qgis.h"
#include "qgsdatasourceuri.h"
#include "qgshelpviewer.h"
+#include "qgscontexthelp.h"
#include "qgsmapcanvas.h"
#include "qgsmaplayer.h"
#include "qgsrectangle.h"
@@ -37,6 +38,7 @@
: QDialog( parent, fl ), map( _map )
{
setupUi( this );
+ connect( buttonBox, SIGNAL( helpRequested() ),this,SLOT( help() ) );
connect( buttonOk, SIGNAL( clicked() ), this, SLOT( accept() ) );
connect( buttonCancel, SIGNAL( clicked() ), this, SLOT( reject() ) );
// These values shouldn't be translated, the units should be in english in the map file
@@ -360,11 +362,12 @@
txtMapFilePath->setText( s );
}
-void QgsMapserverExport::on_buttonHelp_clicked()
+void QgsMapserverExport::help()
{
+ QgsContextHelp::run( context_id );
//QMessageBox::information(this, "Help","Help");
- QgsHelpViewer *hv = new QgsHelpViewer( this );
+ //QgsHelpViewer *hv = new QgsHelpViewer( this );
// causes problems in qt3.1.x: hv->setModal(false);
- hv->setCaption( "QGIS Help - Mapserver Export" );
- hv->show();
+ //hv->setCaption( "QGIS Help - Mapserver Export" );
+ //hv->show();
}
Modified: trunk/qgis/src/app/qgsmapserverexport.h
===================================================================
--- trunk/qgis/src/app/qgsmapserverexport.h 2009-11-10 20:27:39 UTC (rev 12078)
+++ trunk/qgis/src/app/qgsmapserverexport.h 2009-11-10 21:27:18 UTC (rev 12079)
@@ -55,7 +55,8 @@
public slots:
void on_chkExpLayersOnly_clicked();
void on_btnChooseFile_clicked();
- void on_buttonHelp_clicked();
+ void help();
+
private:
void writeMapFile( void );
QString fileName;
@@ -63,6 +64,7 @@
bool neverSaved;
QgsMapCanvas *map;
int action;
+ static const int context_id = 0;
};
#endif //QGSMAPSERVEREXPORT_H
Modified: trunk/qgis/src/app/qgsnewconnection.cpp
===================================================================
--- trunk/qgis/src/app/qgsnewconnection.cpp 2009-11-10 20:27:39 UTC (rev 12078)
+++ trunk/qgis/src/app/qgsnewconnection.cpp 2009-11-10 21:27:18 UTC (rev 12079)
@@ -33,7 +33,7 @@
: QDialog( parent, fl ), mOriginalConnName( connName )
{
setupUi( this );
- connect( buttonBox, SIGNAL( helpRequested() ),this,SLOT( help() ) );
+ connect( buttonBox, SIGNAL( helpRequested() ),this,SLOT( helpClicked() ) );
cbxSSLmode->insertItem( QgsDataSourceURI::SSLprefer, tr( "prefer" ) );
cbxSSLmode->insertItem( QgsDataSourceURI::SSLrequire, tr( "require" ) );
@@ -84,9 +84,9 @@
QDialog::accept();
}
-void QgsNewConnection::help()
+void QgsNewConnection::helpClicked()
{
- helpInfo();
+ QgsContextHelp::run( context_id );
}
void QgsNewConnection::on_btnConnect_clicked()
@@ -151,11 +151,6 @@
settings.setValue( baseKey + "/sslmode", cbxSSLmode->currentIndex() );
}
-void QgsNewConnection::helpInfo()
-{
- QgsContextHelp::run( context_id );
-}
-
#if 0
void QgsNewConnection::saveConnection()
{
Modified: trunk/qgis/src/app/qgsnewconnection.h
===================================================================
--- trunk/qgis/src/app/qgsnewconnection.h 2009-11-10 20:27:39 UTC (rev 12078)
+++ trunk/qgis/src/app/qgsnewconnection.h 2009-11-10 21:27:18 UTC (rev 12079)
@@ -35,11 +35,9 @@
void testConnection();
//! Saves the connection to ~/.qt/qgisrc
void saveConnection();
- //! Display the context help
- void helpInfo();
public slots:
void accept();
- void help();
+ void helpClicked();
void on_btnConnect_clicked();
void on_cb_geometryColumnsOnly_clicked();
private:
Modified: trunk/qgis/src/app/qgsspatialitesourceselect.cpp
===================================================================
--- trunk/qgis/src/app/qgsspatialitesourceselect.cpp 2009-11-10 20:27:39 UTC (rev 12078)
+++ trunk/qgis/src/app/qgsspatialitesourceselect.cpp 2009-11-10 21:27:18 UTC (rev 12079)
@@ -39,7 +39,12 @@
QDialog( app, fl ), qgisApp( app )
{
setupUi( this );
- btnAdd->setEnabled( false );
+ mAddButton = new QPushButton( tr( "&Add" ) );
+ buttonBox->addButton( mAddButton, QDialogButtonBox::ActionRole );
+ connect( mAddButton,SIGNAL( clicked() ), this, SLOT( addClicked() ) );
+ connect( buttonBox,SIGNAL( helpRequested() ), this, SLOT( helpClicked() ) );
+
+ mAddButton->setEnabled( false );
populateConnectionList();
mSearchModeComboBox->addItem( tr( "Wildcard" ) );
@@ -79,15 +84,15 @@
}
// Slot for performing action when the Add button is clicked
-void QgsSpatiaLiteSourceSelect::on_btnAdd_clicked()
+void QgsSpatiaLiteSourceSelect::addClicked()
{
addTables();
}
// Slot for showing help
-void QgsSpatiaLiteSourceSelect::on_btnHelp_clicked()
+void QgsSpatiaLiteSourceSelect::helpClicked()
{
- showHelp();
+ QgsContextHelp::run( context_id );
}
/** End Autoconnected SLOTS **/
@@ -475,7 +480,7 @@
// BEGIN CHANGES ECOS
if ( cmbConnections->count() > 0 )
- btnAdd->setEnabled( true );
+ mAddButton->setEnabled( true );
// END CHANGES ECOS
mTablesTreeView->sortByColumn( 0, Qt::AscendingOrder );
@@ -553,11 +558,6 @@
return false;
}
-void QgsSpatiaLiteSourceSelect::showHelp()
-{
- QgsContextHelp::run( context_id );
-}
-
QString QgsSpatiaLiteSourceSelect::fullDescription( QString table, QString column, QString type )
{
QString full_desc = "";
Modified: trunk/qgis/src/app/qgsspatialitesourceselect.h
===================================================================
--- trunk/qgis/src/app/qgsspatialitesourceselect.h 2009-11-10 20:27:39 UTC (rev 12078)
+++ trunk/qgis/src/app/qgsspatialitesourceselect.h 2009-11-10 21:27:18 UTC (rev 12079)
@@ -21,6 +21,7 @@
#include "qgisgui.h"
#include "qgsspatialitefilterproxymodel.h"
#include "qgsspatialitetablemodel.h"
+#include <QPushButton>
extern "C"
{
@@ -80,14 +81,14 @@
* Once connected, available layers are displayed.
*/
void on_btnConnect_clicked();
- void on_btnAdd_clicked();
+ void addClicked();
void on_btnNew_clicked();
void on_btnDelete_clicked();
void on_mSearchOptionsButton_clicked();
void on_mSearchTableEdit_textChanged( const QString & text );
void on_mSearchColumnComboBox_currentIndexChanged( const QString & text );
void on_mSearchModeComboBox_currentIndexChanged( const QString & text );
- void on_btnHelp_clicked();
+ void helpClicked();
void on_cmbConnections_activated( int );
void setLayerType( QString table, QString column, QString type );
//!Sets a new regular expression to the model
@@ -115,8 +116,6 @@
// Set the position of the database connection list to the last
// used one.
void setConnectionListPosition();
- // Show the context help for the dialog
- void showHelp();
// Combine the table and column data into a single string
// useful for display to the user
QString fullDescription( QString table, QString column, QString type );
@@ -132,6 +131,7 @@
//! Model that acts as datasource for mTableTreeWidget
QgsSpatiaLiteTableModel mTableModel;
QgsSpatiaLiteFilterProxyModel mProxyModel;
+ QPushButton * mAddButton;
};
#endif // QGSSPATIALITESOURCESELECT_H
Modified: trunk/qgis/src/ui/qgsmapserverexportbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsmapserverexportbase.ui 2009-11-10 20:27:39 UTC (rev 12078)
+++ trunk/qgis/src/ui/qgsmapserverexportbase.ui 2009-11-10 21:27:18 UTC (rev 12079)
@@ -1,270 +1,200 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>QgsMapserverExportBase</class>
- <widget class="QDialog" name="QgsMapserverExportBase" >
- <property name="geometry" >
+ <widget class="QDialog" name="QgsMapserverExportBase">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>483</width>
- <height>433</height>
+ <width>410</width>
+ <height>416</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Export to Mapserver</string>
</property>
- <property name="sizeGripEnabled" >
+ <property name="sizeGripEnabled">
<bool>true</bool>
</property>
- <property name="modal" >
+ <property name="modal">
<bool>true</bool>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>10</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <item row="0" column="0" >
- <widget class="QLabel" name="textLabel7" >
- <property name="text" >
+ <item row="0" column="0">
+ <widget class="QLabel" name="textLabel7">
+ <property name="text">
<string>Map file</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>txtMapFilePath</cstring>
</property>
</widget>
</item>
- <item row="1" column="0" colspan="2" >
- <widget class="QCheckBox" name="chkExpLayersOnly" >
- <property name="text" >
+ <item row="1" column="0" colspan="2">
+ <widget class="QCheckBox" name="chkExpLayersOnly">
+ <property name="text">
<string>Export LAYER information only</string>
</property>
</widget>
</item>
- <item row="4" column="0" colspan="3" >
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</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" >
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QPushButton" name="buttonOk" >
- <property name="text" >
- <string>&OK</string>
- </property>
- <property name="shortcut" >
- <string/>
- </property>
- <property name="autoDefault" >
- <bool>true</bool>
- </property>
- <property name="default" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="buttonCancel" >
- <property name="text" >
- <string>&Cancel</string>
- </property>
- <property name="shortcut" >
- <string/>
- </property>
- <property name="autoDefault" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="0" column="2" >
- <widget class="QPushButton" name="btnChooseFile" >
- <property name="text" >
+ <item row="0" column="2">
+ <widget class="QPushButton" name="btnChooseFile">
+ <property name="text">
<string>...</string>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QLineEdit" name="txtMapFilePath" />
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="txtMapFilePath"/>
</item>
- <item row="2" column="0" colspan="3" >
- <widget class="Q3GroupBox" name="grpMap" >
- <property name="title" >
+ <item row="2" column="0" colspan="3">
+ <widget class="Q3GroupBox" name="grpMap">
+ <property name="title">
<string>Map</string>
</property>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>10</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <item row="0" column="0" >
- <widget class="QLabel" name="textLabel1" >
- <property name="toolTip" >
+ <item row="0" column="0">
+ <widget class="QLabel" name="textLabel1">
+ <property name="toolTip">
<string/>
</property>
- <property name="text" >
+ <property name="text">
<string>Name</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>txtMapName</cstring>
</property>
</widget>
</item>
- <item row="0" column="7" >
- <widget class="QLabel" name="textLabel2_2" >
- <property name="text" >
+ <item row="0" column="7">
+ <widget class="QLabel" name="textLabel2_2">
+ <property name="text">
<string>Height</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>txtMapHeight</cstring>
</property>
</widget>
</item>
- <item row="1" column="1" colspan="2" >
- <widget class="QComboBox" name="cmbMapUnits" />
+ <item row="1" column="1" colspan="2">
+ <widget class="QComboBox" name="cmbMapUnits"/>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="textLabel3" >
- <property name="text" >
+ <item row="1" column="0">
+ <widget class="QLabel" name="textLabel3">
+ <property name="text">
<string>Units</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>cmbMapUnits</cstring>
</property>
</widget>
</item>
- <item row="1" column="3" colspan="2" >
- <widget class="QLabel" name="textLabel4" >
- <property name="text" >
+ <item row="1" column="3" colspan="2">
+ <widget class="QLabel" name="textLabel4">
+ <property name="text">
<string>Image type</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>cmbMapImageType</cstring>
</property>
</widget>
</item>
- <item row="1" column="5" colspan="3" >
- <widget class="QComboBox" name="cmbMapImageType" >
+ <item row="1" column="5" colspan="3">
+ <widget class="QComboBox" name="cmbMapImageType">
<item>
- <property name="text" >
+ <property name="text">
<string>gif</string>
</property>
</item>
<item>
- <property name="text" >
+ <property name="text">
<string>gtiff</string>
</property>
</item>
<item>
- <property name="text" >
+ <property name="text">
<string>jpeg</string>
</property>
</item>
<item>
- <property name="text" >
+ <property name="text">
<string>png</string>
</property>
</item>
<item>
- <property name="text" >
+ <property name="text">
<string>swf</string>
</property>
</item>
<item>
- <property name="text" >
+ <property name="text">
<string>userdefined</string>
</property>
</item>
<item>
- <property name="text" >
+ <property name="text">
<string>wbmp</string>
</property>
</item>
</widget>
</item>
- <item row="2" column="0" colspan="2" >
- <widget class="QLabel" name="textLabel6" >
- <property name="text" >
+ <item row="2" column="0" colspan="2">
+ <widget class="QLabel" name="textLabel6">
+ <property name="text">
<string>MinScale</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>txtMinScale</cstring>
</property>
</widget>
</item>
- <item row="2" column="5" colspan="2" >
- <widget class="QLabel" name="textLabel6_2" >
- <property name="text" >
+ <item row="2" column="5" colspan="2">
+ <widget class="QLabel" name="textLabel6_2">
+ <property name="text">
<string>MaxScale</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>txtMaxScale</cstring>
</property>
</widget>
</item>
- <item row="2" column="2" colspan="2" >
- <widget class="QLineEdit" name="txtMinScale" />
+ <item row="2" column="2" colspan="2">
+ <widget class="QLineEdit" name="txtMinScale"/>
</item>
- <item row="2" column="7" colspan="2" >
- <widget class="QLineEdit" name="txtMaxScale" />
+ <item row="2" column="7" colspan="2">
+ <widget class="QLineEdit" name="txtMaxScale"/>
</item>
- <item row="0" column="1" colspan="3" >
- <widget class="QLineEdit" name="txtMapName" >
- <property name="toolTip" >
+ <item row="0" column="1" colspan="3">
+ <widget class="QLineEdit" name="txtMapName">
+ <property name="toolTip">
<string>Prefix attached to map, scalebar and legend GIF filenames created using this MapFile. It should be kept short.</string>
</property>
</widget>
</item>
- <item row="0" column="6" >
- <widget class="QLineEdit" name="txtMapWidth" />
+ <item row="0" column="6">
+ <widget class="QLineEdit" name="txtMapWidth"/>
</item>
- <item row="0" column="8" >
- <widget class="QLineEdit" name="txtMapHeight" />
+ <item row="0" column="8">
+ <widget class="QLineEdit" name="txtMapHeight"/>
</item>
- <item row="0" column="4" colspan="2" >
- <widget class="QLabel" name="textLabel2" >
- <property name="text" >
+ <item row="0" column="4" colspan="2">
+ <widget class="QLabel" name="textLabel2">
+ <property name="text">
<string>Width</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>txtMapWidth</cstring>
</property>
</widget>
@@ -272,66 +202,70 @@
</layout>
</widget>
</item>
- <item row="3" column="0" colspan="3" >
- <widget class="Q3GroupBox" name="grpWeb" >
- <property name="title" >
+ <item row="3" column="0" colspan="3">
+ <widget class="Q3GroupBox" name="grpWeb">
+ <property name="title">
<string>Web Interface Definition</string>
</property>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>10</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <item row="0" column="0" >
- <widget class="QLabel" name="textLabel5" >
- <property name="text" >
+ <item row="0" column="0">
+ <widget class="QLabel" name="textLabel5">
+ <property name="text">
<string>Header</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>txtWebHeader</cstring>
</property>
</widget>
</item>
- <item row="2" column="0" >
- <widget class="QLabel" name="textLabel5_3" >
- <property name="text" >
+ <item row="2" column="0">
+ <widget class="QLabel" name="textLabel5_3">
+ <property name="text">
<string>Footer</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>txtWebFooter</cstring>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="textLabel5_2" >
- <property name="text" >
+ <item row="1" column="0">
+ <widget class="QLabel" name="textLabel5_2">
+ <property name="text">
<string>Template</string>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>txtWebTemplate</cstring>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QLineEdit" name="txtWebHeader" />
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="txtWebHeader"/>
</item>
- <item row="1" column="1" >
- <widget class="QLineEdit" name="txtWebTemplate" />
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="txtWebTemplate"/>
</item>
- <item row="2" column="1" >
- <widget class="QLineEdit" name="txtWebFooter" />
+ <item row="2" column="1">
+ <widget class="QLineEdit" name="txtWebFooter"/>
</item>
</layout>
</widget>
</item>
+ <item row="4" column="0" colspan="3">
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
<customwidgets>
<customwidget>
@@ -355,10 +289,40 @@
<tabstop>txtWebHeader</tabstop>
<tabstop>txtWebTemplate</tabstop>
<tabstop>txtWebFooter</tabstop>
- <tabstop>buttonHelp</tabstop>
- <tabstop>buttonOk</tabstop>
- <tabstop>buttonCancel</tabstop>
</tabstops>
<resources/>
- <connections/>
+ <connections>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>accepted()</signal>
+ <receiver>QgsMapserverExportBase</receiver>
+ <slot>accept()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>349</x>
+ <y>393</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>404</x>
+ <y>317</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>rejected()</signal>
+ <receiver>QgsMapserverExportBase</receiver>
+ <slot>reject()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>280</x>
+ <y>386</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>404</x>
+ <y>282</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
</ui>
Modified: trunk/qgis/src/ui/qgsmessageviewer.ui
===================================================================
--- trunk/qgis/src/ui/qgsmessageviewer.ui 2009-11-10 20:27:39 UTC (rev 12078)
+++ trunk/qgis/src/ui/qgsmessageviewer.ui 2009-11-10 21:27:18 UTC (rev 12079)
@@ -23,13 +23,6 @@
<property name="spacing">
<number>6</number>
</property>
- <item row="1" column="0">
- <widget class="QCheckBox" name="checkBox">
- <property name="text">
- <string>Don't show this message again</string>
- </property>
- </widget>
- </item>
<item row="0" column="0" colspan="3">
<widget class="QTextEdit" name="txtMessage">
<property name="lineWidth">
@@ -50,28 +43,18 @@
</property>
</widget>
</item>
- <item row="2" column="0">
- <spacer>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <item row="1" column="1">
+ <widget class="QCheckBox" name="checkBox">
+ <property name="text">
+ <string>Don't show this message again</string>
</property>
- <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>191</width>
- <height>31</height>
- </size>
- </property>
- </spacer>
+ </widget>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
<tabstops>
<tabstop>txtMessage</tabstop>
- <tabstop>checkBox</tabstop>
</tabstops>
<resources/>
<connections>
Modified: trunk/qgis/src/ui/qgsspatialitesourceselectbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsspatialitesourceselectbase.ui 2009-11-10 20:27:39 UTC (rev 12078)
+++ trunk/qgis/src/ui/qgsspatialitesourceselectbase.ui 2009-11-10 21:27:18 UTC (rev 12079)
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>QgsSpatiaLiteSourceSelectBase</class>
- <widget class="QDialog" name="QgsSpatiaLiteSourceSelectBase" >
- <property name="geometry" >
+ <widget class="QDialog" name="QgsSpatiaLiteSourceSelectBase">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,33 +10,33 @@
<height>687</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Add SpatiaLite Table(s)</string>
</property>
- <property name="windowIcon" >
+ <property name="windowIcon">
<iconset>
<normaloff/>
</iconset>
</property>
- <property name="sizeGripEnabled" >
+ <property name="sizeGripEnabled">
<bool>true</bool>
</property>
- <property name="modal" >
+ <property name="modal">
<bool>true</bool>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>9</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <item row="2" column="0" >
+ <item row="2" column="0">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>271</width>
<height>20</height>
@@ -43,202 +44,150 @@
</property>
</spacer>
</item>
- <item row="1" column="0" colspan="2" >
- <widget class="QTreeView" name="mTablesTreeView" >
- <property name="selectionMode" >
+ <item row="1" column="0" colspan="2">
+ <widget class="QTreeView" name="mTablesTreeView">
+ <property name="selectionMode">
<enum>QAbstractItemView::MultiSelection</enum>
</property>
</widget>
</item>
- <item row="0" column="0" colspan="2" >
- <widget class="QGroupBox" name="groupBox" >
- <property name="title" >
+ <item row="0" column="0" colspan="2">
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
<string>SpatiaLite DBs</string>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>11</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <item row="1" column="2" >
- <widget class="QPushButton" name="btnDelete" >
- <property name="text" >
+ <item row="1" column="2">
+ <widget class="QPushButton" name="btnDelete">
+ <property name="text">
<string>Delete</string>
</property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QPushButton" name="btnNew" >
- <property name="text" >
+ <item row="1" column="1">
+ <widget class="QPushButton" name="btnNew">
+ <property name="text">
<string>New</string>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QPushButton" name="btnConnect" >
- <property name="text" >
+ <item row="1" column="0">
+ <widget class="QPushButton" name="btnConnect">
+ <property name="text">
<string>Connect</string>
</property>
</widget>
</item>
- <item row="0" column="0" colspan="3" >
- <widget class="QComboBox" name="cmbConnections" />
+ <item row="0" column="0" colspan="3">
+ <widget class="QComboBox" name="cmbConnections"/>
</item>
</layout>
</widget>
</item>
- <item row="4" column="0" colspan="2" >
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>11</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QPushButton" name="btnHelp" >
- <property name="enabled" >
- <bool>true</bool>
- </property>
- <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" >
- <size>
- <width>141</width>
- <height>21</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QPushButton" name="btnAdd" >
- <property name="text" >
- <string>Add</string>
- </property>
- <property name="shortcut" >
- <string/>
- </property>
- <property name="autoDefault" >
- <bool>true</bool>
- </property>
- <property name="default" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="btnCancel" >
- <property name="text" >
- <string>Close</string>
- </property>
- <property name="shortcut" >
- <string/>
- </property>
- <property name="autoDefault" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="3" column="0" colspan="2" >
- <widget class="QGroupBox" name="mSearchGroupBox" >
- <property name="title" >
+ <item row="3" column="0" colspan="2">
+ <widget class="QGroupBox" name="mSearchGroupBox">
+ <property name="title">
<string/>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>9</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <item row="0" column="0" >
- <widget class="QLabel" name="mSearchLabel" >
- <property name="text" >
+ <item row="0" column="0">
+ <widget class="QLabel" name="mSearchLabel">
+ <property name="text">
<string>Search:</string>
</property>
+ <property name="buddy">
+ <cstring>mSearchTableEdit</cstring>
+ </property>
</widget>
</item>
- <item row="2" column="0" colspan="2" >
- <widget class="QLabel" name="mSearchModeLabel" >
- <property name="text" >
+ <item row="2" column="0" colspan="2">
+ <widget class="QLabel" name="mSearchModeLabel">
+ <property name="text">
<string>Search mode:</string>
</property>
+ <property name="buddy">
+ <cstring>mSearchModeComboBox</cstring>
+ </property>
</widget>
</item>
- <item row="2" column="2" >
- <widget class="QComboBox" name="mSearchModeComboBox" />
+ <item row="2" column="2">
+ <widget class="QComboBox" name="mSearchModeComboBox"/>
</item>
- <item row="1" column="0" colspan="2" >
- <widget class="QLabel" name="mSearchColumnsLabel" >
- <property name="text" >
+ <item row="1" column="0" colspan="2">
+ <widget class="QLabel" name="mSearchColumnsLabel">
+ <property name="text">
<string>Search in columns:</string>
</property>
+ <property name="buddy">
+ <cstring>mSearchColumnComboBox</cstring>
+ </property>
</widget>
</item>
- <item row="1" column="2" >
- <widget class="QComboBox" name="mSearchColumnComboBox" />
+ <item row="1" column="2">
+ <widget class="QComboBox" name="mSearchColumnComboBox"/>
</item>
- <item row="0" column="1" colspan="2" >
- <widget class="QLineEdit" name="mSearchTableEdit" />
+ <item row="0" column="1" colspan="2">
+ <widget class="QLineEdit" name="mSearchTableEdit"/>
</item>
</layout>
</widget>
</item>
- <item row="2" column="1" >
- <widget class="QPushButton" name="mSearchOptionsButton" >
- <property name="text" >
+ <item row="2" column="1">
+ <widget class="QPushButton" name="mSearchOptionsButton">
+ <property name="text">
<string>Search options...</string>
</property>
</widget>
</item>
+ <item row="4" column="0" colspan="2">
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Close|QDialogButtonBox::Help</set>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
<tabstops>
<tabstop>cmbConnections</tabstop>
<tabstop>btnConnect</tabstop>
<tabstop>btnNew</tabstop>
<tabstop>btnDelete</tabstop>
- <tabstop>btnHelp</tabstop>
- <tabstop>btnAdd</tabstop>
- <tabstop>btnCancel</tabstop>
+ <tabstop>mTablesTreeView</tabstop>
+ <tabstop>mSearchOptionsButton</tabstop>
+ <tabstop>mSearchTableEdit</tabstop>
+ <tabstop>mSearchColumnComboBox</tabstop>
+ <tabstop>mSearchModeComboBox</tabstop>
+ <tabstop>buttonBox</tabstop>
</tabstops>
<resources/>
<connections>
<connection>
- <sender>btnCancel</sender>
- <signal>clicked()</signal>
+ <sender>buttonBox</sender>
+ <signal>rejected()</signal>
<receiver>QgsSpatiaLiteSourceSelectBase</receiver>
<slot>reject()</slot>
<hints>
- <hint type="sourcelabel" >
- <x>404</x>
- <y>446</y>
+ <hint type="sourcelabel">
+ <x>431</x>
+ <y>666</y>
</hint>
- <hint type="destinationlabel" >
- <x>229</x>
- <y>236</y>
+ <hint type="destinationlabel">
+ <x>465</x>
+ <y>527</y>
</hint>
</hints>
</connection>
More information about the QGIS-commit
mailing list