Changeset 7a59f02


Ignore:
Timestamp:
05/09/14 08:11:19 (16 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, enter/10, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2, releng/10.2
Children:
221e4ca
Parents:
b736a6d
Message:

Fix the custom URL display for manually-added repo URLs, and get rid of the update notifications on the installed tab - leave that to the pkgng detection routines as to whether to show that updates are available.

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

Legend:

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

    rd4c9f0db r7a59f02  
    7979      if(!found){ 
    8080        //Add this repo as UNKNOWN 
    81         QListWidgetItem *item = new QListWidgetItem( tr("UNKNOWN"), 0); 
     81        QListWidgetItem *item = new QListWidgetItem( cURL.left(10).append("..."), 0); 
    8282          item->setWhatsThis(cURL); 
    8383          item->setToolTip(cURL); 
  • src-qt4/pc-softwaremanager/pbiNgBackend.cpp

    rd4c9f0db r7a59f02  
    357357      if(PENDING[i].startsWith(appID+"::::")){ 
    358358        //Currently pending - check which type (install/remove) 
    359         if(PENDING[i].contains("pbi_add") || (PENDING[i].contains("pc-pkg ") &&PENDING[i].contains(" add ") ) ){ output = tr("Pending Installation"); } 
    360         else if(PENDING[i].contains("pbi_delete") || (PENDING[i].contains("pc-pkg ") && PENDING[i].contains(" remove ") ) ){ output = tr("Pending Removal"); } 
    361         return output; 
    362       } 
    363     } 
    364     //If it gets here, it is not pending, so check for updates 
    365     NGApp app; 
    366     if(JAILPKGS.contains(injail)){ 
    367         QHash<QString, NGApp> hash = JAILPKGS.value(injail); 
    368         if(hash.contains(appID)){ 
    369           app = hash[appID]; 
     359        if(injail.isEmpty() || PENDING[i].endsWith("::::"+injail) ){ 
     360          if(PENDING[i].contains("pbi_add") || (PENDING[i].contains("pc-pkg ") &&PENDING[i].contains(" add ") ) ){ output = tr("Pending Installation"); } 
     361          else if(PENDING[i].contains("pbi_delete") || (PENDING[i].contains("pc-pkg ") && PENDING[i].contains(" remove ") ) ){ output = tr("Pending Removal"); } 
     362          break; 
    370363        } 
    371     } 
    372     else if(APPHASH.contains(appID)){ app = APPHASH[appID]; } 
    373     else if(PKGHASH.contains(appID)){ app = PKGHASH[appID]; } 
    374     if(!app.origin.isEmpty()){ 
    375       if(app.version != app.installedversion && app.isInstalled && !app.version.isEmpty()){ 
    376          output = QString(tr("Update Available: %1")).arg(app.version); 
    377364      } 
    378365    } 
Note: See TracChangeset for help on using the changeset viewer.