Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit a7fbefe

Browse files
tomkralidistomkralidis
committedFeb 4, 2019
[MetaSearch] OWS GetCapabilities checking regression (fixes #19787) [needs-docs]
1 parent fd42980 commit a7fbefe

File tree

2 files changed

+12
-72
lines changed

2 files changed

+12
-72
lines changed
 

‎python/plugins/MetaSearch/dialogs/maindialog.py

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,6 @@ def __init__(self, iface):
141141
self.mActionAddGisFile.triggered.connect(self.add_gis_file)
142142
self.btnShowXml.clicked.connect(self.show_xml)
143143

144-
# settings
145-
self.radioTitleAsk.clicked.connect(self.set_ows_save_title_ask)
146-
self.radioTitleNoAsk.clicked.connect(self.set_ows_save_title_no_ask)
147-
self.radioTempName.clicked.connect(self.set_ows_save_temp_name)
148-
149144
self.manageGui()
150145

151146
def manageGui(self):
@@ -166,16 +161,6 @@ def manageGui(self):
166161

167162
self.reset_buttons()
168163

169-
# get preferred connection save strategy from settings and set it
170-
save_strategy = self.settings.value('/MetaSearch/ows_save_strategy',
171-
'title_ask')
172-
if save_strategy == 'temp_name':
173-
self.radioTempName.setChecked(True)
174-
elif save_strategy == 'title_no_ask':
175-
self.radioTitleNoAsk.setChecked(True)
176-
else:
177-
self.radioTitleAsk.setChecked(True)
178-
179164
# install proxy handler if specified in QGIS settings
180165
self.install_proxy()
181166

@@ -748,15 +733,10 @@ def add_to_ows(self):
748733

749734
# check for duplicates
750735
if sname in keys: # duplicate found
751-
if self.radioTitleAsk.isChecked(): # ask to overwrite
752-
msg = self.tr('Connection {0} exists. Overwrite?').format(sname)
753-
res = QMessageBox.warning(self, self.tr('Saving server'), msg,
754-
QMessageBox.Yes | QMessageBox.No)
755-
if res != QMessageBox.Yes: # assign new name with serial
756-
sname = serialize_string(sname)
757-
elif self.radioTitleNoAsk.isChecked(): # don't ask to overwrite
758-
pass
759-
elif self.radioTempName.isChecked(): # use temp name
736+
msg = self.tr('Connection {0} exists. Overwrite?').format(sname)
737+
res = QMessageBox.warning(self, self.tr('Saving server'), msg,
738+
QMessageBox.Yes | QMessageBox.No)
739+
if res != QMessageBox.Yes: # assign new name with serial
760740
sname = serialize_string(sname)
761741

762742
# no dups detected or overwrite is allowed

‎python/plugins/MetaSearch/ui/maindialog.ui

Lines changed: 8 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<item>
2424
<widget class="QTabWidget" name="tabWidget">
2525
<property name="currentIndex">
26-
<number>0</number>
26+
<number>2</number>
2727
</property>
2828
<widget class="QWidget" name="tabSearch">
2929
<attribute name="title">
@@ -485,46 +485,6 @@
485485
<string>Settings</string>
486486
</attribute>
487487
<layout class="QVBoxLayout" name="verticalLayout_4">
488-
<item>
489-
<widget class="QGroupBox" name="saveStrategyGroup">
490-
<property name="title">
491-
<string>Connection Naming</string>
492-
</property>
493-
<layout class="QVBoxLayout" name="verticalLayout_3">
494-
<item>
495-
<widget class="QLabel" name="lblSaveStrategy">
496-
<property name="text">
497-
<string>When saving the connection of an OWS service</string>
498-
</property>
499-
</widget>
500-
</item>
501-
<item>
502-
<widget class="QRadioButton" name="radioTitleAsk">
503-
<property name="text">
504-
<string>Use the OWS Service Title and ask before overwriting</string>
505-
</property>
506-
<property name="checked">
507-
<bool>true</bool>
508-
</property>
509-
</widget>
510-
</item>
511-
<item>
512-
<widget class="QRadioButton" name="radioTitleNoAsk">
513-
<property name="text">
514-
<string>Use the OWS Service Title and always overwrite if already available</string>
515-
</property>
516-
</widget>
517-
</item>
518-
<item>
519-
<widget class="QRadioButton" name="radioTempName">
520-
<property name="text">
521-
<string>Use a temporary name, which you can change later</string>
522-
</property>
523-
</widget>
524-
</item>
525-
</layout>
526-
</widget>
527-
</item>
528488
<item>
529489
<widget class="QGroupBox" name="groupBox_4">
530490
<property name="title">
@@ -606,6 +566,13 @@
606566
</item>
607567
</layout>
608568
</widget>
569+
<customwidgets>
570+
<customwidget>
571+
<class>QgsFilterLineEdit</class>
572+
<extends>QLineEdit</extends>
573+
<header>qgis.gui</header>
574+
</customwidget>
575+
</customwidgets>
609576
<resources/>
610577
<connections>
611578
<connection>
@@ -641,11 +608,4 @@
641608
</hints>
642609
</connection>
643610
</connections>
644-
<customwidgets>
645-
<customwidget>
646-
<class>QgsFilterLineEdit</class>
647-
<extends>QLineEdit</extends>
648-
<header>qgis.gui</header>
649-
</customwidget>
650-
</customwidgets>
651611
</ui>

0 commit comments

Comments
 (0)
Please sign in to comment.