ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/s10k/Vago/preferences.ui

Comparing:
Vago/trunk/Vago/preferences.ui (file contents), Revision 771 by s10k, Sun Mar 31 19:02:16 2013 UTC vs.
s10k/Vago/preferences.ui (file contents), Revision 1092 by s10k, Sat Dec 30 13:43:28 2017 UTC

#	Line 7 | Line 7
7		<x>0</x>
8		<y>0</y>
9		<width>493</width>
10	<	<height>258</height>
10	>	<height>297</height>
11		</rect>
12		</property>
13		<property name="windowTitle">
#	Line 21 | Line 21
21		</property>
22		<layout class="QVBoxLayout" name="verticalLayout_2">
23		<item>
24	<	<layout class="QHBoxLayout" name="horizontalLayout">
25	<	<item>
24	>	<layout class="QFormLayout" name="formLayout">
25	>	<item row="0" column="0">
26		<widget class="QLabel" name="label">
27		<property name="minimumSize">
28		<size>
29	<	<width>130</width>
29	>	<width>0</width>
30		<height>0</height>
31		</size>
32		</property>
#	Line 35 | Line 35
35		</property>
36		</widget>
37		</item>
38	<	<item>
39	<	<widget class="QLineEdit" name="leWorkspace"/>
40	<	</item>
41	<	<item>
42	<	<widget class="QPushButton" name="pbChooseWorkspace">
43	<	<property name="text">
44	<	<string>Choose</string>
45	<	</property>
46	<	</widget>
47	<	</item>
48	<	</layout>
49	<	</item>
50	<	<item>
51	<	<layout class="QHBoxLayout" name="horizontalLayout_2">
52	<	<item>
38	>	<item row="1" column="0">
39		<widget class="QLabel" name="label_2">
40		<property name="text">
41		<string>Anniversary Edition Folder:</string>
42		</property>
43		</widget>
44		</item>
45	<	<item>
46	<	<widget class="QLineEdit" name="leAEfolder"/>
47	<	</item>
48	<	<item>
49	<	<widget class="QPushButton" name="pbChooseAE">
45	>	<item row="2" column="0">
46	>	<widget class="QLabel" name="label_3">
47	>	<property name="minimumSize">
48	>	<size>
49	>	<width>0</width>
50	>	<height>0</height>
51	>	</size>
52	>	</property>
53		<property name="text">
54	<	<string>Choose</string>
54	>	<string>Default Vago Window Resolution:</string>
55		</property>
56		</widget>
57		</item>
58	+	<item row="0" column="1">
59	+	<layout class="QHBoxLayout" name="horizontalLayout">
60	+	<item>
61	+	<widget class="QLineEdit" name="leWorkspace"/>
62	+	</item>
63	+	<item>
64	+	<widget class="QPushButton" name="pbChooseWorkspace">
65	+	<property name="text">
66	+	<string>Choose</string>
67	+	</property>
68	+	</widget>
69	+	</item>
70	+	</layout>
71	+	</item>
72	+	<item row="1" column="1">
73	+	<layout class="QHBoxLayout" name="horizontalLayout_2">
74	+	<item>
75	+	<widget class="QLineEdit" name="leAEfolder"/>
76	+	</item>
77	+	<item>
78	+	<widget class="QPushButton" name="pbChooseAE">
79	+	<property name="text">
80	+	<string>Choose</string>
81	+	</property>
82	+	</widget>
83	+	</item>
84	+	</layout>
85	+	</item>
86	+	<item row="2" column="1">
87	+	<layout class="QHBoxLayout" name="horizontalLayout_3">
88	+	<item>
89	+	<widget class="QLineEdit" name="leWidth">
90	+	<property name="placeholderText">
91	+	<string>Width</string>
92	+	</property>
93	+	</widget>
94	+	</item>
95	+	<item>
96	+	<widget class="QLabel" name="label_4">
97	+	<property name="text">
98	+	<string>x</string>
99	+	</property>
100	+	</widget>
101	+	</item>
102	+	<item>
103	+	<widget class="QLineEdit" name="leHeight">
104	+	<property name="placeholderText">
105	+	<string>Height</string>
106	+	</property>
107	+	</widget>
108	+	</item>
109	+	</layout>
110	+	</item>
111		</layout>
112		</item>
113		<item>
#	Line 78 | Line 120
120		<item>
121		<widget class="QCheckBox" name="cbSeparate">
122		<property name="toolTip">
123	<	<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;
82	<	&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;
83	<	p, li { white-space: pre-wrap; }
84	<	&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
85	<	&lt;p 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:8pt; font-weight:600;&quot;&gt;Separate conversions by folders. For example: &amp;quot;Textures&amp;quot; -&amp;gt; &amp;quot;DAT_ONI - DDS&amp;quot;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
123	>	<string>Separate conversions by folders. For example: &quot;Textures&quot; -&gt; &quot;DAT_ONI - DDS&quot;</string>
124		</property>
125		<property name="text">
126		<string>Separate different conversions in workspace</string>
#	Line 90 | Line 128 | p, li { white-space: pre-wrap; }
128		</widget>
129		</item>
130		<item>
131	<	<widget class="QCheckBox" name="cbVagoExit">
131	>	<widget class="QCheckBox" name="cbUseYesAsDefaultWhenRemovingItems">
132	>	<property name="text">
133	>	<string>Use Yes button as default when removing items</string>
134	>	</property>
135	>	</widget>
136	>	</item>
137	>	<item>
138	>	<widget class="QCheckBox" name="cbAskSaveProject">
139	>	<property name="toolTip">
140	>	<string>Shows a questions prompt to save current project if any unsaved changes are found. Asked when user tries to create a new project, load a project or exit the application.</string>
141	>	</property>
142	>	<property name="text">
143	>	<string>Ask to save project if there are unsaved changes</string>
144	>	</property>
145	>	</widget>
146	>	</item>
147	>	<item>
148	>	<widget class="QCheckBox" name="cbAskOpenLastProject">
149		<property name="text">
150	<	<string>Always confirm Vago exit</string>
150	>	<string>Ask to open last saved project at startup</string>
151		</property>
152		</widget>
153		</item>

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)