removed make links checkbox - now set per destination

2 files changed, 64 insertions, 41 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
@@ -13,3 +13,3 @@
             <y>0</y>
-            <width>158</width>
+            <width>154</width>
             <height>205</height>
@@ -25,12 +25,3 @@
     </property>
-    <grid>
-        <property stdset="1">
-            <name>margin</name>
-            <number>11</number>
-        </property>
-        <property stdset="1">
-            <name>spacing</name>
-            <number>6</number>
-        </property>
-        <widget row="0"  column="0" >
+    <widget>
             <class>QGroupBox</class>
@@ -41,15 +32,15 @@
             <property stdset="1">
-                <name>title</name>
-                <string>Options</string>
-            </property>
-            <grid>
-                <property stdset="1">
-                    <name>margin</name>
-                    <number>11</number>
+            <name>geometry</name>
+            <rect>
+                <x>11</x>
+                <y>11</y>
+                <width>136</width>
+                <height>120</height>
+            </rect>
                 </property>
                 <property stdset="1">
-                    <name>spacing</name>
-                    <number>6</number>
+            <name>title</name>
+            <string>Options</string>
                 </property>
-                <widget row="0"  column="0" >
+        <widget>
                     <class>QCheckBox</class>
@@ -60,2 +51,11 @@
                     <property stdset="1">
+                <name>geometry</name>
+                <rect>
+                    <x>11</x>
+                    <y>19</y>
+                    <width>114</width>
+                    <height>19</height>
+                </rect>
+            </property>
+            <property stdset="1">
                         <name>text</name>
@@ -64,3 +64,3 @@
                 </widget>
-                <widget row="1"  column="0" >
+        <widget>
                     <class>QCheckBox</class>
@@ -71,11 +71,9 @@
                     <property stdset="1">
-                        <name>text</name>
-                        <string>Force Reinstall</string>
-                    </property>
-                </widget>
-                <widget row="2"  column="0" >
-                    <class>QCheckBox</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>forceRemove</cstring>
+                <name>geometry</name>
+                <rect>
+                    <x>11</x>
+                    <y>44</y>
+                    <width>114</width>
+                    <height>19</height>
+                </rect>
                     </property>
@@ -83,6 +81,6 @@
                         <name>text</name>
-                        <string>Force Remove</string>
+                <string>Force Reinstall</string>
                     </property>
                 </widget>
-                <widget row="3"  column="0" >
+        <widget>
                     <class>QCheckBox</class>
@@ -93,2 +91,11 @@
                     <property stdset="1">
+                <name>geometry</name>
+                <rect>
+                    <x>11</x>
+                    <y>94</y>
+                    <width>114</width>
+                    <height>19</height>
+                </rect>
+            </property>
+            <property stdset="1">
                         <name>text</name>
@@ -97,3 +104,3 @@
                 </widget>
-                <widget row="4"  column="0" >
+        <widget>
                     <class>QCheckBox</class>
@@ -101,3 +108,12 @@
                         <name>name</name>
-                        <cstring>makeLinks</cstring>
+                <cstring>forceRemove</cstring>
+            </property>
+            <property stdset="1">
+                <name>geometry</name>
+                <rect>
+                    <x>11</x>
+                    <y>69</y>
+                    <width>114</width>
+                    <height>19</height>
+                </rect>
                     </property>
@@ -105,8 +121,7 @@
                         <name>text</name>
-                        <string>Link to root</string>
+                <string>Force Remove</string>
                     </property>
                 </widget>
-            </grid>
         </widget>
-        <widget row="1"  column="0" >
+    <widget>
             <class>QPushButton</class>
@@ -117,2 +132,11 @@
             <property stdset="1">
+            <name>geometry</name>
+            <rect>
+                <x>11</x>
+                <y>166</y>
+                <width>136</width>
+                <height>28</height>
+            </rect>
+        </property>
+        <property stdset="1">
                 <name>text</name>
@@ -121,3 +145,2 @@
         </widget>
-    </grid>
 </widget>
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
@@ -39,4 +39,4 @@ InstallOptionsDlgImpl::InstallOptionsDlgImpl( int flags, QWidget * parent, const
     	forceOverwrite->setChecked( true );
-    if ( flags & MAKE_LINKS )
-    	makeLinks->setChecked( true );
+//    if ( flags & MAKE_LINKS )
+//    	makeLinks->setChecked( true );