summaryrefslogtreecommitdiffstats
path: root/kicker
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-12 17:50:49 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-12 17:50:49 -0500
commit1346f6898707e6a4d95abee07c3d1608fc056998 (patch)
treed5fc28cf446d57d2109c4733938b947335f08da3 /kicker
parentad7c5952211441479dd049c73de84d55cafccf04 (diff)
downloadtdebase-1346f6898707e6a4d95abee07c3d1608fc056998.tar.gz
tdebase-1346f6898707e6a4d95abee07c3d1608fc056998.zip
Bring stop, lock, exit, and run icons into XDG compliance
Diffstat (limited to 'kicker')
-rw-r--r--kicker/applets/lockout/lockout.cpp12
-rw-r--r--kicker/extensions/kasbar/kastasker.cpp2
-rw-r--r--kicker/kicker/core/panelextension.cpp4
-rw-r--r--kicker/kicker/ui/k_mnu.cpp8
-rw-r--r--kicker/kicker/ui/k_new_mnu.cpp10
-rw-r--r--kicker/kicker/ui/service_mnu.cpp2
-rw-r--r--kicker/menuext/tom/tom.cc10
7 files changed, 24 insertions, 24 deletions
diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp
index 8547b1b4f..d4c14c9db 100644
--- a/kicker/applets/lockout/lockout.cpp
+++ b/kicker/applets/lockout/lockout.cpp
@@ -77,8 +77,8 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name
TQToolTip::add( lockButton, i18n("Lock the session") );
TQToolTip::add( logoutButton, i18n("Log out") );
- lockButton->setPixmap( SmallIcon( "lock" ));
- logoutButton->setPixmap( SmallIcon( "exit" ));
+ lockButton->setPixmap( SmallIcon( "system-lock-screen" ));
+ logoutButton->setPixmap( SmallIcon( "system-log-out" ));
bTransparent = conf->readBoolEntry( "Transparent", bTransparent );
@@ -200,7 +200,7 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e )
{
TQPopupMenu *popup = new TQPopupMenu();
- popup->insertItem( SmallIcon( "lock" ), i18n("Lock Session"),
+ popup->insertItem( SmallIcon( "system-lock-screen" ), i18n("Lock Session"),
this, TQT_SLOT( lock() ) );
popup->insertSeparator();
@@ -223,7 +223,7 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e )
{
TQPopupMenu *popup = new TQPopupMenu();
- popup->insertItem( SmallIcon( "exit" ), i18n("&Log Out..."),
+ popup->insertItem( SmallIcon( "system-log-out" ), i18n("&Log Out..."),
this, TQT_SLOT( logout() ) );
popup->insertSeparator();
//popup->insertItem( i18n( "&Transparent" ), 100 );
@@ -271,8 +271,8 @@ void Lockout::slotLogoutPrefs()
void Lockout::slotIconChanged()
{
- lockButton->setPixmap( SmallIcon( "lock" ));
- logoutButton->setPixmap( SmallIcon( "exit" ));
+ lockButton->setPixmap( SmallIcon( "system-lock-screen" ));
+ logoutButton->setPixmap( SmallIcon( "system-log-out" ));
}
#include "lockout.moc"
diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp
index 0d908fa5b..d10805a78 100644
--- a/kicker/extensions/kasbar/kastasker.cpp
+++ b/kicker/extensions/kasbar/kastasker.cpp
@@ -207,7 +207,7 @@ TDEPopupMenu *KasTasker::contextMenu()
if ( standalone_ ) {
menu->insertSeparator();
- menu->insertItem( SmallIcon("exit"), i18n("&Quit"), tqApp, TQT_SLOT( quit() ) );
+ menu->insertItem( SmallIcon("system-log-out"), i18n("&Quit"), tqApp, TQT_SLOT( quit() ) );
}
}
diff --git a/kicker/kicker/core/panelextension.cpp b/kicker/kicker/core/panelextension.cpp
index cf91da256..93bd2356b 100644
--- a/kicker/kicker/core/panelextension.cpp
+++ b/kicker/kicker/core/panelextension.cpp
@@ -361,13 +361,13 @@ void PanelExtension::slotBuildOpMenu()
_opMnu->insertSeparator();
}
- _opMnu->insertItem(SmallIconSet("lock"), i18n("&Lock Panels"),
+ _opMnu->insertItem(SmallIconSet("system-lock-screen"), i18n("&Lock Panels"),
Kicker::the(), TQT_SLOT(toggleLock()));
}
else if (!Kicker::the()->isKioskImmutable())
{
_opMnu->insertItem(kickerImmutable? SmallIconSet("unlock") :
- SmallIconSet("lock"),
+ SmallIconSet("system-lock-screen"),
kickerImmutable ? i18n("Un&lock Panels") :
i18n("&Lock Panels"),
Kicker::the(), TQT_SLOT(toggleLock()));
diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp
index 6f8ddc4aa..9d1d70f87 100644
--- a/kicker/kicker/ui/k_mnu.cpp
+++ b/kicker/kicker/ui/k_mnu.cpp
@@ -366,7 +366,7 @@ void PanelKMenu::initialize()
// run command
if (kapp->authorize("run_command"))
{
- insertItem(KickerLib::menuIconSet("run"),
+ insertItem(KickerLib::menuIconSet("system-run"),
i18n("Run Command..."),
this,
TQT_SLOT( slotRunCommand()));
@@ -393,12 +393,12 @@ void PanelKMenu::initialize()
if (kapp->authorize("lock_screen"))
{
- insertItem(KickerLib::menuIconSet("lock"), i18n("Lock Session"), this, TQT_SLOT(slotLock()));
+ insertItem(KickerLib::menuIconSet("system-lock-screen"), i18n("Lock Session"), this, TQT_SLOT(slotLock()));
}
if (kapp->authorize("logout"))
{
- insertItem(KickerLib::menuIconSet("exit"), i18n("Log Out..."), this, TQT_SLOT(slotLogout()));
+ insertItem(KickerLib::menuIconSet("system-log-out"), i18n("Log Out..."), this, TQT_SLOT(slotLogout()));
}
#if 0
@@ -474,7 +474,7 @@ void PanelKMenu::slotPopulateSessions()
if (kapp->authorize("start_new_session") && (p = dm.numReserve()) >= 0)
{
if (kapp->authorize("lock_screen")) {
- sessionsMenu->insertItem(SmallIconSet("lock"), i18n("Lock Current && Start New Session"), 100 );
+ sessionsMenu->insertItem(SmallIconSet("system-lock-screen"), i18n("Lock Current && Start New Session"), 100 );
}
sessionsMenu->insertItem(SmallIconSet("switchuser"), i18n("Start New Session"), 101 );
if (!p) {
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index 500bc5485..886ae7011 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -936,7 +936,7 @@ void KMenu::slotGoExitSubMenu(const TQString& url)
m_exitView->rightView()->insertItem( "switchuser", i18n( "Start New Session" ),
i18n( "Start a parallel session" ), "kicker:/switchuser", nId++, index++ );
- m_exitView->rightView()->insertItem( "lock", i18n( "Lock Current && Start New Session").replace("&&","&"),
+ m_exitView->rightView()->insertItem( "system-lock-screen", i18n( "Lock Current && Start New Session").replace("&&","&"),
i18n( "Lock screen and start a parallel session" ), "kicker:/switchuserafterlock", nId++, index++ );
SessList sess;
@@ -1340,7 +1340,7 @@ void KMenu::insertStaticExitItems()
m_exitView->leftView()->insertItem( "undo", i18n( "Logout" ),
i18n( "End session" ), "kicker:/logout", nId++, index++ );
if (kapp->authorize("lock_screen"))
- m_exitView->leftView()->insertItem( "lock", i18n( "Lock" ),
+ m_exitView->leftView()->insertItem( "system-lock-screen", i18n( "Lock" ),
i18n( "Lock screen" ), "kicker:/lock", nId++, index++ );
TDEConfig ksmserver("ksmserverrc", false, false);
@@ -1372,7 +1372,7 @@ void KMenu::insertStaticExitItems()
if ( maysd )
{
m_exitView->leftView()->insertSeparator( nId++, i18n("System"), index++ );
- m_exitView->leftView()->insertItem( "exit", i18n( "Shutdown Computer" ),
+ m_exitView->leftView()->insertItem( "system-log-out", i18n( "Shutdown Computer" ),
i18n( "Turn off computer" ), "kicker:/shutdown", nId++, index++ );
m_exitView->leftView()->insertItem( "reload", i18n( "&Restart Computer" ).replace("&",""),
@@ -1418,7 +1418,7 @@ void KMenu::insertStaticItems()
// run command
if (kapp->authorize("run_command"))
{
- m_systemView->insertItem( "run", i18n("Run Command..."),
+ m_systemView->insertItem( "system-run", i18n("Run Command..."),
"", "kicker:/runusercommand", nId++, index++ );
}
@@ -2906,7 +2906,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
if (kapp->authorize("run_command") && (m_popupService || (!m_popupPath.menuPath.isEmpty() && !m_popupPath.menuPath.endsWith("/"))))
{
hasEntries = true;
- m_popupMenu->insertItem(SmallIconSet("run"),
+ m_popupMenu->insertItem(SmallIconSet("system-run"),
i18n("Put Into Run Dialog"), PutIntoRunDialog);
}
}
diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp
index c85c71312..8d7949470 100644
--- a/kicker/kicker/ui/service_mnu.cpp
+++ b/kicker/kicker/ui/service_mnu.cpp
@@ -617,7 +617,7 @@ void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev)
if (kapp->authorize("run_command"))
{
hasEntries = true;
- popupMenu_->insertItem(SmallIconSet("run"),
+ popupMenu_->insertItem(SmallIconSet("system-run"),
i18n("Put Into Run Dialog"), PutIntoRunDialog);
}
break;
diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc
index fa8fcb385..10156afe0 100644
--- a/kicker/menuext/tom/tom.cc
+++ b/kicker/menuext/tom/tom.cc
@@ -98,9 +98,9 @@ class runMenuWidget : public TQWidget, public QMenuItem
textRect = fontMetrics().boundingRect(i18n("Run:"));
runLayout->setSpacing(KDialog::spacingHint());
runLayout->addSpacing((KDialog::spacingHint() * 3) + TDEIcon::SizeMedium + textRect.width());
- icon = DesktopIcon("run", TDEIcon::SizeMedium);
+ icon = DesktopIcon("system-run", TDEIcon::SizeMedium);
/*TQLabel* l1 = new TQLabel(this);
- TQPixmap foo = DesktopIcon("run", TDEIcon::SizeMedium);
+ TQPixmap foo = DesktopIcon("system-run", TDEIcon::SizeMedium);
cout << "foo is: " << foo.width() << " by " << foo.height() << endl;
l1->setPixmap(foo);
runLayout->addWidget(l1);*/
@@ -486,7 +486,7 @@ void TOM::initialize()
}
else if (kapp->authorize("run_command"))
{
- insertItem(DesktopIcon("run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQT_SLOT(runCommand()));
+ insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQT_SLOT(runCommand()));
}
// RECENTLY USED ITEMS
@@ -512,7 +512,7 @@ void TOM::initialize()
// if we have no destinations, put the run command here
if (numDests == 0 && kapp->authorize("run_command"))
{
- insertItem(DesktopIcon("run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQT_SLOT(runCommand()));
+ insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQT_SLOT(runCommand()));
}
@@ -563,7 +563,7 @@ void TOM::initialize()
}
}
- insertItem(DesktopIcon("exit", TDEIcon::SizeMedium),
+ insertItem(DesktopIcon("system-log-out", TDEIcon::SizeMedium),
i18n("Logout %1").arg(username), this, TQT_SLOT(logout()));
}