diff --git a/python/plugins/db_manager/dlg_sql_window.py b/python/plugins/db_manager/dlg_sql_window.py index 67d157f3ff3..05f3ef9b9d5 100644 --- a/python/plugins/db_manager/dlg_sql_window.py +++ b/python/plugins/db_manager/dlg_sql_window.py @@ -62,11 +62,11 @@ class DlgSqlWindow(QDialog, Ui_Dialog): self.connect(self.btnClear, SIGNAL("clicked()"), self.clearSql) self.connect(self.buttonBox.button(QDialogButtonBox.Close), SIGNAL("clicked()"), self.close) - self.connect(self.presetStore, SIGNAL("clicked()"), self.storePreset) self.connect(self.presetDelete, SIGNAL("clicked()"), self.deletePreset) self.connect(self.presetCombo, SIGNAL("activated(QString)"), self.loadPreset) self.connect(self.presetCombo, SIGNAL("activated(QString)"), self.presetName.setText) + self.updatePresetsCombobox() # hide the load query as layer if feature is not supported self._loadAsLayerAvailable = self.db.connector.hasCustomQuerySupport() @@ -78,22 +78,18 @@ class DlgSqlWindow(QDialog, Ui_Dialog): self.connect(self.loadAsLayerGroup, SIGNAL("toggled(bool)"), self.loadAsLayerToggled) self.loadAsLayerToggled(False) - def showEvent(self, event): - QDialog.showEvent(self, event) - self.updatePresetsCombobox() - def updatePresetsCombobox(self): - entries = QgsProject.instance().subkeyList('DBManager','savedQueries') self.presetCombo.clear() + names = [] + entries = QgsProject.instance().subkeyList('DBManager','savedQueries') for entry in entries: name = QgsProject.instance().readEntry('DBManager','savedQueries/'+entry+'/name' )[0] names.append( name ) - names.sort() - - for name in names: + for name in sorted(names): self.presetCombo.addItem(name) + self.presetCombo.setCurrentIndex(-1) def storePreset(self): query = self.editSql.toPlainText() @@ -112,6 +108,7 @@ class DlgSqlWindow(QDialog, Ui_Dialog): QgsProject.instance().removeEntry('DBManager','savedQueries/q'+str(name.__hash__()) ) self.presetCombo.removeItem( self.presetCombo.findText(name) ) self.presetCombo.setCurrentIndex(-1) + def loadPreset(self, name): query = QgsProject.instance().readEntry('DBManager','savedQueries/q'+str(name.__hash__())+'/query' )[0] name = QgsProject.instance().readEntry('DBManager','savedQueries/q'+str(name.__hash__())+'/name' )[0] diff --git a/python/plugins/db_manager/ui/DlgSqlWindow.ui b/python/plugins/db_manager/ui/DlgSqlWindow.ui index 21b07f74171..986869b4a1b 100644 --- a/python/plugins/db_manager/ui/DlgSqlWindow.ui +++ b/python/plugins/db_manager/ui/DlgSqlWindow.ui @@ -44,7 +44,11 @@ - + + + + + @@ -77,8 +81,8 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;"><br /></span></p></body></html> +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html>