author | andyq <andyq> | 2002-11-22 16:11:49 (UTC) |
---|---|---|
committer | andyq <andyq> | 2002-11-22 16:11:49 (UTC) |
commit | 34ca473739286557b3d0c73525740f0b8b01fd4b (patch) (side-by-side diff) | |
tree | 727fa7f17d0bafa7b2e4ae30eed2c80f80b770d9 /noncore/settings/aqpkg | |
parent | 8366956992e07a9fc77b9e126bb429b32fd4ad9a (diff) | |
download | opie-34ca473739286557b3d0c73525740f0b8b01fd4b.zip opie-34ca473739286557b3d0c73525740f0b8b01fd4b.tar.gz opie-34ca473739286557b3d0c73525740f0b8b01fd4b.tar.bz2 |
Added verbose_wget flags (doesn't yet work properly though coz ipkg is sending crap)
-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 @@ -16,8 +16,9 @@ ***************************************************************************/ #ifdef QWS #include <qpe/config.h> +#include <qpe/qpeapplication.h> #endif #include <qmultilineedit.h> #include <qdialog.h> @@ -127,17 +128,9 @@ void InstallDlgImpl :: optionsSelected() InstallOptionsDlgImpl opt( flags, this, "Option", true ); opt.exec(); // 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 Config cfg( "aqpkg" ); cfg.setGroup( "settings" ); @@ -146,14 +139,17 @@ void InstallDlgImpl :: optionsSelected() } void InstallDlgImpl :: installSelected() { + if ( btnInstall->text() == "Close" ) { done( 1 ); return; } + // Disable buttons + btnOptions->setEnabled( false ); btnInstall->setEnabled( false ); if ( pIpkg ) { @@ -229,8 +225,9 @@ void InstallDlgImpl :: installSelected() delete pIpkg; } + 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 @@ -10,10 +10,10 @@ <name>geometry</name> <rect> <x>0</x> <y>0</y> - <width>154</width> - <height>205</height> + <width>283</width> + <height>274</height> </rect> </property> <property stdset="1"> <name>caption</name> @@ -22,24 +22,24 @@ <property stdset="1"> <name>sizeGripEnabled</name> <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> <property stdset="1"> <name>name</name> <cstring>GroupBox1</cstring> </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> </property> <widget> @@ -50,11 +50,11 @@ </property> <property stdset="1"> <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> </property> <property stdset="1"> @@ -70,11 +70,11 @@ </property> <property stdset="1"> <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> </property> <property stdset="1"> @@ -85,65 +85,77 @@ <widget> <class>QCheckBox</class> <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> </property> <property stdset="1"> <name>text</name> - <string>Force Overwrite</string> + <string>Force Remove</string> </property> </widget> <widget> <class>QCheckBox</class> <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> </rect> </property> <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> <connection> <sender>btnOK</sender> 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 @@ -36,8 +36,10 @@ InstallOptionsDlgImpl::InstallOptionsDlgImpl( int flags, QWidget * parent, const if ( flags & FORCE_REMOVE ) forceRemove->setChecked( true ); if ( flags & FORCE_OVERWRITE ) forceOverwrite->setChecked( true ); + if ( flags & VERBOSE_WGET ) + verboseWget->setChecked( true ); // if ( flags & MAKE_LINKS ) // makeLinks->setChecked( true ); showMaximized(); @@ -46,4 +48,23 @@ InstallOptionsDlgImpl::InstallOptionsDlgImpl( int flags, QWidget * parent, const 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 @@ -23,8 +23,9 @@ class InstallOptionsDlgImpl : public InstallOptionsDlg { public: InstallOptionsDlgImpl( int flags, QWidget * parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~InstallOptionsDlgImpl(); + int getFlags(); protected: private: |