summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/instoptions.ui185
-rw-r--r--noncore/settings/aqpkg/instoptionsimpl.cpp4
2 files changed, 106 insertions, 83 deletions
diff --git a/noncore/settings/aqpkg/instoptions.ui b/noncore/settings/aqpkg/instoptions.ui
index d4a3548..52897dd 100644
--- a/noncore/settings/aqpkg/instoptions.ui
+++ b/noncore/settings/aqpkg/instoptions.ui
@@ -11,7 +11,7 @@
11 <rect> 11 <rect>
12 <x>0</x> 12 <x>0</x>
13 <y>0</y> 13 <y>0</y>
14 <width>158</width> 14 <width>154</width>
15 <height>205</height> 15 <height>205</height>
16 </rect> 16 </rect>
17 </property> 17 </property>
@@ -23,103 +23,126 @@
23 <name>sizeGripEnabled</name> 23 <name>sizeGripEnabled</name>
24 <bool>false</bool> 24 <bool>false</bool>
25 </property> 25 </property>
26 <grid> 26 <widget>
27 <class>QGroupBox</class>
27 <property stdset="1"> 28 <property stdset="1">
28 <name>margin</name> 29 <name>name</name>
29 <number>11</number> 30 <cstring>GroupBox1</cstring>
30 </property> 31 </property>
31 <property stdset="1"> 32 <property stdset="1">
32 <name>spacing</name> 33 <name>geometry</name>
33 <number>6</number> 34 <rect>
35 <x>11</x>
36 <y>11</y>
37 <width>136</width>
38 <height>120</height>
39 </rect>
34 </property> 40 </property>
35 <widget row="0" column="0" > 41 <property stdset="1">
36 <class>QGroupBox</class> 42 <name>title</name>
43 <string>Options</string>
44 </property>
45 <widget>
46 <class>QCheckBox</class>
47 <property stdset="1">
48 <name>name</name>
49 <cstring>forceDepends</cstring>
50 </property>
51 <property stdset="1">
52 <name>geometry</name>
53 <rect>
54 <x>11</x>
55 <y>19</y>
56 <width>114</width>
57 <height>19</height>
58 </rect>
59 </property>
60 <property stdset="1">
61 <name>text</name>
62 <string>Force Depends</string>
63 </property>
64 </widget>
65 <widget>
66 <class>QCheckBox</class>
37 <property stdset="1"> 67 <property stdset="1">
38 <name>name</name> 68 <name>name</name>
39 <cstring>GroupBox1</cstring> 69 <cstring>forceReinstall</cstring>
70 </property>
71 <property stdset="1">
72 <name>geometry</name>
73 <rect>
74 <x>11</x>
75 <y>44</y>
76 <width>114</width>
77 <height>19</height>
78 </rect>
40 </property> 79 </property>
41 <property stdset="1"> 80 <property stdset="1">
42 <name>title</name> 81 <name>text</name>
43 <string>Options</string> 82 <string>Force Reinstall</string>
44 </property> 83 </property>
45 <grid>
46 <property stdset="1">
47 <name>margin</name>
48 <number>11</number>
49 </property>
50 <property stdset="1">
51 <name>spacing</name>
52 <number>6</number>
53 </property>
54 <widget row="0" column="0" >
55 <class>QCheckBox</class>
56 <property stdset="1">
57 <name>name</name>
58 <cstring>forceDepends</cstring>
59 </property>
60 <property stdset="1">
61 <name>text</name>
62 <string>Force Depends</string>
63 </property>
64 </widget>
65 <widget row="1" column="0" >
66 <class>QCheckBox</class>
67 <property stdset="1">
68 <name>name</name>
69 <cstring>forceReinstall</cstring>
70 </property>
71 <property stdset="1">
72 <name>text</name>
73 <string>Force Reinstall</string>
74 </property>
75 </widget>
76 <widget row="2" column="0" >
77 <class>QCheckBox</class>
78 <property stdset="1">
79 <name>name</name>
80 <cstring>forceRemove</cstring>
81 </property>
82 <property stdset="1">
83 <name>text</name>
84 <string>Force Remove</string>
85 </property>
86 </widget>
87 <widget row="3" column="0" >
88 <class>QCheckBox</class>
89 <property stdset="1">
90 <name>name</name>
91 <cstring>forceOverwrite</cstring>
92 </property>
93 <property stdset="1">
94 <name>text</name>
95 <string>Force Overwrite</string>
96 </property>
97 </widget>
98 <widget row="4" column="0" >
99 <class>QCheckBox</class>
100 <property stdset="1">
101 <name>name</name>
102 <cstring>makeLinks</cstring>
103 </property>
104 <property stdset="1">
105 <name>text</name>
106 <string>Link to root</string>
107 </property>
108 </widget>
109 </grid>
110 </widget> 84 </widget>
111 <widget row="1" column="0" > 85 <widget>
112 <class>QPushButton</class> 86 <class>QCheckBox</class>
113 <property stdset="1"> 87 <property stdset="1">
114 <name>name</name> 88 <name>name</name>
115 <cstring>btnOK</cstring> 89 <cstring>forceOverwrite</cstring>
90 </property>
91 <property stdset="1">
92 <name>geometry</name>
93 <rect>
94 <x>11</x>
95 <y>94</y>
96 <width>114</width>
97 <height>19</height>
98 </rect>
116 </property> 99 </property>
117 <property stdset="1"> 100 <property stdset="1">
118 <name>text</name> 101 <name>text</name>
119 <string>OK</string> 102 <string>Force Overwrite</string>
120 </property> 103 </property>
121 </widget> 104 </widget>
122 </grid> 105 <widget>
106 <class>QCheckBox</class>
107 <property stdset="1">
108 <name>name</name>
109 <cstring>forceRemove</cstring>
110 </property>
111 <property stdset="1">
112 <name>geometry</name>
113 <rect>
114 <x>11</x>
115 <y>69</y>
116 <width>114</width>
117 <height>19</height>
118 </rect>
119 </property>
120 <property stdset="1">
121 <name>text</name>
122 <string>Force Remove</string>
123 </property>
124 </widget>
125 </widget>
126 <widget>
127 <class>QPushButton</class>
128 <property stdset="1">
129 <name>name</name>
130 <cstring>btnOK</cstring>
131 </property>
132 <property stdset="1">
133 <name>geometry</name>
134 <rect>
135 <x>11</x>
136 <y>166</y>
137 <width>136</width>
138 <height>28</height>
139 </rect>
140 </property>
141 <property stdset="1">
142 <name>text</name>
143 <string>OK</string>
144 </property>
145 </widget>
123</widget> 146</widget>
124<connections> 147<connections>
125 <connection> 148 <connection>
diff --git a/noncore/settings/aqpkg/instoptionsimpl.cpp b/noncore/settings/aqpkg/instoptionsimpl.cpp
index d9d2be9..dd996e0 100644
--- a/noncore/settings/aqpkg/instoptionsimpl.cpp
+++ b/noncore/settings/aqpkg/instoptionsimpl.cpp
@@ -37,8 +37,8 @@ InstallOptionsDlgImpl::InstallOptionsDlgImpl( int flags, QWidget * parent, const
37 forceRemove->setChecked( true ); 37 forceRemove->setChecked( true );
38 if ( flags & FORCE_OVERWRITE ) 38 if ( flags & FORCE_OVERWRITE )
39 forceOverwrite->setChecked( true ); 39 forceOverwrite->setChecked( true );
40 if ( flags & MAKE_LINKS ) 40// if ( flags & MAKE_LINKS )
41 makeLinks->setChecked( true ); 41 // makeLinks->setChecked( true );
42 42
43 showMaximized(); 43 showMaximized();
44 44