Changeset b913d3a


Ignore:
Timestamp:
11/15/13 01:14:07 (10 months ago)
Author:
yurkis <yurkis@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
3dec5de
Parents:
453e63a
Message:

Add conflict description dialog

Location:
src-qt4/pc-updatecenter
Files:
3 added
3 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-updatecenter/mainwindow.cpp

    r3224cf9 rb913d3a  
    11#include "mainwindow.h" 
    22#include "ui_mainwindow.h" 
     3 
     4#include "dialogconflict.h" 
    35 
    46#include <QTreeWidgetItem> 
     
    9698    connect(&mPkgController, SIGNAL(progress(CAbstractUpdateController::SProgress)), 
    9799            this, SLOT(pkgProgress(CAbstractUpdateController::SProgress))); 
     100    connect(&mPkgController, SIGNAL(packageConflict(QString)), 
     101            this, SLOT(packageConflict(QString))); 
    98102    connect(&mPBIController, SIGNAL(stateChanged(CAbstractUpdateController::EUpdateControllerState)), 
    99103            this, SLOT(pbiStateChanged(CAbstractUpdateController::EUpdateControllerState))); 
     
    240244} 
    241245 
     246void MainWindow::pkgConflict(QString conflictList) 
     247{ 
     248    DialogConflict* dlg = new  DialogConflict(this); 
     249    dlg->exec(conflictList, &mPkgController); //QDialog::Accepted | QDialog::Rejected 
     250} 
     251 
    242252void MainWindow::on_updateSelectedPBIBtn_clicked() 
    243253{ 
  • src-qt4/pc-updatecenter/mainwindow.h

    r3224cf9 rb913d3a  
    3737    void pkgProgress(CAbstractUpdateController::SProgress progress); 
    3838 
     39    void pkgConflict(QString conflictList); 
     40 
    3941private slots: 
    4042    void on_updateSelectedPBIBtn_clicked(); 
  • src-qt4/pc-updatecenter/pc-updatecenter.pro

    rd540652 rb913d3a  
    2323    syscontroller.cpp \ 
    2424    pkgcontroller.cpp \ 
    25     pbicontroller.cpp 
     25    pbicontroller.cpp \ 
     26    dialogconflict.cpp 
    2627 
    2728HEADERS  += mainwindow.h \ 
     
    3031    syscontroller.h \ 
    3132    pkgcontroller.h \ 
    32     pbicontroller.h 
     33    pbicontroller.h \ 
     34    dialogconflict.h 
    3335 
    3436FORMS    += mainwindow.ui \ 
    35     indicatorwidget.ui 
     37    indicatorwidget.ui \ 
     38    dialogconflict.ui 
    3639 
    3740RESOURCES += \ 
Note: See TracChangeset for help on using the changeset viewer.