Mercurial > hg > octave-nkf
comparison libgui/src/settings-dialog.ui @ 16703:5cf19370011d
add more settings concerning tabs and indentation to the editor settings
* settings-dialog.ui: insert input widget for tabs and indentation
* settings-dialog.cc(constructor): read state for input widgets from settings,
(write_changed_settings): write state of input widgets into settings file
* file-editor-tab.cc(notice-settings): load tab width and indentation options
from settings
author | Torsten <ttl@justmail.de> |
---|---|
date | Sun, 26 May 2013 22:16:21 +0200 |
parents | 553cfdd5d660 |
children | 33ab01a26b80 |
comparison
equal
deleted
inserted
replaced
16702:553cfdd5d660 | 16703:5cf19370011d |
---|---|
196 </attribute> | 196 </attribute> |
197 <layout class="QVBoxLayout" name="verticalLayout_6"> | 197 <layout class="QVBoxLayout" name="verticalLayout_6"> |
198 <item> | 198 <item> |
199 <layout class="QVBoxLayout" name="verticalLayout_9"> | 199 <layout class="QVBoxLayout" name="verticalLayout_9"> |
200 <item> | 200 <item> |
201 <widget class="QCheckBox" name="editor_longWindowTitle"> | |
202 <property name="text"> | |
203 <string>Show complete path in window title</string> | |
204 </property> | |
205 </widget> | |
206 </item> | |
207 <item> | |
201 <widget class="QCheckBox" name="editor_showLineNumbers"> | 208 <widget class="QCheckBox" name="editor_showLineNumbers"> |
202 <property name="enabled"> | 209 <property name="enabled"> |
203 <bool>true</bool> | 210 <bool>true</bool> |
204 </property> | 211 </property> |
205 <property name="text"> | 212 <property name="text"> |
220 <widget class="QCheckBox" name="editor_ws_indent_checkbox"> | 227 <widget class="QCheckBox" name="editor_ws_indent_checkbox"> |
221 <property name="enabled"> | 228 <property name="enabled"> |
222 <bool>false</bool> | 229 <bool>false</bool> |
223 </property> | 230 </property> |
224 <property name="text"> | 231 <property name="text"> |
225 <string>But no white spaces used for indentation</string> | 232 <string>Do not show white spaces used for indentation</string> |
226 </property> | 233 </property> |
227 </widget> | 234 </widget> |
228 </item> | 235 </item> |
229 <item> | 236 <item> |
230 <spacer name="horizontalSpacer_12"> | 237 <spacer name="horizontalSpacer_12"> |
295 <item row="0" column="3"> | 302 <item row="0" column="3"> |
296 <spacer name="horizontalSpacer_11"> | 303 <spacer name="horizontalSpacer_11"> |
297 <property name="orientation"> | 304 <property name="orientation"> |
298 <enum>Qt::Horizontal</enum> | 305 <enum>Qt::Horizontal</enum> |
299 </property> | 306 </property> |
307 <property name="sizeType"> | |
308 <enum>QSizePolicy::Fixed</enum> | |
309 </property> | |
310 <property name="sizeHint" stdset="0"> | |
311 <size> | |
312 <width>80</width> | |
313 <height>20</height> | |
314 </size> | |
315 </property> | |
316 </spacer> | |
317 </item> | |
318 </layout> | |
319 </item> | |
320 <item> | |
321 <widget class="Line" name="line"> | |
322 <property name="orientation"> | |
323 <enum>Qt::Horizontal</enum> | |
324 </property> | |
325 </widget> | |
326 </item> | |
327 <item> | |
328 <layout class="QGridLayout" name="gridLayout_4"> | |
329 <item row="0" column="0"> | |
330 <widget class="QLabel" name="label_13"> | |
331 <property name="text"> | |
332 <string>Indent width</string> | |
333 </property> | |
334 </widget> | |
335 </item> | |
336 <item row="2" column="4"> | |
337 <widget class="QCheckBox" name="editor_tab_ind_checkbox"> | |
338 <property name="text"> | |
339 <string>Tab indents line</string> | |
340 </property> | |
341 </widget> | |
342 </item> | |
343 <item row="0" column="4"> | |
344 <widget class="QCheckBox" name="editor_auto_ind_checkbox"> | |
345 <property name="text"> | |
346 <string>Auto indentation</string> | |
347 </property> | |
348 </widget> | |
349 </item> | |
350 <item row="0" column="2"> | |
351 <widget class="QSpinBox" name="editor_ind_width_spinbox"> | |
352 <property name="minimum"> | |
353 <number>1</number> | |
354 </property> | |
355 <property name="maximum"> | |
356 <number>32</number> | |
357 </property> | |
358 <property name="value"> | |
359 <number>2</number> | |
360 </property> | |
361 </widget> | |
362 </item> | |
363 <item row="2" column="0"> | |
364 <widget class="QLabel" name="label_14"> | |
365 <property name="text"> | |
366 <string>Tab width</string> | |
367 </property> | |
368 </widget> | |
369 </item> | |
370 <item row="0" column="5"> | |
371 <widget class="QCheckBox" name="editor_ind_guides_checkbox"> | |
372 <property name="text"> | |
373 <string>Show indentation guides</string> | |
374 </property> | |
375 </widget> | |
376 </item> | |
377 <item row="2" column="2"> | |
378 <widget class="QSpinBox" name="editor_tab_width_spinbox"> | |
379 <property name="minimum"> | |
380 <number>1</number> | |
381 </property> | |
382 <property name="maximum"> | |
383 <number>32</number> | |
384 </property> | |
385 </widget> | |
386 </item> | |
387 <item row="2" column="5"> | |
388 <widget class="QCheckBox" name="editor_bs_unind_checkbox"> | |
389 <property name="text"> | |
390 <string>Backspace unindents line</string> | |
391 </property> | |
392 </widget> | |
393 </item> | |
394 <item row="0" column="9"> | |
395 <spacer name="horizontalSpacer_13"> | |
396 <property name="orientation"> | |
397 <enum>Qt::Horizontal</enum> | |
398 </property> | |
300 <property name="sizeHint" stdset="0"> | 399 <property name="sizeHint" stdset="0"> |
301 <size> | 400 <size> |
302 <width>40</width> | 401 <width>40</width> |
303 <height>20</height> | 402 <height>20</height> |
304 </size> | 403 </size> |
306 </spacer> | 405 </spacer> |
307 </item> | 406 </item> |
308 </layout> | 407 </layout> |
309 </item> | 408 </item> |
310 <item> | 409 <item> |
311 <widget class="QCheckBox" name="editor_longWindowTitle"> | 410 <widget class="Line" name="line_2"> |
312 <property name="text"> | 411 <property name="orientation"> |
313 <string>Show complete path in window title</string> | 412 <enum>Qt::Horizontal</enum> |
314 </property> | |
315 </widget> | |
316 </item> | |
317 <item> | |
318 <widget class="QCheckBox" name="editor_restoreSession"> | |
319 <property name="text"> | |
320 <string>Restore tabs from previous session on startup</string> | |
321 </property> | 413 </property> |
322 </widget> | 414 </widget> |
323 </item> | 415 </item> |
324 <item> | 416 <item> |
325 <layout class="QGridLayout" name="gridLayout_2"> | 417 <layout class="QGridLayout" name="gridLayout_2"> |
470 </item> | 562 </item> |
471 </layout> | 563 </layout> |
472 </item> | 564 </item> |
473 </layout> | 565 </layout> |
474 </item> | 566 </item> |
567 <item> | |
568 <widget class="Line" name="line_3"> | |
569 <property name="orientation"> | |
570 <enum>Qt::Horizontal</enum> | |
571 </property> | |
572 </widget> | |
573 </item> | |
574 <item> | |
575 <widget class="QCheckBox" name="editor_restoreSession"> | |
576 <property name="text"> | |
577 <string>Restore editor tabs from previous session on startup</string> | |
578 </property> | |
579 </widget> | |
580 </item> | |
475 </layout> | 581 </layout> |
582 </item> | |
583 <item> | |
584 <widget class="Line" name="line_4"> | |
585 <property name="orientation"> | |
586 <enum>Qt::Horizontal</enum> | |
587 </property> | |
588 </widget> | |
476 </item> | 589 </item> |
477 <item> | 590 <item> |
478 <spacer name="verticalSpacer"> | 591 <spacer name="verticalSpacer"> |
479 <property name="orientation"> | 592 <property name="orientation"> |
480 <enum>Qt::Vertical</enum> | 593 <enum>Qt::Vertical</enum> |
712 </widget> | 825 </widget> |
713 </item> | 826 </item> |
714 <item> | 827 <item> |
715 <widget class="QLabel" name="label_12"> | 828 <widget class="QLabel" name="label_12"> |
716 <property name="text"> | 829 <property name="text"> |
717 <string>Font Size</string> | 830 <string>Font size</string> |
718 </property> | 831 </property> |
719 </widget> | 832 </widget> |
720 </item> | 833 </item> |
721 <item> | 834 <item> |
722 <widget class="QSpinBox" name="terminal_fontSize"> | 835 <widget class="QSpinBox" name="terminal_fontSize"> |
837 <attribute name="title"> | 950 <attribute name="title"> |
838 <string>Network</string> | 951 <string>Network</string> |
839 </attribute> | 952 </attribute> |
840 <layout class="QVBoxLayout" name="verticalLayout_4"> | 953 <layout class="QVBoxLayout" name="verticalLayout_4"> |
841 <item> | 954 <item> |
842 <widget class="QCheckBox" name="useProxyServer"> | 955 <layout class="QGridLayout" name="gridLayout_5"> |
843 <property name="text"> | 956 <item row="1" column="1"> |
844 <string>Use proxy server</string> | 957 <widget class="QLabel" name="label_4"> |
845 </property> | |
846 </widget> | |
847 </item> | |
848 <item> | |
849 <layout class="QFormLayout" name="formLayout"> | |
850 <item row="0" column="0"> | |
851 <widget class="QLabel" name="label_3"> | |
852 <property name="enabled"> | 958 <property name="enabled"> |
853 <bool>false</bool> | 959 <bool>false</bool> |
854 </property> | 960 </property> |
855 <property name="text"> | 961 <property name="text"> |
856 <string>Proxy Type:</string> | 962 <string>Hostname:</string> |
857 </property> | 963 </property> |
858 </widget> | 964 </widget> |
859 </item> | 965 </item> |
860 <item row="0" column="1"> | 966 <item row="0" column="2"> |
861 <widget class="QComboBox" name="proxyType"> | 967 <widget class="QComboBox" name="proxyType"> |
862 <property name="enabled"> | 968 <property name="enabled"> |
863 <bool>false</bool> | 969 <bool>false</bool> |
864 </property> | 970 </property> |
865 <item> | 971 <item> |
872 <string>Socks5Proxy</string> | 978 <string>Socks5Proxy</string> |
873 </property> | 979 </property> |
874 </item> | 980 </item> |
875 </widget> | 981 </widget> |
876 </item> | 982 </item> |
877 <item row="1" column="0"> | 983 <item row="3" column="1"> |
878 <widget class="QLabel" name="label_4"> | 984 <widget class="QLabel" name="label_6"> |
879 <property name="enabled"> | 985 <property name="enabled"> |
880 <bool>false</bool> | 986 <bool>false</bool> |
881 </property> | 987 </property> |
882 <property name="text"> | 988 <property name="text"> |
883 <string>Hostname:</string> | 989 <string>Username:</string> |
884 </property> | 990 </property> |
885 </widget> | 991 </widget> |
886 </item> | 992 </item> |
887 <item row="1" column="1"> | 993 <item row="0" column="0"> |
994 <widget class="QCheckBox" name="useProxyServer"> | |
995 <property name="text"> | |
996 <string>Use proxy server</string> | |
997 </property> | |
998 </widget> | |
999 </item> | |
1000 <item row="0" column="1"> | |
1001 <widget class="QLabel" name="label_3"> | |
1002 <property name="enabled"> | |
1003 <bool>false</bool> | |
1004 </property> | |
1005 <property name="text"> | |
1006 <string>Proxy Type:</string> | |
1007 </property> | |
1008 </widget> | |
1009 </item> | |
1010 <item row="2" column="1"> | |
1011 <widget class="QLabel" name="label_5"> | |
1012 <property name="enabled"> | |
1013 <bool>false</bool> | |
1014 </property> | |
1015 <property name="text"> | |
1016 <string>Port:</string> | |
1017 </property> | |
1018 </widget> | |
1019 </item> | |
1020 <item row="4" column="1"> | |
1021 <widget class="QLabel" name="label_7"> | |
1022 <property name="enabled"> | |
1023 <bool>false</bool> | |
1024 </property> | |
1025 <property name="text"> | |
1026 <string>Password:</string> | |
1027 </property> | |
1028 </widget> | |
1029 </item> | |
1030 <item row="1" column="2"> | |
888 <widget class="QLineEdit" name="proxyHostName"> | 1031 <widget class="QLineEdit" name="proxyHostName"> |
889 <property name="enabled"> | 1032 <property name="enabled"> |
890 <bool>false</bool> | 1033 <bool>false</bool> |
891 </property> | 1034 </property> |
892 </widget> | 1035 </widget> |
893 </item> | 1036 </item> |
894 <item row="2" column="0"> | 1037 <item row="2" column="2"> |
895 <widget class="QLabel" name="label_5"> | |
896 <property name="enabled"> | |
897 <bool>false</bool> | |
898 </property> | |
899 <property name="text"> | |
900 <string>Port:</string> | |
901 </property> | |
902 </widget> | |
903 </item> | |
904 <item row="2" column="1"> | |
905 <widget class="QLineEdit" name="proxyPort"> | 1038 <widget class="QLineEdit" name="proxyPort"> |
906 <property name="enabled"> | 1039 <property name="enabled"> |
907 <bool>false</bool> | 1040 <bool>false</bool> |
908 </property> | 1041 </property> |
909 </widget> | 1042 </widget> |
910 </item> | 1043 </item> |
911 <item row="3" column="0"> | 1044 <item row="3" column="2"> |
912 <widget class="QLabel" name="label_6"> | |
913 <property name="enabled"> | |
914 <bool>false</bool> | |
915 </property> | |
916 <property name="text"> | |
917 <string>Username:</string> | |
918 </property> | |
919 </widget> | |
920 </item> | |
921 <item row="3" column="1"> | |
922 <widget class="QLineEdit" name="proxyUserName"> | 1045 <widget class="QLineEdit" name="proxyUserName"> |
923 <property name="enabled"> | 1046 <property name="enabled"> |
924 <bool>false</bool> | 1047 <bool>false</bool> |
925 </property> | 1048 </property> |
926 </widget> | 1049 </widget> |
927 </item> | 1050 </item> |
928 <item row="4" column="0"> | 1051 <item row="4" column="2"> |
929 <widget class="QLabel" name="label_7"> | |
930 <property name="enabled"> | |
931 <bool>false</bool> | |
932 </property> | |
933 <property name="text"> | |
934 <string>Password:</string> | |
935 </property> | |
936 </widget> | |
937 </item> | |
938 <item row="4" column="1"> | |
939 <widget class="QLineEdit" name="proxyPassword"> | 1052 <widget class="QLineEdit" name="proxyPassword"> |
940 <property name="enabled"> | 1053 <property name="enabled"> |
941 <bool>false</bool> | 1054 <bool>false</bool> |
942 </property> | 1055 </property> |
943 <property name="echoMode"> | 1056 <property name="echoMode"> |
944 <enum>QLineEdit::Password</enum> | 1057 <enum>QLineEdit::Password</enum> |
945 </property> | 1058 </property> |
946 </widget> | 1059 </widget> |
947 </item> | 1060 </item> |
948 </layout> | 1061 </layout> |
1062 </item> | |
1063 <item> | |
1064 <spacer name="verticalSpacer_5"> | |
1065 <property name="orientation"> | |
1066 <enum>Qt::Vertical</enum> | |
1067 </property> | |
1068 <property name="sizeHint" stdset="0"> | |
1069 <size> | |
1070 <width>20</width> | |
1071 <height>40</height> | |
1072 </size> | |
1073 </property> | |
1074 </spacer> | |
949 </item> | 1075 </item> |
950 </layout> | 1076 </layout> |
951 </widget> | 1077 </widget> |
952 </widget> | 1078 </widget> |
953 </item> | 1079 </item> |