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
@@ -1,132 +1,155 @@
 <!DOCTYPE UI><UI>
 <class>InstallOptionsDlg</class>
 <widget>
     <class>QDialog</class>
     <property stdset="1">
         <name>name</name>
         <cstring>InstallOptionsDlg</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>158</width>
+            <width>154</width>
             <height>205</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Options</string>
     </property>
     <property stdset="1">
         <name>sizeGripEnabled</name>
         <bool>false</bool>
     </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>
             <property stdset="1">
                 <name>name</name>
                 <cstring>GroupBox1</cstring>
             </property>
             <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>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>forceDepends</cstring>
                     </property>
                     <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>
                         <string>Force Depends</string>
                     </property>
                 </widget>
-                <widget row="1"  column="0" >
+        <widget>
                     <class>QCheckBox</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>forceReinstall</cstring>
                     </property>
                     <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>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Force Remove</string>
+                <string>Force Reinstall</string>
                     </property>
                 </widget>
-                <widget row="3"  column="0" >
+        <widget>
                     <class>QCheckBox</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>forceOverwrite</cstring>
                     </property>
                     <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>
                         <string>Force Overwrite</string>
                     </property>
                 </widget>
-                <widget row="4"  column="0" >
+        <widget>
                     <class>QCheckBox</class>
                     <property stdset="1">
                         <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>
                     <property stdset="1">
                         <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>
             <property stdset="1">
                 <name>name</name>
                 <cstring>btnOK</cstring>
             </property>
             <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>
                 <string>OK</string>
             </property>
         </widget>
-    </grid>
 </widget>
 <connections>
     <connection>
         <sender>btnOK</sender>
         <signal>clicked()</signal>
         <receiver>InstallOptionsDlg</receiver>
         <slot>accept()</slot>
     </connection>
 </connections>
 </UI>
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
@@ -1,49 +1,49 @@
 /***************************************************************************
                           instoptionsimpl.cpp  -  description
                              -------------------
     begin                : Mon Aug 26 2002
     copyright            : (C) 2002 by Andy Qua
     email                : andy.qua@blueyonder.co.uk
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #ifdef QWS
 #include <qpe/config.h>
 #endif
 
 #include <qdialog.h>
 #include <qcheckbox.h>
 
 #include "instoptionsimpl.h"
 #include "ipkg.h"
 #include "global.h"
 
 InstallOptionsDlgImpl::InstallOptionsDlgImpl( int flags, QWidget * parent, const char* name, bool modal, WFlags fl )
     : InstallOptionsDlg( parent, name, modal, fl )
 {
     if ( flags & FORCE_DEPENDS )
     	forceDepends->setChecked( true );
     if ( flags & FORCE_REINSTALL )
     	forceReinstall->setChecked( true );
     if ( flags & FORCE_REMOVE )
     	forceRemove->setChecked( true );
     if ( flags & FORCE_OVERWRITE )
     	forceOverwrite->setChecked( true );
-    if ( flags & MAKE_LINKS )
-    	makeLinks->setChecked( true );
+//    if ( flags & MAKE_LINKS )
+//    	makeLinks->setChecked( true );
 
   	showMaximized();
 
 }
 
 InstallOptionsDlgImpl::~InstallOptionsDlgImpl()
 {
 }