Skip to content

Commit dbbbdbd

Browse files
slarosaslarosa
authoredAug 5, 2018
Merge pull request #7534 from slarosa/backport_3_2
[dbmanager] Fixes #19528: cannot resize query area
·
final-3_2_3final-3_2_2
2 parents f6692cb + 5e50676 commit dbbbdbd

File tree

1 file changed

+215
-204
lines changed

1 file changed

+215
-204
lines changed
 

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

Lines changed: 215 additions & 204 deletions
Original file line numberDiff line numberDiff line change
@@ -21,223 +21,234 @@
2121
</property>
2222
<layout class="QGridLayout" name="gridLayout_4">
2323
<item row="0" column="0">
24-
<layout class="QHBoxLayout" name="horizontalLayout">
25-
<item>
26-
<widget class="QToolButton" name="queryBuilderBtn">
27-
<property name="text">
28-
<string/>
29-
</property>
30-
</widget>
31-
</item>
32-
<item>
33-
<spacer name="horizontalSpacer">
34-
<property name="orientation">
35-
<enum>Qt::Horizontal</enum>
36-
</property>
37-
<property name="sizeHint" stdset="0">
38-
<size>
39-
<width>40</width>
40-
<height>20</height>
41-
</size>
42-
</property>
43-
</spacer>
44-
</item>
45-
<item>
46-
<widget class="QLabel" name="label">
47-
<property name="text">
48-
<string>Saved query</string>
49-
</property>
50-
</widget>
51-
</item>
52-
<item>
53-
<widget class="QComboBox" name="presetCombo">
54-
<property name="sizePolicy">
55-
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
56-
<horstretch>1</horstretch>
57-
<verstretch>0</verstretch>
58-
</sizepolicy>
59-
</property>
60-
</widget>
61-
</item>
62-
<item>
63-
<widget class="QLabel" name="label_2">
64-
<property name="text">
65-
<string>Name</string>
66-
</property>
67-
</widget>
68-
</item>
69-
<item>
70-
<widget class="QLineEdit" name="presetName">
71-
<property name="sizePolicy">
72-
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
73-
<horstretch>1</horstretch>
74-
<verstretch>0</verstretch>
75-
</sizepolicy>
76-
</property>
77-
<property name="text">
78-
<string notr="true"/>
79-
</property>
80-
</widget>
81-
</item>
82-
<item>
83-
<widget class="QPushButton" name="presetStore">
84-
<property name="text">
85-
<string>Save</string>
86-
</property>
87-
</widget>
88-
</item>
89-
<item>
90-
<widget class="QPushButton" name="presetDelete">
91-
<property name="text">
92-
<string>Delete</string>
93-
</property>
94-
</widget>
95-
</item>
96-
</layout>
97-
</item>
98-
<item row="1" column="0">
99-
<widget class="QSplitter" name="splitterHistory">
24+
<widget class="QSplitter" name="splitter">
10025
<property name="orientation">
101-
<enum>Qt::Horizontal</enum>
26+
<enum>Qt::Vertical</enum>
10227
</property>
103-
<property name="handleWidth">
104-
<number>2</number>
105-
</property>
106-
<widget class="QgsCodeEditorSQL" name="editSql"/>
107-
<widget class="QWidget" name="queryHistoryWidget" native="true">
108-
<layout class="QGridLayout" name="gridLayout_2">
109-
<property name="leftMargin">
110-
<number>0</number>
111-
</property>
112-
<property name="topMargin">
113-
<number>0</number>
114-
</property>
115-
<property name="rightMargin">
116-
<number>0</number>
117-
</property>
118-
<property name="bottomMargin">
119-
<number>0</number>
120-
</property>
121-
<item row="0" column="0">
122-
<widget class="QTableWidget" name="queryHistoryTableWidget">
123-
<property name="editTriggers">
124-
<set>QAbstractItemView::NoEditTriggers</set>
28+
<widget class="QWidget" name="">
29+
<layout class="QVBoxLayout" name="verticalLayout_2">
30+
<item>
31+
<layout class="QHBoxLayout" name="horizontalLayout">
32+
<item>
33+
<widget class="QToolButton" name="queryBuilderBtn">
34+
<property name="text">
35+
<string/>
36+
</property>
37+
</widget>
38+
</item>
39+
<item>
40+
<spacer name="horizontalSpacer">
41+
<property name="orientation">
42+
<enum>Qt::Horizontal</enum>
43+
</property>
44+
<property name="sizeHint" stdset="0">
45+
<size>
46+
<width>40</width>
47+
<height>20</height>
48+
</size>
49+
</property>
50+
</spacer>
51+
</item>
52+
<item>
53+
<widget class="QLabel" name="label">
54+
<property name="text">
55+
<string>Saved query</string>
56+
</property>
57+
</widget>
58+
</item>
59+
<item>
60+
<widget class="QComboBox" name="presetCombo">
61+
<property name="sizePolicy">
62+
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
63+
<horstretch>1</horstretch>
64+
<verstretch>0</verstretch>
65+
</sizepolicy>
66+
</property>
67+
</widget>
68+
</item>
69+
<item>
70+
<widget class="QLabel" name="label_2">
71+
<property name="text">
72+
<string>Name</string>
73+
</property>
74+
</widget>
75+
</item>
76+
<item>
77+
<widget class="QLineEdit" name="presetName">
78+
<property name="sizePolicy">
79+
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
80+
<horstretch>1</horstretch>
81+
<verstretch>0</verstretch>
82+
</sizepolicy>
83+
</property>
84+
<property name="text">
85+
<string notr="true"/>
86+
</property>
87+
</widget>
88+
</item>
89+
<item>
90+
<widget class="QPushButton" name="presetStore">
91+
<property name="text">
92+
<string>Save</string>
93+
</property>
94+
</widget>
95+
</item>
96+
<item>
97+
<widget class="QPushButton" name="presetDelete">
98+
<property name="text">
99+
<string>Delete</string>
100+
</property>
101+
</widget>
102+
</item>
103+
</layout>
104+
</item>
105+
<item>
106+
<widget class="QSplitter" name="splitterHistory">
107+
<property name="orientation">
108+
<enum>Qt::Horizontal</enum>
125109
</property>
126-
<property name="alternatingRowColors">
127-
<bool>true</bool>
110+
<property name="handleWidth">
111+
<number>2</number>
128112
</property>
129-
<property name="selectionMode">
130-
<enum>QAbstractItemView::SingleSelection</enum>
113+
<widget class="QgsCodeEditorSQL" name="editSql"/>
114+
<widget class="QWidget" name="queryHistoryWidget" native="true">
115+
<layout class="QGridLayout" name="gridLayout_2">
116+
<property name="leftMargin">
117+
<number>0</number>
118+
</property>
119+
<property name="topMargin">
120+
<number>0</number>
121+
</property>
122+
<property name="rightMargin">
123+
<number>0</number>
124+
</property>
125+
<property name="bottomMargin">
126+
<number>0</number>
127+
</property>
128+
<item row="0" column="0">
129+
<widget class="QTableWidget" name="queryHistoryTableWidget">
130+
<property name="editTriggers">
131+
<set>QAbstractItemView::NoEditTriggers</set>
132+
</property>
133+
<property name="alternatingRowColors">
134+
<bool>true</bool>
135+
</property>
136+
<property name="selectionMode">
137+
<enum>QAbstractItemView::SingleSelection</enum>
138+
</property>
139+
<property name="selectionBehavior">
140+
<enum>QAbstractItemView::SelectRows</enum>
141+
</property>
142+
<attribute name="horizontalHeaderStretchLastSection">
143+
<bool>true</bool>
144+
</attribute>
145+
<column>
146+
<property name="text">
147+
<string>Query</string>
148+
</property>
149+
</column>
150+
<column>
151+
<property name="text">
152+
<string>Rows affected</string>
153+
</property>
154+
</column>
155+
<column>
156+
<property name="text">
157+
<string>Duration (secs)</string>
158+
</property>
159+
</column>
160+
</widget>
161+
</item>
162+
</layout>
163+
</widget>
164+
</widget>
165+
</item>
166+
<item>
167+
<layout class="QHBoxLayout" name="buttonLayout">
168+
<item>
169+
<widget class="QPushButton" name="btnExecute">
170+
<property name="toolTip">
171+
<string>Execute query (Ctrl+R)</string>
172+
</property>
173+
<property name="text">
174+
<string>Execute</string>
175+
</property>
176+
<property name="shortcut">
177+
<string>Ctrl+R</string>
178+
</property>
179+
</widget>
180+
</item>
181+
<item>
182+
<widget class="QLabel" name="lblResult">
183+
<property name="text">
184+
<string/>
185+
</property>
186+
</widget>
187+
</item>
188+
<item>
189+
<widget class="QPushButton" name="btnCreateView">
190+
<property name="text">
191+
<string>Create a view</string>
192+
</property>
193+
</widget>
194+
</item>
195+
<item>
196+
<widget class="QPushButton" name="btnClear">
197+
<property name="text">
198+
<string>&amp;Clear</string>
199+
</property>
200+
</widget>
201+
</item>
202+
<item>
203+
<spacer>
204+
<property name="orientation">
205+
<enum>Qt::Horizontal</enum>
206+
</property>
207+
<property name="sizeHint" stdset="0">
208+
<size>
209+
<width>40</width>
210+
<height>20</height>
211+
</size>
212+
</property>
213+
</spacer>
214+
</item>
215+
<item>
216+
<widget class="QPushButton" name="btnQueryHistory">
217+
<property name="text">
218+
<string>Query History</string>
219+
</property>
220+
<property name="checkable">
221+
<bool>true</bool>
222+
</property>
223+
</widget>
224+
</item>
225+
</layout>
226+
</item>
227+
</layout>
228+
</widget>
229+
<widget class="QWidget" name="">
230+
<layout class="QVBoxLayout" name="verticalLayout">
231+
<item>
232+
<widget class="QTableView" name="viewResult">
233+
<property name="sizePolicy">
234+
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
235+
<horstretch>0</horstretch>
236+
<verstretch>3</verstretch>
237+
</sizepolicy>
131238
</property>
132239
<property name="selectionBehavior">
133240
<enum>QAbstractItemView::SelectRows</enum>
134241
</property>
135-
<attribute name="horizontalHeaderStretchLastSection">
136-
<bool>true</bool>
137-
</attribute>
138-
<column>
139-
<property name="text">
140-
<string>Query</string>
141-
</property>
142-
</column>
143-
<column>
144-
<property name="text">
145-
<string>Rows affected</string>
146-
</property>
147-
</column>
148-
<column>
149-
<property name="text">
150-
<string>Duration (secs)</string>
151-
</property>
152-
</column>
242+
<property name="horizontalScrollMode">
243+
<enum>QAbstractItemView::ScrollPerPixel</enum>
244+
</property>
153245
</widget>
154246
</item>
155247
</layout>
156248
</widget>
157249
</widget>
158250
</item>
159-
<item row="2" column="0">
160-
<layout class="QHBoxLayout">
161-
<item>
162-
<widget class="QPushButton" name="btnExecute">
163-
<property name="toolTip">
164-
<string>Execute query (Ctrl+R)</string>
165-
</property>
166-
<property name="text">
167-
<string>Execute</string>
168-
</property>
169-
<property name="shortcut">
170-
<string>Ctrl+R</string>
171-
</property>
172-
</widget>
173-
</item>
174-
<item>
175-
<widget class="QLabel" name="lblResult">
176-
<property name="text">
177-
<string/>
178-
</property>
179-
</widget>
180-
</item>
181-
<item>
182-
<widget class="QPushButton" name="btnCreateView">
183-
<property name="text">
184-
<string>Create a view</string>
185-
</property>
186-
</widget>
187-
</item>
188-
<item>
189-
<widget class="QPushButton" name="btnClear">
190-
<property name="text">
191-
<string>&amp;Clear</string>
192-
</property>
193-
</widget>
194-
</item>
195-
<item>
196-
<spacer>
197-
<property name="orientation">
198-
<enum>Qt::Horizontal</enum>
199-
</property>
200-
<property name="sizeHint" stdset="0">
201-
<size>
202-
<width>40</width>
203-
<height>20</height>
204-
</size>
205-
</property>
206-
</spacer>
207-
</item>
208-
<item>
209-
<widget class="QPushButton" name="btnQueryHistory">
210-
<property name="text">
211-
<string>Query History</string>
212-
</property>
213-
<property name="checkable">
214-
<bool>true</bool>
215-
</property>
216-
</widget>
217-
</item>
218-
</layout>
219-
</item>
220-
<item row="3" column="0">
221-
<layout class="QVBoxLayout" name="verticalLayout">
222-
<item>
223-
<widget class="QTableView" name="viewResult">
224-
<property name="sizePolicy">
225-
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
226-
<horstretch>0</horstretch>
227-
<verstretch>3</verstretch>
228-
</sizepolicy>
229-
</property>
230-
<property name="selectionBehavior">
231-
<enum>QAbstractItemView::SelectRows</enum>
232-
</property>
233-
<property name="horizontalScrollMode">
234-
<enum>QAbstractItemView::ScrollPerPixel</enum>
235-
</property>
236-
</widget>
237-
</item>
238-
</layout>
239-
</item>
240-
<item row="4" column="0">
251+
<item row="1" column="0">
241252
<widget class="QGroupBox" name="loadAsLayerGroup">
242253
<property name="sizePolicy">
243254
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -450,7 +461,7 @@ unique values</string>
450461
</layout>
451462
</widget>
452463
</item>
453-
<item row="5" column="0">
464+
<item row="2" column="0">
454465
<layout class="QHBoxLayout" name="horizontalLayout_4">
455466
<property name="bottomMargin">
456467
<number>0</number>

0 commit comments

Comments
 (0)
Please sign in to comment.