Skip to content

Commit

Permalink
Merge pull request #5193 from Gustry/layer_properties
Browse files Browse the repository at this point in the history 
move metadata panel to OGC server panel
  • Loading branch information
@nyalldawson
nyalldawson committed Sep 19, 2017
2 parents 4587961 + 677c104 commit dc72e14
Show file tree
Hide file tree
Showing 4 changed files with 2,271 additions and 2,281 deletions.
2 changes: 1 addition & 1 deletion src/app/qgsrasterlayerproperties.cpp
View file
Expand Up @@ -602,7 +602,7 @@ void QgsRasterLayerProperties::sync()
{
gboxNoDataValue->setEnabled( false );
gboxCustomTransparency->setEnabled( false );
mOptionsStackedWidget->setCurrentWidget( mOptsPage_Metadata );
mOptionsStackedWidget->setCurrentWidget( mOptsPage_Server );
}

// TODO: Wouldn't it be better to just removeWidget() the tabs than delete them? [LS]
Expand Down
62 changes: 31 additions & 31 deletions src/ui/qgsprojectpropertiesbase.ui
View file
Expand Up @@ -118,7 +118,7 @@
</item>
<item>
<property name="text">
<string>Identify layers</string>
<string>Identify Layers</string>
</property>
<property name="toolTip">
<string>Identifiable layers</string>
Expand All @@ -130,7 +130,7 @@
</item>
<item>
<property name="text">
<string>Default styles</string>
<string>Default Styles</string>
</property>
<property name="toolTip">
<string>Default styles</string>
Expand All @@ -142,10 +142,10 @@
</item>
<item>
<property name="text">
<string>OWS server</string>
<string>QGIS Server</string>
</property>
<property name="toolTip">
<string>WMS/WFS Server Configuration</string>
<string>WMS/WFS/WCS Server Configuration</string>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
Expand Down Expand Up @@ -259,8 +259,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>597</width>
<height>656</height>
<width>565</width>
<height>697</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_8">
Expand Down Expand Up @@ -770,8 +770,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>683</width>
<height>779</height>
<width>676</width>
<height>764</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_7">
Expand Down Expand Up @@ -829,7 +829,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>133</width>
<width>132</width>
<height>100</height>
</rect>
</property>
Expand Down Expand Up @@ -915,8 +915,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>297</width>
<height>532</height>
<width>269</width>
<height>597</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_12">
Expand Down Expand Up @@ -1338,8 +1338,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>667</width>
<height>2305</height>
<width>598</width>
<height>2361</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_13">
Expand Down Expand Up @@ -2418,8 +2418,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>168</width>
<height>46</height>
<width>156</width>
<height>59</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_17">
Expand Down Expand Up @@ -2572,45 +2572,45 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>QgsScrollArea</class>
<extends>QScrollArea</extends>
<header>qgsscrollarea.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsCollapsibleGroupBox</class>
<extends>QGroupBox</extends>
<header>qgscollapsiblegroupbox.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsVariableEditorWidget</class>
<extends>QWidget</extends>
<header location="global">qgsvariableeditorwidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsFilterLineEdit</class>
<extends>QLineEdit</extends>
<header>qgsfilterlineedit.h</header>
</customwidget>
<customwidget>
<class>QgsScrollArea</class>
<extends>QScrollArea</extends>
<header>qgsscrollarea.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsColorButton</class>
<extends>QToolButton</extends>
<header>qgscolorbutton.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsColorSchemeList</class>
<class>QgsOpacityWidget</class>
<extends>QWidget</extends>
<header location="global">qgscolorschemelist.h</header>
<header>qgsopacitywidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsOpacityWidget</class>
<class>QgsVariableEditorWidget</class>
<extends>QWidget</extends>
<header>qgsopacitywidget.h</header>
<header location="global">qgsvariableeditorwidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsColorSchemeList</class>
<extends>QWidget</extends>
<header location="global">qgscolorschemelist.h</header>
<container>1</container>
</customwidget>
<customwidget>
Expand Down

0 comments on commit dc72e14

Please sign in to comment.