author | andyq <andyq> | 2002-11-22 16:11:49 (UTC) |
---|---|---|
committer | andyq <andyq> | 2002-11-22 16:11:49 (UTC) |
commit | 34ca473739286557b3d0c73525740f0b8b01fd4b (patch) (unidiff) | |
tree | 727fa7f17d0bafa7b2e4ae30eed2c80f80b770d9 | |
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 | |||
@@ -19,2 +19,3 @@ | |||
19 | #include <qpe/config.h> | 19 | #include <qpe/config.h> |
20 | #include <qpe/qpeapplication.h> | ||
20 | #endif | 21 | #endif |
@@ -130,11 +131,3 @@ void InstallDlgImpl :: optionsSelected() | |||
130 | // set options selected from dialog | 131 | // set options selected from dialog |
131 | flags = 0; | 132 | flags = opt.getFlags(); |
132 | if ( opt.forceDepends->isChecked() ) | ||
133 | flags |= FORCE_DEPENDS; | ||
134 | if ( opt.forceReinstall->isChecked() ) | ||
135 | flags |= FORCE_REINSTALL; | ||
136 | if ( opt.forceRemove->isChecked() ) | ||
137 | flags |= FORCE_REMOVE; | ||
138 | if ( opt.forceOverwrite->isChecked() ) | ||
139 | flags |= FORCE_OVERWRITE; | ||
140 | 133 | ||
@@ -149,2 +142,3 @@ void InstallDlgImpl :: installSelected() | |||
149 | { | 142 | { |
143 | |||
150 | if ( btnInstall->text() == "Close" ) | 144 | if ( btnInstall->text() == "Close" ) |
@@ -155,2 +149,4 @@ void InstallDlgImpl :: installSelected() | |||
155 | 149 | ||
150 | // Disable buttons | ||
151 | btnOptions->setEnabled( false ); | ||
156 | btnInstall->setEnabled( false ); | 152 | btnInstall->setEnabled( false ); |
@@ -232,2 +228,3 @@ void InstallDlgImpl :: installSelected() | |||
232 | 228 | ||
229 | btnOptions->setEnabled( true ); | ||
233 | btnInstall->setEnabled( true ); | 230 | 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 @@ | |||
13 | <y>0</y> | 13 | <y>0</y> |
14 | <width>154</width> | 14 | <width>283</width> |
15 | <height>205</height> | 15 | <height>274</height> |
16 | </rect> | 16 | </rect> |
@@ -25,2 +25,11 @@ | |||
25 | </property> | 25 | </property> |
26 | <vbox> | ||
27 | <property stdset="1"> | ||
28 | <name>margin</name> | ||
29 | <number>11</number> | ||
30 | </property> | ||
31 | <property stdset="1"> | ||
32 | <name>spacing</name> | ||
33 | <number>6</number> | ||
34 | </property> | ||
26 | <widget> | 35 | <widget> |
@@ -32,11 +41,2 @@ | |||
32 | <property stdset="1"> | 41 | <property stdset="1"> |
33 | <name>geometry</name> | ||
34 | <rect> | ||
35 | <x>11</x> | ||
36 | <y>11</y> | ||
37 | <width>136</width> | ||
38 | <height>120</height> | ||
39 | </rect> | ||
40 | </property> | ||
41 | <property stdset="1"> | ||
42 | <name>title</name> | 42 | <name>title</name> |
@@ -53,5 +53,5 @@ | |||
53 | <rect> | 53 | <rect> |
54 | <x>11</x> | 54 | <x>12</x> |
55 | <y>19</y> | 55 | <y>20</y> |
56 | <width>114</width> | 56 | <width>110</width> |
57 | <height>19</height> | 57 | <height>19</height> |
@@ -73,5 +73,5 @@ | |||
73 | <rect> | 73 | <rect> |
74 | <x>11</x> | 74 | <x>12</x> |
75 | <y>44</y> | 75 | <y>45</y> |
76 | <width>114</width> | 76 | <width>107</width> |
77 | <height>19</height> | 77 | <height>19</height> |
@@ -88,3 +88,3 @@ | |||
88 | <name>name</name> | 88 | <name>name</name> |
89 | <cstring>forceOverwrite</cstring> | 89 | <cstring>forceRemove</cstring> |
90 | </property> | 90 | </property> |
@@ -93,5 +93,5 @@ | |||
93 | <rect> | 93 | <rect> |
94 | <x>11</x> | 94 | <x>12</x> |
95 | <y>94</y> | 95 | <y>70</y> |
96 | <width>114</width> | 96 | <width>105</width> |
97 | <height>19</height> | 97 | <height>19</height> |
@@ -101,3 +101,3 @@ | |||
101 | <name>text</name> | 101 | <name>text</name> |
102 | <string>Force Overwrite</string> | 102 | <string>Force Remove</string> |
103 | </property> | 103 | </property> |
@@ -108,3 +108,3 @@ | |||
108 | <name>name</name> | 108 | <name>name</name> |
109 | <cstring>forceRemove</cstring> | 109 | <cstring>forceOverwrite</cstring> |
110 | </property> | 110 | </property> |
@@ -113,4 +113,4 @@ | |||
113 | <rect> | 113 | <rect> |
114 | <x>11</x> | 114 | <x>12</x> |
115 | <y>69</y> | 115 | <y>95</y> |
116 | <width>114</width> | 116 | <width>114</width> |
@@ -121,11 +121,10 @@ | |||
121 | <name>text</name> | 121 | <name>text</name> |
122 | <string>Force Remove</string> | 122 | <string>Force Overwrite</string> |
123 | </property> | 123 | </property> |
124 | </widget> | 124 | </widget> |
125 | </widget> | ||
126 | <widget> | 125 | <widget> |
127 | <class>QPushButton</class> | 126 | <class>QCheckBox</class> |
128 | <property stdset="1"> | 127 | <property stdset="1"> |
129 | <name>name</name> | 128 | <name>name</name> |
130 | <cstring>btnOK</cstring> | 129 | <cstring>verboseWget</cstring> |
131 | </property> | 130 | </property> |
@@ -134,6 +133,6 @@ | |||
134 | <rect> | 133 | <rect> |
135 | <x>11</x> | 134 | <x>12</x> |
136 | <y>166</y> | 135 | <y>120</y> |
137 | <width>136</width> | 136 | <width>104</width> |
138 | <height>28</height> | 137 | <height>19</height> |
139 | </rect> | 138 | </rect> |
@@ -142,2 +141,14 @@ | |||
142 | <name>text</name> | 141 | <name>text</name> |
142 | <string>Verbose WGet</string> | ||
143 | </property> | ||
144 | </widget> | ||
145 | </widget> | ||
146 | <widget> | ||
147 | <class>QPushButton</class> | ||
148 | <property stdset="1"> | ||
149 | <name>name</name> | ||
150 | <cstring>btnOK</cstring> | ||
151 | </property> | ||
152 | <property stdset="1"> | ||
153 | <name>text</name> | ||
143 | <string>OK</string> | 154 | <string>OK</string> |
@@ -145,2 +156,3 @@ | |||
145 | </widget> | 156 | </widget> |
157 | </vbox> | ||
146 | </widget> | 158 | </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 | |||
39 | forceOverwrite->setChecked( true ); | 39 | forceOverwrite->setChecked( true ); |
40 | if ( flags & VERBOSE_WGET ) | ||
41 | verboseWget->setChecked( true ); | ||
40 | // if ( flags & MAKE_LINKS ) | 42 | // if ( flags & MAKE_LINKS ) |
@@ -49 +51,20 @@ InstallOptionsDlgImpl::~InstallOptionsDlgImpl() | |||
49 | } | 51 | } |
52 | |||
53 | |||
54 | int InstallOptionsDlgImpl :: getFlags() | ||
55 | { | ||
56 | int flags = 0; | ||
57 | |||
58 | if ( forceDepends->isChecked() ) | ||
59 | flags |= FORCE_DEPENDS; | ||
60 | if ( forceReinstall->isChecked() ) | ||
61 | flags |= FORCE_REINSTALL; | ||
62 | if ( forceRemove->isChecked() ) | ||
63 | flags |= FORCE_REMOVE; | ||
64 | if ( forceOverwrite->isChecked() ) | ||
65 | flags |= FORCE_OVERWRITE; | ||
66 | if ( verboseWget->isChecked() ) | ||
67 | flags |= VERBOSE_WGET; | ||
68 | |||
69 | return flags; | ||
70 | } \ 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: | |||
26 | ~InstallOptionsDlgImpl(); | 26 | ~InstallOptionsDlgImpl(); |
27 | int getFlags(); | ||
27 | 28 | ||