suspend text and icon consistency

[Sebastian Kügler]

On Monday 16 February 2009 21:19:47 Jonathan Riddell wrote:
> In 4.2 the suspend icons and text are inconsistent between battery
> applet and kickoff.
>
> http://www.kubuntu.org/~jriddell/tmp/logout1.png
> http://www.kubuntu.org/~jriddell/tmp/logout2.png
>
> I propose changing kickoff to use "Sleep" and "Hibernate" with the
> subtext set to "Suspend to Memory" and "Suspend to Disk"
> respectively.  Also use "system-suspend" icon for Sleep to be consistent.

The icon fix is fine, the label fix as well. (Both IMO, which is hardly 
surprising since I wrote the option you picked ;-)).

> --- kdebase-workspace-4.2.0/plasma/applets/kickoff/core/leavemodel.cpp
>     2008-12-10 16:13:23.000000000 +0000
> +++ kdebase-workspace-4.2.0/plasma/applets/kickoff/core/leavemodel.cpp
>     2009-02-16 19:27:44.000000000 +0000
> @@ -74,13 +74,13 @@
>          item->setIcon(KIcon("system-suspend"));
>          item->setData(i18n("Pause without logging out"),
>     Kickoff::SubTitleRole);
>      } else if (basename == "suspenddisk") {
> -        item->setText(i18n("Suspend to Disk"));
> +        item->setText(i18n("Hibernate"));
>          item->setIcon(KIcon("system-suspend-hibernate"));
> -        item->setData(i18n("Pause without logging out"),
>     Kickoff::SubTitleRole);
> +        item->setData(i18n("Suspend to Disk"),
>     Kickoff::SubTitleRole);
>      } else if (basename == "suspendram") {
> -        item->setText(i18n("Suspend to RAM"));
> -        item->setIcon(KIcon("system-suspend-hibernate"));
> -        item->setData(i18n("Pause without logging out"),
>     Kickoff::SubTitleRole);
> +        item->setText(i18n("Sleep"));
> +        item->setIcon(KIcon("system-suspend"));
> +        item->setData(i18n("Suspend to Memory"), Kickoff::SubTitleRole);
>      } else {
>          item->setText(basename);
>          item->setData(url, Kickoff::SubTitleRole);
-- 
sebas

 http://www.kde.org | http://vizZzion.org |  GPG Key ID: 9119 0EF9