Author: tgoettlicher Date: Tue Aug 7 16:23:25 2007 New Revision: 6508 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6508&view=rev Log: added state unknown when no update sources are defined (fate #300635) Added: trunk/updater-kde/icons/cr16-app-opensuseupdater_unknown.png (with props) trunk/updater-kde/icons/cr24-app-opensuseupdater_unknown.png (with props) trunk/updater-kde/icons/cr32-app-opensuseupdater_unknown.png (with props) trunk/updater-kde/icons/cr48-app-opensuseupdater_unknown.png (with props) trunk/updater-kde/icons/cr64-app-opensuseupdater_unknown.png (with props) Modified: trunk/updater-kde/updater/Constants.h trunk/updater-kde/updater/TrayIcon.cpp trunk/updater-kde/updater/Updater.h trunk/updater-kde/updater/simpleview.cpp trunk/updater-kde/updater/zypp/ZYppUpdater.cpp trunk/updater-kde/updater/zypp/ZYppUpdater.h Added: trunk/updater-kde/icons/cr16-app-opensuseupdater_unknown.png URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/icons/cr16-app-opensuseupdater_unknown.png?rev=6508&view=auto ============================================================================== Binary file - no diff available. Added: trunk/updater-kde/icons/cr24-app-opensuseupdater_unknown.png URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/icons/cr24-app-opensuseupdater_unknown.png?rev=6508&view=auto ============================================================================== Binary file - no diff available. Added: trunk/updater-kde/icons/cr32-app-opensuseupdater_unknown.png URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/icons/cr32-app-opensuseupdater_unknown.png?rev=6508&view=auto ============================================================================== Binary file - no diff available. Added: trunk/updater-kde/icons/cr48-app-opensuseupdater_unknown.png URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/icons/cr48-app-opensuseupdater_unknown.png?rev=6508&view=auto ============================================================================== Binary file - no diff available. Added: trunk/updater-kde/icons/cr64-app-opensuseupdater_unknown.png URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/icons/cr64-app-opensuseupdater_unknown.png?rev=6508&view=auto ============================================================================== Binary file - no diff available. Modified: trunk/updater-kde/updater/Constants.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/Constants.h?rev=6508&r1=6507&r2=6508&view=diff ============================================================================== --- trunk/updater-kde/updater/Constants.h (original) +++ trunk/updater-kde/updater/Constants.h Tue Aug 7 16:23:25 2007 @@ -30,6 +30,7 @@ #define TRAY_ICON_PROBLEM "messagebox_warning" #define TRAY_ICON_CHECKING "opensuseupdater_busy" #define TRAY_ICON_INSTALLING "opensuseupdater_busy" +#define TRAY_ICON_UNKNOWN "opensuseupdater_unknown" #define PROGRAM_ICON "opensuseupdater" Modified: trunk/updater-kde/updater/TrayIcon.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/TrayIcon.cpp?rev=6508&r1=6507&r2=6508&view=diff ============================================================================== --- trunk/updater-kde/updater/TrayIcon.cpp (original) +++ trunk/updater-kde/updater/TrayIcon.cpp Tue Aug 7 16:23:25 2007 @@ -110,6 +110,12 @@ QToolTip::add(this, i18n("Updating...")); break; + case APPLET_UNKNOWN: + QToolTip::add(this, i18n("Unable to check whether updates are available.")); + setPixmap(loadIcon(TRAY_ICON_UNKNOWN)); + showPopup(); + break; + } } Modified: trunk/updater-kde/updater/Updater.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/Updater.h?rev=6508&r1=6507&r2=6508&view=diff ============================================================================== --- trunk/updater-kde/updater/Updater.h (original) +++ trunk/updater-kde/updater/Updater.h Tue Aug 7 16:23:25 2007 @@ -45,7 +45,6 @@ /** Constants that define the various states our applet can be in. - Currently APPLET_CHECKING is a useless constant. **/ enum { APPLET_NO_UPDATES, /** No updates **/ @@ -54,7 +53,8 @@ APPLET_CHECKING, /** Checking for updates **/ APPLET_PROBLEM, /** problem **/ APPLET_INSTALLING, /** installing patches or packages **/ - APPLET_PKGMGR_UPDATES /** Updates available that affect the package manager **/ + APPLET_PKGMGR_UPDATES, /** Updates available that affect the package manager **/ + APPLET_UNKNOWN /** Unknown update status: No repositories are known to zypper **/ }; /** Modified: trunk/updater-kde/updater/simpleview.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/simpleview.cpp?rev=6508&r1=6507&r2=6508&view=diff ============================================================================== --- trunk/updater-kde/updater/simpleview.cpp (original) +++ trunk/updater-kde/updater/simpleview.cpp Tue Aug 7 16:23:25 2007 @@ -65,6 +65,7 @@ install->setText(i18n("Install")); ok->setText(i18n("Close")); + // -------------------------- layout ----------------------- layout->addWidget(details,6,0); @@ -240,6 +241,19 @@ cancel->hide(); bar->show(); break; + + case APPLET_UNKNOWN: + headline->setText(i18n("<b>Unable to check whether updates are available.</b>")); + title->setText(i18n("Please use \"Add/Remove Update Sources...\"\nfrom the tray icon menu to define a update repository.")); + recommended->hide(); + norestart->hide(); + install->hide(); + ok->show(); + details->hide(); + cancel->hide(); + bar->hide(); + break; + } updateSelection(); Modified: trunk/updater-kde/updater/zypp/ZYppUpdater.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/zypp/ZYppUpdater.cpp?rev=6508&r1=6507&r2=6508&view=diff ============================================================================== --- trunk/updater-kde/updater/zypp/ZYppUpdater.cpp (original) +++ trunk/updater-kde/updater/zypp/ZYppUpdater.cpp Tue Aug 7 16:23:25 2007 @@ -220,7 +220,9 @@ } } - if (pkgmgr_available) + if (_noUpdateRepositories) + emit(updateApplet(APPLET_UNKNOWN, _patchList->childCount(), _packageList->childCount())); + else if (pkgmgr_available) emit(updateApplet(APPLET_PKGMGR_UPDATES, _patchList->childCount(), _packageList->childCount())); else if (critical_available) emit(updateApplet(APPLET_CRITICAL_UPDATES, _patchList->childCount(), _packageList->childCount())); @@ -275,6 +277,7 @@ resetXmlStream(); _error=false; + _noUpdateRepositories=false; _process = new KProcess; *_process << "/usr/sbin/zypp-checkpatches-wrapper"; @@ -514,6 +517,11 @@ _state = Error; _error = true; } + if( qName == "appletinfo" ) + { + if (atts.value("status") == "no-update-repositories") + _noUpdateRepositories = true;; + } if ( qName == "update" ) { kdDebug() << "found patch..." << qName << endl; Modified: trunk/updater-kde/updater/zypp/ZYppUpdater.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/zypp/ZYppUpdater.h?rev=6508&r1=6507&r2=6508&view=diff ============================================================================== --- trunk/updater-kde/updater/zypp/ZYppUpdater.h (original) +++ trunk/updater-kde/updater/zypp/ZYppUpdater.h Tue Aug 7 16:23:25 2007 @@ -194,6 +194,7 @@ bool _last_xml_parse_code; bool _error; bool _message; + bool _noUpdateRepositories; // QProgressDialog *progressDialog; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org