TDE
/
kshutdown
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kshutdown
0
0
Fork 0
Code Issues Releases Wiki Activity

Bring stop, lock, exit, and run icons into XDG compliance

Browse Source
pull/1/head
Timothy Pearson 10 years ago
parent df3daedcec
commit 62b1572453
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File

4
kshutdown/actions.cpp
Unescape View File

@ -227,9 +227,9 @@ TQString Action::getIconName(const Type action) const
{ {
switch (action) switch (action)
{ {
case ShutDown: return "exit"; case ShutDown: return "system-log-out";
case Reboot: return "reload"; case Reboot: return "reload";
case LockScreen: return "lock"; case LockScreen: return "system-lock-screen";
case Logout: return "undo"; case Logout: return "undo";
case Extras: return "bookmark"; case Extras: return "bookmark";
case Nothing: case Nothing:

8
kshutdown/links.cpp
Unescape View File

@ -66,7 +66,7 @@ Links::Links(TQWidget *parent)
cb_type->insertItem(kapp->miniIcon(), "KShutDown"); cb_type->insertItem(kapp->miniIcon(), "KShutDown");
// NOTE: slotAddRemoveLink() // NOTE: slotAddRemoveLink()
cb_type->insertItem(SmallIcon("exit"), i18n("Standard Logout Dialog")); cb_type->insertItem(SmallIcon("system-log-out"), i18n("Standard Logout Dialog"));
cb_type->insertItem(ks_actions->getIcon(Action::ShutDown), ks_actions->getName(Action::ShutDown)); cb_type->insertItem(ks_actions->getIcon(Action::ShutDown), ks_actions->getName(Action::ShutDown));
cb_type->insertItem(ks_actions->getIcon(Action::Reboot), ks_actions->getName(Action::Reboot)); cb_type->insertItem(ks_actions->getIcon(Action::Reboot), ks_actions->getName(Action::Reboot));
@ -166,11 +166,11 @@ TQString Links::getCurrentTypeIcon() const
switch (cb_type->currentItem()) switch (cb_type->currentItem())
{ {
case 0: return "kshutdown"; case 0: return "kshutdown";
case 1: return "exit"; case 1: return "system-log-out";
// sync. with Action::getIcon // sync. with Action::getIcon
case 2: return "exit"; case 2: return "system-log-out";
case 3: return "reload"; case 3: return "reload";
case 4: return "lock"; case 4: return "system-lock-screen";
case 5: return "undo"; case 5: return "undo";
default: return TQString::null; default: return TQString::null;
} }

6
kshutdown/msystemtray.cpp
Unescape View File

@ -134,7 +134,7 @@ MSystemTray::MSystemTray()
_flashCount(0), _flashCount(0),
_saveIcon(0) _saveIcon(0)
{ {
setPixmap(SmallIcon("exit", TDEIcon::SizeSmallMedium)); // 22x22 setPixmap(SmallIcon("system-log-out", TDEIcon::SizeSmallMedium)); // 22x22
// TODO: 2.0: mouse wheel: decrease/increase end time by 5min. (?) // TODO: 2.0: mouse wheel: decrease/increase end time by 5min. (?)
@ -147,7 +147,7 @@ MSystemTray::MSystemTray()
connect(_flashTimer, SIGNAL(timeout()), SLOT(slotFlashTimeout())); connect(_flashTimer, SIGNAL(timeout()), SLOT(slotFlashTimeout()));
// init icons // init icons
KPixmap pm(SmallIcon("exit", TDEIcon::SizeSmallMedium)); KPixmap pm(SmallIcon("system-log-out", TDEIcon::SizeSmallMedium));
_flashIcon = new KPixmap(KPixmapEffect::fade(pm, 0.7f, white)); _flashIcon = new KPixmap(KPixmapEffect::fade(pm, 0.7f, white));
show(); show();
@ -194,7 +194,7 @@ void MSystemTray::slotFade()
_fadeValue = 0.0f; _fadeValue = 0.0f;
} }
} }
KPixmap p(SmallIcon("exit", TDEIcon::SizeSmallMedium)); KPixmap p(SmallIcon("system-log-out", TDEIcon::SizeSmallMedium));
setPixmap(KPixmapEffect::fade(p, _fadeValue, KS_TRAY_FADE_COLOR)); setPixmap(KPixmapEffect::fade(p, _fadeValue, KS_TRAY_FADE_COLOR));
} }

8
kshutdownlockout/lockout.cpp
Unescape View File

@ -95,7 +95,7 @@ Lockout::Lockout(const TQString& configFile, TQWidget *parent)
TQToolButton *button = new TQToolButton(this); TQToolButton *button = new TQToolButton(this);
button->setAutoRaise(true); button->setAutoRaise(true);
button->setBackgroundMode(X11ParentRelative); button->setBackgroundMode(X11ParentRelative);
button->setPixmap(SmallIcon("exit")); button->setPixmap(SmallIcon("system-log-out"));
button->setPopupDelay(100); button->setPopupDelay(100);
button->setMinimumSize(button->pixmap()->size()); button->setMinimumSize(button->pixmap()->size());
button->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); button->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
@ -162,7 +162,7 @@ void Lockout::initActions() {
TDEActionCollection *ac_shutDown = new TDEActionCollection(this, this); TDEActionCollection *ac_shutDown = new TDEActionCollection(this, this);
_lockScreenAction = new TDEAction( _lockScreenAction = new TDEAction(
i18n("Lock Screen"), "lock", TDEShortcut(), i18n("Lock Screen"), "system-lock-screen", TDEShortcut(),
this, SLOT(slotLockScreen()), this, SLOT(slotLockScreen()),
ac_shutDown, "kshutdown_lockscreen" ac_shutDown, "kshutdown_lockscreen"
); );
@ -180,7 +180,7 @@ void Lockout::initActions() {
); );
_shutDownAction = new TDEAction( _shutDownAction = new TDEAction(
i18n("Turn Off Computer"), "exit", TDEShortcut(), i18n("Turn Off Computer"), "system-log-out", TDEShortcut(),
this, SLOT(slotShutDown()), this, SLOT(slotShutDown()),
ac_shutDown, "kshutdown_shutdown" ac_shutDown, "kshutdown_shutdown"
); );
@ -212,7 +212,7 @@ void Lockout::slotConfigureKShutDown() {
void Lockout::slotIconChanged() { void Lockout::slotIconChanged() {
// FIXME: 2.0: update action icons // FIXME: 2.0: update action icons
setIcon(SmallIcon("exit")); setIcon(SmallIcon("system-log-out"));
} }
void Lockout::slotLockScreen() { void Lockout::slotLockScreen() {

Write Preview
Loading…
Cancel
Save