ViewVC Help
View File | Revision Log | View Changeset | Root Listing
root/Oni2/s10k/Vago/preferences.ui
(Generate patch)

Comparing Vago/trunk/Vago/preferences.ui (file contents):
Revision 771 by s10k, Sun Mar 31 19:02:16 2013 UTC vs.
Revision 790 by s10k, Sat Apr 6 20:54:26 2013 UTC

# Line 19 | Line 19
19       <property name="title">
20        <string>Preferences</string>
21       </property>
22 <     <layout class="QVBoxLayout" name="verticalLayout_2">
23 <      <item>
22 >     <layout class="QFormLayout" name="formLayout">
23 >      <item row="0" column="0">
24 >       <widget class="QLabel" name="label">
25 >        <property name="minimumSize">
26 >         <size>
27 >          <width>130</width>
28 >          <height>0</height>
29 >         </size>
30 >        </property>
31 >        <property name="text">
32 >         <string>Vago Workspace Folder:</string>
33 >        </property>
34 >       </widget>
35 >      </item>
36 >      <item row="0" column="1">
37         <layout class="QHBoxLayout" name="horizontalLayout">
38          <item>
26 –         <widget class="QLabel" name="label">
27 –          <property name="minimumSize">
28 –           <size>
29 –            <width>130</width>
30 –            <height>0</height>
31 –           </size>
32 –          </property>
33 –          <property name="text">
34 –           <string>Vago Workspace Folder:</string>
35 –          </property>
36 –         </widget>
37 –        </item>
38 –        <item>
39           <widget class="QLineEdit" name="leWorkspace"/>
40          </item>
41          <item>
# Line 47 | Line 47
47          </item>
48         </layout>
49        </item>
50 <      <item>
50 >      <item row="1" column="0">
51 >       <widget class="QLabel" name="label_2">
52 >        <property name="text">
53 >         <string>Anniversary Edition Folder:</string>
54 >        </property>
55 >       </widget>
56 >      </item>
57 >      <item row="1" column="1">
58         <layout class="QHBoxLayout" name="horizontalLayout_2">
59          <item>
53 –         <widget class="QLabel" name="label_2">
54 –          <property name="text">
55 –           <string>Anniversary Edition Folder:</string>
56 –          </property>
57 –         </widget>
58 –        </item>
59 –        <item>
60           <widget class="QLineEdit" name="leAEfolder"/>
61          </item>
62          <item>
# Line 68 | Line 68
68          </item>
69         </layout>
70        </item>
71 <      <item>
72 <       <widget class="QCheckBox" name="cbOniWindow">
73 <        <property name="text">
74 <         <string>Launch Oni in a window</string>
75 <        </property>
76 <       </widget>
77 <      </item>
78 <      <item>
71 >      <item row="3" column="0" colspan="2">
72         <widget class="QCheckBox" name="cbSeparate">
73          <property name="toolTip">
74           <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;
# Line 89 | Line 82 | p, li { white-space: pre-wrap; }
82          </property>
83         </widget>
84        </item>
85 <      <item>
85 >      <item row="4" column="0" colspan="2">
86         <widget class="QCheckBox" name="cbVagoExit">
87          <property name="text">
88           <string>Always confirm Vago exit</string>
89          </property>
90         </widget>
91        </item>
92 +      <item row="2" column="0" colspan="2">
93 +       <widget class="QCheckBox" name="cbOniWindow">
94 +        <property name="text">
95 +         <string>Launch Oni in a window</string>
96 +        </property>
97 +       </widget>
98 +      </item>
99       </layout>
100      </widget>
101     </item>

Diff Legend

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