Mercurial > octave-nkf
comparison gui/src/SettingsDialog.ui @ 14599:97cb9286919c gui
Cleaned up code.
* .hgsub: Removed IRC Widget.
* gui.pro: Removed dependency on IRC Widget and removed files.
* class FileEditorMdiSubWindow: Renamed to FileEditor. File editor windows are now independent windows, thus removed the extra close button.
* MainWindow: Removed MDI Area and replaced it with the terminal instead.
* BrowserWidget: Removed browser widget.
* SettingsDialog: Rearranged settings for the editor, removed tab for shortcuts.
* OctaveCallbackThread: Raised update intervals from 0,5s to 1s.
* OctaveLink: Replaced signals names for triggering updates on the symbol table.
* WorkspaceView: Adjusted connect statements to fit the new signal names.
author | Jacob Dawid <jacob.dawid@googlemail.com> |
---|---|
date | Mon, 07 May 2012 00:53:54 +0200 |
parents | fa52c6e84ae0 |
children | 6573ba8f094f |
comparison
equal
deleted
inserted
replaced
14588:fa52c6e84ae0 | 14599:97cb9286919c |
---|---|
32 <item> | 32 <item> |
33 <widget class="QTabWidget" name="tabWidget"> | 33 <widget class="QTabWidget" name="tabWidget"> |
34 <property name="currentIndex"> | 34 <property name="currentIndex"> |
35 <number>0</number> | 35 <number>0</number> |
36 </property> | 36 </property> |
37 <widget class="QWidget" name="tab_4"> | |
38 <attribute name="title"> | |
39 <string>Interface</string> | |
40 </attribute> | |
41 <layout class="QVBoxLayout" name="verticalLayout_6"> | |
42 <item> | |
43 <widget class="QLabel" name="label_10"> | |
44 <property name="text"> | |
45 <string>Shortcuts:</string> | |
46 </property> | |
47 </widget> | |
48 </item> | |
49 <item> | |
50 <widget class="QTableWidget" name="shortcutTableWidget"> | |
51 <property name="enabled"> | |
52 <bool>false</bool> | |
53 </property> | |
54 </widget> | |
55 </item> | |
56 <item> | |
57 <layout class="QHBoxLayout" name="horizontalLayout_2"> | |
58 <item> | |
59 <widget class="QPushButton" name="addShortcutButton"> | |
60 <property name="enabled"> | |
61 <bool>false</bool> | |
62 </property> | |
63 <property name="text"> | |
64 <string>Add</string> | |
65 </property> | |
66 </widget> | |
67 </item> | |
68 <item> | |
69 <widget class="QPushButton" name="removeShortCutButton"> | |
70 <property name="enabled"> | |
71 <bool>false</bool> | |
72 </property> | |
73 <property name="text"> | |
74 <string>Remove</string> | |
75 </property> | |
76 </widget> | |
77 </item> | |
78 <item> | |
79 <spacer name="horizontalSpacer_2"> | |
80 <property name="orientation"> | |
81 <enum>Qt::Horizontal</enum> | |
82 </property> | |
83 <property name="sizeHint" stdset="0"> | |
84 <size> | |
85 <width>40</width> | |
86 <height>20</height> | |
87 </size> | |
88 </property> | |
89 </spacer> | |
90 </item> | |
91 </layout> | |
92 </item> | |
93 </layout> | |
94 </widget> | |
95 <widget class="QWidget" name="tab"> | 37 <widget class="QWidget" name="tab"> |
96 <attribute name="title"> | 38 <attribute name="title"> |
97 <string>Editor</string> | 39 <string>Editor</string> |
98 </attribute> | 40 </attribute> |
99 <layout class="QVBoxLayout" name="verticalLayout_5"> | 41 <layout class="QVBoxLayout" name="verticalLayout_6"> |
100 <item> | 42 <item> |
101 <layout class="QVBoxLayout" name="verticalLayout_7"> | 43 <layout class="QVBoxLayout" name="verticalLayout_5"> |
102 <item> | 44 <item> |
103 <layout class="QHBoxLayout" name="horizontalLayout_3"> | 45 <layout class="QHBoxLayout" name="horizontalLayout_4"> |
104 <item> | 46 <item> |
105 <widget class="QCheckBox" name="useCustomFileEditor"> | 47 <widget class="QLabel" name="label_8"> |
106 <property name="enabled"> | |
107 <bool>true</bool> | |
108 </property> | |
109 <property name="text"> | 48 <property name="text"> |
110 <string>Use custom file editor:</string> | 49 <string>Font</string> |
111 </property> | 50 </property> |
112 </widget> | 51 </widget> |
113 </item> | 52 </item> |
114 <item> | 53 <item> |
115 <widget class="QLineEdit" name="customFileEditor"> | 54 <widget class="QFontComboBox" name="editor_fontName"> |
116 <property name="enabled"> | 55 <property name="editable"> |
117 <bool>false</bool> | 56 <bool>false</bool> |
118 </property> | |
119 <property name="text"> | |
120 <string>emacs</string> | |
121 </property> | 57 </property> |
122 </widget> | 58 </widget> |
123 </item> | 59 </item> |
60 <item> | |
61 <widget class="QLabel" name="label_9"> | |
62 <property name="text"> | |
63 <string>Font Size</string> | |
64 </property> | |
65 </widget> | |
66 </item> | |
67 <item> | |
68 <widget class="QSpinBox" name="editor_fontSize"> | |
69 <property name="minimum"> | |
70 <number>2</number> | |
71 </property> | |
72 <property name="maximum"> | |
73 <number>96</number> | |
74 </property> | |
75 <property name="value"> | |
76 <number>10</number> | |
77 </property> | |
78 </widget> | |
79 </item> | |
80 <item> | |
81 <spacer name="horizontalSpacer_4"> | |
82 <property name="orientation"> | |
83 <enum>Qt::Horizontal</enum> | |
84 </property> | |
85 <property name="sizeHint" stdset="0"> | |
86 <size> | |
87 <width>40</width> | |
88 <height>20</height> | |
89 </size> | |
90 </property> | |
91 </spacer> | |
92 </item> | |
124 </layout> | 93 </layout> |
125 </item> | 94 </item> |
126 <item> | 95 <item> |
127 <widget class="QCheckBox" name="editor_showLineNumbers"> | 96 <widget class="QCheckBox" name="editor_showLineNumbers"> |
128 <property name="enabled"> | 97 <property name="enabled"> |
166 <widget class="QCheckBox" name="editor_longWindowTitle"> | 135 <widget class="QCheckBox" name="editor_longWindowTitle"> |
167 <property name="text"> | 136 <property name="text"> |
168 <string>Show complete path in window title</string> | 137 <string>Show complete path in window title</string> |
169 </property> | 138 </property> |
170 </widget> | 139 </widget> |
171 </item> | |
172 </layout> | |
173 </item> | |
174 <item> | |
175 <layout class="QHBoxLayout" name="horizontalLayout_4"> | |
176 <item> | |
177 <widget class="QLabel" name="label_8"> | |
178 <property name="text"> | |
179 <string>Font</string> | |
180 </property> | |
181 </widget> | |
182 </item> | |
183 <item> | |
184 <widget class="QFontComboBox" name="editor_fontName"> | |
185 <property name="editable"> | |
186 <bool>false</bool> | |
187 </property> | |
188 </widget> | |
189 </item> | |
190 <item> | |
191 <widget class="QLabel" name="label_9"> | |
192 <property name="text"> | |
193 <string>Font Size</string> | |
194 </property> | |
195 </widget> | |
196 </item> | |
197 <item> | |
198 <widget class="QSpinBox" name="editor_fontSize"> | |
199 <property name="minimum"> | |
200 <number>2</number> | |
201 </property> | |
202 <property name="maximum"> | |
203 <number>96</number> | |
204 </property> | |
205 <property name="value"> | |
206 <number>10</number> | |
207 </property> | |
208 </widget> | |
209 </item> | |
210 <item> | |
211 <spacer name="horizontalSpacer_4"> | |
212 <property name="orientation"> | |
213 <enum>Qt::Horizontal</enum> | |
214 </property> | |
215 <property name="sizeHint" stdset="0"> | |
216 <size> | |
217 <width>40</width> | |
218 <height>20</height> | |
219 </size> | |
220 </property> | |
221 </spacer> | |
222 </item> | 140 </item> |
223 </layout> | 141 </layout> |
224 </item> | 142 </item> |
225 <item> | 143 <item> |
226 <spacer name="verticalSpacer"> | 144 <spacer name="verticalSpacer"> |
232 <width>20</width> | 150 <width>20</width> |
233 <height>40</height> | 151 <height>40</height> |
234 </size> | 152 </size> |
235 </property> | 153 </property> |
236 </spacer> | 154 </spacer> |
155 </item> | |
156 <item> | |
157 <layout class="QHBoxLayout" name="horizontalLayout"> | |
158 <item> | |
159 <widget class="QCheckBox" name="useCustomFileEditor"> | |
160 <property name="enabled"> | |
161 <bool>true</bool> | |
162 </property> | |
163 <property name="text"> | |
164 <string>Use custom file editor:</string> | |
165 </property> | |
166 </widget> | |
167 </item> | |
168 <item> | |
169 <widget class="QLineEdit" name="customFileEditor"> | |
170 <property name="enabled"> | |
171 <bool>false</bool> | |
172 </property> | |
173 <property name="text"> | |
174 <string>emacs</string> | |
175 </property> | |
176 </widget> | |
177 </item> | |
178 </layout> | |
237 </item> | 179 </item> |
238 </layout> | 180 </layout> |
239 </widget> | 181 </widget> |
240 <widget class="QWidget" name="tab_5"> | 182 <widget class="QWidget" name="tab_5"> |
241 <attribute name="title"> | 183 <attribute name="title"> |
242 <string>Terminal</string> | 184 <string>Terminal</string> |
243 </attribute> | 185 </attribute> |
244 <widget class="QWidget" name="layoutWidget"> | 186 <layout class="QVBoxLayout" name="verticalLayout"> |
245 <property name="geometry"> | 187 <item> |
246 <rect> | 188 <layout class="QHBoxLayout" name="horizontalLayout_5"> |
247 <x>10</x> | 189 <item> |
248 <y>10</y> | 190 <widget class="QLabel" name="label_11"> |
249 <width>436</width> | 191 <property name="text"> |
250 <height>22</height> | 192 <string>Font</string> |
251 </rect> | 193 </property> |
252 </property> | 194 </widget> |
253 <layout class="QHBoxLayout" name="horizontalLayout_5"> | 195 </item> |
254 <item> | 196 <item> |
255 <widget class="QLabel" name="label_11"> | 197 <widget class="QFontComboBox" name="terminal_fontName"> |
256 <property name="text"> | 198 <property name="editable"> |
257 <string>Font</string> | 199 <bool>false</bool> |
258 </property> | 200 </property> |
259 </widget> | 201 </widget> |
260 </item> | 202 </item> |
261 <item> | 203 <item> |
262 <widget class="QFontComboBox" name="terminal_fontName"> | 204 <widget class="QLabel" name="label_12"> |
263 <property name="editable"> | 205 <property name="text"> |
264 <bool>false</bool> | 206 <string>Font Size</string> |
265 </property> | 207 </property> |
266 </widget> | 208 </widget> |
267 </item> | 209 </item> |
268 <item> | 210 <item> |
269 <widget class="QLabel" name="label_12"> | 211 <widget class="QSpinBox" name="terminal_fontSize"> |
270 <property name="text"> | 212 <property name="minimum"> |
271 <string>Font Size</string> | 213 <number>2</number> |
272 </property> | 214 </property> |
273 </widget> | 215 <property name="maximum"> |
274 </item> | 216 <number>96</number> |
275 <item> | 217 </property> |
276 <widget class="QSpinBox" name="terminal_fontSize"> | 218 <property name="value"> |
277 <property name="minimum"> | 219 <number>10</number> |
278 <number>2</number> | 220 </property> |
279 </property> | 221 </widget> |
280 <property name="maximum"> | 222 </item> |
281 <number>96</number> | 223 <item> |
282 </property> | 224 <spacer name="horizontalSpacer_5"> |
283 <property name="value"> | 225 <property name="orientation"> |
284 <number>10</number> | 226 <enum>Qt::Horizontal</enum> |
285 </property> | 227 </property> |
286 </widget> | 228 <property name="sizeHint" stdset="0"> |
287 </item> | 229 <size> |
288 <item> | 230 <width>40</width> |
289 <spacer name="horizontalSpacer_5"> | 231 <height>20</height> |
290 <property name="orientation"> | 232 </size> |
291 <enum>Qt::Horizontal</enum> | 233 </property> |
292 </property> | 234 </spacer> |
293 <property name="sizeHint" stdset="0"> | 235 </item> |
294 <size> | 236 </layout> |
295 <width>40</width> | 237 </item> |
296 <height>20</height> | 238 <item> |
297 </size> | 239 <spacer name="verticalSpacer_3"> |
298 </property> | 240 <property name="orientation"> |
299 </spacer> | 241 <enum>Qt::Vertical</enum> |
300 </item> | 242 </property> |
301 </layout> | 243 <property name="sizeHint" stdset="0"> |
302 </widget> | 244 <size> |
245 <width>20</width> | |
246 <height>321</height> | |
247 </size> | |
248 </property> | |
249 </spacer> | |
250 </item> | |
251 </layout> | |
303 </widget> | 252 </widget> |
304 <widget class="QWidget" name="tab_2"> | 253 <widget class="QWidget" name="tab_2"> |
305 <attribute name="title"> | 254 <attribute name="title"> |
306 <string>File Browser</string> | 255 <string>File Browser</string> |
307 </attribute> | 256 </attribute> |