Skip to content

Commit a778e26

Browse files
slarosanyalldawson
slarosa
authored and
nyalldawson
committed
[dbmanager] followp 1646f67: fixes some string and changes more messageboxes
1 parent 5fc78bf commit a778e26

File tree

5 files changed

+23
-29
lines changed

5 files changed

+23
-29
lines changed

‎python/plugins/db_manager/db_manager.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ def refreshActionSlot(self):
148148
def importActionSlot(self):
149149
db = self.tree.currentDatabase()
150150
if db is None:
151-
self.infoBar.pushMessage(self.tr("Sorry"), self.tr("No database selected or you are not connected to it."), QgsMessageBar.INFO, self.iface.messageTimeout())
151+
self.infoBar.pushMessage(self.tr("No database selected or you are not connected to it."), QgsMessageBar.INFO, self.iface.messageTimeout())
152152
return
153153

154154
outUri = db.uri()
@@ -163,7 +163,7 @@ def importActionSlot(self):
163163
def exportActionSlot(self):
164164
table = self.tree.currentTable()
165165
if table is None:
166-
self.infoBar.pushMessage(self.tr("Sorry"), self.tr("Select the table you want export to file."), QgsMessageBar.INFO, self.iface.messageTimeout())
166+
self.infoBar.pushMessage(self.tr("Select the table you want export to file."), QgsMessageBar.INFO, self.iface.messageTimeout())
167167
return
168168

169169
inLayer = table.toMapLayer()

‎python/plugins/db_manager/db_plugins/plugin.py

