Ignore:
Timestamp:
02/25/14 11:36:45 (9 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
ff5a5e4
Parents:
c24d6287
Message:

Fix up the browser app page status notifications with the new backend process class.

File:
1 edited

Legend:

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

    r68eacde r9cbf5aa  
    685685    //Not currently running - hide the display indicators 
    686686    ui->group_install_appStat->setVisible(false); 
    687   }else if(stat.startsWith("DLSTAT::")){ 
     687  /*}else if(stat.startsWith("DLSTAT::")){ 
    688688    //Currently downloading - show download status indicators 
    689689    QString percent = stat.section("::",1,1); 
     
    704704      ui->label_install_DL->setVisible(TRUE); 
    705705      ui->label_install_DL->setText(speed); 
    706     } 
     706    }*/ 
    707707  }else{ 
    708708    //Currently installing/removing/updating - show last message from process 
     
    710710    else{ ui->label_install_status->setText(stat); } 
    711711    ui->group_install_appStat->setVisible(TRUE); 
    712       ui->progress_install_DL->setVisible(FALSE); 
    713       ui->label_install_DL->setVisible(FALSE); 
     712      //ui->progress_install_DL->setVisible(FALSE); 
     713      //ui->label_install_DL->setVisible(FALSE); 
    714714  } 
    715715} 
     
    916916  QString ico; 
    917917  QString working = PBI->currentAppStatus(cApp); 
     918  QString rawstat = PBI->currentAppStatus(cApp, true); 
    918919  QStringList info = PBI->AppInfo(cApp, QStringList() << "latestversion" << "backupversion" << "requiresroot"); 
    919920  QString pbiID = PBI->isInstalled(cApp); 
    920   if(!working.isEmpty()){ //app currently pending or actually doing something 
    921     ui->tool_bapp_download->setText(working); 
     921  qDebug() << "App Download status:" << working << rawstat; 
     922  if(!working.isEmpty() && !rawstat.isEmpty() ){ //app currently pending or actually doing something 
     923    if(rawstat.startsWith("DLSTAT::")){ ui->tool_bapp_download->setText(tr("Downloading..")); } 
     924    else{ ui->tool_bapp_download->setText(working); } 
    922925    ui->tool_bapp_download->setIcon(QIcon(":icons/working.png")); 
    923926    ui->tool_bapp_download->setEnabled(FALSE); 
Note: See TracChangeset for help on using the changeset viewer.