summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/aqpkg/installdlgimpl.cpp15
-rw-r--r--noncore/settings/aqpkg/instoptions.ui78
-rw-r--r--noncore/settings/aqpkg/instoptionsimpl.cpp21
-rw-r--r--noncore/settings/aqpkg/instoptionsimpl.h1
4 files changed, 73 insertions, 42 deletions
diff --git a/noncore/settings/aqpkg/installdlgimpl.cpp b/noncore/settings/aqpkg/installdlgimpl.cpp
index db9a259..485fe3d 100644
--- a/noncore/settings/aqpkg/installdlgimpl.cpp
+++ b/noncore/settings/aqpkg/installdlgimpl.cpp
@@ -19,2 +19,3 @@
#include <qpe/config.h>
+#include <qpe/qpeapplication.h>
#endif
@@ -130,11 +131,3 @@ void InstallDlgImpl :: optionsSelected()
// set options selected from dialog
- flags = 0;
- if ( opt.forceDepends->isChecked() )
- flags |= FORCE_DEPENDS;
- if ( opt.forceReinstall->isChecked() )
- flags |= FORCE_REINSTALL;
- if ( opt.forceRemove->isChecked() )
- flags |= FORCE_REMOVE;
- if ( opt.forceOverwrite->isChecked() )
- flags |= FORCE_OVERWRITE;
+ flags = opt.getFlags();
@@ -149,2 +142,3 @@ void InstallDlgImpl :: installSelected()
{
+
if ( btnInstall->text() == "Close" )
@@ -155,2 +149,4 @@ void InstallDlgImpl :: installSelected()
+ // Disable buttons
+ btnOptions->setEnabled( false );
btnInstall->setEnabled( false );
@@ -232,2 +228,3 @@ void InstallDlgImpl :: installSelected()
+ btnOptions->setEnabled( true );
btnInstall->setEnabled( true );
diff --git a/noncore/settings/aqpkg/instoptions.ui b/noncore/settings/aqpkg/instoptions.ui
index 52897dd..00eab1e 100644
--- a/noncore/settings/aqpkg/instoptions.ui
+++ b/noncore/settings/aqpkg/instoptions.ui
@@ -13,4 +13,4 @@
<y>0</y>
- <width>154</width>
- <height>205</height>
+ <width>283</width>
+ <height>274</height>
</rect>
@@ -25,2 +25,11 @@
</property>
+ <vbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>11</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
<widget>
@@ -32,11 +41,2 @@
<property stdset="1">
- <name>geometry</name>
- <rect>
- <x>11</x>
- <y>11</y>
- <width>136</width>
- <height>120</height>
- </rect>
- </property>
- <property stdset="1">
<name>title</name>
@@ -53,5 +53,5 @@
<rect>
- <x>11</x>
- <y>19</y>
- <width>114</width>
+ <x>12</x>
+ <y>20</y>
+ <width>110</width>
<height>19</height>
@@ -73,5 +73,5 @@
<rect>
- <x>11</x>
- <y>44</y>
- <width>114</width>
+ <x>12</x>
+ <y>45</y>
+ <width>107</width>
<height>19</height>
@@ -88,3 +88,3 @@
<name>name</name>
- <cstring>forceOverwrite</cstring>
+ <cstring>forceRemove</cstring>
</property>
@@ -93,5 +93,5 @@
<rect>
- <x>11</x>
- <y>94</y>
- <width>114</width>
+ <x>12</x>
+ <y>70</y>
+ <width>105</width>
<height>19</height>
@@ -101,3 +101,3 @@
<name>text</name>
- <string>Force Overwrite</string>
+ <string>Force Remove</string>
</property>
@@ -108,3 +108,3 @@
<name>name</name>
- <cstring>forceRemove</cstring>
+ <cstring>forceOverwrite</cstring>
</property>
@@ -113,4 +113,4 @@
<rect>
- <x>11</x>
- <y>69</y>
+ <x>12</x>
+ <y>95</y>
<width>114</width>
@@ -121,11 +121,10 @@
<name>text</name>
- <string>Force Remove</string>
+ <string>Force Overwrite</string>
</property>
</widget>
- </widget>
<widget>
- <class>QPushButton</class>
+ <class>QCheckBox</class>
<property stdset="1">
<name>name</name>
- <cstring>btnOK</cstring>
+ <cstring>verboseWget</cstring>
</property>
@@ -134,6 +133,6 @@
<rect>
- <x>11</x>
- <y>166</y>
- <width>136</width>
- <height>28</height>
+ <x>12</x>
+ <y>120</y>
+ <width>104</width>
+ <height>19</height>
</rect>
@@ -142,2 +141,14 @@
<name>text</name>
+ <string>Verbose WGet</string>
+ </property>
+ </widget>
+ </widget>
+ <widget>
+ <class>QPushButton</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>btnOK</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
<string>OK</string>
@@ -145,2 +156,3 @@
</widget>
+ </vbox>
</widget>
diff --git a/noncore/settings/aqpkg/instoptionsimpl.cpp b/noncore/settings/aqpkg/instoptionsimpl.cpp
index dd996e0..3a37eec 100644
--- a/noncore/settings/aqpkg/instoptionsimpl.cpp
+++ b/noncore/settings/aqpkg/instoptionsimpl.cpp
@@ -39,2 +39,4 @@ InstallOptionsDlgImpl::InstallOptionsDlgImpl( int flags, QWidget * parent, const
forceOverwrite->setChecked( true );
+ if ( flags & VERBOSE_WGET )
+ verboseWget->setChecked( true );
// if ( flags & MAKE_LINKS )
@@ -49 +51,20 @@ InstallOptionsDlgImpl::~InstallOptionsDlgImpl()
}
+
+
+int InstallOptionsDlgImpl :: getFlags()
+{
+ int flags = 0;
+
+ if ( forceDepends->isChecked() )
+ flags |= FORCE_DEPENDS;
+ if ( forceReinstall->isChecked() )
+ flags |= FORCE_REINSTALL;
+ if ( forceRemove->isChecked() )
+ flags |= FORCE_REMOVE;
+ if ( forceOverwrite->isChecked() )
+ flags |= FORCE_OVERWRITE;
+ if ( verboseWget->isChecked() )
+ flags |= VERBOSE_WGET;
+
+ return flags;
+} \ No newline at end of file
diff --git a/noncore/settings/aqpkg/instoptionsimpl.h b/noncore/settings/aqpkg/instoptionsimpl.h
index 08ec616..893f9bb 100644
--- a/noncore/settings/aqpkg/instoptionsimpl.h
+++ b/noncore/settings/aqpkg/instoptionsimpl.h
@@ -26,2 +26,3 @@ public:
~InstallOptionsDlgImpl();
+ int getFlags();