summaryrefslogtreecommitdiff
authorandyq <andyq>2002-10-17 22:56:55 (UTC)
committer andyq <andyq>2002-10-17 22:56:55 (UTC)
commit4ce3fb5c10a50aece4ef8a78d07ed116ad754c27 (patch) (side-by-side diff)
tree0c966b8fbf8eb1b7592ef1792e3a693a6bae4f30
parent2f4ea594b00c0f5e220a773d0d34493546d860d3 (diff)
downloadopie-4ce3fb5c10a50aece4ef8a78d07ed116ad754c27.zip
opie-4ce3fb5c10a50aece4ef8a78d07ed116ad754c27.tar.gz
opie-4ce3fb5c10a50aece4ef8a78d07ed116ad754c27.tar.bz2
removed make links checkbox - now set per destination
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
@@ -13,3 +13,3 @@
<y>0</y>
- <width>158</width>
+ <width>154</width>
<height>205</height>
@@ -25,92 +25,75 @@
</property>
- <grid>
+ <widget>
+ <class>QGroupBox</class>
<property stdset="1">
- <name>margin</name>
- <number>11</number>
+ <name>name</name>
+ <cstring>GroupBox1</cstring>
</property>
<property stdset="1">
- <name>spacing</name>
- <number>6</number>
+ <name>geometry</name>
+ <rect>
+ <x>11</x>
+ <y>11</y>
+ <width>136</width>
+ <height>120</height>
+ </rect>
</property>
- <widget row="0" column="0" >
- <class>QGroupBox</class>
+ <property stdset="1">
+ <name>title</name>
+ <string>Options</string>
+ </property>
+ <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>
+ <class>QCheckBox</class>
<property stdset="1">
<name>name</name>
- <cstring>GroupBox1</cstring>
+ <cstring>forceReinstall</cstring>
+ </property>
+ <property stdset="1">
+ <name>geometry</name>
+ <rect>
+ <x>11</x>
+ <y>44</y>
+ <width>114</width>
+ <height>19</height>
+ </rect>
</property>
<property stdset="1">
- <name>title</name>
- <string>Options</string>
+ <name>text</name>
+ <string>Force Reinstall</string>
</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" >
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>forceDepends</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Force Depends</string>
- </property>
- </widget>
- <widget row="1" column="0" >
- <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>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Force Remove</string>
- </property>
- </widget>
- <widget row="3" column="0" >
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>forceOverwrite</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Force Overwrite</string>
- </property>
- </widget>
- <widget row="4" column="0" >
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>makeLinks</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Link to root</string>
- </property>
- </widget>
- </grid>
</widget>
- <widget row="1" column="0" >
- <class>QPushButton</class>
+ <widget>
+ <class>QCheckBox</class>
<property stdset="1">
<name>name</name>
- <cstring>btnOK</cstring>
+ <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>
@@ -118,6 +101,46 @@
<name>text</name>
- <string>OK</string>
+ <string>Force Overwrite</string>
</property>
</widget>
- </grid>
+ <widget>
+ <class>QCheckBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <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>Force Remove</string>
+ </property>
+ </widget>
+ </widget>
+ <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>
</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 );