Author: tgoettlicher Date: Thu Jun 14 13:32:59 2007 New Revision: 5748 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5748&view=rev Log: clean up Removed: trunk/updater-kde/updater/dummy/opensuseupdater_dummy2.desktop trunk/updater-kde/updater/dummy/opensuseupdater_dummy3.desktop Modified: trunk/updater-kde/updater/osupdaterpopup.cpp trunk/updater-kde/updater/osupdaterpopup.h Modified: trunk/updater-kde/updater/osupdaterpopup.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/osupdaterpopup.cpp?rev=5748&r1=5747&r2=5748&view=diff ============================================================================== --- trunk/updater-kde/updater/osupdaterpopup.cpp (original) +++ trunk/updater-kde/updater/osupdaterpopup.cpp Thu Jun 14 13:32:59 2007 @@ -92,28 +92,35 @@ */ void OSUpdaterPopup::setUpdates(int patches, int packages) { - _patches = patches; - _packages = packages; + patchCount = patches; + packageCount = packages; - if ((_patches + _packages) > 0) + if ((patchCount + packageCount) > 0) { - QString desc = ""; - - if (_patches == 1) - desc.append(i18n("1 Patch")); - else - desc.append(i18n("%1 Patches").arg(_patches)); - - if (_packages > 0) - if (_packages == 1) - desc.append(i18n("\n1 Upgrade")); - else - desc.append(i18n("\n%1 Upgrades").arg(_packages)); + // the following isn't realy stylish but allows fine translations + if (patchCount == 1 && packageCount == 0) + _description->setText(i18n("1 Patch available")); + if (patchCount > 1 && packageCount == 0) + _description->setText(i18n("%1 Patches available").arg(patchCount) ); - desc.append(i18n(" Available")); - - _description->setText(desc); + if (patchCount == 0 && packageCount == 1) + _description->setText(i18n("1 Package available")); + + if (patchCount == 0 && packageCount > 1) + _description->setText(i18n("%1 Packages available").arg(packageCount) ); + + if (patchCount == 1 && packageCount == 1) + _description->setText(i18n("1 Patch and 1 Package available")); + + if (patchCount > 1 && packageCount == 1) + _description->setText(i18n("%1 Patches and 1 Package available").arg(patchCount)); + + if (patchCount == 1 && packageCount > 1) + _description->setText(i18n("1 Patch and %1 Packages available").arg(packageCount)); + + if (patchCount > 1 && packageCount > 1) + _description->setText(i18n("%1 Patches and %2 Packages available").arg(patchCount).arg(packageCount)); show(); } Modified: trunk/updater-kde/updater/osupdaterpopup.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/osupdaterpopup.h?rev=5748&r1=5747&r2=5748&view=diff ============================================================================== --- trunk/updater-kde/updater/osupdaterpopup.h (original) +++ trunk/updater-kde/updater/osupdaterpopup.h Thu Jun 14 13:32:59 2007 @@ -42,8 +42,8 @@ protected: void paintEvent( QPaintEvent *e ); private: - int _patches; - int _packages; + int patchCount; + int packageCount; QVBoxLayout *_popupLayout; QHBoxLayout *_titleLayout; QHBoxLayout *_descriptionLayout; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org