author | drw <drw> | 2003-04-26 22:42:19 (UTC) |
---|---|---|
committer | drw <drw> | 2003-04-26 22:42:19 (UTC) |
commit | 98a9291263e167b8882ac916330e7215ebd884b4 (patch) (unidiff) | |
tree | 882a909e9381ab4cc97e77377fd61361d7f21eab /noncore/settings/aqpkg/mainwin.cpp | |
parent | 64c48b637c1bd1bef679bff500f3e0ce5365358d (diff) | |
download | opie-98a9291263e167b8882ac916330e7215ebd884b4.zip opie-98a9291263e167b8882ac916330e7215ebd884b4.tar.gz opie-98a9291263e167b8882ac916330e7215ebd884b4.tar.bz2 |
1. Fix for bug #872 - reduce CPU useage while ipkg is doing its thing 2. Re-enable setDocument function for identifying local ipks
Diffstat (limited to 'noncore/settings/aqpkg/mainwin.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/aqpkg/mainwin.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp index 1aec6a8..58f6feb 100644 --- a/noncore/settings/aqpkg/mainwin.cpp +++ b/noncore/settings/aqpkg/mainwin.cpp | |||
@@ -276,79 +276,79 @@ void MainWindow :: init() | |||
276 | cfg.setGroup( "settings" ); | 276 | cfg.setGroup( "settings" ); |
277 | currentlySelectedServer = cfg.readEntry( "selectedServer", "local" ); | 277 | currentlySelectedServer = cfg.readEntry( "selectedServer", "local" ); |
278 | // showJumpTo = cfg.readBoolEntry( "showJumpTo", "true" ); | 278 | // showJumpTo = cfg.readBoolEntry( "showJumpTo", "true" ); |
279 | 279 | ||
280 | #endif | 280 | #endif |
281 | 281 | ||
282 | stack->raiseWidget( progressWindow ); | 282 | stack->raiseWidget( progressWindow ); |
283 | 283 | ||
284 | mgr = new DataManager(); | 284 | mgr = new DataManager(); |
285 | connect( mgr, SIGNAL( progressSetSteps( int ) ), this, SLOT( setProgressSteps( int ) ) ); | 285 | connect( mgr, SIGNAL( progressSetSteps( int ) ), this, SLOT( setProgressSteps( int ) ) ); |
286 | connect( mgr, SIGNAL( progressSetMessage( const QString & ) ), | 286 | connect( mgr, SIGNAL( progressSetMessage( const QString & ) ), |
287 | this, SLOT( setProgressMessage( const QString & ) ) ); | 287 | this, SLOT( setProgressMessage( const QString & ) ) ); |
288 | connect( mgr, SIGNAL( progressUpdate( int ) ), this, SLOT( updateProgress( int ) ) ); | 288 | connect( mgr, SIGNAL( progressUpdate( int ) ), this, SLOT( updateProgress( int ) ) ); |
289 | mgr->loadServers(); | 289 | mgr->loadServers(); |
290 | 290 | ||
291 | showUninstalledPkgs = false; | 291 | showUninstalledPkgs = false; |
292 | showInstalledPkgs = false; | 292 | showInstalledPkgs = false; |
293 | showUpgradedPkgs = false; | 293 | showUpgradedPkgs = false; |
294 | categoryFilterEnabled = false; | 294 | categoryFilterEnabled = false; |
295 | 295 | ||
296 | updateData(); | 296 | updateData(); |
297 | 297 | ||
298 | stack->raiseWidget( networkPkgWindow ); | 298 | stack->raiseWidget( networkPkgWindow ); |
299 | } | 299 | } |
300 | /* | 300 | |
301 | void MainWindow :: setDocument( const QString &doc ) | 301 | void MainWindow :: setDocument( const QString &doc ) |
302 | { | 302 | { |
303 | // Remove path from package | 303 | // Remove path from package |
304 | QString package = Utils::getPackageNameFromIpkFilename( doc ); | 304 | QString package = Utils::getPackageNameFromIpkFilename( doc ); |
305 | // std::cout << "Selecting package " << package << std::endl; | 305 | // std::cout << "Selecting package " << package << std::endl; |
306 | 306 | ||
307 | // First select local server | 307 | // First select local server |
308 | for ( int i = 0 ; i < serversList->count() ; ++i ) | 308 | for ( int i = 0 ; i < serversList->count() ; ++i ) |
309 | { | 309 | { |
310 | if ( serversList->text( i ) == LOCAL_IPKGS ) | 310 | if ( serversList->text( i ) == LOCAL_IPKGS ) |
311 | { | 311 | { |
312 | serversList->setCurrentItem( i ); | 312 | serversList->setCurrentItem( i ); |
313 | break; | 313 | break; |
314 | } | 314 | } |
315 | } | 315 | } |
316 | serverSelected( 0 ); | 316 | serverSelected( 0 ); |
317 | 317 | ||
318 | // Now set the check box of the selected package | 318 | // Now set the check box of the selected package |
319 | for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild(); | 319 | for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild(); |
320 | item != 0 ; | 320 | item != 0 ; |
321 | item = (QCheckListItem *)item->nextSibling() ) | 321 | item = (QCheckListItem *)item->nextSibling() ) |
322 | { | 322 | { |
323 | if ( item->text().startsWith( package ) ) | 323 | if ( item->text().startsWith( package ) ) |
324 | { | 324 | { |
325 | item->setOn( true ); | 325 | item->setOn( true ); |
326 | break; | 326 | break; |
327 | } | 327 | } |
328 | } | 328 | } |
329 | } | 329 | } |
330 | */ | 330 | |
331 | void MainWindow :: displaySettings() | 331 | void MainWindow :: displaySettings() |
332 | { | 332 | { |
333 | SettingsImpl *dlg = new SettingsImpl( mgr, this, "Settings", true ); | 333 | SettingsImpl *dlg = new SettingsImpl( mgr, this, "Settings", true ); |
334 | if ( dlg->showDlg() ) | 334 | if ( dlg->showDlg() ) |
335 | { | 335 | { |
336 | stack->raiseWidget( progressWindow ); | 336 | stack->raiseWidget( progressWindow ); |
337 | updateData(); | 337 | updateData(); |
338 | stack->raiseWidget( networkPkgWindow ); | 338 | stack->raiseWidget( networkPkgWindow ); |
339 | } | 339 | } |
340 | delete dlg; | 340 | delete dlg; |
341 | } | 341 | } |
342 | 342 | ||
343 | void MainWindow :: closeEvent( QCloseEvent *e ) | 343 | void MainWindow :: closeEvent( QCloseEvent *e ) |
344 | { | 344 | { |
345 | // If install dialog is visible, return to main view, otherwise close app | 345 | // If install dialog is visible, return to main view, otherwise close app |
346 | QWidget *widget = stack->visibleWidget(); | 346 | QWidget *widget = stack->visibleWidget(); |
347 | 347 | ||
348 | if ( widget != networkPkgWindow && widget != progressWindow ) | 348 | if ( widget != networkPkgWindow && widget != progressWindow ) |
349 | { | 349 | { |
350 | if ( widget ) delete widget; | 350 | if ( widget ) delete widget; |
351 | stack->raiseWidget( networkPkgWindow ); | 351 | stack->raiseWidget( networkPkgWindow ); |
352 | e->ignore(); | 352 | e->ignore(); |
353 | } | 353 | } |
354 | else | 354 | else |
@@ -971,56 +971,56 @@ void MainWindow :: applyChanges() | |||
971 | stack->raiseWidget( dlg ); | 971 | stack->raiseWidget( dlg ); |
972 | } | 972 | } |
973 | 973 | ||
974 | // decide what to do - either remove, upgrade or install | 974 | // decide what to do - either remove, upgrade or install |
975 | // Current rules: | 975 | // Current rules: |
976 | // If not installed - install | 976 | // If not installed - install |
977 | // If installed and different version available - upgrade | 977 | // If installed and different version available - upgrade |
978 | // If installed and version up to date - remove | 978 | // If installed and version up to date - remove |
979 | InstallData *MainWindow :: dealWithItem( QCheckListItem *item ) | 979 | InstallData *MainWindow :: dealWithItem( QCheckListItem *item ) |
980 | { | 980 | { |
981 | QString name = item->text(); | 981 | QString name = item->text(); |
982 | 982 | ||
983 | // Get package | 983 | // Get package |
984 | Server *s = mgr->getServer( serversList->currentText() ); | 984 | Server *s = mgr->getServer( serversList->currentText() ); |
985 | Package *p = s->getPackage( name ); | 985 | Package *p = s->getPackage( name ); |
986 | 986 | ||
987 | // If the package has a filename then it is a local file | 987 | // If the package has a filename then it is a local file |
988 | if ( p->isPackageStoredLocally() ) | 988 | if ( p->isPackageStoredLocally() ) |
989 | name = p->getFilename(); | 989 | name = p->getFilename(); |
990 | 990 | ||
991 | QString option; | 991 | QString option; |
992 | QString dest = "root"; | 992 | QString dest = "root"; |
993 | if ( !p->isInstalled() ) | 993 | if ( !p->isInstalled() ) |
994 | { | 994 | { |
995 | InstallData *newitem = new InstallData();; | 995 | InstallData *newitem = new InstallData(); |
996 | newitem->option = "I"; | 996 | newitem->option = "I"; |
997 | newitem->packageName = name; | 997 | newitem->packageName = name; |
998 | return newitem; | 998 | return newitem; |
999 | } | 999 | } |
1000 | else | 1000 | else |
1001 | { | 1001 | { |
1002 | InstallData *newitem = new InstallData();; | 1002 | InstallData *newitem = new InstallData(); |
1003 | newitem->option = "D"; | 1003 | newitem->option = "D"; |
1004 | if ( !p->isPackageStoredLocally() ) | 1004 | if ( !p->isPackageStoredLocally() ) |
1005 | newitem->packageName = p->getInstalledPackageName(); | 1005 | newitem->packageName = p->getInstalledPackageName(); |
1006 | else | 1006 | else |
1007 | newitem->packageName = name; | 1007 | newitem->packageName = name; |
1008 | 1008 | ||
1009 | if ( p->getInstalledTo() ) | 1009 | if ( p->getInstalledTo() ) |
1010 | { | 1010 | { |
1011 | newitem->destination = p->getInstalledTo(); | 1011 | newitem->destination = p->getInstalledTo(); |
1012 | // cout << "dest - " << p->getInstalledTo()->getDestinationName() << endl; | 1012 | // cout << "dest - " << p->getInstalledTo()->getDestinationName() << endl; |
1013 | // cout << "dest - " << p->getInstalledTo()->getDestinationPath() << endl; | 1013 | // cout << "dest - " << p->getInstalledTo()->getDestinationPath() << endl; |
1014 | } | 1014 | } |
1015 | else | 1015 | else |
1016 | { | 1016 | { |
1017 | newitem->destination = p->getLocalPackage()->getInstalledTo(); | 1017 | newitem->destination = p->getLocalPackage()->getInstalledTo(); |
1018 | } | 1018 | } |
1019 | 1019 | ||
1020 | // Now see if version is newer or not | 1020 | // Now see if version is newer or not |
1021 | int val = compareVersions( p->getInstalledVersion(), p->getVersion() ); | 1021 | int val = compareVersions( p->getInstalledVersion(), p->getVersion() ); |
1022 | 1022 | ||
1023 | // If the version requested is older and user selected a local ipk file, then reinstall the file | 1023 | // If the version requested is older and user selected a local ipk file, then reinstall the file |
1024 | if ( p->isPackageStoredLocally() && val == -1 ) | 1024 | if ( p->isPackageStoredLocally() && val == -1 ) |
1025 | val = 0; | 1025 | val = 0; |
1026 | 1026 | ||