[QGIS Commit] r11528 - in trunk/qgis/src: app ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sun Aug 30 12:30:02 EDT 2009
Author: jef
Date: 2009-08-30 12:30:01 -0400 (Sun, 30 Aug 2009)
New Revision: 11528
Modified:
trunk/qgis/src/app/qgisapp.cpp
trunk/qgis/src/app/qgsserversourceselect.cpp
trunk/qgis/src/app/qgsserversourceselect.h
trunk/qgis/src/ui/qgsserversourceselectbase.ui
Log:
don't close wms layer dialog after addition and allow naming of layers
Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp 2009-08-30 14:26:39 UTC (rev 11527)
+++ trunk/qgis/src/app/qgisapp.cpp 2009-08-30 16:30:01 UTC (rev 11528)
@@ -2778,18 +2778,7 @@
QgsDebugMsg( "about to addRasterLayer" );
QgsServerSourceSelect *wmss = new QgsServerSourceSelect( this );
-
- if ( wmss->exec() )
- {
-
- addRasterLayer( wmss->connectionInfo(),
- /*wmss->connName()*/wmss->selectedLayers().join( "/" ),
- "wms",
- wmss->selectedLayers(),
- wmss->selectedStylesForSelectedLayers(),
- wmss->selectedImageEncoding(),
- wmss->selectedCrs() );
- }
+ wmss->exec();
}
Modified: trunk/qgis/src/app/qgsserversourceselect.cpp
===================================================================
--- trunk/qgis/src/app/qgsserversourceselect.cpp 2009-08-30 14:26:39 UTC (rev 11527)
+++ trunk/qgis/src/app/qgsserversourceselect.cpp 2009-08-30 16:30:01 UTC (rev 11528)
@@ -439,7 +439,14 @@
}
else
{
- accept();
+ QgisApp::instance()->addRasterLayer(
+ connectionInfo(),
+ leLayerName->text().isEmpty() ? selectedLayers().join( "/" ) : leLayerName->text(),
+ "wms",
+ selectedLayers(),
+ selectedStylesForSelectedLayers(),
+ selectedImageEncoding(),
+ selectedCrs() );
}
}
Modified: trunk/qgis/src/app/qgsserversourceselect.h
===================================================================
--- trunk/qgis/src/app/qgsserversourceselect.h 2009-08-30 14:26:39 UTC (rev 11527)
+++ trunk/qgis/src/app/qgsserversourceselect.h 2009-08-30 16:30:01 UTC (rev 11528)
@@ -102,7 +102,7 @@
*/
void on_btnConnect_clicked();
- //! Determines the layers the user selected and closes the dialog
+ //! Determines the layers the user selected
void on_btnAdd_clicked();
//! Opens the Spatial Reference System dialog.
Modified: trunk/qgis/src/ui/qgsserversourceselectbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsserversourceselectbase.ui 2009-08-30 14:26:39 UTC (rev 11527)
+++ trunk/qgis/src/ui/qgsserversourceselectbase.ui 2009-08-30 16:30:01 UTC (rev 11528)
@@ -1,101 +1,102 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>QgsServerSourceSelectBase</class>
- <widget class="QDialog" name="QgsServerSourceSelectBase" >
- <property name="geometry" >
+ <widget class="QDialog" name="QgsServerSourceSelectBase">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>600</width>
- <height>481</height>
+ <width>510</width>
+ <height>439</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Add Layer(s) from a Server</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" >
- <item row="0" column="0" colspan="4" >
- <widget class="QTabWidget" name="tabWidget" >
- <property name="currentIndex" >
+ <layout class="QGridLayout">
+ <item row="0" column="1" colspan="4">
+ <widget class="QTabWidget" name="tabWidget">
+ <property name="currentIndex">
<number>0</number>
</property>
- <widget class="QWidget" name="tab" >
- <attribute name="title" >
+ <widget class="QWidget" name="tab">
+ <attribute name="title">
<string>Servers</string>
</attribute>
- <layout class="QGridLayout" >
- <item row="0" column="0" colspan="6" >
- <widget class="QComboBox" name="cmbConnections" />
+ <layout class="QGridLayout">
+ <item row="0" column="0" colspan="6">
+ <widget class="QComboBox" name="cmbConnections"/>
</item>
- <item row="1" column="0" >
- <widget class="QPushButton" name="btnConnect" >
- <property name="enabled" >
+ <item row="1" column="0">
+ <widget class="QPushButton" name="btnConnect">
+ <property name="enabled">
<bool>false</bool>
</property>
- <property name="text" >
+ <property name="text">
<string>C&onnect</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="2" >
- <widget class="QPushButton" name="btnEdit" >
- <property name="enabled" >
+ <item row="1" column="2">
+ <widget class="QPushButton" name="btnEdit">
+ <property name="enabled">
<bool>false</bool>
</property>
- <property name="text" >
+ <property name="text">
<string>Edit</string>
</property>
</widget>
</item>
- <item row="1" column="3" >
- <widget class="QPushButton" name="btnDelete" >
- <property name="enabled" >
+ <item row="1" column="3">
+ <widget class="QPushButton" name="btnDelete">
+ <property name="enabled">
<bool>false</bool>
</property>
- <property name="text" >
+ <property name="text">
<string>Delete</string>
</property>
</widget>
</item>
- <item row="1" column="4" >
- <widget class="QPushButton" name="btnAddDefault" >
- <property name="statusTip" >
+ <item row="1" column="4">
+ <widget class="QPushButton" name="btnAddDefault">
+ <property name="statusTip">
<string>Adds a few example WMS servers</string>
</property>
- <property name="whatsThis" >
- <string comment="Adds several example WMS servers to the list" />
+ <property name="whatsThis">
+ <string comment="Adds several example WMS servers to the list"/>
</property>
- <property name="text" >
+ <property name="text">
<string>Add default servers</string>
</property>
</widget>
</item>
- <item row="1" column="5" >
+ <item row="1" column="5">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>131</width>
<height>30</height>
@@ -103,37 +104,37 @@
</property>
</spacer>
</item>
- <item row="2" column="0" colspan="6" >
- <widget class="QTreeWidget" name="lstLayers" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+ <item row="2" column="0" colspan="6">
+ <widget class="QTreeWidget" name="lstLayers">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="selectionMode" >
+ <property name="selectionMode">
<enum>QAbstractItemView::MultiSelection</enum>
</property>
- <property name="allColumnsShowFocus" >
+ <property name="allColumnsShowFocus">
<bool>true</bool>
</property>
<column>
- <property name="text" >
+ <property name="text">
<string>ID</string>
</property>
</column>
<column>
- <property name="text" >
+ <property name="text">
<string>Name</string>
</property>
</column>
<column>
- <property name="text" >
+ <property name="text">
<string>Title</string>
</property>
</column>
<column>
- <property name="text" >
+ <property name="text">
<string>Abstract</string>
</property>
</column>
@@ -141,31 +142,31 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="tabLayerOrder" >
- <attribute name="title" >
+ <widget class="QWidget" name="tabLayerOrder">
+ <attribute name="title">
<string>Layer Order</string>
</attribute>
- <layout class="QGridLayout" name="gridLayout" >
- <item row="0" column="0" >
- <widget class="QPushButton" name="mLayerUpButton" >
- <property name="text" >
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QPushButton" name="mLayerUpButton">
+ <property name="text">
<string/>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QPushButton" name="mLayerDownButton" >
- <property name="text" >
+ <item row="0" column="1">
+ <widget class="QPushButton" name="mLayerDownButton">
+ <property name="text">
<string/>
</property>
</widget>
</item>
- <item row="0" column="2" >
- <spacer name="horizontalSpacer" >
- <property name="orientation" >
+ <item row="0" column="2">
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>391</width>
<height>30</height>
@@ -173,18 +174,18 @@
</property>
</spacer>
</item>
- <item row="1" column="0" colspan="3" >
- <widget class="QTreeWidget" name="mLayerOrderTreeWidget" >
- <property name="columnCount" >
+ <item row="1" column="0" colspan="3">
+ <widget class="QTreeWidget" name="mLayerOrderTreeWidget">
+ <property name="columnCount">
<number>2</number>
</property>
<column>
- <property name="text" >
+ <property name="text">
<string>Layer</string>
</property>
</column>
<column>
- <property name="text" >
+ <property name="text">
<string>Style</string>
</property>
</column>
@@ -196,55 +197,55 @@
<zorder>horizontalSpacer</zorder>
<zorder>mLayerOrderTreeWidget</zorder>
</widget>
- <widget class="QWidget" name="tab_2" >
- <attribute name="title" >
+ <widget class="QWidget" name="tab_2">
+ <attribute name="title">
<string>Server Search</string>
</attribute>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QLineEdit" name="leSearchTerm" />
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QLineEdit" name="leSearchTerm"/>
</item>
- <item row="0" column="1" >
- <widget class="QPushButton" name="btnSearch" >
- <property name="text" >
+ <item row="0" column="1">
+ <widget class="QPushButton" name="btnSearch">
+ <property name="text">
<string>Search</string>
</property>
- <property name="default" >
+ <property name="default">
<bool>true</bool>
</property>
</widget>
</item>
- <item row="1" column="0" colspan="2" >
- <widget class="QTableWidget" name="tableWidgetWMSList" >
- <property name="selectionMode" >
+ <item row="1" column="0" colspan="2">
+ <widget class="QTableWidget" name="tableWidgetWMSList">
+ <property name="selectionMode">
<enum>QAbstractItemView::SingleSelection</enum>
</property>
- <property name="selectionBehavior" >
+ <property name="selectionBehavior">
<enum>QAbstractItemView::SelectRows</enum>
</property>
- <property name="cornerButtonEnabled" >
+ <property name="cornerButtonEnabled">
<bool>false</bool>
</property>
<column>
- <property name="text" >
+ <property name="text">
<string>Title</string>
</property>
</column>
<column>
- <property name="text" >
+ <property name="text">
<string>URL</string>
</property>
</column>
<column>
- <property name="text" >
+ <property name="text">
<string>Description</string>
</property>
</column>
</widget>
</item>
- <item row="2" column="0" colspan="2" >
- <widget class="QPushButton" name="btnAddWMS" >
- <property name="text" >
+ <item row="2" column="0" colspan="2">
+ <widget class="QPushButton" name="btnAddWMS">
+ <property name="text">
<string>Add selected row to WMS list</string>
</property>
</widget>
@@ -253,92 +254,50 @@
</widget>
</widget>
</item>
- <item row="1" column="0" colspan="4" >
- <widget class="QGroupBox" name="btnGrpImageEncoding" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <item row="1" column="1" colspan="4">
+ <widget class="QGroupBox" name="btnGrpImageEncoding">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize" >
+ <property name="minimumSize">
<size>
<width>16</width>
<height>64</height>
</size>
</property>
- <property name="title" >
+ <property name="title">
<string>Image encoding</string>
</property>
</widget>
</item>
- <item row="2" column="0" colspan="4" >
- <widget class="QGroupBox" name="gbCRS" >
- <property name="title" >
- <string>Coordinate Reference System</string>
- </property>
- <layout class="QHBoxLayout" >
- <item>
- <widget class="QLabel" name="labelCoordRefSys" >
- <property name="text" >
- <string/>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>441</width>
- <height>23</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QPushButton" name="btnChangeSpatialRefSys" >
- <property name="enabled" >
- <bool>false</bool>
- </property>
- <property name="text" >
- <string>Change ...</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="3" column="0" >
- <widget class="QPushButton" name="btnHelp" >
- <property name="enabled" >
+ <item row="3" column="1">
+ <widget class="QPushButton" name="btnHelp">
+ <property name="enabled">
<bool>true</bool>
</property>
- <property name="text" >
+ <property name="text">
<string>Help</string>
</property>
- <property name="shortcut" >
+ <property name="shortcut">
<string>F1</string>
</property>
- <property name="autoDefault" >
+ <property name="autoDefault">
<bool>true</bool>
</property>
</widget>
</item>
- <item row="3" column="1" >
+ <item row="3" column="2">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>284</width>
<height>31</height>
@@ -346,57 +305,111 @@
</property>
</spacer>
</item>
- <item row="3" column="2" >
- <widget class="QPushButton" name="btnAdd" >
- <property name="enabled" >
+ <item row="3" column="3">
+ <widget class="QPushButton" name="btnAdd">
+ <property name="enabled">
<bool>false</bool>
</property>
- <property name="text" >
+ <property name="text">
<string>&Add</string>
</property>
- <property name="shortcut" >
+ <property name="shortcut">
<string>Alt+A</string>
</property>
- <property name="autoDefault" >
+ <property name="autoDefault">
<bool>true</bool>
</property>
- <property name="default" >
+ <property name="default">
<bool>true</bool>
</property>
</widget>
</item>
- <item row="3" column="3" >
- <widget class="QPushButton" name="btnCancel" >
- <property name="text" >
+ <item row="3" column="4">
+ <widget class="QPushButton" name="btnCancel">
+ <property name="text">
<string>C&lose</string>
</property>
- <property name="shortcut" >
+ <property name="shortcut">
<string>Alt+L</string>
</property>
- <property name="autoDefault" >
+ <property name="autoDefault">
<bool>true</bool>
</property>
</widget>
</item>
- <item row="4" column="0" colspan="4" >
- <widget class="QLabel" name="labelStatus" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Ignored" >
+ <item row="4" column="1" colspan="4">
+ <widget class="QLabel" name="labelStatus">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Ignored" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text" >
+ <property name="text">
<string>Ready</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
+ <item row="2" column="4">
+ <widget class="QGroupBox" name="gbCRS">
+ <property name="title">
+ <string>Coordinate Reference System</string>
+ </property>
+ <layout class="QHBoxLayout">
+ <item>
+ <widget class="QLabel" name="labelCoordRefSys">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>441</width>
+ <height>23</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnChangeSpatialRefSys">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Change ...</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="2" column="1" colspan="3">
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>Layer name</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="0">
+ <widget class="QLineEdit" name="leLayerName"/>
+ </item>
+ </layout>
+ </widget>
+ </item>
</layout>
</widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
<tabstops>
<tabstop>cmbConnections</tabstop>
<tabstop>btnConnect</tabstop>
More information about the QGIS-commit
mailing list