Changeset b4350b9


Ignore:
Timestamp:
04/24/13 16:35:20 (16 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.1-release, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
83ebbb5
Parents:
84406a4
Message:

Change how we call the conflict message box, add a placeholder for additional text about the conflicting packages, so we can make a better choice as to remove it or not

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

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-pkgmanager/mainWin.cpp

    r84406a4 rb4350b9  
    184184} 
    185185 
     186QString mainWin::getConflictDetailText() { 
     187  return QString(); 
     188} 
     189 
    186190void mainWin::prepPkgProcess() { 
    187191  pkgCmdList.clear(); 
     
    254258        tmp = line;  
    255259        tmp.replace("PKGREPLY: ", ""); 
    256         if ( QMessageBox::Yes == QMessageBox::warning(this, tr("Package Conflicts"), 
    257           tr("The following packages are causing conflicts with the selected changes and can be automatically removed. Continue?") + "\n" + ConflictList, 
    258           QMessageBox::Yes|QMessageBox::No, 
    259           QMessageBox::Yes) ) { 
    260  
     260        QMessageBox msgBox; 
     261        msgBox.setText(tr("The following packages are causing conflicts with the selected changes and can be automatically removed. Continue?") + "\n" + ConflictList); 
     262        msgBox.setStandardButtons(QMessageBox::Yes|QMessageBox::No); 
     263        msgBox.setDetailedText(getConflictDetailText()); 
     264        msgBox.setDefaultButton(QMessageBox::No); 
     265        if ( msgBox.exec() == QMessageBox::Yes) { 
    261266          // We will try to fix conflicts 
    262267          ans="yes"; 
    263             
    264268        } else { 
    265269          // We will fail :( 
     
    277281           pkgTrig.close(); 
    278282        } 
     283        continue; 
    279284     } 
    280285 
  • src-qt4/pc-pkgmanager/mainWin.h

    r84406a4 rb4350b9  
    6767    QList<QStringList> pkgCmdList; 
    6868    bool pkgHasFailed; 
     69    QString getConflictDetailText(); 
    6970 
    7071    // Updates 
Note: See TracChangeset for help on using the changeset viewer.