Skip to content

Commit 3da32c0

Browse files
brushtylerbrushtyler
committedDec 10, 2012
do not translate geometry types, change dbmanager translation context names (fix #6837)
·
ltr-3_40Before-merge-new_vector_api
1 parent 7a62127 commit 3da32c0

18 files changed

+182
-141
lines changed
 

‎python/plugins/db_manager/dlg_add_geometry_column.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
from .dlg_db_error import DlgDbError
3030
from .db_plugins.plugin import TableField
3131

32-
from .ui.ui_DlgAddGeometryColumn import Ui_DlgAddGeometryColumn
32+
from .ui.ui_DlgAddGeometryColumn import Ui_DbManagerDlgAddGeometryColumn as Ui_Dialog
3333

34-
class DlgAddGeometryColumn(QDialog, Ui_DlgAddGeometryColumn):
34+
class DlgAddGeometryColumn(QDialog, Ui_Dialog):
3535

3636
GEOM_TYPES = ["POINT", "LINESTRING", "POLYGON", "MULTIPOINT", "MULTILINESTRING", "MULTIPOLYGON", "GEOMETRYCOLLECTION"]
3737

‎python/plugins/db_manager/dlg_create_constraint.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,9 @@
2929
from .dlg_db_error import DlgDbError
3030
from .db_plugins.plugin import TableConstraint
3131

32-
from .ui.ui_DlgCreateConstraint import Ui_DlgCreateConstraint
33-
34-
class DlgCreateConstraint(QDialog, Ui_DlgCreateConstraint):
32+
from .ui.ui_DlgCreateConstraint import Ui_DbManagerDlgCreateConstraint as Ui_Dialog
3533

34+
class DlgCreateConstraint(QDialog, Ui_Dialog):
3635
def __init__(self, parent=None, table=None, db=None):
3736
QDialog.__init__(self, parent)
3837
self.table = table

‎python/plugins/db_manager/dlg_create_index.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,9 @@
2929
from .dlg_db_error import DlgDbError
3030
from .db_plugins.plugin import TableIndex
3131

32-
from .ui.ui_DlgCreateIndex import Ui_DlgCreateIndex
33-
34-
35-
class DlgCreateIndex(QDialog, Ui_DlgCreateIndex):
32+
from .ui.ui_DlgCreateIndex import Ui_DbManagerDlgCreateIndex as Ui_Dialog
3633

34+
class DlgCreateIndex(QDialog, Ui_Dialog):
3735
def __init__(self, parent=None, table=None, db=None):
3836
QDialog.__init__(self, parent)
3937
self.table = table

‎python/plugins/db_manager/dlg_create_table.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
from .db_plugins.plugin import DbError, ConnectionError
3030
from .dlg_db_error import DlgDbError
3131

32-
from .ui.ui_DlgCreateTable import Ui_DlgCreateTable
32+
from .ui.ui_DlgCreateTable import Ui_DbManagerDlgCreateTable as Ui_Dialog
3333

3434

3535
class TableFieldsDelegate(QItemDelegate):
@@ -79,8 +79,7 @@ def setModelData(self, editor, model, index):
7979
self.emit(SIGNAL("columnNameChanged()"))
8080

8181

82-
class DlgCreateTable(QDialog, Ui_DlgCreateTable):
83-
82+
class DlgCreateTable(QDialog, Ui_Dialog):
8483
GEOM_TYPES = ["POINT", "LINESTRING", "POLYGON", "MULTIPOINT", "MULTILINESTRING", "MULTIPOLYGON", "GEOMETRYCOLLECTION"]
8584

8685
def __init__(self, item, parent=None):

‎python/plugins/db_manager/dlg_db_error.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
from PyQt4.QtCore import *
2626
from PyQt4.QtGui import *
2727

28-
from .ui.ui_DlgDbError import Ui_DlgDbError
28+
from .ui.ui_DlgDbError import Ui_DbManagerDlgDbError as Ui_Dialog
2929
from .db_plugins.plugin import DbError
3030

31-
class DlgDbError(QDialog, Ui_DlgDbError):
31+
class DlgDbError(QDialog, Ui_Dialog):
3232
def __init__(self, e, parent=None):
3333
QDialog.__init__(self, parent)
3434
self.setupUi(self)

‎python/plugins/db_manager/dlg_export_vector.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
import qgis.core
2929
from qgis.utils import iface
3030

31-
from .ui.ui_DlgExportVector import Ui_DlgExportVector
31+
from .ui.ui_DlgExportVector import Ui_DbManagerDlgExportVector as Ui_Dialog
3232

33-
class DlgExportVector(QDialog, Ui_DlgExportVector):
33+
class DlgExportVector(QDialog, Ui_Dialog):
3434

3535
def __init__(self, inLayer, inDb, parent=None):
3636
QDialog.__init__(self, parent)

‎python/plugins/db_manager/dlg_field_properties.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,9 @@
2929

3030
from .db_plugins.plugin import TableField
3131

32-
from .ui.ui_DlgFieldProperties import Ui_DlgFieldProperties
33-
34-
class DlgFieldProperties(QDialog, Ui_DlgFieldProperties):
32+
from .ui.ui_DlgFieldProperties import Ui_DbManagerDlgFieldProperties as Ui_Dialog
3533

34+
class DlgFieldProperties(QDialog, Ui_Dialog):
3635
def __init__(self, parent=None, fld=None, table=None, db=None):
3736
QDialog.__init__(self, parent)
3837
self.fld = fld

‎python/plugins/db_manager/dlg_import_vector.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
import qgis.core
2929
from qgis.utils import iface
3030

31-
from .ui.ui_DlgImportVector import Ui_DlgImportVector
31+
from .ui.ui_DlgImportVector import Ui_DbManagerDlgImportVector as Ui_Dialog
3232

33-
class DlgImportVector(QDialog, Ui_DlgImportVector):
33+
class DlgImportVector(QDialog, ):
3434

3535
HAS_INPUT_MODE, ASK_FOR_INPUT_MODE = range(2)
3636

‎python/plugins/db_manager/dlg_sql_window.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
from .db_plugins.plugin import BaseError
2929
from .dlg_db_error import DlgDbError
3030

31-
from .ui.ui_DlgSqlWindow import Ui_DlgSqlWindow
31+
from .ui.ui_DlgSqlWindow import Ui_DbManagerDlgSqlWindow as Ui_Dialog
3232

3333
from .highlighter import SqlHighlighter
3434
from .completer import SqlCompleter
3535

36-
class DlgSqlWindow(QDialog, Ui_DlgSqlWindow):
36+
class DlgSqlWindow(QDialog, Ui_Dialog):
3737

3838
def __init__(self, iface, db, parent=None):
3939
QDialog.__init__(self, parent)

‎python/plugins/db_manager/dlg_table_properties.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,9 @@
3434
from .dlg_create_constraint import DlgCreateConstraint
3535
from .dlg_create_index import DlgCreateIndex
3636

37-
from .ui.ui_DlgTableProperties import Ui_DlgTableProperties
38-
39-
class DlgTableProperties(QDialog, Ui_DlgTableProperties):
37+
from .ui.ui_DlgTableProperties import Ui_DbManagerDlgTableProperties as Ui_Dialog
4038

39+
class DlgTableProperties(QDialog, Ui_Dialog):
4140
def __init__(self, table, parent=None):
4241
QDialog.__init__(self, parent)
4342
self.table = table

‎python/plugins/db_manager/ui/DlgAddGeometryColumn.ui

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<ui version="4.0">
3-
<class>DlgAddGeometryColumn</class>
4-
<widget class="QDialog" name="DlgAddGeometryColumn">
3+
<class>DbManagerDlgAddGeometryColumn</class>
4+
<widget class="QDialog" name="DbManagerDlgAddGeometryColumn">
55
<property name="geometry">
66
<rect>
77
<x>0</x>
@@ -11,7 +11,7 @@
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
14-
<string>Dialog</string>
14+
<string>Add geometry column</string>
1515
</property>
1616
<layout class="QGridLayout" name="gridLayout">
1717
<item row="0" column="0">
@@ -27,7 +27,7 @@
2727
<item row="0" column="1" colspan="2">
2828
<widget class="QLineEdit" name="editName">
2929
<property name="text">
30-
<string>geom</string>
30+
<string notr="true">geom</string>
3131
</property>
3232
</widget>
3333
</item>
@@ -45,37 +45,37 @@
4545
<widget class="QComboBox" name="cboType">
4646
<item>
4747
<property name="text">
48-
<string>POINT</string>
48+
<string notr="true">POINT</string>
4949
</property>
5050
</item>
5151
<item>
5252
<property name="text">
53-
<string>LINESTRING</string>
53+
<string notr="true">LINESTRING</string>
5454
</property>
5555
</item>
5656
<item>
5757
<property name="text">
58-
<string>POLYGON</string>
58+
<string notr="true">POLYGON</string>
5959
</property>
6060
</item>
6161
<item>
6262
<property name="text">
63-
<string>MULTIPOINT</string>
63+
<string notr="true">MULTIPOINT</string>
6464
</property>
6565
</item>
6666
<item>
6767
<property name="text">
68-
<string>MULTILINESTRING</string>
68+
<string notr="true">MULTILINESTRING</string>
6969
</property>
7070
</item>
7171
<item>
7272
<property name="text">
73-
<string>MULTIPOLYGON</string>
73+
<string notr="true">MULTIPOLYGON</string>
7474
</property>
7575
</item>
7676
<item>
7777
<property name="text">
78-
<string>GEOMETRYCOLLECTION</string>
78+
<string notr="true">GEOMETRYCOLLECTION</string>
7979
</property>
8080
</item>
8181
</widget>
@@ -126,7 +126,7 @@
126126
<item row="3" column="1">
127127
<widget class="QLineEdit" name="editSrid">
128128
<property name="text">
129-
<string>-1</string>
129+
<string notr="true">-1</string>
130130
</property>
131131
</widget>
132132
</item>
@@ -154,7 +154,7 @@
154154
<connection>
155155
<sender>buttonBox</sender>
156156
<signal>rejected()</signal>
157-
<receiver>DlgAddGeometryColumn</receiver>
157+
<receiver>DbManagerDlgAddGeometryColumn</receiver>
158158
<slot>reject()</slot>
159159
<hints>
160160
<hint type="sourcelabel">

‎python/plugins/db_manager/ui/DlgCreateConstraint.ui

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<ui version="4.0">
3-
<class>DlgCreateConstraint</class>
4-
<widget class="QDialog" name="DlgCreateConstraint">
3+
<class>DbManagerDlgCreateConstraint</class>
4+
<widget class="QDialog" name="DbManagerDlgCreateConstraint">
55
<property name="geometry">
66
<rect>
77
<x>0</x>
@@ -65,7 +65,7 @@
6565
<connection>
6666
<sender>buttonBox</sender>
6767
<signal>rejected()</signal>
68-
<receiver>DlgCreateConstraint</receiver>
68+
<receiver>DbManagerDlgCreateConstraint</receiver>
6969
<slot>reject()</slot>
7070
<hints>
7171
<hint type="sourcelabel">

‎python/plugins/db_manager/ui/DlgCreateIndex.ui

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<ui version="4.0">
3-
<class>DlgCreateIndex</class>
4-
<widget class="QDialog" name="DlgCreateIndex">
3+
<class>DbManagerDlgCreateIndex</class>
4+
<widget class="QDialog" name="DbManagerDlgCreateIndex">
55
<property name="geometry">
66
<rect>
77
<x>0</x>
@@ -32,7 +32,11 @@
3232
</widget>
3333
</item>
3434
<item row="1" column="1">
35-
<widget class="QLineEdit" name="editName"/>
35+
<widget class="QLineEdit" name="editName">
36+
<property name="text">
37+
<string notr="true"/>
38+
</property>
39+
</widget>
3640
</item>
3741
<item row="2" column="0" colspan="2">
3842
<widget class="QDialogButtonBox" name="buttonBox">
@@ -56,7 +60,7 @@
5660
<connection>
5761
<sender>buttonBox</sender>
5862
<signal>rejected()</signal>
59-
<receiver>DlgCreateIndex</receiver>
63+
<receiver>DbManagerDlgCreateIndex</receiver>
6064
<slot>reject()</slot>
6165
<hints>
6266
<hint type="sourcelabel">

‎python/plugins/db_manager/ui/DlgCreateTable.ui

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<ui version="4.0">
3-
<class>DlgCreateTable</class>
4-
<widget class="QDialog" name="DlgCreateTable">
3+
<class>DbManagerDlgCreateTable</class>
4+
<widget class="QDialog" name="DbManagerDlgCreateTable">
55
<property name="geometry">
66
<rect>
77
<x>0</x>
@@ -40,7 +40,11 @@
4040
</widget>
4141
</item>
4242
<item row="1" column="2">
43-
<widget class="QLineEdit" name="editName"/>
43+
<widget class="QLineEdit" name="editName">
44+
<property name="text">
45+
<string notr="true"/>
46+
</property>
47+
</widget>
4448
</item>
4549
</layout>
4650
</item>
@@ -126,37 +130,37 @@
126130
<widget class="QComboBox" name="cboGeomType">
127131
<item>
128132
<property name="text">
129-
<string>POINT</string>
133+
<string notr="true">POINT</string>
130134
</property>
131135
</item>
132136
<item>
133137
<property name="text">
134-
<string>LINESTRING</string>
138+
<string notr="true">LINESTRING</string>
135139
</property>
136140
</item>
137141
<item>
138142
<property name="text">
139-
<string>POLYGON</string>
143+
<string notr="true">POLYGON</string>
140144
</property>
141145
</item>
142146
<item>
143147
<property name="text">
144-
<string>MULTIPOINT</string>
148+
<string notr="true">MULTIPOINT</string>
145149
</property>
146150
</item>
147151
<item>
148152
<property name="text">
149-
<string>MULTILINESTRING</string>
153+
<string notr="true">MULTILINESTRING</string>
150154
</property>
151155
</item>
152156
<item>
153157
<property name="text">
154-
<string>MULTIPOLYGON</string>
158+
<string notr="true">MULTIPOLYGON</string>
155159
</property>
156160
</item>
157161
<item>
158162
<property name="text">
159-
<string>GEOMETRYCOLLECTION</string>
163+
<string notr="true">GEOMETRYCOLLECTION</string>
160164
</property>
161165
</item>
162166
</widget>
@@ -174,7 +178,7 @@
174178
<item row="1" column="1">
175179
<widget class="QLineEdit" name="editGeomColumn">
176180
<property name="text">
177-
<string>geom</string>
181+
<string notr="true">geom</string>
178182
</property>
179183
</widget>
180184
</item>
@@ -224,7 +228,7 @@
224228
<item row="3" column="1">
225229
<widget class="QLineEdit" name="editGeomSrid">
226230
<property name="text">
227-
<string>-1</string>
231+
<string notr="true">-1</string>
228232
</property>
229233
</widget>
230234
</item>
@@ -278,7 +282,7 @@
278282
<connection>
279283
<sender>buttonBox</sender>
280284
<signal>rejected()</signal>
281-
<receiver>DlgCreateTable</receiver>
285+
<receiver>DbManagerDlgCreateTable</receiver>
282286
<slot>reject()</slot>
283287
<hints>
284288
<hint type="sourcelabel">

‎python/plugins/db_manager/ui/DlgExportVector.ui

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<ui version="4.0">
3-
<class>DlgExportVector</class>
4-
<widget class="QDialog" name="DlgExportVector">
3+
<class>DbManagerDlgExportVector</class>
4+
<widget class="QDialog" name="DbManagerDlgExportVector">
55
<property name="geometry">
66
<rect>
77
<x>0</x>
@@ -28,7 +28,11 @@
2828
</widget>
2929
</item>
3030
<item row="0" column="1">
31-
<widget class="QLineEdit" name="editOutputFile"/>
31+
<widget class="QLineEdit" name="editOutputFile">
32+
<property name="text">
33+
<string notr="true"/>
34+
</property>
35+
</widget>
3236
</item>
3337
<item row="0" column="2">
3438
<widget class="QToolButton" name="btnChooseOutputFile">
@@ -113,6 +117,9 @@
113117
<property name="enabled">
114118
<bool>false</bool>
115119
</property>
120+
<property name="text">
121+
<string notr="true"/>
122+
</property>
116123
</widget>
117124
</item>
118125
<item>
@@ -143,6 +150,9 @@
143150
<property name="enabled">
144151
<bool>false</bool>
145152
</property>
153+
<property name="text">
154+
<string notr="true"/>
155+
</property>
146156
</widget>
147157
</item>
148158
</layout>
@@ -203,7 +213,7 @@
203213
<connection>
204214
<sender>buttonBox</sender>
205215
<signal>rejected()</signal>
206-
<receiver>DlgExportVector</receiver>
216+
<receiver>DbManagerDlgExportVector</receiver>
207217
<slot>reject()</slot>
208218
<hints>
209219
<hint type="sourcelabel">
@@ -283,7 +293,7 @@
283293
<connection>
284294
<sender>buttonBox</sender>
285295
<signal>accepted()</signal>
286-
<receiver>DlgExportVector</receiver>
296+
<receiver>DbManagerDlgExportVector</receiver>
287297
<slot>accept()</slot>
288298
<hints>
289299
<hint type="sourcelabel">

‎python/plugins/db_manager/ui/DlgFieldProperties.ui

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<ui version="4.0">
3-
<class>DlgFieldProperties</class>
4-
<widget class="QDialog" name="DlgFieldProperties">
3+
<class>DbManagerDlgFieldProperties</class>
4+
<widget class="QDialog" name="DbManagerDlgFieldProperties">
55
<property name="geometry">
66
<rect>
77
<x>0</x>
@@ -24,7 +24,11 @@
2424
</widget>
2525
</item>
2626
<item row="0" column="1">
27-
<widget class="QLineEdit" name="editName"/>
27+
<widget class="QLineEdit" name="editName">
28+
<property name="text">
29+
<string notr="true"/>
30+
</property>
31+
</widget>
2832
</item>
2933
<item row="1" column="0">
3034
<widget class="QLabel" name="label_2">
@@ -38,6 +42,9 @@
3842
<property name="editable">
3943
<bool>true</bool>
4044
</property>
45+
<property name="insertPolicy">
46+
<enum>QComboBox::NoInsert</enum>
47+
</property>
4148
</widget>
4249
</item>
4350
<item row="3" column="0">
@@ -50,7 +57,7 @@
5057
<item row="3" column="1">
5158
<widget class="QCheckBox" name="chkNull">
5259
<property name="text">
53-
<string/>
60+
<string notr="true"/>
5461
</property>
5562
<property name="checked">
5663
<bool>true</bool>
@@ -65,7 +72,11 @@
6572
</widget>
6673
</item>
6774
<item row="4" column="1">
68-
<widget class="QLineEdit" name="editDefault"/>
75+
<widget class="QLineEdit" name="editDefault">
76+
<property name="text">
77+
<string notr="true"/>
78+
</property>
79+
</widget>
6980
</item>
7081
<item row="2" column="0">
7182
<widget class="QLabel" name="label_5">
@@ -75,7 +86,11 @@
7586
</widget>
7687
</item>
7788
<item row="2" column="1">
78-
<widget class="QLineEdit" name="editLength"/>
89+
<widget class="QLineEdit" name="editLength">
90+
<property name="text">
91+
<string notr="true"/>
92+
</property>
93+
</widget>
7994
</item>
8095
</layout>
8196
</item>
@@ -104,7 +119,7 @@
104119
<connection>
105120
<sender>buttonBox</sender>
106121
<signal>rejected()</signal>
107-
<receiver>DlgFieldProperties</receiver>
122+
<receiver>DbManagerDlgFieldProperties</receiver>
108123
<slot>reject()</slot>
109124
<hints>
110125
<hint type="sourcelabel">

‎python/plugins/db_manager/ui/DlgSqlWindow.ui

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<ui version="4.0">
3-
<class>DlgSqlWindow</class>
4-
<widget class="QDialog" name="DlgSqlWindow">
3+
<class>DbManagerDlgSqlWindow</class>
4+
<widget class="QDialog" name="DbManagerDlgSqlWindow">
55
<property name="geometry">
66
<rect>
77
<x>0</x>
@@ -36,6 +36,13 @@
3636
<verstretch>1</verstretch>
3737
</sizepolicy>
3838
</property>
39+
<property name="html">
40+
<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;
41+
&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;
42+
p, li { white-space: pre-wrap; }
43+
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
44+
&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>
45+
</property>
3946
</widget>
4047
</item>
4148
<item>
@@ -162,6 +169,9 @@ integer values</string>
162169
<property name="editable">
163170
<bool>true</bool>
164171
</property>
172+
<property name="insertPolicy">
173+
<enum>QComboBox::NoInsert</enum>
174+
</property>
165175
</widget>
166176
</item>
167177
<item>
@@ -185,6 +195,9 @@ integer values</string>
185195
<property name="editable">
186196
<bool>true</bool>
187197
</property>
198+
<property name="insertPolicy">
199+
<enum>QComboBox::NoInsert</enum>
200+
</property>
188201
</widget>
189202
</item>
190203
<item>
@@ -228,7 +241,7 @@ columns</string>
228241
<bool>true</bool>
229242
</property>
230243
<property name="text">
231-
<string/>
244+
<string notr="true"/>
232245
</property>
233246
</widget>
234247
</item>

‎python/plugins/db_manager/ui/DlgTableProperties.ui

Lines changed: 68 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,72 @@
1-
<ui version="4.0" >
2-
<class>DlgTableProperties</class>
3-
<widget class="QDialog" name="DlgTableProperties" >
4-
<property name="geometry" >
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ui version="4.0">
3+
<class>DbManagerDlgTableProperties</class>
4+
<widget class="QDialog" name="DbManagerDlgTableProperties">
5+
<property name="geometry">
56
<rect>
67
<x>0</x>
78
<y>0</y>
8-
<width>531</width>
9+
<width>547</width>
910
<height>435</height>
1011
</rect>
1112
</property>
12-
<property name="windowTitle" >
13+
<property name="windowTitle">
1314
<string>Table properties</string>
1415
</property>
15-
<layout class="QVBoxLayout" >
16+
<layout class="QVBoxLayout">
1617
<item>
17-
<widget class="QTabWidget" name="tabs" >
18-
<property name="currentIndex" >
19-
<number>0</number>
18+
<widget class="QTabWidget" name="tabs">
19+
<property name="currentIndex">
20+
<number>2</number>
2021
</property>
21-
<widget class="QWidget" name="tabColumns" >
22-
<attribute name="title" >
22+
<widget class="QWidget" name="tabColumns">
23+
<attribute name="title">
2324
<string>Columns</string>
2425
</attribute>
25-
<layout class="QVBoxLayout" >
26+
<layout class="QVBoxLayout">
2627
<item>
27-
<widget class="QLabel" name="label" >
28-
<property name="text" >
28+
<widget class="QLabel" name="label">
29+
<property name="text">
2930
<string>Table columns:</string>
3031
</property>
3132
</widget>
3233
</item>
3334
<item>
34-
<widget class="QTreeView" name="viewFields" >
35-
<property name="rootIsDecorated" >
35+
<widget class="QTreeView" name="viewFields">
36+
<property name="rootIsDecorated">
3637
<bool>false</bool>
3738
</property>
3839
</widget>
3940
</item>
4041
<item>
41-
<layout class="QHBoxLayout" >
42+
<layout class="QHBoxLayout">
4243
<item>
43-
<widget class="QPushButton" name="btnAddColumn" >
44-
<property name="text" >
44+
<widget class="QPushButton" name="btnAddColumn">
45+
<property name="text">
4546
<string>Add column</string>
4647
</property>
4748
</widget>
4849
</item>
4950
<item>
50-
<widget class="QPushButton" name="btnAddGeometryColumn" >
51-
<property name="text" >
51+
<widget class="QPushButton" name="btnAddGeometryColumn">
52+
<property name="text">
5253
<string>Add geometry column</string>
5354
</property>
5455
</widget>
5556
</item>
5657
<item>
57-
<widget class="QPushButton" name="btnEditColumn" >
58-
<property name="text" >
58+
<widget class="QPushButton" name="btnEditColumn">
59+
<property name="text">
5960
<string>Edit column</string>
6061
</property>
6162
</widget>
6263
</item>
6364
<item>
6465
<spacer>
65-
<property name="orientation" >
66+
<property name="orientation">
6667
<enum>Qt::Horizontal</enum>
6768
</property>
68-
<property name="sizeHint" >
69+
<property name="sizeHint" stdset="0">
6970
<size>
7071
<width>40</width>
7172
<height>20</height>
@@ -74,8 +75,8 @@
7475
</spacer>
7576
</item>
7677
<item>
77-
<widget class="QPushButton" name="btnDeleteColumn" >
78-
<property name="text" >
78+
<widget class="QPushButton" name="btnDeleteColumn">
79+
<property name="text">
7980
<string>Delete column</string>
8081
</property>
8182
</widget>
@@ -84,40 +85,40 @@
8485
</item>
8586
</layout>
8687
</widget>
87-
<widget class="QWidget" name="tabConstraints" >
88-
<attribute name="title" >
88+
<widget class="QWidget" name="tabConstraints">
89+
<attribute name="title">
8990
<string>Constraints</string>
9091
</attribute>
91-
<layout class="QVBoxLayout" >
92+
<layout class="QVBoxLayout">
9293
<item>
93-
<widget class="QLabel" name="label_3" >
94-
<property name="text" >
94+
<widget class="QLabel" name="label_3">
95+
<property name="text">
9596
<string>Primary, foreign keys, unique and check constraints:</string>
9697
</property>
9798
</widget>
9899
</item>
99100
<item>
100-
<widget class="QTreeView" name="viewConstraints" >
101-
<property name="rootIsDecorated" >
101+
<widget class="QTreeView" name="viewConstraints">
102+
<property name="rootIsDecorated">
102103
<bool>false</bool>
103104
</property>
104105
</widget>
105106
</item>
106107
<item>
107-
<layout class="QHBoxLayout" >
108+
<layout class="QHBoxLayout">
108109
<item>
109-
<widget class="QPushButton" name="btnAddConstraint" >
110-
<property name="text" >
110+
<widget class="QPushButton" name="btnAddConstraint">
111+
<property name="text">
111112
<string>Add primary key / unique</string>
112113
</property>
113114
</widget>
114115
</item>
115116
<item>
116117
<spacer>
117-
<property name="orientation" >
118+
<property name="orientation">
118119
<enum>Qt::Horizontal</enum>
119120
</property>
120-
<property name="sizeHint" >
121+
<property name="sizeHint" stdset="0">
121122
<size>
122123
<width>40</width>
123124
<height>20</height>
@@ -126,8 +127,8 @@
126127
</spacer>
127128
</item>
128129
<item>
129-
<widget class="QPushButton" name="btnDeleteConstraint" >
130-
<property name="text" >
130+
<widget class="QPushButton" name="btnDeleteConstraint">
131+
<property name="text">
131132
<string>Delete constraint</string>
132133
</property>
133134
</widget>
@@ -136,47 +137,47 @@
136137
</item>
137138
</layout>
138139
</widget>
139-
<widget class="QWidget" name="tabIndexes" >
140-
<attribute name="title" >
140+
<widget class="QWidget" name="tabIndexes">
141+
<attribute name="title">
141142
<string>Indexes</string>
142143
</attribute>
143-
<layout class="QVBoxLayout" >
144+
<layout class="QVBoxLayout">
144145
<item>
145-
<widget class="QLabel" name="label_2" >
146-
<property name="text" >
146+
<widget class="QLabel" name="label_2">
147+
<property name="text">
147148
<string>Indexes defined for this table:</string>
148149
</property>
149150
</widget>
150151
</item>
151152
<item>
152-
<widget class="QTreeView" name="viewIndexes" >
153-
<property name="rootIsDecorated" >
153+
<widget class="QTreeView" name="viewIndexes">
154+
<property name="rootIsDecorated">
154155
<bool>false</bool>
155156
</property>
156157
</widget>
157158
</item>
158159
<item>
159-
<layout class="QHBoxLayout" >
160+
<layout class="QHBoxLayout">
160161
<item>
161-
<widget class="QPushButton" name="btnAddIndex" >
162-
<property name="text" >
162+
<widget class="QPushButton" name="btnAddIndex">
163+
<property name="text">
163164
<string>Add index</string>
164165
</property>
165166
</widget>
166167
</item>
167168
<item>
168-
<widget class="QPushButton" name="btnAddSpatialIndex" >
169-
<property name="text" >
169+
<widget class="QPushButton" name="btnAddSpatialIndex">
170+
<property name="text">
170171
<string>Add spatial index</string>
171172
</property>
172173
</widget>
173174
</item>
174175
<item>
175176
<spacer>
176-
<property name="orientation" >
177+
<property name="orientation">
177178
<enum>Qt::Horizontal</enum>
178179
</property>
179-
<property name="sizeHint" >
180+
<property name="sizeHint" stdset="0">
180181
<size>
181182
<width>40</width>
182183
<height>20</height>
@@ -185,8 +186,8 @@
185186
</spacer>
186187
</item>
187188
<item>
188-
<widget class="QPushButton" name="btnDeleteIndex" >
189-
<property name="text" >
189+
<widget class="QPushButton" name="btnDeleteIndex">
190+
<property name="text">
190191
<string>Delete index</string>
191192
</property>
192193
</widget>
@@ -198,11 +199,11 @@
198199
</widget>
199200
</item>
200201
<item>
201-
<widget class="QDialogButtonBox" name="buttonBox" >
202-
<property name="orientation" >
202+
<widget class="QDialogButtonBox" name="buttonBox">
203+
<property name="orientation">
203204
<enum>Qt::Horizontal</enum>
204205
</property>
205-
<property name="standardButtons" >
206+
<property name="standardButtons">
206207
<set>QDialogButtonBox::Close</set>
207208
</property>
208209
</widget>
@@ -230,14 +231,14 @@
230231
<connection>
231232
<sender>buttonBox</sender>
232233
<signal>accepted()</signal>
233-
<receiver>DlgTableProperties</receiver>
234+
<receiver>DbManagerDlgTableProperties</receiver>
234235
<slot>accept()</slot>
235236
<hints>
236-
<hint type="sourcelabel" >
237+
<hint type="sourcelabel">
237238
<x>248</x>
238239
<y>254</y>
239240
</hint>
240-
<hint type="destinationlabel" >
241+
<hint type="destinationlabel">
241242
<x>157</x>
242243
<y>274</y>
243244
</hint>
@@ -246,14 +247,14 @@
246247
<connection>
247248
<sender>buttonBox</sender>
248249
<signal>rejected()</signal>
249-
<receiver>DlgTableProperties</receiver>
250+
<receiver>DbManagerDlgTableProperties</receiver>
250251
<slot>reject()</slot>
251252
<hints>
252-
<hint type="sourcelabel" >
253+
<hint type="sourcelabel">
253254
<x>316</x>
254255
<y>260</y>
255256
</hint>
256-
<hint type="destinationlabel" >
257+
<hint type="destinationlabel">
257258
<x>286</x>
258259
<y>274</y>
259260
</hint>

0 commit comments

Comments
 (0)
Please sign in to comment.