-rw-r--r-- | noncore/settings/aqpkg/installdlgimpl.cpp | 15 | ||||
-rw-r--r-- | noncore/settings/aqpkg/instoptions.ui | 78 | ||||
-rw-r--r-- | noncore/settings/aqpkg/instoptionsimpl.cpp | 21 | ||||
-rw-r--r-- | noncore/settings/aqpkg/instoptionsimpl.h | 1 |
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 @@ -18,4 +18,5 @@ #ifdef QWS #include <qpe/config.h> +#include <qpe/qpeapplication.h> #endif @@ -129,13 +130,5 @@ 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(); #ifdef QWS @@ -148,4 +141,5 @@ void InstallDlgImpl :: optionsSelected() void InstallDlgImpl :: installSelected() { + if ( btnInstall->text() == "Close" ) { @@ -154,4 +148,6 @@ void InstallDlgImpl :: installSelected() } + // Disable buttons + btnOptions->setEnabled( false ); btnInstall->setEnabled( false ); @@ -231,4 +227,5 @@ void InstallDlgImpl :: installSelected() } + btnOptions->setEnabled( true ); btnInstall->setEnabled( true ); btnInstall->setText( tr( "Close" ) ); 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 @@ -12,6 +12,6 @@ <x>0</x> <y>0</y> - <width>154</width> - <height>205</height> + <width>283</width> + <height>274</height> </rect> </property> @@ -24,4 +24,13 @@ <bool>false</bool> </property> + <vbox> + <property stdset="1"> + <name>margin</name> + <number>11</number> + </property> + <property stdset="1"> + <name>spacing</name> + <number>6</number> + </property> <widget> <class>QGroupBox</class> @@ -31,13 +40,4 @@ </property> <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> <string>Options</string> @@ -52,7 +52,7 @@ <name>geometry</name> <rect> - <x>11</x> - <y>19</y> - <width>114</width> + <x>12</x> + <y>20</y> + <width>110</width> <height>19</height> </rect> @@ -72,7 +72,7 @@ <name>geometry</name> <rect> - <x>11</x> - <y>44</y> - <width>114</width> + <x>12</x> + <y>45</y> + <width>107</width> <height>19</height> </rect> @@ -87,12 +87,12 @@ <property stdset="1"> <name>name</name> - <cstring>forceOverwrite</cstring> + <cstring>forceRemove</cstring> </property> <property stdset="1"> <name>geometry</name> <rect> - <x>11</x> - <y>94</y> - <width>114</width> + <x>12</x> + <y>70</y> + <width>105</width> <height>19</height> </rect> @@ -100,5 +100,5 @@ <property stdset="1"> <name>text</name> - <string>Force Overwrite</string> + <string>Force Remove</string> </property> </widget> @@ -107,11 +107,11 @@ <property stdset="1"> <name>name</name> - <cstring>forceRemove</cstring> + <cstring>forceOverwrite</cstring> </property> <property stdset="1"> <name>geometry</name> <rect> - <x>11</x> - <y>69</y> + <x>12</x> + <y>95</y> <width>114</width> <height>19</height> @@ -120,28 +120,40 @@ <property stdset="1"> <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> <property stdset="1"> <name>geometry</name> <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> </property> <property stdset="1"> <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> </property> </widget> + </vbox> </widget> <connections> 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 @@ -38,4 +38,6 @@ InstallOptionsDlgImpl::InstallOptionsDlgImpl( int flags, QWidget * parent, const if ( flags & FORCE_OVERWRITE ) forceOverwrite->setChecked( true ); + if ( flags & VERBOSE_WGET ) + verboseWget->setChecked( true ); // if ( flags & MAKE_LINKS ) // makeLinks->setChecked( true ); @@ -48,2 +50,21 @@ 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 @@ -25,4 +25,5 @@ public: InstallOptionsDlgImpl( int flags, QWidget * parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~InstallOptionsDlgImpl(); + int getFlags(); protected: |