Skip to content

Commit 0660dcf

Browse files
slarosaslarosa
committedOct 28, 2012
Remove the about tab in settings dialog for console
·
ltr-3_40Before-merge-new_vector_api
1 parent 50f3352 commit 0660dcf

File tree

2 files changed

+209
-229
lines changed

2 files changed

+209
-229
lines changed
 

‎python/console_settings.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ def __init__(self, parent):
4040
self.fontConfig()
4141

4242
self.lineEdit.setReadOnly(True)
43-
self.tabWidget.setTabText(0, QCoreApplication.translate("PythonConsole", "General"))
44-
self.tabWidget.setTabIcon(0, QIcon(":/images/themes/default/propertyicons/general.png"))
45-
self.tabWidget.setTabText(1, QCoreApplication.translate("PythonConsole", "About"))
46-
self.tabWidget.setTabIcon(1, QIcon(":/images/console/iconAboutConsole.png"))
4743

4844
self.addAPIpath.setIcon(QIcon(":/images/themes/default/symbologyAdd.png"))
4945
self.addAPIpath.setToolTip(QCoreApplication.translate("PythonConsole", "Add API path"))

‎python/console_settings.ui

Lines changed: 209 additions & 225 deletions
Original file line numberDiff line numberDiff line change
@@ -9,255 +9,239 @@
99
<rect>
1010
<x>0</x>
1111
<y>0</y>
12-
<width>472</width>
13-
<height>388</height>
12+
<width>411</width>
13+
<height>352</height>
1414
</rect>
1515
</property>
1616
<property name="modal">
1717
<bool>true</bool>
1818
</property>
19-
<layout class="QGridLayout" name="gridLayout">
19+
<layout class="QGridLayout" name="gridLayout_2">
20+
<item row="0" column="0">
21+
<layout class="QHBoxLayout" name="horizontalLayout">
22+
<item>
23+
<widget class="QLabel" name="label">
24+
<property name="text">
25+
<string>Font</string>
26+
</property>
27+
</widget>
28+
</item>
29+
<item>
30+
<widget class="QFontComboBox" name="fontComboBox">
31+
<property name="sizePolicy">
32+
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
33+
<horstretch>0</horstretch>
34+
<verstretch>0</verstretch>
35+
</sizepolicy>
36+
</property>
37+
<property name="insertPolicy">
38+
<enum>QComboBox::NoInsert</enum>
39+
</property>
40+
</widget>
41+
</item>
42+
<item>
43+
<widget class="QLabel" name="label_3">
44+
<property name="text">
45+
<string>Size</string>
46+
</property>
47+
</widget>
48+
</item>
49+
<item>
50+
<widget class="QSpinBox" name="spinBox">
51+
<property name="minimumSize">
52+
<size>
53+
<width>51</width>
54+
<height>26</height>
55+
</size>
56+
</property>
57+
<property name="maximumSize">
58+
<size>
59+
<width>51</width>
60+
<height>26</height>
61+
</size>
62+
</property>
63+
<property name="minimum">
64+
<number>6</number>
65+
</property>
66+
<property name="maximum">
67+
<number>15</number>
68+
</property>
69+
<property name="value">
70+
<number>10</number>
71+
</property>
72+
</widget>
73+
</item>
74+
</layout>
75+
</item>
2076
<item row="1" column="0">
21-
<widget class="QDialogButtonBox" name="buttonBox">
77+
<spacer name="verticalSpacer_2">
2278
<property name="orientation">
23-
<enum>Qt::Horizontal</enum>
79+
<enum>Qt::Vertical</enum>
2480
</property>
25-
<property name="standardButtons">
26-
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
81+
<property name="sizeHint" stdset="0">
82+
<size>
83+
<width>20</width>
84+
<height>40</height>
85+
</size>
2786
</property>
28-
</widget>
87+
</spacer>
2988
</item>
30-
<item row="0" column="0">
31-
<widget class="QTabWidget" name="tabWidget">
32-
<property name="focusPolicy">
33-
<enum>Qt::NoFocus</enum>
89+
<item row="2" column="0">
90+
<layout class="QHBoxLayout" name="horizontalLayout_2">
91+
<item>
92+
<widget class="QLabel" name="label_2">
93+
<property name="text">
94+
<string>API file</string>
95+
</property>
96+
</widget>
97+
</item>
98+
<item>
99+
<widget class="QLineEdit" name="lineEdit"/>
100+
</item>
101+
<item>
102+
<widget class="QPushButton" name="browseButton">
103+
<property name="text">
104+
<string>Browse</string>
105+
</property>
106+
</widget>
107+
</item>
108+
</layout>
109+
</item>
110+
<item row="3" column="0">
111+
<widget class="QCheckBox" name="preloadAPI">
112+
<property name="text">
113+
<string>Use preloaded API file</string>
34114
</property>
35-
<property name="currentIndex">
36-
<number>0</number>
115+
<property name="checked">
116+
<bool>true</bool>
37117
</property>
38-
<widget class="QWidget" name="tabGeneral">
39-
<attribute name="title">
40-
<string>Tab 1</string>
41-
</attribute>
42-
<layout class="QGridLayout" name="gridLayout_5">
43-
<item row="1" column="0">
44-
<widget class="QCheckBox" name="preloadAPI">
45-
<property name="text">
46-
<string>Use preloaded API file</string>
118+
</widget>
119+
</item>
120+
<item row="4" column="0">
121+
<layout class="QGridLayout" name="gridLayout">
122+
<item row="0" column="0">
123+
<widget class="QTableWidget" name="tableWidget">
124+
<property name="editTriggers">
125+
<set>QAbstractItemView::NoEditTriggers</set>
126+
</property>
127+
<property name="tabKeyNavigation">
128+
<bool>false</bool>
129+
</property>
130+
<property name="showDropIndicator" stdset="0">
131+
<bool>false</bool>
132+
</property>
133+
<property name="dragDropOverwriteMode">
134+
<bool>false</bool>
135+
</property>
136+
<property name="selectionMode">
137+
<enum>QAbstractItemView::ExtendedSelection</enum>
138+
</property>
139+
<property name="selectionBehavior">
140+
<enum>QAbstractItemView::SelectItems</enum>
141+
</property>
142+
<property name="verticalScrollMode">
143+
<enum>QAbstractItemView::ScrollPerItem</enum>
144+
</property>
145+
<property name="horizontalScrollMode">
146+
<enum>QAbstractItemView::ScrollPerPixel</enum>
147+
</property>
148+
<property name="rowCount">
149+
<number>0</number>
150+
</property>
151+
<attribute name="horizontalHeaderVisible">
152+
<bool>true</bool>
153+
</attribute>
154+
<attribute name="verticalHeaderVisible">
155+
<bool>false</bool>
156+
</attribute>
157+
</widget>
158+
</item>
159+
<item row="0" column="1">
160+
<layout class="QVBoxLayout" name="verticalLayout">
161+
<item>
162+
<widget class="QPushButton" name="addAPIpath">
163+
<property name="sizePolicy">
164+
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
165+
<horstretch>0</horstretch>
166+
<verstretch>0</verstretch>
167+
</sizepolicy>
47168
</property>
48-
<property name="checked">
49-
<bool>true</bool>
169+
<property name="minimumSize">
170+
<size>
171+
<width>32</width>
172+
<height>32</height>
173+
</size>
174+
</property>
175+
<property name="maximumSize">
176+
<size>
177+
<width>32</width>
178+
<height>32</height>
179+
</size>
180+
</property>
181+
<property name="text">
182+
<string/>
50183
</property>
51184
</widget>
52185
</item>
53-
<item row="0" column="0">
54-
<layout class="QGridLayout" name="gridLayout_4">
55-
<item row="0" column="3">
56-
<widget class="QSpinBox" name="spinBox">
57-
<property name="minimumSize">
58-
<size>
59-
<width>51</width>
60-
<height>26</height>
61-
</size>
62-
</property>
63-
<property name="maximumSize">
64-
<size>
65-
<width>51</width>
66-
<height>26</height>
67-
</size>
68-
</property>
69-
<property name="minimum">
70-
<number>6</number>
71-
</property>
72-
<property name="maximum">
73-
<number>15</number>
74-
</property>
75-
<property name="value">
76-
<number>10</number>
77-
</property>
78-
</widget>
79-
</item>
80-
<item row="0" column="0">
81-
<widget class="QLabel" name="label">
82-
<property name="text">
83-
<string>Font</string>
84-
</property>
85-
</widget>
86-
</item>
87-
<item row="0" column="1">
88-
<widget class="QFontComboBox" name="fontComboBox">
89-
<property name="sizePolicy">
90-
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
91-
<horstretch>0</horstretch>
92-
<verstretch>0</verstretch>
93-
</sizepolicy>
94-
</property>
95-
<property name="insertPolicy">
96-
<enum>QComboBox::NoInsert</enum>
97-
</property>
98-
</widget>
99-
</item>
100-
<item row="0" column="2">
101-
<widget class="QLabel" name="label_3">
102-
<property name="text">
103-
<string>Size</string>
104-
</property>
105-
</widget>
106-
</item>
107-
</layout>
108-
</item>
109-
<item row="3" column="0">
110-
<layout class="QGridLayout" name="gridLayout_3">
111-
<item row="0" column="1">
112-
<layout class="QGridLayout" name="gridLayout_2">
113-
<item row="0" column="0">
114-
<widget class="QPushButton" name="addAPIpath">
115-
<property name="sizePolicy">
116-
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
117-
<horstretch>0</horstretch>
118-
<verstretch>0</verstretch>
119-
</sizepolicy>
120-
</property>
121-
<property name="minimumSize">
122-
<size>
123-
<width>32</width>
124-
<height>32</height>
125-
</size>
126-
</property>
127-
<property name="maximumSize">
128-
<size>
129-
<width>32</width>
130-
<height>32</height>
131-
</size>
132-
</property>
133-
<property name="text">
134-
<string/>
135-
</property>
136-
</widget>
137-
</item>
138-
<item row="1" column="0">
139-
<widget class="QPushButton" name="removeAPIpath">
140-
<property name="minimumSize">
141-
<size>
142-
<width>32</width>
143-
<height>32</height>
144-
</size>
145-
</property>
146-
<property name="maximumSize">
147-
<size>
148-
<width>32</width>
149-
<height>32</height>
150-
</size>
151-
</property>
152-
<property name="text">
153-
<string/>
154-
</property>
155-
</widget>
156-
</item>
157-
</layout>
158-
</item>
159-
<item row="1" column="1">
160-
<spacer name="verticalSpacer_2">
161-
<property name="orientation">
162-
<enum>Qt::Vertical</enum>
163-
</property>
164-
<property name="sizeHint" stdset="0">
165-
<size>
166-
<width>20</width>
167-
<height>40</height>
168-
</size>
169-
</property>
170-
</spacer>
171-
</item>
172-
<item row="0" column="0" rowspan="2">
173-
<widget class="QTableWidget" name="tableWidget">
174-
<property name="editTriggers">
175-
<set>QAbstractItemView::NoEditTriggers</set>
176-
</property>
177-
<property name="tabKeyNavigation">
178-
<bool>false</bool>
179-
</property>
180-
<property name="showDropIndicator" stdset="0">
181-
<bool>false</bool>
182-
</property>
183-
<property name="dragDropOverwriteMode">
184-
<bool>false</bool>
185-
</property>
186-
<property name="selectionMode">
187-
<enum>QAbstractItemView::ExtendedSelection</enum>
188-
</property>
189-
<property name="selectionBehavior">
190-
<enum>QAbstractItemView::SelectItems</enum>
191-
</property>
192-
<property name="verticalScrollMode">
193-
<enum>QAbstractItemView::ScrollPerItem</enum>
194-
</property>
195-
<property name="horizontalScrollMode">
196-
<enum>QAbstractItemView::ScrollPerPixel</enum>
197-
</property>
198-
<property name="rowCount">
199-
<number>0</number>
200-
</property>
201-
<attribute name="horizontalHeaderVisible">
202-
<bool>true</bool>
203-
</attribute>
204-
<attribute name="verticalHeaderVisible">
205-
<bool>false</bool>
206-
</attribute>
207-
</widget>
208-
</item>
209-
</layout>
210-
</item>
211-
<item row="2" column="0">
212-
<layout class="QHBoxLayout" name="horizontalLayout_2">
213-
<item>
214-
<widget class="QLabel" name="label_2">
215-
<property name="text">
216-
<string>API file</string>
217-
</property>
218-
</widget>
219-
</item>
220-
<item>
221-
<widget class="QLineEdit" name="lineEdit"/>
222-
</item>
223-
<item>
224-
<widget class="QPushButton" name="browseButton">
225-
<property name="text">
226-
<string>Browse</string>
227-
</property>
228-
</widget>
229-
</item>
230-
</layout>
231-
</item>
232-
</layout>
233-
</widget>
234-
<widget class="QWidget" name="tabAbout">
235-
<attribute name="title">
236-
<string>Tab 2</string>
237-
</attribute>
238-
<layout class="QGridLayout" name="gridLayout_6">
239-
<item row="0" column="0">
240-
<widget class="QTextEdit" name="textEdit">
241-
<property name="readOnly">
242-
<bool>true</bool>
186+
<item>
187+
<widget class="QPushButton" name="removeAPIpath">
188+
<property name="minimumSize">
189+
<size>
190+
<width>32</width>
191+
<height>32</height>
192+
</size>
193+
</property>
194+
<property name="maximumSize">
195+
<size>
196+
<width>32</width>
197+
<height>32</height>
198+
</size>
243199
</property>
244-
<property name="html">
245-
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
246-
&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;
247-
p, li { white-space: pre-wrap; }
248-
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Aurulent Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
249-
&lt;p align=&quot;center&quot; 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-size:14pt; font-weight:600;&quot;&gt;Python Console for QGIS&lt;/span&gt;&lt;/p&gt;
250-
&lt;p align=&quot;center&quot; 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-size:10pt;&quot;&gt;Developed by Salvatore Larosa&lt;/span&gt;&lt;/p&gt;
251-
&lt;p align=&quot;center&quot; 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-size:10pt;&quot;&gt;---------------------------&lt;/span&gt;&lt;/p&gt;
252-
&lt;p align=&quot;center&quot; 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-size:10pt;&quot;&gt;This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
200+
<property name="text">
201+
<string/>
253202
</property>
254203
</widget>
255204
</item>
205+
<item>
206+
<spacer name="verticalSpacer">
207+
<property name="orientation">
208+
<enum>Qt::Vertical</enum>
209+
</property>
210+
<property name="sizeHint" stdset="0">
211+
<size>
212+
<width>20</width>
213+
<height>40</height>
214+
</size>
215+
</property>
216+
</spacer>
217+
</item>
256218
</layout>
257-
</widget>
219+
</item>
220+
</layout>
221+
</item>
222+
<item row="5" column="0">
223+
<widget class="QDialogButtonBox" name="buttonBox">
224+
<property name="orientation">
225+
<enum>Qt::Horizontal</enum>
226+
</property>
227+
<property name="standardButtons">
228+
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
229+
</property>
258230
</widget>
259231
</item>
260232
</layout>
233+
<zorder>buttonBox</zorder>
234+
<zorder>layoutWidget</zorder>
235+
<zorder>layoutWidget_2</zorder>
236+
<zorder>layoutWidget_3</zorder>
237+
<zorder>label</zorder>
238+
<zorder>fontComboBox</zorder>
239+
<zorder>label_3</zorder>
240+
<zorder>fontComboBox</zorder>
241+
<zorder>label</zorder>
242+
<zorder>label_3</zorder>
243+
<zorder>preloadAPI</zorder>
244+
<zorder>verticalSpacer_2</zorder>
261245
</widget>
262246
<resources/>
263247
<connections>

0 commit comments

Comments
 (0)
Please sign in to comment.