Changeset 77024b5


Ignore:
Timestamp:
02/03/14 10:38:57 (8 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
405f33b, 4f9718b
Parents:
e62a5d2
Message:

Fix the Update tab of the package manager, now blank out the contents and display a notification
once the refresh begins of packages, either post-update, or after changing settings

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • .gitignore

    re8a4eae r77024b5  
    12071207src-qt4/pc-zmanager/ui_dialogprop.h 
    12081208src-qt4/pc-zmanager/ui_zmanagerwindow.h 
     1209src-qt4/pc-pkgmanager/ui_dialogConfig.h 
     1210src-qt4/pc-sysmanager/pc-sysmanager 
     1211src-qt4/pc-sysmanager/ui_cmdDialog.h 
     1212src-sh/pbi-manager/install 
     1213src-sh/pbi-manager/mount_nullfs/mount_nullfs 
     1214src-sh/pbi-manager/pbime/pbime 
     1215src-sh/warden/install 
     1216 
  • src-qt4/pc-pkgmanager/mainWin.cpp

    re62a5d2 r77024b5  
    290290  uPackages = false; 
    291291 
     292  // Set the type of pkg command 
     293  pkgProcessType="update"; 
     294 
    292295  // Init the pkg process 
    293296  prepPkgProcess(); 
     
    568571  } 
    569572 
     573  // Eventually we will have more stuff to do after running a package command 
     574  //if ( pkgProcessType == "update" ) 
     575  //{ 
     576  //} 
     577 
    570578  // Nothing left to run! Lets wrap up 
    571579  QFile sysTrig( SYSTRIGGER ); 
     
    607615  //Make sure the search box is disabled at startup 
    608616  tool_search->setEnabled(false); 
     617 
     618  // We will refresh the update tab after, clear it out for now 
     619  buttonRescanPkgs->setEnabled(false); 
     620  pushUpdatePkgs->setEnabled(false); 
     621  listViewUpdatesPkgs->clear(); 
     622  groupUpdatesPkgs->setTitle(tr("Reading package database...")); 
    609623 
    610624  // Running in basic mode 
     
    948962   
    949963  if ( ! pkgRemoveList.isEmpty() ) { 
     964    pkgProcessType="delete"; 
    950965    if ( wDir.isEmpty() ) 
    951966      pCmds << "pkg" << "delete" << "-R" << "-y" << pkgRemoveList.join(" "); 
     
    959974  // Adding packages 
    960975  if ( ! pkgAddList.isEmpty() ) { 
     976    pkgProcessType="add"; 
    961977 
    962978    // Look for conflicts first 
     
    11791195 
    11801196  if ( ! delPkgs.isEmpty() ) { 
     1197    pkgProcessType="deletemeta"; 
    11811198    if ( wDir.isEmpty() ) 
    11821199      pCmds << "pc-metapkgmanager" << "del" << delPkgs; 
     
    11891206 
    11901207  if ( ! addPkgs.isEmpty() ) { 
     1208    pkgProcessType="addmeta"; 
    11911209    if ( wDir.isEmpty() ) 
    11921210      pCmds << "pc-metapkgmanager" << "add" << addPkgs; 
  • src-qt4/pc-pkgmanager/mainWin.h

    re62a5d2 r77024b5  
    169169    dialogConfig *configD; 
    170170 
     171    // Indicator of package process type 
     172    QString pkgProcessType; 
     173 
    171174signals: 
    172175 
Note: See TracChangeset for help on using the changeset viewer.