Changeset bbc8497


Ignore:
Timestamp:
05/11/14 12:40:31 (8 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
72614b5
Parents:
bb7f3a3
Message:

Remove the temporary fix in the migrate UI for the conflict detection: this is now fixed in the libpcbsd class itself.

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

Legend:

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

    r5215583 rbbc8497  
    3939void MigrateUI::updateProgress(QString msg){ 
    4040  ui->text_progress->append(msg); 
    41  
    42   QString line = msg; 
    43  
    44   if ( line.indexOf("PKGCONFLICTS: ") == 0 ) { 
    45      QString tmp = line; 
    46      tmp.replace("PKGCONFLICTS: ", ""); 
    47      ConflictList = tmp; 
    48   } 
    49   else if ( line.indexOf("PKGREPLY: ") == 0 ) { 
    50      QString ans; 
    51      QString tmp = line; 
    52      tmp.replace("PKGREPLY: ", ""); 
    53      QMessageBox msgBox; 
    54      msgBox.setText(tr("The following packages are causing conflicts with the selected changes and can be automatically removed. Continue?") + "\n" + ConflictList); 
    55      msgBox.setStandardButtons(QMessageBox::Yes|QMessageBox::No); 
    56      msgBox.setDetailedText(getConflictDetailText()); 
    57      msgBox.setDefaultButton(QMessageBox::No); 
    58      if ( msgBox.exec() == QMessageBox::Yes) { 
    59         // We will try to fix conflicts 
    60         ans="yes"; 
    61      } else { 
    62        // We will fail :( 
    63        QMessageBox::warning(this, tr("Package Conflicts"), 
    64        tr("You may need to manually fix the conflicts before trying again."), 
    65        QMessageBox::Ok, 
    66        QMessageBox::Ok); 
    67        ans="no"; 
    68      } 
    69  
    70      QFile pkgTrig( tmp ); 
    71      if ( pkgTrig.open( QIODevice::WriteOnly ) ) { 
    72         QTextStream streamTrig( &pkgTrig ); 
    73         streamTrig << ans; 
    74         pkgTrig.close(); 
    75         ConflictList.clear(); //already sent an answer - clear the internal list 
    76      } 
    77   } 
    7841} 
    7942 
    8043void MigrateUI::updatePercent(QString percent, QString size, QString filename){ 
    81   QString msg = QString(tr("Downloading: %1 (%2 of %3)")).arg(filename, percent, size); 
     44  QString msg = QString(tr("Downloading: %1 (%2% of %3)")).arg(filename, percent, size); 
    8245  ui->text_progress->append(msg); 
    8346} 
  • src-qt4/pc-softwaremanager/pbiNgBackend.cpp

    re7fce9d rbbc8497  
    718718 
    719719void PBIBackend::procPercent(QString percent, QString size, QString filename){ //percent, file size, filename 
    720   PKGRUNSTAT = QString( tr("Downloading %1 (%2 of %3)")).arg(filename, percent, size); 
     720  PKGRUNSTAT = QString( tr("Downloading %1 (%2% of %3)")).arg(filename, percent, size); 
    721721  qDebug() << "MSG:" << PKGRUNSTAT; 
    722722  //don't save this to the log - can get tons of these types of messages for every percent update 
Note: See TracChangeset for help on using the changeset viewer.