[QGIS Commit] r14622 - in trunk/qgis/src: app ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sat Nov 13 16:27:42 EST 2010
Author: timlinux
Date: 2010-11-13 13:27:42 -0800 (Sat, 13 Nov 2010)
New Revision: 14622
Modified:
trunk/qgis/src/app/qgsvectorlayerproperties.cpp
trunk/qgis/src/app/qgsvectorlayerproperties.h
trunk/qgis/src/ui/qgsvectorlayerpropertiesbase.ui
Log:
Cleanups for vector layer properties
Modified: trunk/qgis/src/app/qgsvectorlayerproperties.cpp
===================================================================
--- trunk/qgis/src/app/qgsvectorlayerproperties.cpp 2010-11-13 21:23:15 UTC (rev 14621)
+++ trunk/qgis/src/app/qgsvectorlayerproperties.cpp 2010-11-13 21:27:42 UTC (rev 14622)
@@ -140,19 +140,16 @@
for ( ; it != overlayPluginList.constEnd(); ++it )
{
QgsApplyDialog* d = ( *it )->dialog( lyr );
- position = stackedWidget->insertWidget( stackedWidget->count(), qobject_cast<QDialog*>( d ) );
- stackedWidget->setCurrentIndex( position ); //ugly, but otherwise the properties dialog is a mess
+ position = tabWidget->insertTab( tabWidget->count(), qobject_cast<QDialog*>( d ), QgisApp::getThemeIcon( "propertyicons/diagram.png" ), tr( "Overlay"));
+ tabWidget->setCurrentIndex( position ); //ugly, but otherwise the properties dialog is a mess
mOverlayDialogs.push_back( d );
- //shamelessly hard coded - what will we do if other types of layer plugins exist? TS
- QListWidgetItem * mypItem = new QListWidgetItem( QgisApp::getThemeIcon( "propertyicons/diagram.png" ), ( *it )->name() );
- listWidget->insertItem( stackedWidget->count() - 1, mypItem );
}
- stackedWidget->setCurrentIndex( 0 );
+ tabWidget->setCurrentIndex( 0 );
QSettings settings;
restoreGeometry( settings.value( "/Windows/VectorLayerProperties/geometry" ).toByteArray() );
- listWidget->setCurrentRow( settings.value( "/Windows/VectorLayerProperties/row" ).toInt() );
+ tabWidget->setCurrentIndex( settings.value( "/Windows/VectorLayerProperties/row" ).toInt() );
setWindowTitle( tr( "Layer Properties - %1" ).arg( layer->name() ) );
} // QgsVectorLayerProperties ctor
@@ -211,7 +208,7 @@
QSettings settings;
settings.setValue( "/Windows/VectorLayerProperties/geometry", saveGeometry() );
- settings.setValue( "/Windows/VectorLayerProperties/row", listWidget->currentRow() );
+ settings.setValue( "/Windows/VectorLayerProperties/row", tabWidget->currentIndex() );
}
void QgsVectorLayerProperties::attributeTypeDialog( )
@@ -1233,12 +1230,12 @@
}
else
{
- if ( listWidget->currentRow() == 0 )
+ if ( tabWidget->currentIndex() == 0 )
{
- listWidget->setCurrentRow( 1 );
+ tabWidget->setCurrentIndex( 1 );
}
- listWidget->setItemHidden( listWidget->item( 0 ), true ); // hide symbology item
+ tabWidget->setTabEnabled( 0, true ); // hide symbology item
}
if ( mRendererDialog )
@@ -1248,7 +1245,7 @@
}
}
-void QgsVectorLayerProperties::on_stackedWidget_currentChanged( int index )
+void QgsVectorLayerProperties::on_tabWidget_currentChanged( int index )
{
if ( index != 4 || mMetadataFilled )
return;
Modified: trunk/qgis/src/app/qgsvectorlayerproperties.h
===================================================================
--- trunk/qgis/src/app/qgsvectorlayerproperties.h 2010-11-13 21:23:15 UTC (rev 14621)
+++ trunk/qgis/src/app/qgsvectorlayerproperties.h 2010-11-13 21:27:42 UTC (rev 14622)
@@ -104,7 +104,7 @@
void on_tblAttributes_cellChanged( int row, int column );
void on_mCalculateFieldButton_clicked();
void on_pbnSelectEditForm_clicked();
- void on_stackedWidget_currentChanged( int idx );
+ void on_tabWidget_currentChanged( int idx );
void on_buttonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }
void addAttribute();
Modified: trunk/qgis/src/ui/qgsvectorlayerpropertiesbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsvectorlayerpropertiesbase.ui 2010-11-13 21:23:15 UTC (rev 14621)
+++ trunk/qgis/src/ui/qgsvectorlayerpropertiesbase.ui 2010-11-13 21:27:42 UTC (rev 14622)
@@ -21,168 +21,67 @@
<bool>true</bool>
</property>
<layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QListWidget" name="listWidget">
- <property name="minimumSize">
- <size>
- <width>110</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>110</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Plain</enum>
- </property>
- <property name="horizontalScrollBarPolicy">
- <enum>Qt::ScrollBarAlwaysOff</enum>
- </property>
- <property name="editTriggers">
- <set>QAbstractItemView::NoEditTriggers</set>
- </property>
- <property name="showDropIndicator" stdset="0">
- <bool>false</bool>
- </property>
- <property name="iconSize">
- <size>
- <width>64</width>
- <height>64</height>
- </size>
- </property>
- <property name="textElideMode">
- <enum>Qt::ElideNone</enum>
- </property>
- <property name="flow">
- <enum>QListView::TopToBottom</enum>
- </property>
- <property name="isWrapping" stdset="0">
- <bool>false</bool>
- </property>
- <property name="resizeMode">
- <enum>QListView::Adjust</enum>
- </property>
- <property name="spacing">
- <number>9</number>
- </property>
- <property name="viewMode">
- <enum>QListView::IconMode</enum>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
+ <item row="1" column="0" colspan="2">
+ <layout class="QHBoxLayout" name="horizontalLayout">
<item>
- <property name="text">
- <string>Symbology</string>
- </property>
- <property name="textAlignment">
- <set>AlignHCenter|AlignVCenter|AlignCenter</set>
- </property>
- <property name="icon">
- <iconset resource="../../images/images.qrc">
- <normaloff>:/images/themes/default/propertyicons/symbology.png</normaloff>:/images/themes/default/propertyicons/symbology.png</iconset>
- </property>
- <property name="flags">
- <set>ItemIsSelectable|ItemIsUserCheckable|ItemIsEnabled</set>
- </property>
+ <widget class="QPushButton" name="pbnLoadDefaultStyle">
+ <property name="text">
+ <string>Restore Default Style</string>
+ </property>
+ </widget>
</item>
<item>
- <property name="text">
- <string>Labels</string>
- </property>
- <property name="textAlignment">
- <set>AlignHCenter|AlignVCenter|AlignCenter</set>
- </property>
- <property name="icon">
- <iconset resource="../../images/images.qrc">
- <normaloff>:/images/themes/default/propertyicons/labels.png</normaloff>:/images/themes/default/propertyicons/labels.png</iconset>
- </property>
- <property name="flags">
- <set>ItemIsSelectable|ItemIsUserCheckable|ItemIsEnabled</set>
- </property>
+ <widget class="QPushButton" name="pbnSaveDefaultStyle">
+ <property name="text">
+ <string>Save As Default</string>
+ </property>
+ </widget>
</item>
<item>
- <property name="text">
- <string>Attributes</string>
- </property>
- <property name="textAlignment">
- <set>AlignHCenter|AlignVCenter|AlignCenter</set>
- </property>
- <property name="icon">
- <iconset resource="../../images/images.qrc">
- <normaloff>:/images/themes/default/propertyicons/attributes.png</normaloff>:/images/themes/default/propertyicons/attributes.png</iconset>
- </property>
- <property name="flags">
- <set>ItemIsSelectable|ItemIsUserCheckable|ItemIsEnabled</set>
- </property>
+ <widget class="QPushButton" name="pbnLoadStyle">
+ <property name="text">
+ <string>Load Style ...</string>
+ </property>
+ </widget>
</item>
<item>
- <property name="text">
- <string>General</string>
- </property>
- <property name="textAlignment">
- <set>AlignHCenter|AlignVCenter|AlignCenter</set>
- </property>
- <property name="icon">
- <iconset resource="../../images/images.qrc">
- <normaloff>:/images/themes/default/propertyicons/general.png</normaloff>:/images/themes/default/propertyicons/general.png</iconset>
- </property>
- <property name="flags">
- <set>ItemIsSelectable|ItemIsUserCheckable|ItemIsEnabled</set>
- </property>
+ <widget class="QPushButton" name="pbnSaveStyleAs">
+ <property name="text">
+ <string>Save Style ...</string>
+ </property>
+ </widget>
</item>
- <item>
- <property name="text">
- <string>Metadata</string>
- </property>
- <property name="textAlignment">
- <set>AlignHCenter|AlignVCenter|AlignCenter</set>
- </property>
- <property name="icon">
- <iconset resource="../../images/images.qrc">
- <normaloff>:/images/themes/default/propertyicons/metadata.png</normaloff>:/images/themes/default/propertyicons/metadata.png</iconset>
- </property>
- <property name="flags">
- <set>ItemIsSelectable|ItemIsUserCheckable|ItemIsEnabled</set>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Actions</string>
- </property>
- <property name="textAlignment">
- <set>AlignHCenter|AlignVCenter|AlignCenter</set>
- </property>
- <property name="icon">
- <iconset resource="../../images/images.qrc">
- <normaloff>:/images/themes/default/propertyicons/action.png</normaloff>:/images/themes/default/propertyicons/action.png</iconset>
- </property>
- <property name="flags">
- <set>ItemIsSelectable|ItemIsUserCheckable|ItemIsEnabled</set>
- </property>
- </item>
- <item>
- <property name="text">
- <string notr="true"/>
- </property>
- <property name="flags">
- <set>NoItemFlags</set>
- </property>
- </item>
+ </layout>
+ </item>
+ <item row="2" column="0" colspan="2">
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
+ </property>
</widget>
</item>
<item row="0" column="1">
- <widget class="QStackedWidget" name="stackedWidget">
+ <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
- <number>3</number>
+ <number>0</number>
</property>
- <widget class="QWidget" name="page_3">
+ <property name="iconSize">
+ <size>
+ <width>32</width>
+ <height>32</height>
+ </size>
+ </property>
+ <widget class="QWidget" name="tabWidgetPage1" native="true">
+ <attribute name="icon">
+ <iconset resource="../../images/images.qrc">
+ <normaloff>:/images/themes/default/propertyicons/symbology.png</normaloff>:/images/themes/default/propertyicons/symbology.png</iconset>
+ </attribute>
+ <attribute name="title">
+ <string>Style</string>
+ </attribute>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
<widget class="QLabel" name="legendtypelabel">
@@ -201,9 +100,6 @@
<property name="text">
<string>Legend type</string>
</property>
- <property name="buddy">
- <cstring>legendtypecombobox</cstring>
- </property>
</widget>
</item>
<item row="0" column="1">
@@ -239,9 +135,6 @@
<property name="text">
<string>Transparency</string>
</property>
- <property name="buddy">
- <cstring>sliderTransparency</cstring>
- </property>
</widget>
</item>
<item row="0" column="3">
@@ -293,7 +186,14 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="page_4">
+ <widget class="QWidget" name="tabWidgetPage2" native="true">
+ <attribute name="icon">
+ <iconset resource="../../images/images.qrc">
+ <normaloff>:/images/themes/default/propertyicons/labels.png</normaloff>:/images/themes/default/propertyicons/labels.png</iconset>
+ </attribute>
+ <attribute name="title">
+ <string>Labels</string>
+ </attribute>
<layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0">
<widget class="QCheckBox" name="labelCheckBox">
@@ -329,7 +229,14 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="page_5">
+ <widget class="QWidget" name="tabWidgetPage3" native="true">
+ <attribute name="icon">
+ <iconset resource="../../images/images.qrc">
+ <normaloff>:/images/themes/default/propertyicons/attributes.png</normaloff>:/images/themes/default/propertyicons/attributes.png</iconset>
+ </attribute>
+ <attribute name="title">
+ <string>Fields</string>
+ </attribute>
<layout class="QGridLayout" name="gridLayout_6">
<item row="0" column="0">
<widget class="QToolButton" name="mAddAttributeButton">
@@ -437,7 +344,14 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="page_6">
+ <widget class="QWidget" name="tabWidgetPage4" native="true">
+ <attribute name="icon">
+ <iconset resource="../../images/images.qrc">
+ <normaloff>:/images/themes/default/propertyicons/general.png</normaloff>:/images/themes/default/propertyicons/general.png</iconset>
+ </attribute>
+ <attribute name="title">
+ <string>General</string>
+ </attribute>
<layout class="QGridLayout" name="gridLayout_7">
<property name="margin">
<number>0</number>
@@ -458,8 +372,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>514</width>
- <height>378</height>
+ <width>624</width>
+ <height>412</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_3">
@@ -474,9 +388,6 @@
<property name="text">
<string>Display name</string>
</property>
- <property name="buddy">
- <cstring>txtDisplayName</cstring>
- </property>
</widget>
</item>
<item row="0" column="1">
@@ -493,9 +404,6 @@
<property name="text">
<string>Display field</string>
</property>
- <property name="buddy">
- <cstring>displayFieldComboBox</cstring>
- </property>
</widget>
</item>
<item row="0" column="3">
@@ -655,7 +563,14 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="page_7">
+ <widget class="QWidget" name="tabWidgetPage5" native="true">
+ <attribute name="icon">
+ <iconset resource="../../images/images.qrc">
+ <normaloff>:/images/themes/default/propertyicons/metadata.png</normaloff>:/images/themes/default/propertyicons/metadata.png</iconset>
+ </attribute>
+ <attribute name="title">
+ <string>Metadata</string>
+ </attribute>
<layout class="QGridLayout" name="gridLayout_8">
<item row="0" column="0">
<widget class="QTextEdit" name="teMetadata">
@@ -669,7 +584,14 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="page_8">
+ <widget class="QWidget" name="tabWidgetPage6" native="true">
+ <attribute name="icon">
+ <iconset resource="../../images/images.qrc">
+ <normaloff>:/images/themes/default/propertyicons/action.png</normaloff>:/images/themes/default/propertyicons/action.png</iconset>
+ </attribute>
+ <attribute name="title">
+ <string>Actions</string>
+ </attribute>
<layout class="QGridLayout" name="gridLayout_9">
<item row="0" column="0">
<widget class="QFrame" name="actionOptionsFrame">
@@ -691,48 +613,6 @@
</widget>
</widget>
</item>
- <item row="1" column="0" colspan="2">
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QPushButton" name="pbnLoadDefaultStyle">
- <property name="text">
- <string>Restore Default Style</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pbnSaveDefaultStyle">
- <property name="text">
- <string>Save As Default</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pbnLoadStyle">
- <property name="text">
- <string>Load Style ...</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pbnSaveStyleAs">
- <property name="text">
- <string>Save Style ...</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="2" column="0" colspan="2">
- <widget class="QDialogButtonBox" name="buttonBox">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="standardButtons">
- <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
- </property>
- </widget>
- </item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
@@ -750,38 +630,5 @@
<resources>
<include location="../../images/images.qrc"/>
</resources>
- <connections>
- <connection>
- <sender>labelCheckBox</sender>
- <signal>clicked(bool)</signal>
- <receiver>labelOptionsFrame</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
- <x>201</x>
- <y>20</y>
- </hint>
- <hint type="destinationlabel">
- <x>201</x>
- <y>49</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>listWidget</sender>
- <signal>currentRowChanged(int)</signal>
- <receiver>stackedWidget</receiver>
- <slot>setCurrentIndex(int)</slot>
- <hints>
- <hint type="sourcelabel">
- <x>99</x>
- <y>10</y>
- </hint>
- <hint type="destinationlabel">
- <x>754</x>
- <y>12</y>
- </hint>
- </hints>
- </connection>
- </connections>
+ <connections/>
</ui>
More information about the QGIS-commit
mailing list