author | tille <tille> | 2002-04-28 01:35:36 (UTC) |
---|---|---|
committer | tille <tille> | 2002-04-28 01:35:36 (UTC) |
commit | 61cc74e0e4602d0df07b250f2786f0f0e96da28f (patch) (unidiff) | |
tree | 7fab7d278163082856f0561ec9e451922f6066e3 /noncore/unsupported/oipkg/pmipkg.cpp | |
parent | a64cc0ad0574ae1e15c4965d2557c3e06cc3fd65 (diff) | |
download | opie-61cc74e0e4602d0df07b250f2786f0f0e96da28f.zip opie-61cc74e0e4602d0df07b250f2786f0f0e96da28f.tar.gz opie-61cc74e0e4602d0df07b250f2786f0f0e96da28f.tar.bz2 |
gui fixes
Diffstat (limited to 'noncore/unsupported/oipkg/pmipkg.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/unsupported/oipkg/pmipkg.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp index f0992f5..ecc97b2 100644 --- a/noncore/unsupported/oipkg/pmipkg.cpp +++ b/noncore/unsupported/oipkg/pmipkg.cpp | |||
@@ -202,8 +202,8 @@ void PmIpkg::commit( PackageList pl ) | |||
202 | 202 | ||
203 | void PmIpkg::startDialog() | 203 | void PmIpkg::startDialog() |
204 | { | 204 | { |
205 | QDialog *d = new QDialog(); | 205 | installDialog = new QDialog(0,0,true); |
206 | QGridLayout *RunWindowLayout = new QGridLayout( d ); | 206 | QGridLayout *RunWindowLayout = new QGridLayout( installDialog ); |
207 | RunWindowLayout->setSpacing( 2 ); | 207 | RunWindowLayout->setSpacing( 2 ); |
208 | RunWindowLayout->setMargin( 2 ); | 208 | RunWindowLayout->setMargin( 2 ); |
209 | 209 | ||
@@ -211,7 +211,7 @@ void PmIpkg::startDialog() | |||
211 | buttons->setSpacing( 6 ); | 211 | buttons->setSpacing( 6 ); |
212 | buttons->setMargin( 0 ); | 212 | buttons->setMargin( 0 ); |
213 | 213 | ||
214 | PackageListView *plv = new PackageListView(d, "install",settings); | 214 | PackageListView *plv = new PackageListView(installDialog, "install",settings); |
215 | RunWindowLayout->addWidget( plv, 1, 0 ); | 215 | RunWindowLayout->addWidget( plv, 1, 0 ); |
216 | for (Package *it=to_remove.first(); it != 0; it=to_remove.next() ) | 216 | for (Package *it=to_remove.first(); it != 0; it=to_remove.next() ) |
217 | { | 217 | { |
@@ -221,7 +221,7 @@ void PmIpkg::startDialog() | |||
221 | { | 221 | { |
222 | plv->insertItem( new PackageListItem(plv, it,settings) ); | 222 | plv->insertItem( new PackageListItem(plv, it,settings) ); |
223 | } | 223 | } |
224 | QPushButton *doItButton = new QPushButton( d, "doItButton" ); | 224 | QPushButton *doItButton = new QPushButton( installDialog, "doItButton" ); |
225 | doItButton->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, doItButton->sizePolicy().hasHeightForWidth() ) ); | 225 | doItButton->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, doItButton->sizePolicy().hasHeightForWidth() ) ); |
226 | QFont doItButton_font( doItButton->font() ); | 226 | QFont doItButton_font( doItButton->font() ); |
227 | doItButton_font.setPointSize( 8 ); | 227 | doItButton_font.setPointSize( 8 ); |
@@ -230,7 +230,7 @@ void PmIpkg::startDialog() | |||
230 | doItButton->setAutoResize( FALSE ); | 230 | doItButton->setAutoResize( FALSE ); |
231 | buttons->addWidget( doItButton ); | 231 | buttons->addWidget( doItButton ); |
232 | 232 | ||
233 | QPushButton *installButton = new QPushButton( d, "installButton" ); | 233 | QPushButton *installButton = new QPushButton( installDialog, "installButton" ); |
234 | QFont installButton_font( installButton->font() ); | 234 | QFont installButton_font( installButton->font() ); |
235 | installButton_font.setPointSize( 8 ); | 235 | installButton_font.setPointSize( 8 ); |
236 | installButton->setFont( installButton_font ); | 236 | installButton->setFont( installButton_font ); |
@@ -238,7 +238,7 @@ void PmIpkg::startDialog() | |||
238 | installButton->setAutoResize( TRUE ); | 238 | installButton->setAutoResize( TRUE ); |
239 | buttons->addWidget( installButton ); | 239 | buttons->addWidget( installButton ); |
240 | 240 | ||
241 | QPushButton *removeButton = new QPushButton( d, "removeButton" ); | 241 | QPushButton *removeButton = new QPushButton( installDialog, "removeButton" ); |
242 | QFont removeButton_font( removeButton->font() ); | 242 | QFont removeButton_font( removeButton->font() ); |
243 | removeButton_font.setPointSize( 7 ); | 243 | removeButton_font.setPointSize( 7 ); |
244 | removeButton->setFont( removeButton_font ); | 244 | removeButton->setFont( removeButton_font ); |
@@ -246,7 +246,7 @@ void PmIpkg::startDialog() | |||
246 | removeButton->setAutoResize( TRUE ); | 246 | removeButton->setAutoResize( TRUE ); |
247 | buttons->addWidget( removeButton ); | 247 | buttons->addWidget( removeButton ); |
248 | 248 | ||
249 | QPushButton *cancelButton = new QPushButton( d, "cancelButton" ); | 249 | QPushButton *cancelButton = new QPushButton( installDialog, "cancelButton" ); |
250 | QFont cancelButton_font( cancelButton->font() ); | 250 | QFont cancelButton_font( cancelButton->font() ); |
251 | cancelButton_font.setPointSize( 8 ); | 251 | cancelButton_font.setPointSize( 8 ); |
252 | cancelButton->setFont( cancelButton_font ); | 252 | cancelButton->setFont( cancelButton_font ); |
@@ -263,10 +263,10 @@ void PmIpkg::startDialog() | |||
263 | connect( removeButton, SIGNAL( clicked() ), | 263 | connect( removeButton, SIGNAL( clicked() ), |
264 | this, SLOT( remove() ) ); | 264 | this, SLOT( remove() ) ); |
265 | connect( cancelButton, SIGNAL( clicked() ), | 265 | connect( cancelButton, SIGNAL( clicked() ), |
266 | d, SLOT( close() ) ); | 266 | installDialog, SLOT( close() ) ); |
267 | d->showMaximized(); | 267 | installDialog->showMaximized(); |
268 | d->exec(); | 268 | if ( installDialog->exec() ) doIt(); |
269 | // d->close(); | 269 | installDialog->close(); |
270 | } | 270 | } |
271 | 271 | ||
272 | void PmIpkg::doIt() | 272 | void PmIpkg::doIt() |
@@ -279,6 +279,7 @@ void PmIpkg::doIt() | |||
279 | void PmIpkg::remove() | 279 | void PmIpkg::remove() |
280 | { | 280 | { |
281 | if ( to_remove.count() == 0 ) return; | 281 | if ( to_remove.count() == 0 ) return; |
282 | installDialog->close(); | ||
282 | show( true ); | 283 | show( true ); |
283 | 284 | ||
284 | out("<hr><hr><b>"+tr("Removing")+"<br>"+tr("please wait")+"</b><br>"); | 285 | out("<hr><hr><b>"+tr("Removing")+"<br>"+tr("please wait")+"</b><br>"); |
@@ -300,6 +301,7 @@ void PmIpkg::remove() | |||
300 | void PmIpkg::install() | 301 | void PmIpkg::install() |
301 | { | 302 | { |
302 | if ( to_install.count() == 0 ) return; | 303 | if ( to_install.count() == 0 ) return; |
304 | installDialog->close(); | ||
303 | show( true ); | 305 | show( true ); |
304 | out("<hr><hr><b>"+tr("Installing")+"<br>"+tr("please wait")+"</b><br>"); | 306 | out("<hr><hr><b>"+tr("Installing")+"<br>"+tr("please wait")+"</b><br>"); |
305 | for (Package *it=to_install.first(); it != 0; it=to_install.next() ) | 307 | for (Package *it=to_install.first(); it != 0; it=to_install.next() ) |