Author: tgoettlicher Date: Fri Jul 6 14:54:13 2007 New Revision: 5915 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5915&view=rev Log: miscellaneous Modified: trunk/updater-kde/po/CMakeLists.txt trunk/updater-kde/updater/Constants.h trunk/updater-kde/updater/MainWindow.h trunk/updater-kde/updater/TrayIcon.cpp trunk/updater-kde/updater/zypp/ZYppUpdater.cpp trunk/updater-kde/updater/zypp/ZYppUpdater.h Modified: trunk/updater-kde/po/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/po/CMakeLists.txt?rev=5915&r1=5914&r2=5915&view=diff ============================================================================== --- trunk/updater-kde/po/CMakeLists.txt (original) +++ trunk/updater-kde/po/CMakeLists.txt Fri Jul 6 14:54:13 2007 @@ -1,2 +1,2 @@ FILE( GLOB UPDATERKDE_PO_FILES ${CMAKE_SOURCE_DIR}/po/*.po ) -GETTEXT_CREATE_TRANSLATIONS( "${CMAKE_SOURCE_DIR}/po/opensuseupdater.pot" ${UPDATERKDE} ) \ No newline at end of file +#GETTEXT_CREATE_TRANSLATIONS( "${CMAKE_SOURCE_DIR}/po/opensuseupdater.pot" ${UPDATERKDE} ) Modified: trunk/updater-kde/updater/Constants.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/Constants.h?rev=5915&r1=5914&r2=5915&view=diff ============================================================================== --- trunk/updater-kde/updater/Constants.h (original) +++ trunk/updater-kde/updater/Constants.h Fri Jul 6 14:54:13 2007 @@ -26,7 +26,7 @@ #define TRAY_ICON_GREEN "opensuseupdater_green" #define TRAY_ICON_RED "opensuseupdater_red" -#define TRAY_ICON_YELLOW "opensuseupdater_yellow.png" +#define TRAY_ICON_YELLOW "opensuseupdater_yellow" #define TRAY_ICON_PROBLEM "messagebox_warning" #define TRAY_ICON_CHECKING "opensuseupdater_busy" Modified: trunk/updater-kde/updater/MainWindow.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.h?rev=5915&r1=5914&r2=5915&view=diff ============================================================================== --- trunk/updater-kde/updater/MainWindow.h (original) +++ trunk/updater-kde/updater/MainWindow.h Fri Jul 6 14:54:13 2007 @@ -61,6 +61,8 @@ 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 **/ }; /** Modified: trunk/updater-kde/updater/TrayIcon.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/TrayIcon.cpp?rev=5915&r1=5914&r2=5915&view=diff ============================================================================== --- trunk/updater-kde/updater/TrayIcon.cpp (original) +++ trunk/updater-kde/updater/TrayIcon.cpp Fri Jul 6 14:54:13 2007 @@ -41,13 +41,16 @@ void TrayIcon::setState(int state, const QString &description ) { + + kdDebug() << "Set applet status to: " << state << endl; QToolTip::remove(this); appletState = state; switch (state) { case APPLET_CHECKING: - setPixmap(loadIcon(TRAY_ICON_CHECKING)); +// setPixmap(loadIcon(TRAY_ICON_CHECKING)); + setMovie(QMovie( KGlobal::iconLoader()->moviePath(TRAY_ICON_CHECKING, KIcon::Panel) )); QToolTip::add(this, i18n("Checking for updates...")); break; Modified: trunk/updater-kde/updater/zypp/ZYppUpdater.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/zypp/ZYppUpdater.cpp?rev=5915&r1=5914&r2=5915&view=diff ============================================================================== --- trunk/updater-kde/updater/zypp/ZYppUpdater.cpp (original) +++ trunk/updater-kde/updater/zypp/ZYppUpdater.cpp Fri Jul 6 14:54:13 2007 @@ -45,24 +45,6 @@ #include "MainWindow.h" #include "UpdateListItem.h" -// <?xml version='1.0'?> -// <update-status op="success"> -// <update-sources> -// <source url="http://ftp.gwdg.de/pub/suse/update/10.1" alias="http://ftp.gwdg.de/pub/suse/update/10.1"/> -// </update-sources> -// <update-list> -// <update category="security"> -// <name>java-1_5_0-sun</name> -// <edition>1438-0</edition> -// </update> -// <update category="recommended"> -// <name>ghostscript-library</name> -// <edition>1686-0</edition> -// </update> -// </update-list> -// <update-summary total="2" security="1"/> -// </update-status> - K_EXPORT_COMPONENT_FACTORY( opensuseupdater_zypp, KGenericFactory<ZYppUpdater>( "opensuseupdater_zypp" ) ) ZYppUpdater::ZYppUpdater( QObject *parent, const char* name, const QStringList& ) : Updater( parent, name ) @@ -76,12 +58,8 @@ , _end_document_reached(false) , _error(false) { - //setInstance(KGenericFactory<ZYppUpdater>::instance()); - //setXMLFile("plugindemo_capitalizeui.rc"); - // For ease announce that we have been loaded. kdDebug() << "ZyppUpdater plugin loaded" << endl; - kdDebug() << "Initializing zypp backend" << endl; } @@ -153,10 +131,10 @@ _packageList->clear(); -// TODO - kdDebug() << "populating... " << _patches.count() << " patches" << endl; - for ( QPtrList<ZYppResolvable>::const_iterator it = _patches.begin(); it != _patches.end(); ++it ) + kdDebug() << "populating... " << _resolvables.count() << " resolvables" << endl; + for ( QPtrList<ZYppResolvable>::const_iterator it = _resolvables.begin(); it != _resolvables.end(); ++it ) { +/* if ( (*it)->category != "optional" ) { QListViewItem *newItem; @@ -167,11 +145,24 @@ //newItem->setText(COLUMN_ID, (*iter).id); newItem->setText(COLUMN_CATALOG, (*it)->source ); } +*/ + if ( (*it)->resolvableType == RESOLVABLE_PATCH) + { + QListViewItem *newItem; + newItem = new ZYppListItem ( (*it), _patchList, (*it)->summary ); + newItem->setText(COLUMN_TYPE, (*it)->category ); + newItem->setText(COLUMN_NEW_VERSION,(*it)->edition); + newItem->setText(COLUMN_CATALOG, (*it)->source ); + + newItem->setText(COLUMN_DOWNLOADSIZE, QString("%1 MB").arg((*it)->downloadSize)); + newItem->setText(COLUMN_RESTART, ((*it)->restart == true ) ? "Yes" : "No" ) ; + } + } // TODO - if ( _patches.count() > 0 ) - emit(updateApplet(APPLET_UPDATES, _patches.count(), _patches.count())); + if ( _resolvables.count() > 0 ) + emit(updateApplet(APPLET_UPDATES, _resolvables.count(), _resolvables.count())); else emit(updateApplet(APPLET_NO_UPDATES, 0, 0)); @@ -311,8 +302,8 @@ _found_update_status_tag = false; _end_document_reached = false; _error = false; - _patches.setAutoDelete(true); - _patches.clear(); + _resolvables.setAutoDelete(true); + _resolvables.clear(); return true; } @@ -448,7 +439,7 @@ { _state = Unknown; kdDebug() << _current_resolvable->name << " appended" << endl; - _patches.append(_current_resolvable); + _resolvables.append(_current_resolvable); // ignore sources for now kdDebug() << _current_resolvable->name << endl; Modified: trunk/updater-kde/updater/zypp/ZYppUpdater.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/zypp/ZYppUpdater.h?rev=5915&r1=5914&r2=5915&view=diff ============================================================================== --- trunk/updater-kde/updater/zypp/ZYppUpdater.h (original) +++ trunk/updater-kde/updater/zypp/ZYppUpdater.h Fri Jul 6 14:54:13 2007 @@ -155,7 +155,7 @@ // parsed data, cleared between calls // to checkpatches - QPtrList<ZYppResolvable> _patches; + QPtrList<ZYppResolvable> _resolvables; QValueList<ZYppSource> _sources; ZYppSource _current_source; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org