Changeset 868c95d


Ignore:
Timestamp:
Jul 17, 2013 11:11:39 AM (9 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1
Children:
6d0c3259
Parents:
6b68456
Message:

Fix a bug where the Upgrade status keeps just showing the last bit of a download,
especially when we may be 4 minutes into the actual extraction part of the update ;)

Fix a compiler warning

Rename Upgrade -> Update to be consistent

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

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-softwaremanager/largeItemWidget.h

    r3ec5e7f r868c95d  
    7575     
    7676  protected: 
    77     void mousePressEvent(QMouseEvent *ev){ sendSignal(); }   
     77    void mousePressEvent(QMouseEvent *ev){ Q_UNUSED(ev); sendSignal(); }   
    7878  
    7979           
  • src-qt4/pc-softwaremanager/mainUI.cpp

    rc71b68c r868c95d  
    131131  //Setup the action menu for installed applications 
    132132  actionMenu = new QMenu(); 
    133     actionMenu->addAction( QIcon(":icons/view-refresh.png"), tr("Upgrade"), this, SLOT(slotActionUpdate()) ); 
     133    actionMenu->addAction( QIcon(":icons/view-refresh.png"), tr("Update"), this, SLOT(slotActionUpdate()) ); 
    134134    actionMenu->addSeparator(); 
    135135    QMenu *dmenu = actionMenu->addMenu( QIcon(":icons/xdg_desktop.png"), tr("Desktop Icons")); 
     
    364364      if(rootonly){ ui->tool_install_remove->setIcon(QIcon(":icons/remove-root.png")); } 
    365365      else{ ui->tool_install_remove->setIcon(QIcon(":icons/remove.png")); } 
    366       //Upgrade button 
     366      //Update 
    367367      if(PBI->upgradeAvailable(appID).isEmpty()){ ui->tool_install_update->setVisible(FALSE); } 
    368368      else{ 
     
    698698    ico = ":icons/app_download.png"; 
    699699    ui->tool_bapp_download->setEnabled(TRUE); 
    700   }else if(useLatest){ //Upgrade available 
    701     ui->tool_bapp_download->setText(tr("Upgrade")); 
     700  }else if(useLatest){ //Update available 
     701    ui->tool_bapp_download->setText(tr("Update")); 
    702702    ico = ":icons/app_upgrade.png"; 
    703703    ui->tool_bapp_download->setEnabled(TRUE); 
  • src-qt4/pc-softwaremanager/processManager.cpp

    r6b68456 r868c95d  
    188188    QString line = upProc->readLine().simplified(); 
    189189    if(line.isEmpty()){ continue; } 
     190    // Change status back to "Updating..." 
     191    emit ProcessMessage(UPDATE,QString()); 
    190192    QString dl = parseDlLine(line); 
    191193    if(!dl.isEmpty()){ emit ProcessMessage(UPDATE,dl); } 
Note: See TracChangeset for help on using the changeset viewer.