[zypp-commit] r5931 - in /trunk/updater-kde/updater: MainWindow.cpp MainWindow.h zypp/ZYppListItem.cpp zypp/ZYppListItem.h zypp/ZYppUpdater.cpp

Author: tgoettlicher Date: Mon Jul 9 14:07:34 2007 New Revision: 5931 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5931&view=rev Log: fixed bug Modified: trunk/updater-kde/updater/MainWindow.cpp trunk/updater-kde/updater/MainWindow.h trunk/updater-kde/updater/zypp/ZYppListItem.cpp trunk/updater-kde/updater/zypp/ZYppListItem.h trunk/updater-kde/updater/zypp/ZYppUpdater.cpp Modified: trunk/updater-kde/updater/MainWindow.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.cpp?rev=5931&r1=5930&r2=5931&view=diff ============================================================================== --- trunk/updater-kde/updater/MainWindow.cpp (original) +++ trunk/updater-kde/updater/MainWindow.cpp Mon Jul 9 14:07:34 2007 @@ -126,6 +126,7 @@ patchLabel->setText(i18n("The following are software patches to fix bugs.")); patchList = new QListView(patchWidget); patchList->addColumn(i18n("Name")); + patchList->addColumn(i18n("Summary")); patchList->setColumnWidthMode(COLUMN_NAME, QListView::Maximum); patchList->addColumn(i18n("Type")); patchList->addColumn(i18n("New Version")); @@ -165,7 +166,6 @@ packageList->addColumn(i18n("Type")); packageList->addColumn(i18n("New Version")); packageList->addColumn(i18n("Catalog")); - packageList->addColumn("ID", 0); // This is a hidden column to hold the ID of the package QVBoxLayout *packageBox = new QVBoxLayout(packageWidget); packageDescription = new KTextEdit(packageWidget); packageDescription->setReadOnly(true); @@ -440,6 +440,7 @@ while (item != NULL) { if (!item->isOn()) { item->setState(QCheckListItem::On); + item->setSelected(true); } item = (QCheckListItem*)item->nextSibling(); } @@ -456,6 +457,7 @@ while (item != NULL) { if (item->isOn()) { item->setState(QCheckListItem::Off); + item->setSelected(false); } item = (QCheckListItem*)item->nextSibling(); } Modified: trunk/updater-kde/updater/MainWindow.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.h?rev=5931&r1=5930&r2=5931&view=diff ============================================================================== --- trunk/updater-kde/updater/MainWindow.h (original) +++ trunk/updater-kde/updater/MainWindow.h Mon Jul 9 14:07:34 2007 @@ -56,13 +56,14 @@ our package info */ enum { - COLUMN_NAME, /** The Package Name or Patch Description **/ + COLUMN_NAME, /** The Package Name **/ COLUMN_TYPE, /** Patch or Package **/ COLUMN_NEW_VERSION, /** The Version We Are Upgrading To **/ COLUMN_CATALOG, /** The Catalog **/ COLUMN_ID, /** The ID of the Package/Patch **/ COLUMN_DOWNLOADSIZE, /** Download size **/ COLUMN_RESTART, /** Restart needed **/ + COLUMN_SUMMARY, /** Package description **/ }; /** Modified: trunk/updater-kde/updater/zypp/ZYppListItem.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/zypp/ZYppListItem.cpp?rev=5931&r1=5930&r2=5931&view=diff ============================================================================== --- trunk/updater-kde/updater/zypp/ZYppListItem.cpp (original) +++ trunk/updater-kde/updater/zypp/ZYppListItem.cpp Mon Jul 9 14:07:34 2007 @@ -20,7 +20,8 @@ #include "ZYppListItem.h" ZYppListItem::ZYppListItem( ZYppResolvable *resolvable, QListView *parent, const QString &text ) - : QListViewItem(parent, text ) +// : QListViewItem(parent, text ) + : QCheckListItem(parent, text , QCheckListItem::CheckBox ) , _resolvable(resolvable) { } Modified: trunk/updater-kde/updater/zypp/ZYppListItem.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/zypp/ZYppListItem.h?rev=5931&r1=5930&r2=5931&view=diff ============================================================================== --- trunk/updater-kde/updater/zypp/ZYppListItem.h (original) +++ trunk/updater-kde/updater/zypp/ZYppListItem.h Mon Jul 9 14:07:34 2007 @@ -35,7 +35,9 @@ @author Narayan Newton **/ -class ZYppListItem : public QListViewItem +class ZYppListItem : +//public QListViewItem +public QCheckListItem { public: Modified: trunk/updater-kde/updater/zypp/ZYppUpdater.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/zypp/ZYppUpdater.cpp?rev=5931&r1=5930&r2=5931&view=diff ============================================================================== --- trunk/updater-kde/updater/zypp/ZYppUpdater.cpp (original) +++ trunk/updater-kde/updater/zypp/ZYppUpdater.cpp Mon Jul 9 14:07:34 2007 @@ -66,7 +66,7 @@ UpdaterCapabilities ZYppUpdater::capabilities() { UpdaterCapabilities caps; - caps.canSelectIndividualUpdates = false; + caps.canSelectIndividualUpdates = true; caps.canProvidePackages = true; return caps; } @@ -134,14 +134,16 @@ kdDebug() << "populating... " << _resolvables.count() << " resolvables" << endl; for ( QPtrList<ZYppResolvable>::const_iterator it = _resolvables.begin(); it != _resolvables.end(); ++it ) { - QListViewItem *newItem; +// QListViewItem *newItem; + QCheckListItem *newItem; if ( (*it)->resolvableType == RESOLVABLE_PATCH) - newItem = new ZYppListItem ( (*it), _patchList, (*it)->summary ); + newItem = new ZYppListItem ( (*it), _patchList, (*it)->name ); else - newItem = new ZYppListItem ( (*it), _packageList, (*it)->summary ); - + newItem = new ZYppListItem ( (*it), _packageList, (*it)->name ); + newItem->setText(COLUMN_NAME, (*it)->name ); + newItem->setText(COLUMN_SUMMARY, (*it)->summary ); newItem->setText(COLUMN_TYPE, (*it)->category ); newItem->setText(COLUMN_NEW_VERSION,(*it)->edition); newItem->setText(COLUMN_CATALOG, (*it)->source ); @@ -149,6 +151,8 @@ newItem->setText(COLUMN_DOWNLOADSIZE, QString("%1 MB").arg((*it)->downloadSize)); newItem->setText(COLUMN_RESTART, ((*it)->restart == true ) ? "Yes" : "No" ) ; + newItem->setText(COLUMN_ID, (*it)->name ) ; + } if ( _patchList->childCount() > 0 ) @@ -257,18 +261,34 @@ void ZYppUpdater::startInstall() { - if ( _you_process != 0L ) - { - kdDebug() << "yast already running" << endl; - return; + QString installList = ""; + + QCheckListItem *item = (QCheckListItem*)_patchList->firstChild(); + + while (item != NULL) + { + if (item->isOn()) + { + installList += " "; + installList += item->text(); + } + item = (QCheckListItem*)item->nextSibling(); } - - _you_process = new KProcess; - *_you_process << "opensuseupdater-su" << "-c" << "/sbin/yast2 online_update"; - connect( _you_process, SIGNAL( processExited( KProcess * ) ), - SLOT( slotYOUProcessExited( KProcess * ) ) ); - _you_process->start( KProcess::NotifyOnExit ); + item = (QCheckListItem*)_packageList->firstChild(); + + while (item != NULL) + { + if (item->isOn()) + { + installList += " "; + installList += item->text(); + } + item = (QCheckListItem*)item->nextSibling(); + } + + kdDebug() << "Install: " << installList << endl; + } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org