Author: tgoettlicher Date: Thu Aug 9 16:13:00 2007 New Revision: 6554 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6554&view=rev Log: Some fixes for zypp_traditinal Modified: trunk/updater-kde/updater/CMakeLists.txt trunk/updater-kde/updater/MainWindow.cpp trunk/updater-kde/updater/MainWindow.h trunk/updater-kde/updater/simpleview.cpp trunk/updater-kde/updater/simpleview.h trunk/updater-kde/updater/zypp_traditional/ZYppUpdater.cpp trunk/updater-kde/updater/zypp_traditional/ZYppUpdater.h Modified: trunk/updater-kde/updater/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/CMakeLists.txt?rev=6554&r1=6553&r2=6554&view=diff ============================================================================== --- trunk/updater-kde/updater/CMakeLists.txt (original) +++ trunk/updater-kde/updater/CMakeLists.txt Thu Aug 9 16:13:00 2007 @@ -1,6 +1,6 @@ #ADD_SUBDIRECTORY( zmd ) ADD_SUBDIRECTORY( zypp ) -#ADD_SUBDIRECTORY( zypp_traditional ) +ADD_SUBDIRECTORY( zypp_traditional ) #ADD_SUBDIRECTORY( dummy ) #ADD_SUBDIRECTORY( dummy_with_packages ) Modified: trunk/updater-kde/updater/MainWindow.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.cpp?rev=6554&r1=6553&r2=6554&view=diff ============================================================================== --- trunk/updater-kde/updater/MainWindow.cpp (original) +++ trunk/updater-kde/updater/MainWindow.cpp Thu Aug 9 16:13:00 2007 @@ -281,6 +281,11 @@ } } +UpdaterCapabilities MainWindow::getUpdaterCapabilities() +{ + return _caps; +} + void MainWindow::setUpdaterCapabilities(const UpdaterCapabilities &caps) { _caps = caps; @@ -505,7 +510,6 @@ void MainWindow::patchSelectButtonClicked() { - QCheckListItem *item = (QCheckListItem*)patchList->firstChild(); while (item != NULL) { @@ -577,6 +581,8 @@ void MainWindow::patchSelectRecommended() { + if ( _caps.canSelectIndividualUpdates == false ) + return; QCheckListItem *item = (QCheckListItem*)patchList->firstChild(); while (item != NULL) { @@ -638,6 +644,9 @@ void MainWindow::patchUnselectRestart() { + if ( _caps.canSelectIndividualUpdates == false ) + return; + QCheckListItem *item = (QCheckListItem*)patchList->firstChild(); while (item != NULL) { Modified: trunk/updater-kde/updater/MainWindow.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.h?rev=6554&r1=6553&r2=6554&view=diff ============================================================================== --- trunk/updater-kde/updater/MainWindow.h (original) +++ trunk/updater-kde/updater/MainWindow.h Thu Aug 9 16:13:00 2007 @@ -81,6 +81,7 @@ public: void setUpdaterCapabilities( const UpdaterCapabilities &caps ); + UpdaterCapabilities getUpdaterCapabilities(); /** Init function Modified: trunk/updater-kde/updater/simpleview.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/simpleview.cpp?rev=6554&r1=6553&r2=6554&view=diff ============================================================================== --- trunk/updater-kde/updater/simpleview.cpp (original) +++ trunk/updater-kde/updater/simpleview.cpp Thu Aug 9 16:13:00 2007 @@ -15,6 +15,8 @@ #include <kpushbutton.h> #include <qtimer.h> #include "Updater.h" +#include "UpdaterCapabilities.h" + SimpleView::SimpleView() : _detailWindow(0L) @@ -46,6 +48,8 @@ title->setText(i18n("Choose the updates to be installed:")); recommended = new QCheckBox(i18n("Install %1 recommeded updates additionally").arg(0), centralWidget); + recommended2 = new QLabel(centralWidget); + recommended2->setText(i18n("Install %1 recommeded updates additionally").arg(0)); norestart = new QCheckBox(i18n("Don't install updates that require a restart"), centralWidget); bar = new QProgressBar(centralWidget); @@ -53,6 +57,7 @@ layout->addMultiCellWidget(title,1,1,1,3); layout->addMultiCellWidget(recommended,3,3,1,3); + layout->addMultiCellWidget(recommended2,3,3,1,3); layout->addMultiCellWidget(bar,3,3,1,3); layout->addMultiCellWidget(norestart,5,5,1,3); @@ -144,7 +149,7 @@ } } -void SimpleView::setDetailWindow(QWidget * detailWindow) +void SimpleView::setDetailWindow(MainWindow * detailWindow) { _detailWindow = detailWindow; } @@ -157,6 +162,7 @@ headline->setText(i18n("<b>Checking for updates...</b>")); title->setText(""); recommended->hide(); + recommended2->hide(); norestart->hide(); install->hide(); ok->show(); @@ -169,6 +175,7 @@ headline->setText(i18n("<b>Error:</b>")); title->setText(i18n(description)); recommended->hide(); + recommended2->hide(); norestart->hide(); install->hide(); ok->show(); @@ -181,6 +188,7 @@ headline->setText(i18n("<b>No Updates Available</b>")); title->setText(""); recommended->hide(); + recommended2->hide(); norestart->hide(); install->hide(); ok->show(); @@ -194,6 +202,7 @@ title->setText(i18n("Updates that affect your updater itself are available.")); recommended->hide(); + recommended2->hide(); recommended->setDown(true); securityCount=999; norestart->hide(); @@ -210,13 +219,31 @@ headline->setText(i18n("<b>New software for your system is available</b>")); title->setText(i18n("%1 security updates are available").arg(securityCount)); - if (recommendedCount > 0) + if (recommendedCount > 0 ) { - recommended->setText(i18n("Install %1 recommeded updates additionally").arg(recommendedCount)); - recommended->show(); + if ( _detailWindow->getUpdaterCapabilities().canSelectIndividualUpdates ) + { + recommended->setText(i18n("Install %1 recommeded updates additionally").arg(recommendedCount)); + recommended->show(); + recommended2->hide(); + } + else + { + recommended2->setText(i18n("%1 recommeded updates are available").arg(recommendedCount)); + recommended2->show(); + recommended->hide(); + } } else + { recommended->hide(); + recommended2->hide(); + } + + + + + if (restartCount > 0) norestart->show(); Modified: trunk/updater-kde/updater/simpleview.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/simpleview.h?rev=6554&r1=6553&r2=6554&view=diff ============================================================================== --- trunk/updater-kde/updater/simpleview.h (original) +++ trunk/updater-kde/updater/simpleview.h Thu Aug 9 16:13:00 2007 @@ -3,6 +3,10 @@ #include <qlabel.h> #include <kpushbutton.h> #include <qprogressbar.h> +#include "MainWindow.h" + + +class MainWindow; #ifndef SIMPLEVIEW_H #define SIMPLEVIEW_H @@ -12,14 +16,15 @@ Q_OBJECT public: SimpleView(); - void setDetailWindow(QWidget *); + void setDetailWindow(MainWindow *); protected: private: QLabel *title; QCheckBox *recommended; + QLabel *recommended2; QCheckBox *norestart; void showEvent(QShowEvent *); - QWidget *_detailWindow; + MainWindow *_detailWindow; QLabel *headline; KPushButton *install; KPushButton *details; Modified: trunk/updater-kde/updater/zypp_traditional/ZYppUpdater.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/zypp_traditional/ZYppUpdater.cpp?rev=6554&r1=6553&r2=6554&view=diff ============================================================================== --- trunk/updater-kde/updater/zypp_traditional/ZYppUpdater.cpp (original) +++ trunk/updater-kde/updater/zypp_traditional/ZYppUpdater.cpp Thu Aug 9 16:13:00 2007 @@ -123,7 +123,7 @@ QXmlSimpleReader reader; reader.setContentHandler(this); reader.parse(xml_source); - + /* if ( !_end_document_reached ) { kdDebug() << "Houston, we have a problem." << endl; @@ -138,7 +138,7 @@ emit(populateDone()); return; } - + */ // clear the buffer _stderr_buffer.truncate(0); _buffer.truncate(0); @@ -162,7 +162,8 @@ QListViewItem *newItem; newItem = new ZYppListItem( (*it), _patchList, (*it)->summary ); - newItem->setText(COLUMN_TYPE, ((*it)->category == "security") ? i18n("Security") : i18n("Patch") ); +// newItem->setText(COLUMN_TYPE, ((*it)->category == "security") ? i18n("Security") : i18n("Patch") ); + newItem->setText(COLUMN_TYPE, (*it)->category); newItem->setText(COLUMN_NEW_VERSION,(*it)->edition); //newItem->setText(COLUMN_ID, (*iter).id); newItem->setText(COLUMN_CATALOG, (*it)->source ); @@ -362,6 +363,7 @@ _current_resolvable->name = atts.value("name"); _current_resolvable->category = atts.value("category"); _current_resolvable->edition = atts.value("edition"); + _current_resolvable->kind = atts.value("kind"); _state = Update; // ignore sources for now @@ -439,13 +441,17 @@ } if ( qName == "update" ) { - _state = Unknown; - kdDebug() << _current_resolvable->name << " appended" << endl; - _patches.append(_current_resolvable); - // ignore sources for now + + if ( _current_resolvable->kind == "patch" ) + { + _state = Unknown; + kdDebug() << _current_resolvable->name << " appended" << endl; + _patches.append(_current_resolvable); + // ignore sources for now - kdDebug() << _current_resolvable->name << endl; - kdDebug() << _current_resolvable->summary << endl; + kdDebug() << _current_resolvable->name << endl; + kdDebug() << _current_resolvable->summary << endl; + } return true; } Modified: trunk/updater-kde/updater/zypp_traditional/ZYppUpdater.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/zypp_traditional/ZYppUpdater.h?rev=6554&r1=6553&r2=6554&view=diff ============================================================================== --- trunk/updater-kde/updater/zypp_traditional/ZYppUpdater.h (original) +++ trunk/updater-kde/updater/zypp_traditional/ZYppUpdater.h Thu Aug 9 16:13:00 2007 @@ -43,6 +43,7 @@ QString source; QString summary; QString description; + QString kind; }; struct ZYppSource -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org