+8-16
Original file line numberDiff line numberDiff line change
@@ -270,8 +270,7 @@ def deleteActionSlot(self, item, action, parent):
270270
self.deleteTableActionSlot(item, action, parent)
271271
else:
272272
QApplication.restoreOverrideCursor()
273-
parent.infoBar.pushMessage(QApplication.translate("DBManagerPlugin", "Sorry"),
274-
QApplication.translate("DBManagerPlugin", "Cannot delete the selected item."),
273+
parent.infoBar.pushMessage(QApplication.translate("DBManagerPlugin", "Cannot delete the selected item."),
275274
QgsMessageBar.INFO, parent.iface.messageTimeout())
276275
QApplication.setOverrideCursor(Qt.WaitCursor)
277276

@@ -280,8 +279,7 @@ def createSchemaActionSlot(self, item, action, parent):
280279
QApplication.restoreOverrideCursor()
281280
try:
282281
if not isinstance(item, (DBPlugin, Schema, Table)) or item.database() == None:
283-
parent.infoBar.pushMessage(QApplication.translate("DBManagerPlugin", "Sorry"),
284-
QApplication.translate("DBManagerPlugin", "No database selected or you are not connected to it."),
282+
parent.infoBar.pushMessage(QApplication.translate("DBManagerPlugin", "No database selected or you are not connected to it."),
285283
QgsMessageBar.INFO, parent.iface.messageTimeout())
286284
return
287285
(schema, ok) = QInputDialog.getText(parent, QApplication.translate("DBManagerPlugin", "New schema"), QApplication.translate("DBManagerPlugin", "Enter new schema name"))
@@ -296,8 +294,7 @@ def deleteSchemaActionSlot(self, item, action, parent):
296294
QApplication.restoreOverrideCursor()
297295
try:
298296
if not isinstance(item, Schema):
299-
parent.infoBar.pushMessage(QApplication.translate("DBManagerPlugin", "Sorry"),
300-
QApplication.translate("DBManagerPlugin", "Select an empty SCHEMA for deletion."),
297+
parent.infoBar.pushMessage(QApplication.translate("DBManagerPlugin", "Select an empty schema for deletion."),
301298
QgsMessageBar.INFO, parent.iface.messageTimeout())
302299
return
303300
res = QMessageBox.question(parent, QApplication.translate("DBManagerPlugin", "hey!"), QApplication.translate("DBManagerPlugin", "Really delete schema %s?") % item.name, QMessageBox.Yes | QMessageBox.No)
@@ -325,8 +322,7 @@ def createSchema(self, name):
325322
def createTableActionSlot(self, item, action, parent):
326323
QApplication.restoreOverrideCursor()
327324
if not hasattr(item, 'database') or item.database() == None:
328-
parent.infoBar.pushMessage(QApplication.translate("DBManagerPlugin", "Sorry"),
329-
QApplication.translate("DBManagerPlugin", "No database selected or you are not connected to it."),
325+
parent.infoBar.pushMessage(QApplication.translate("DBManagerPlugin", "No database selected or you are not connected to it."),
330326
QgsMessageBar.INFO, parent.iface.messageTimeout())
331327
return
332328
from ..dlg_create_table import DlgCreateTable
@@ -337,8 +333,7 @@ def editTableActionSlot(self, item, action, parent):
337333
QApplication.restoreOverrideCursor()
338334
try:
339335
if not isinstance(item, Table) or item.isView:
340-
parent.infoBar.pushMessage(QApplication.translate("DBManagerPlugin", "Sorry"),
341-
QApplication.translate("DBManagerPlugin", "Select a TABLE for editation."),
336+
parent.infoBar.pushMessage(QApplication.translate("DBManagerPlugin", "Select a table for editation."),
342337
QgsMessageBar.INFO, parent.iface.messageTimeout())
343338
return
344339
from ..dlg_table_properties import DlgTableProperties
@@ -350,8 +345,7 @@ def deleteTableActionSlot(self, item, action, parent):
350345
QApplication.restoreOverrideCursor()
351346
try:
352347
if not isinstance(item, Table):
353-
parent.infoBar.pushMessage(QApplication.translate("DBManagerPlugin", "Sorry"),
354-
QApplication.translate("DBManagerPlugin", "Select a TABLE/VIEW for deletion."),
348+
parent.infoBar.pushMessage(QApplication.translate("DBManagerPlugin", "Select a table/view for deletion."),
355349
QgsMessageBar.INFO, parent.iface.messageTimeout())
356350
return
357351
res = QMessageBox.question(parent, QApplication.translate("DBManagerPlugin", "hey!"), QApplication.translate("DBManagerPlugin", "Really delete table/view %s?") % item.name, QMessageBox.Yes | QMessageBox.No)
@@ -366,8 +360,7 @@ def emptyTableActionSlot(self, item, action, parent):
366360
QApplication.restoreOverrideCursor()
367361
try:
368362
if not isinstance(item, Table) or item.isView:
369-
parent.infoBar.pushMessage(QApplication.translate("DBManagerPlugin", "Sorry"),
370-
QApplication.translate("DBManagerPlugin", "Select a TABLE to empty it."),
363+
parent.infoBar.pushMessage(QApplication.translate("DBManagerPlugin", "Select a table to empty it."),
371364
QgsMessageBar.INFO, parent.iface.messageTimeout())
372365
return
373366
res = QMessageBox.question(parent, QApplication.translate("DBManagerPlugin", "hey!"), QApplication.translate("DBManagerPlugin", "Really delete all items from table %s?") % item.name, QMessageBox.Yes | QMessageBox.No)
@@ -390,8 +383,7 @@ def moveTableToSchemaActionSlot(self, item, action, parent, new_schema):
390383
QApplication.restoreOverrideCursor()
391384
try:
392385
if not isinstance(item, Table):
393-
parent.infoBar.pushMessage(QApplication.translate("DBManagerPlugin", "Sorry"),
394-
QApplication.translate("DBManagerPlugin", "Select a TABLE/VIEW."),
386+
parent.infoBar.pushMessage(QApplication.translate("DBManagerPlugin", "Select a table/view."),
395387
QgsMessageBar.INFO, parent.iface.messageTimeout())
396388
return
397389
finally:

‎python/plugins/db_manager/db_plugins/postgis/plugin.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
from PyQt4.QtCore import *
2727
from PyQt4.QtGui import *
28+
from qgis.gui import QgsMessageBar
2829

2930
from ..plugin import ConnectionError, InvalidDataException, DBPlugin, Database, Schema, Table, VectorTable, RasterTable, TableField, TableConstraint, TableIndex, TableTrigger, TableRule
3031

@@ -168,7 +169,7 @@ def runVacuumAnalyzeActionSlot(self, item, action, parent):
168169
QApplication.restoreOverrideCursor()
169170
try:
170171
if not isinstance(item, Table) or item.isView:
171-
QMessageBox.information(parent, self.tr("Sorry"), self.tr("Select a TABLE for vacuum analyze."))
172+
parent.infoBar().pushMessage(self.tr("Select a table for vacuum analyze."), QgsMessageBar.INFO, parent.iface.messageTimeout())
172173
return
173174
finally:
174175
QApplication.setOverrideCursor(Qt.WaitCursor)

‎python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/__init__.py

+10-9
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
from PyQt4.QtCore import *
2525
from PyQt4.QtGui import *
2626
from qgis.core import *
27+
from qgis.gui import QgsMessageBar
2728

2829
import os
2930
current_path = os.path.dirname(__file__)
@@ -68,19 +69,19 @@ def run(item, action, mainwindow):
6869
isTopoSchema = False
6970

7071
if not hasattr(item, 'schema'):
71-
QMessageBox.critical(mainwindow, "Invalid topology", u'Select a topology schema to continue.')
72-
return False
72+
mainwindow.infoBar.pushMessage("Invalid topology", u'Select a topology schema to continue.', QgsMessageBar.INFO, mainwindow.iface.messageTimeout())
73+
return False
7374

7475
if item.schema() != None:
75-
sql = u"SELECT srid FROM topology.topology WHERE name = %s" % quoteStr(item.schema().name)
76-
c = db.connector._get_cursor()
77-
db.connector._execute( c, sql )
78-
res = db.connector._fetchone( c )
79-
isTopoSchema = res != None
76+
sql = u"SELECT srid FROM topology.topology WHERE name = %s" % quoteStr(item.schema().name)
77+
c = db.connector._get_cursor()
78+
db.connector._execute( c, sql )
79+
res = db.connector._fetchone( c )
80+
isTopoSchema = res != None
8081

8182
if not isTopoSchema:
82-
QMessageBox.critical(mainwindow, "Invalid topology", u'Schema "%s" is not registered in topology.topology.' % item.schema().name)
83-
return False
83+
mainwindow.infoBar.pushMessage("Invalid topology", u'Schema "{0}" is not registered in topology.topology.'.format(item.schema().name), QgsMessageBar.WARNING, mainwindow.iface.messageTimeout())
84+
return False
8485

8586
toposrid = str(res[0])
8687

‎python/plugins/db_manager/db_plugins/spatialite/plugin.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ def runVacuumActionSlot(self, item, action, parent):
116116
QApplication.restoreOverrideCursor()
117117
try:
118118
if not isinstance(item, (DBPlugin, Table)) or item.database() == None:
119-
QMessageBox.information(parent, self.tr("Sorry"), self.tr("No database selected or you are not connected to it."))
119+
parent.infoBar.pushMessage(self.tr("No database selected or you are not connected to it."), QgsMessageBar.INFO, parent.iface.messageTimeout())
120120
return
121121
finally:
122122
QApplication.setOverrideCursor(Qt.WaitCursor)

0 commit comments

Comments
 (0)