Skip to content

Commit dc72e14

Browse files
nyalldawsonnyalldawson
authoredSep 19, 2017
Merge pull request #5193 from Gustry/layer_properties
move metadata panel to OGC server panel
·
ltr-3_40final-3_0_0
2 parents 4587961 + 677c104 commit dc72e14

File tree

4 files changed

+2271
-2281
lines changed

4 files changed

+2271
-2281
lines changed
 

‎src/app/qgsrasterlayerproperties.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ void QgsRasterLayerProperties::sync()
602602
{
603603
gboxNoDataValue->setEnabled( false );
604604
gboxCustomTransparency->setEnabled( false );
605-
mOptionsStackedWidget->setCurrentWidget( mOptsPage_Metadata );
605+
mOptionsStackedWidget->setCurrentWidget( mOptsPage_Server );
606606
}
607607

608608
// TODO: Wouldn't it be better to just removeWidget() the tabs than delete them? [LS]

‎src/ui/qgsprojectpropertiesbase.ui

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
</item>
119119
<item>
120120
<property name="text">
121-
<string>Identify layers</string>
121+
<string>Identify Layers</string>
122122
</property>
123123
<property name="toolTip">
124124
<string>Identifiable layers</string>
@@ -130,7 +130,7 @@
130130
</item>
131131
<item>
132132
<property name="text">
133-
<string>Default styles</string>
133+
<string>Default Styles</string>
134134
</property>
135135
<property name="toolTip">
136136
<string>Default styles</string>
@@ -142,10 +142,10 @@
142142
</item>
143143
<item>
144144
<property name="text">
145-
<string>OWS server</string>
145+
<string>QGIS Server</string>
146146
</property>
147147
<property name="toolTip">
148-
<string>WMS/WFS Server Configuration</string>
148+
<string>WMS/WFS/WCS Server Configuration</string>
149149
</property>
150150
<property name="icon">
151151
<iconset resource="../../images/images.qrc">
@@ -259,8 +259,8 @@
259259
<rect>
260260
<x>0</x>
261261
<y>0</y>
262-
<width>597</width>
263-
<height>656</height>
262+
<width>565</width>
263+
<height>697</height>
264264
</rect>
265265
</property>
266266
<layout class="QVBoxLayout" name="verticalLayout_8">
@@ -770,8 +770,8 @@
770770
<rect>
771771
<x>0</x>
772772
<y>0</y>
773-
<width>683</width>
774-
<height>779</height>
773+
<width>676</width>
774+
<height>764</height>
775775
</rect>
776776
</property>
777777
<layout class="QVBoxLayout" name="verticalLayout_7">
@@ -829,7 +829,7 @@
829829
<rect>
830830
<x>0</x>
831831
<y>0</y>
832-
<width>133</width>
832+
<width>132</width>
833833
<height>100</height>
834834
</rect>
835835
</property>
@@ -915,8 +915,8 @@
915915
<rect>
916916
<x>0</x>
917917
<y>0</y>
918-
<width>297</width>
919-
<height>532</height>
918+
<width>269</width>
919+
<height>597</height>
920920
</rect>
921921
</property>
922922
<layout class="QVBoxLayout" name="verticalLayout_12">
@@ -1338,8 +1338,8 @@
13381338
<rect>
13391339
<x>0</x>
13401340
<y>0</y>
1341-
<width>667</width>
1342-
<height>2305</height>
1341+
<width>598</width>
1342+
<height>2361</height>
13431343
</rect>
13441344
</property>
13451345
<layout class="QVBoxLayout" name="verticalLayout_13">
@@ -2418,8 +2418,8 @@
24182418
<rect>
24192419
<x>0</x>
24202420
<y>0</y>
2421-
<width>168</width>
2422-
<height>46</height>
2421+
<width>156</width>
2422+
<height>59</height>
24232423
</rect>
24242424
</property>
24252425
<layout class="QVBoxLayout" name="verticalLayout_17">
@@ -2572,45 +2572,45 @@
25722572
</layout>
25732573
</widget>
25742574
<customwidgets>
2575-
<customwidget>
2576-
<class>QgsScrollArea</class>
2577-
<extends>QScrollArea</extends>
2578-
<header>qgsscrollarea.h</header>
2579-
<container>1</container>
2580-
</customwidget>
25812575
<customwidget>
25822576
<class>QgsCollapsibleGroupBox</class>
25832577
<extends>QGroupBox</extends>
25842578
<header>qgscollapsiblegroupbox.h</header>
25852579
<container>1</container>
25862580
</customwidget>
2587-
<customwidget>
2588-
<class>QgsVariableEditorWidget</class>
2589-
<extends>QWidget</extends>
2590-
<header location="global">qgsvariableeditorwidget.h</header>
2591-
<container>1</container>
2592-
</customwidget>
25932581
<customwidget>
25942582
<class>QgsFilterLineEdit</class>
25952583
<extends>QLineEdit</extends>
25962584
<header>qgsfilterlineedit.h</header>
25972585
</customwidget>
2586+
<customwidget>
2587+
<class>QgsScrollArea</class>
2588+
<extends>QScrollArea</extends>
2589+
<header>qgsscrollarea.h</header>
2590+
<container>1</container>
2591+
</customwidget>
25982592
<customwidget>
25992593
<class>QgsColorButton</class>
26002594
<extends>QToolButton</extends>
26012595
<header>qgscolorbutton.h</header>
26022596
<container>1</container>
26032597
</customwidget>
26042598
<customwidget>
2605-
<class>QgsColorSchemeList</class>
2599+
<class>QgsOpacityWidget</class>
26062600
<extends>QWidget</extends>
2607-
<header location="global">qgscolorschemelist.h</header>
2601+
<header>qgsopacitywidget.h</header>
26082602
<container>1</container>
26092603
</customwidget>
26102604
<customwidget>
2611-
<class>QgsOpacityWidget</class>
2605+
<class>QgsVariableEditorWidget</class>
26122606
<extends>QWidget</extends>
2613-
<header>qgsopacitywidget.h</header>
2607+
<header location="global">qgsvariableeditorwidget.h</header>
2608+
<container>1</container>
2609+
</customwidget>
2610+
<customwidget>
2611+
<class>QgsColorSchemeList</class>
2612+
<extends>QWidget</extends>
2613+
<header location="global">qgscolorschemelist.h</header>
26142614
<container>1</container>
26152615
</customwidget>
26162616
<customwidget>

‎src/ui/qgsrasterlayerpropertiesbase.ui

Lines changed: 1429 additions & 1437 deletions
Large diffs are not rendered by default.

‎src/ui/qgsvectorlayerpropertiesbase.ui

Lines changed: 810 additions & 812 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.