do not translate geometry types, change dbmanager translation context names (fix #6837)

This commit is contained in:
Giuseppe Sucameli 2012-12-09 17:47:26 +01:00
parent 7a6212707c
commit 3da32c00d5
18 changed files with 182 additions and 141 deletions

View File

@ -29,9 +29,9 @@ from .db_plugins.plugin import DbError
from .dlg_db_error import DlgDbError from .dlg_db_error import DlgDbError
from .db_plugins.plugin import TableField from .db_plugins.plugin import TableField
from .ui.ui_DlgAddGeometryColumn import Ui_DlgAddGeometryColumn from .ui.ui_DlgAddGeometryColumn import Ui_DbManagerDlgAddGeometryColumn as Ui_Dialog
class DlgAddGeometryColumn(QDialog, Ui_DlgAddGeometryColumn): class DlgAddGeometryColumn(QDialog, Ui_Dialog):
GEOM_TYPES = ["POINT", "LINESTRING", "POLYGON", "MULTIPOINT", "MULTILINESTRING", "MULTIPOLYGON", "GEOMETRYCOLLECTION"] GEOM_TYPES = ["POINT", "LINESTRING", "POLYGON", "MULTIPOINT", "MULTILINESTRING", "MULTIPOLYGON", "GEOMETRYCOLLECTION"]

View File

@ -29,10 +29,9 @@ from .db_plugins.plugin import DbError
from .dlg_db_error import DlgDbError from .dlg_db_error import DlgDbError
from .db_plugins.plugin import TableConstraint from .db_plugins.plugin import TableConstraint
from .ui.ui_DlgCreateConstraint import Ui_DlgCreateConstraint from .ui.ui_DlgCreateConstraint import Ui_DbManagerDlgCreateConstraint as Ui_Dialog
class DlgCreateConstraint(QDialog, Ui_DlgCreateConstraint):
class DlgCreateConstraint(QDialog, Ui_Dialog):
def __init__(self, parent=None, table=None, db=None): def __init__(self, parent=None, table=None, db=None):
QDialog.__init__(self, parent) QDialog.__init__(self, parent)
self.table = table self.table = table

View File

@ -29,11 +29,9 @@ from .db_plugins.plugin import DbError
from .dlg_db_error import DlgDbError from .dlg_db_error import DlgDbError
from .db_plugins.plugin import TableIndex from .db_plugins.plugin import TableIndex
from .ui.ui_DlgCreateIndex import Ui_DlgCreateIndex from .ui.ui_DlgCreateIndex import Ui_DbManagerDlgCreateIndex as Ui_Dialog
class DlgCreateIndex(QDialog, Ui_DlgCreateIndex):
class DlgCreateIndex(QDialog, Ui_Dialog):
def __init__(self, parent=None, table=None, db=None): def __init__(self, parent=None, table=None, db=None):
QDialog.__init__(self, parent) QDialog.__init__(self, parent)
self.table = table self.table = table

View File

@ -29,7 +29,7 @@ from .db_plugins.data_model import TableFieldsModel
from .db_plugins.plugin import DbError, ConnectionError from .db_plugins.plugin import DbError, ConnectionError
from .dlg_db_error import DlgDbError from .dlg_db_error import DlgDbError
from .ui.ui_DlgCreateTable import Ui_DlgCreateTable from .ui.ui_DlgCreateTable import Ui_DbManagerDlgCreateTable as Ui_Dialog
class TableFieldsDelegate(QItemDelegate): class TableFieldsDelegate(QItemDelegate):
@ -79,8 +79,7 @@ class TableFieldsDelegate(QItemDelegate):
self.emit(SIGNAL("columnNameChanged()")) self.emit(SIGNAL("columnNameChanged()"))
class DlgCreateTable(QDialog, Ui_DlgCreateTable): class DlgCreateTable(QDialog, Ui_Dialog):
GEOM_TYPES = ["POINT", "LINESTRING", "POLYGON", "MULTIPOINT", "MULTILINESTRING", "MULTIPOLYGON", "GEOMETRYCOLLECTION"] GEOM_TYPES = ["POINT", "LINESTRING", "POLYGON", "MULTIPOINT", "MULTILINESTRING", "MULTIPOLYGON", "GEOMETRYCOLLECTION"]
def __init__(self, item, parent=None): def __init__(self, item, parent=None):

View File

@ -25,10 +25,10 @@ The content of this file is based on
from PyQt4.QtCore import * from PyQt4.QtCore import *
from PyQt4.QtGui import * from PyQt4.QtGui import *
from .ui.ui_DlgDbError import Ui_DlgDbError from .ui.ui_DlgDbError import Ui_DbManagerDlgDbError as Ui_Dialog
from .db_plugins.plugin import DbError from .db_plugins.plugin import DbError
class DlgDbError(QDialog, Ui_DlgDbError): class DlgDbError(QDialog, Ui_Dialog):
def __init__(self, e, parent=None): def __init__(self, e, parent=None):
QDialog.__init__(self, parent) QDialog.__init__(self, parent)
self.setupUi(self) self.setupUi(self)

View File

@ -28,9 +28,9 @@ from PyQt4.QtGui import *
import qgis.core import qgis.core
from qgis.utils import iface from qgis.utils import iface
from .ui.ui_DlgExportVector import Ui_DlgExportVector from .ui.ui_DlgExportVector import Ui_DbManagerDlgExportVector as Ui_Dialog
class DlgExportVector(QDialog, Ui_DlgExportVector): class DlgExportVector(QDialog, Ui_Dialog):
def __init__(self, inLayer, inDb, parent=None): def __init__(self, inLayer, inDb, parent=None):
QDialog.__init__(self, parent) QDialog.__init__(self, parent)

View File

@ -29,10 +29,9 @@ from PyQt4.QtGui import *
from .db_plugins.plugin import TableField from .db_plugins.plugin import TableField
from .ui.ui_DlgFieldProperties import Ui_DlgFieldProperties from .ui.ui_DlgFieldProperties import Ui_DbManagerDlgFieldProperties as Ui_Dialog
class DlgFieldProperties(QDialog, Ui_DlgFieldProperties):
class DlgFieldProperties(QDialog, Ui_Dialog):
def __init__(self, parent=None, fld=None, table=None, db=None): def __init__(self, parent=None, fld=None, table=None, db=None):
QDialog.__init__(self, parent) QDialog.__init__(self, parent)
self.fld = fld self.fld = fld

View File

@ -28,9 +28,9 @@ from PyQt4.QtGui import *
import qgis.core import qgis.core
from qgis.utils import iface from qgis.utils import iface
from .ui.ui_DlgImportVector import Ui_DlgImportVector from .ui.ui_DlgImportVector import Ui_DbManagerDlgImportVector as Ui_Dialog
class DlgImportVector(QDialog, Ui_DlgImportVector): class DlgImportVector(QDialog, ):
HAS_INPUT_MODE, ASK_FOR_INPUT_MODE = range(2) HAS_INPUT_MODE, ASK_FOR_INPUT_MODE = range(2)

View File

@ -28,12 +28,12 @@ from PyQt4.QtGui import *
from .db_plugins.plugin import BaseError from .db_plugins.plugin import BaseError
from .dlg_db_error import DlgDbError from .dlg_db_error import DlgDbError
from .ui.ui_DlgSqlWindow import Ui_DlgSqlWindow from .ui.ui_DlgSqlWindow import Ui_DbManagerDlgSqlWindow as Ui_Dialog
from .highlighter import SqlHighlighter from .highlighter import SqlHighlighter
from .completer import SqlCompleter from .completer import SqlCompleter
class DlgSqlWindow(QDialog, Ui_DlgSqlWindow): class DlgSqlWindow(QDialog, Ui_Dialog):
def __init__(self, iface, db, parent=None): def __init__(self, iface, db, parent=None):
QDialog.__init__(self, parent) QDialog.__init__(self, parent)

View File

@ -34,10 +34,9 @@ from .dlg_add_geometry_column import DlgAddGeometryColumn
from .dlg_create_constraint import DlgCreateConstraint from .dlg_create_constraint import DlgCreateConstraint
from .dlg_create_index import DlgCreateIndex from .dlg_create_index import DlgCreateIndex
from .ui.ui_DlgTableProperties import Ui_DlgTableProperties from .ui.ui_DlgTableProperties import Ui_DbManagerDlgTableProperties as Ui_Dialog
class DlgTableProperties(QDialog, Ui_DlgTableProperties):
class DlgTableProperties(QDialog, Ui_Dialog):
def __init__(self, table, parent=None): def __init__(self, table, parent=None):
QDialog.__init__(self, parent) QDialog.__init__(self, parent)
self.table = table self.table = table

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>DlgAddGeometryColumn</class> <class>DbManagerDlgAddGeometryColumn</class>
<widget class="QDialog" name="DlgAddGeometryColumn"> <widget class="QDialog" name="DbManagerDlgAddGeometryColumn">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
@ -11,7 +11,7 @@
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Dialog</string> <string>Add geometry column</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="0" column="0">
@ -27,7 +27,7 @@
<item row="0" column="1" colspan="2"> <item row="0" column="1" colspan="2">
<widget class="QLineEdit" name="editName"> <widget class="QLineEdit" name="editName">
<property name="text"> <property name="text">
<string>geom</string> <string notr="true">geom</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -45,37 +45,37 @@
<widget class="QComboBox" name="cboType"> <widget class="QComboBox" name="cboType">
<item> <item>
<property name="text"> <property name="text">
<string>POINT</string> <string notr="true">POINT</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>LINESTRING</string> <string notr="true">LINESTRING</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>POLYGON</string> <string notr="true">POLYGON</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>MULTIPOINT</string> <string notr="true">MULTIPOINT</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>MULTILINESTRING</string> <string notr="true">MULTILINESTRING</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>MULTIPOLYGON</string> <string notr="true">MULTIPOLYGON</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>GEOMETRYCOLLECTION</string> <string notr="true">GEOMETRYCOLLECTION</string>
</property> </property>
</item> </item>
</widget> </widget>
@ -126,7 +126,7 @@
<item row="3" column="1"> <item row="3" column="1">
<widget class="QLineEdit" name="editSrid"> <widget class="QLineEdit" name="editSrid">
<property name="text"> <property name="text">
<string>-1</string> <string notr="true">-1</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -154,7 +154,7 @@
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>
<signal>rejected()</signal> <signal>rejected()</signal>
<receiver>DlgAddGeometryColumn</receiver> <receiver>DbManagerDlgAddGeometryColumn</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>DlgCreateConstraint</class> <class>DbManagerDlgCreateConstraint</class>
<widget class="QDialog" name="DlgCreateConstraint"> <widget class="QDialog" name="DbManagerDlgCreateConstraint">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
@ -65,7 +65,7 @@
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>
<signal>rejected()</signal> <signal>rejected()</signal>
<receiver>DlgCreateConstraint</receiver> <receiver>DbManagerDlgCreateConstraint</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>DlgCreateIndex</class> <class>DbManagerDlgCreateIndex</class>
<widget class="QDialog" name="DlgCreateIndex"> <widget class="QDialog" name="DbManagerDlgCreateIndex">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
@ -32,7 +32,11 @@
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QLineEdit" name="editName"/> <widget class="QLineEdit" name="editName">
<property name="text">
<string notr="true"/>
</property>
</widget>
</item> </item>
<item row="2" column="0" colspan="2"> <item row="2" column="0" colspan="2">
<widget class="QDialogButtonBox" name="buttonBox"> <widget class="QDialogButtonBox" name="buttonBox">
@ -56,7 +60,7 @@
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>
<signal>rejected()</signal> <signal>rejected()</signal>
<receiver>DlgCreateIndex</receiver> <receiver>DbManagerDlgCreateIndex</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>DlgCreateTable</class> <class>DbManagerDlgCreateTable</class>
<widget class="QDialog" name="DlgCreateTable"> <widget class="QDialog" name="DbManagerDlgCreateTable">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
@ -40,7 +40,11 @@
</widget> </widget>
</item> </item>
<item row="1" column="2"> <item row="1" column="2">
<widget class="QLineEdit" name="editName"/> <widget class="QLineEdit" name="editName">
<property name="text">
<string notr="true"/>
</property>
</widget>
</item> </item>
</layout> </layout>
</item> </item>
@ -126,37 +130,37 @@
<widget class="QComboBox" name="cboGeomType"> <widget class="QComboBox" name="cboGeomType">
<item> <item>
<property name="text"> <property name="text">
<string>POINT</string> <string notr="true">POINT</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>LINESTRING</string> <string notr="true">LINESTRING</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>POLYGON</string> <string notr="true">POLYGON</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>MULTIPOINT</string> <string notr="true">MULTIPOINT</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>MULTILINESTRING</string> <string notr="true">MULTILINESTRING</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>MULTIPOLYGON</string> <string notr="true">MULTIPOLYGON</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>GEOMETRYCOLLECTION</string> <string notr="true">GEOMETRYCOLLECTION</string>
</property> </property>
</item> </item>
</widget> </widget>
@ -174,7 +178,7 @@
<item row="1" column="1"> <item row="1" column="1">
<widget class="QLineEdit" name="editGeomColumn"> <widget class="QLineEdit" name="editGeomColumn">
<property name="text"> <property name="text">
<string>geom</string> <string notr="true">geom</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -224,7 +228,7 @@
<item row="3" column="1"> <item row="3" column="1">
<widget class="QLineEdit" name="editGeomSrid"> <widget class="QLineEdit" name="editGeomSrid">
<property name="text"> <property name="text">
<string>-1</string> <string notr="true">-1</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -278,7 +282,7 @@
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>
<signal>rejected()</signal> <signal>rejected()</signal>
<receiver>DlgCreateTable</receiver> <receiver>DbManagerDlgCreateTable</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>DlgExportVector</class> <class>DbManagerDlgExportVector</class>
<widget class="QDialog" name="DlgExportVector"> <widget class="QDialog" name="DbManagerDlgExportVector">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
@ -28,7 +28,11 @@
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLineEdit" name="editOutputFile"/> <widget class="QLineEdit" name="editOutputFile">
<property name="text">
<string notr="true"/>
</property>
</widget>
</item> </item>
<item row="0" column="2"> <item row="0" column="2">
<widget class="QToolButton" name="btnChooseOutputFile"> <widget class="QToolButton" name="btnChooseOutputFile">
@ -113,6 +117,9 @@
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="text">
<string notr="true"/>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -143,6 +150,9 @@
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="text">
<string notr="true"/>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
@ -203,7 +213,7 @@
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>
<signal>rejected()</signal> <signal>rejected()</signal>
<receiver>DlgExportVector</receiver> <receiver>DbManagerDlgExportVector</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
@ -283,7 +293,7 @@
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>
<signal>accepted()</signal> <signal>accepted()</signal>
<receiver>DlgExportVector</receiver> <receiver>DbManagerDlgExportVector</receiver>
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>DlgFieldProperties</class> <class>DbManagerDlgFieldProperties</class>
<widget class="QDialog" name="DlgFieldProperties"> <widget class="QDialog" name="DbManagerDlgFieldProperties">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
@ -24,7 +24,11 @@
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLineEdit" name="editName"/> <widget class="QLineEdit" name="editName">
<property name="text">
<string notr="true"/>
</property>
</widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
@ -38,6 +42,9 @@
<property name="editable"> <property name="editable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="insertPolicy">
<enum>QComboBox::NoInsert</enum>
</property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="3" column="0">
@ -50,7 +57,7 @@
<item row="3" column="1"> <item row="3" column="1">
<widget class="QCheckBox" name="chkNull"> <widget class="QCheckBox" name="chkNull">
<property name="text"> <property name="text">
<string/> <string notr="true"/>
</property> </property>
<property name="checked"> <property name="checked">
<bool>true</bool> <bool>true</bool>
@ -65,7 +72,11 @@
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="4" column="1">
<widget class="QLineEdit" name="editDefault"/> <widget class="QLineEdit" name="editDefault">
<property name="text">
<string notr="true"/>
</property>
</widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">
@ -75,7 +86,11 @@
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QLineEdit" name="editLength"/> <widget class="QLineEdit" name="editLength">
<property name="text">
<string notr="true"/>
</property>
</widget>
</item> </item>
</layout> </layout>
</item> </item>
@ -104,7 +119,7 @@
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>
<signal>rejected()</signal> <signal>rejected()</signal>
<receiver>DlgFieldProperties</receiver> <receiver>DbManagerDlgFieldProperties</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>DlgSqlWindow</class> <class>DbManagerDlgSqlWindow</class>
<widget class="QDialog" name="DlgSqlWindow"> <widget class="QDialog" name="DbManagerDlgSqlWindow">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
@ -36,6 +36,13 @@
<verstretch>1</verstretch> <verstretch>1</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="html">
<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;
p, li { white-space: pre-wrap; }
&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;-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>
</widget> </widget>
</item> </item>
<item> <item>
@ -162,6 +169,9 @@ integer values</string>
<property name="editable"> <property name="editable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="insertPolicy">
<enum>QComboBox::NoInsert</enum>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -185,6 +195,9 @@ integer values</string>
<property name="editable"> <property name="editable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="insertPolicy">
<enum>QComboBox::NoInsert</enum>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -228,7 +241,7 @@ columns</string>
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="text"> <property name="text">
<string/> <string notr="true"/>
</property> </property>
</widget> </widget>
</item> </item>

View File

@ -1,71 +1,72 @@
<ui version="4.0" > <?xml version="1.0" encoding="UTF-8"?>
<class>DlgTableProperties</class> <ui version="4.0">
<widget class="QDialog" name="DlgTableProperties" > <class>DbManagerDlgTableProperties</class>
<property name="geometry" > <widget class="QDialog" name="DbManagerDlgTableProperties">
<property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>531</width> <width>547</width>
<height>435</height> <height>435</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle">
<string>Table properties</string> <string>Table properties</string>
</property> </property>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout">
<item> <item>
<widget class="QTabWidget" name="tabs" > <widget class="QTabWidget" name="tabs">
<property name="currentIndex" > <property name="currentIndex">
<number>0</number> <number>2</number>
</property> </property>
<widget class="QWidget" name="tabColumns" > <widget class="QWidget" name="tabColumns">
<attribute name="title" > <attribute name="title">
<string>Columns</string> <string>Columns</string>
</attribute> </attribute>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout">
<item> <item>
<widget class="QLabel" name="label" > <widget class="QLabel" name="label">
<property name="text" > <property name="text">
<string>Table columns:</string> <string>Table columns:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QTreeView" name="viewFields" > <widget class="QTreeView" name="viewFields">
<property name="rootIsDecorated" > <property name="rootIsDecorated">
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<item> <item>
<widget class="QPushButton" name="btnAddColumn" > <widget class="QPushButton" name="btnAddColumn">
<property name="text" > <property name="text">
<string>Add column</string> <string>Add column</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="btnAddGeometryColumn" > <widget class="QPushButton" name="btnAddGeometryColumn">
<property name="text" > <property name="text">
<string>Add geometry column</string> <string>Add geometry column</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="btnEditColumn" > <widget class="QPushButton" name="btnEditColumn">
<property name="text" > <property name="text">
<string>Edit column</string> <string>Edit column</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -74,8 +75,8 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QPushButton" name="btnDeleteColumn" > <widget class="QPushButton" name="btnDeleteColumn">
<property name="text" > <property name="text">
<string>Delete column</string> <string>Delete column</string>
</property> </property>
</widget> </widget>
@ -84,40 +85,40 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tabConstraints" > <widget class="QWidget" name="tabConstraints">
<attribute name="title" > <attribute name="title">
<string>Constraints</string> <string>Constraints</string>
</attribute> </attribute>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout">
<item> <item>
<widget class="QLabel" name="label_3" > <widget class="QLabel" name="label_3">
<property name="text" > <property name="text">
<string>Primary, foreign keys, unique and check constraints:</string> <string>Primary, foreign keys, unique and check constraints:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QTreeView" name="viewConstraints" > <widget class="QTreeView" name="viewConstraints">
<property name="rootIsDecorated" > <property name="rootIsDecorated">
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<item> <item>
<widget class="QPushButton" name="btnAddConstraint" > <widget class="QPushButton" name="btnAddConstraint">
<property name="text" > <property name="text">
<string>Add primary key / unique</string> <string>Add primary key / unique</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -126,8 +127,8 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QPushButton" name="btnDeleteConstraint" > <widget class="QPushButton" name="btnDeleteConstraint">
<property name="text" > <property name="text">
<string>Delete constraint</string> <string>Delete constraint</string>
</property> </property>
</widget> </widget>
@ -136,47 +137,47 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tabIndexes" > <widget class="QWidget" name="tabIndexes">
<attribute name="title" > <attribute name="title">
<string>Indexes</string> <string>Indexes</string>
</attribute> </attribute>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout">
<item> <item>
<widget class="QLabel" name="label_2" > <widget class="QLabel" name="label_2">
<property name="text" > <property name="text">
<string>Indexes defined for this table:</string> <string>Indexes defined for this table:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QTreeView" name="viewIndexes" > <widget class="QTreeView" name="viewIndexes">
<property name="rootIsDecorated" > <property name="rootIsDecorated">
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<item> <item>
<widget class="QPushButton" name="btnAddIndex" > <widget class="QPushButton" name="btnAddIndex">
<property name="text" > <property name="text">
<string>Add index</string> <string>Add index</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="btnAddSpatialIndex" > <widget class="QPushButton" name="btnAddSpatialIndex">
<property name="text" > <property name="text">
<string>Add spatial index</string> <string>Add spatial index</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -185,8 +186,8 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QPushButton" name="btnDeleteIndex" > <widget class="QPushButton" name="btnDeleteIndex">
<property name="text" > <property name="text">
<string>Delete index</string> <string>Delete index</string>
</property> </property>
</widget> </widget>
@ -198,11 +199,11 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QDialogButtonBox" name="buttonBox" > <widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation" > <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="standardButtons" > <property name="standardButtons">
<set>QDialogButtonBox::Close</set> <set>QDialogButtonBox::Close</set>
</property> </property>
</widget> </widget>
@ -230,14 +231,14 @@
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>
<signal>accepted()</signal> <signal>accepted()</signal>
<receiver>DlgTableProperties</receiver> <receiver>DbManagerDlgTableProperties</receiver>
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>248</x> <x>248</x>
<y>254</y> <y>254</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>157</x> <x>157</x>
<y>274</y> <y>274</y>
</hint> </hint>
@ -246,14 +247,14 @@
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>
<signal>rejected()</signal> <signal>rejected()</signal>
<receiver>DlgTableProperties</receiver> <receiver>DbManagerDlgTableProperties</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>316</x> <x>316</x>
<y>260</y> <y>260</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>286</x> <x>286</x>
<y>274</y> <y>274</y>
</hint> </hint>