Skip to content

Commit

Permalink
make raster source in General tab enabled (but read-only), so it can …
Browse files Browse the repository at this point in the history
…be copied ; add vector source to vector properties General tab, make UI consistent with that of raster properties
  • Loading branch information
etiennesky committed May 6, 2013
1 parent cf9a1b5 commit 0164058
Show file tree
Hide file tree
Showing 3 changed files with 97 additions and 79 deletions.
1 change: 1 addition & 0 deletions src/app/qgsvectorlayerproperties.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,7 @@ void QgsVectorLayerProperties::reset( void )
// populate the general information
mLayerOrigNameLineEdit->setText( layer->originalName() );
txtDisplayName->setText( layer->name() );
txtLayerSource->setText( layer->publicSource() );
pbnQueryBuilder->setWhatsThis( tr( "This button opens the query "
"builder and allows you to create a subset of features to display on "
"the map canvas rather than displaying all features in the layer" ) );
Expand Down
4 changes: 2 additions & 2 deletions src/ui/qgsrasterlayerpropertiesbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -265,8 +265,8 @@
</item>
<item row="1" column="1" colspan="3">
<widget class="QLineEdit" name="leLayerSource">
<property name="enabled">
<bool>false</bool>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
Expand Down
171 changes: 94 additions & 77 deletions src/ui/qgsvectorlayerpropertiesbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>785</width>
<height>755</height>
<width>792</width>
<height>774</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_13">
Expand All @@ -283,73 +283,90 @@
<property name="syncGroup" stdset="0">
<string notr="true">vectorgeneral</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0">
<widget class="QLabel" name="textLabel3">
<property name="text">
<string>Layer name</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QFrame" name="mDataSourceEncodingFrame">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="margin">
<number>0</number>
</property>
</layout>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="mLayerOrigNameLineEdit"/>
</item>
<item row="1" column="3">
<widget class="QLineEdit" name="txtDisplayName">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QLabel" name="label_2">
<property name="text">
<string>displayed as</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lblLayerSource">
<property name="text">
<string>Layer source</string>
</property>
</widget>
</item>
<item row="2" column="1" colspan="3">
<widget class="QLineEdit" name="txtLayerSource">
<property name="enabled">
<bool>true</bool>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="4" column="0" colspan="4">
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="QLabel" name="textLabel3">
<widget class="QLabel" name="label_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Layer name</string>
<string>Data source encoding</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="mLayerOrigNameLineEdit"/>
<widget class="QComboBox" name="cboProviderEncoding"/>
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>displayed as</string>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="txtDisplayName">
<property name="readOnly">
<bool>true</bool>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
</widget>
</spacer>
</item>
</layout>
</item>
<item>
<widget class="QFrame" name="mDataSourceEncodingFrame">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Data source encoding</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="cboProviderEncoding"/>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</item>
Expand Down Expand Up @@ -451,12 +468,12 @@
<string notr="true">vectorgeneral</string>
</property>
<layout class="QGridLayout" name="_5">
<property name="verticalSpacing">
<number>6</number>
</property>
<property name="margin">
<number>11</number>
</property>
<property name="verticalSpacing">
<number>6</number>
</property>
<item row="0" column="4">
<widget class="QLabel" name="textLabel1_2_2_2">
<property name="toolTip">
Expand Down Expand Up @@ -689,8 +706,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>949</width>
<height>776</height>
<width>84</width>
<height>16</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_18">
Expand Down Expand Up @@ -750,8 +767,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>949</width>
<height>776</height>
<width>84</width>
<height>16</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_19">
Expand Down Expand Up @@ -805,8 +822,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>949</width>
<height>776</height>
<width>133</width>
<height>37</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_28">
Expand Down Expand Up @@ -882,8 +899,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>949</width>
<height>776</height>
<width>84</width>
<height>16</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_20">
Expand Down Expand Up @@ -937,8 +954,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>949</width>
<height>776</height>
<width>473</width>
<height>186</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_26">
Expand Down Expand Up @@ -1111,8 +1128,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>949</width>
<height>776</height>
<width>84</width>
<height>16</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_21">
Expand Down Expand Up @@ -1172,8 +1189,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>949</width>
<height>776</height>
<width>134</width>
<height>155</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_23">
Expand Down Expand Up @@ -1287,8 +1304,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>949</width>
<height>776</height>
<width>84</width>
<height>16</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_24">
Expand Down Expand Up @@ -1348,8 +1365,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>949</width>
<height>776</height>
<width>186</width>
<height>249</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_8">
Expand Down

0 comments on commit 0164058

Please sign in to comment.