Changeset ae5a5d8


Ignore:
Timestamp:
02/24/14 10:28:57 (10 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
3adfc87
Parents:
a2ef28e
Message:

Make sure that with actual PBI installed list changes, the browser app page does a full refresh if it is visible, rather than just updating the download button.

Location:
src-qt4/pc-softwaremanager
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-softwaremanager/mainUI.cpp

    rf7905b5 rae5a5d8  
    294294  //If the browser app page is currently visible for this app 
    295295  if( (ui->stacked_browser->currentWidget() == ui->page_app) && ui->page_app->isVisible() ){ 
    296     slotUpdateAppDownloadButton(); 
     296    slotGoToApp(cApp); 
    297297  } 
    298298} 
     
    879879  //Now update the download button appropriately 
    880880  slotUpdateAppDownloadButton(); 
    881   /*QString ico; 
    882   QString working = PBI->currentAppStatus(appID); 
    883   if(!working.isEmpty()){ //app currently pending or actually doing something 
    884     ui->tool_bapp_download->setText(working); 
    885     ui->tool_bapp_download->setIcon(QIcon(":icons/working.png")); 
    886     ui->tool_bapp_download->setEnabled(FALSE); 
    887   }else if(useLatest && cVer.isEmpty()){ //new installation 
    888     ui->tool_bapp_download->setText(tr("Install Now!")); 
    889     ico = ":icons/app_download.png"; 
    890     ui->tool_bapp_download->setEnabled(TRUE); 
    891   }else if(useLatest){ //Update available 
    892     ui->tool_bapp_download->setText(tr("Update")); 
    893     ico = ":icons/app_upgrade.png"; 
    894     ui->tool_bapp_download->setEnabled(TRUE); 
    895   }else if(!nobackup){  //Downgrade available 
    896     ui->tool_bapp_download->setText(tr("Downgrade")); 
    897     ico = ":icons/app_downgrade.png"; 
    898     ui->tool_bapp_download->setEnabled(TRUE); 
    899   }else{ //already installed (no downgrade available) 
    900     ui->tool_bapp_download->setText(tr("Installed")); 
    901     ui->tool_bapp_download->setIcon(QIcon(":icons/dialog-ok.png")); 
    902     ui->tool_bapp_download->setEnabled(FALSE); 
    903   } 
    904   //Now set the icon appropriately if it requires root permissions 
    905   if(!ico.isEmpty()){ 
    906     if(data[8]=="true"){ //requires root permissions to install 
    907       ico.replace(".png","-root.png"); 
    908     } 
    909     ui->tool_bapp_download->setIcon(QIcon(ico)); 
    910   } 
    911   ui->tool_bapp_download->setWhatsThis(appID); //set for slot 
    912   */ 
     881 
    913882  //Now enable/disable the shortcut buttons 
    914883  ui->tool_browse_app->setVisible(TRUE); 
  • src-qt4/pc-softwaremanager/mainUI.h

    rf7905b5 rae5a5d8  
    115115  PBIBackend *PBI; 
    116116  //INSTALLED TAB 
    117   QMenu *actionMenu, *appBinMenu; 
     117  QMenu *actionMenu, *appBinMenu, *shortcutMenu; 
    118118  void initializeInstalledTab(); 
    119119  void formatInstalledItemDisplay(QTreeWidgetItem *item); 
     
    128128  void slotDisplayStats(); 
    129129     
    130      
    131 signals: 
    132      
    133130} ; 
    134131 
Note: See TracChangeset for help on using the changeset viewer.