sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-12-12 00:06:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

DBManager: remove empty line from sql editor

Browse Source
This commit is contained in:
Giuseppe Sucameli 2013-06-04 07:33:43 +02:00
parent 80b5a07e55
commit ae3abccfe3
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
python/plugins/db_manager/dlg_sql_window.py
View File

@ -62,11 +62,11 @@ class DlgSqlWindow(QDialog, Ui_Dialog):
self.connect(self.btnClear, SIGNAL("clicked()"), self.clearSql) self.connect(self.btnClear, SIGNAL("clicked()"), self.clearSql)
self.connect(self.buttonBox.button(QDialogButtonBox.Close), SIGNAL("clicked()"), self.close) self.connect(self.buttonBox.button(QDialogButtonBox.Close), SIGNAL("clicked()"), self.close)
self.connect(self.presetStore, SIGNAL("clicked()"), self.storePreset) self.connect(self.presetStore, SIGNAL("clicked()"), self.storePreset)
self.connect(self.presetDelete, SIGNAL("clicked()"), self.deletePreset) 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.loadPreset)
self.connect(self.presetCombo, SIGNAL("activated(QString)"), self.presetName.setText) self.connect(self.presetCombo, SIGNAL("activated(QString)"), self.presetName.setText)
self.updatePresetsCombobox()
# hide the load query as layer if feature is not supported # hide the load query as layer if feature is not supported
self._loadAsLayerAvailable = self.db.connector.hasCustomQuerySupport() 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.connect(self.loadAsLayerGroup, SIGNAL("toggled(bool)"), self.loadAsLayerToggled)
self.loadAsLayerToggled(False) self.loadAsLayerToggled(False)
def showEvent(self, event):
QDialog.showEvent(self, event)
self.updatePresetsCombobox()
def updatePresetsCombobox(self): def updatePresetsCombobox(self):
entries = QgsProject.instance().subkeyList('DBManager','savedQueries')
self.presetCombo.clear() self.presetCombo.clear()
names = [] names = []
entries = QgsProject.instance().subkeyList('DBManager','savedQueries')
for entry in entries: for entry in entries:
name = QgsProject.instance().readEntry('DBManager','savedQueries/'+entry+'/name' )[0] name = QgsProject.instance().readEntry('DBManager','savedQueries/'+entry+'/name' )[0]
names.append( name ) names.append( name )
names.sort() for name in sorted(names):
for name in names:
self.presetCombo.addItem(name) self.presetCombo.addItem(name)
self.presetCombo.setCurrentIndex(-1)
def storePreset(self): def storePreset(self):
query = self.editSql.toPlainText() query = self.editSql.toPlainText()
@ -112,6 +108,7 @@ class DlgSqlWindow(QDialog, Ui_Dialog):
QgsProject.instance().removeEntry('DBManager','savedQueries/q'+str(name.__hash__()) ) QgsProject.instance().removeEntry('DBManager','savedQueries/q'+str(name.__hash__()) )
self.presetCombo.removeItem( self.presetCombo.findText(name) ) self.presetCombo.removeItem( self.presetCombo.findText(name) )
self.presetCombo.setCurrentIndex(-1) self.presetCombo.setCurrentIndex(-1)
def loadPreset(self, name): def loadPreset(self, name):
query = QgsProject.instance().readEntry('DBManager','savedQueries/q'+str(name.__hash__())+'/query' )[0] query = QgsProject.instance().readEntry('DBManager','savedQueries/q'+str(name.__hash__())+'/query' )[0]
name = QgsProject.instance().readEntry('DBManager','savedQueries/q'+str(name.__hash__())+'/name' )[0] name = QgsProject.instance().readEntry('DBManager','savedQueries/q'+str(name.__hash__())+'/name' )[0]

10
python/plugins/db_manager/ui/DlgSqlWindow.ui
View File

@ -44,7 +44,11 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QLineEdit" name="presetName"/> <widget class="QLineEdit" name="presetName">
<property name="text">
<string notr="true"/>
</property>
</widget>
</item> </item>
<item> <item>
<widget class="QComboBox" name="presetCombo"/> <widget class="QComboBox" name="presetCombo"/>
@ -77,8 +81,8 @@
<string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt; &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>