| 1346f689 | 2014-10-12 17:50:49 | Timothy Pearson |
Bring stop, lock, exit, and run icons into XDG compliance |
||
|
M kdesktop/krootwm.cc M kdesktop/lock/autologout.cc M kdesktop/lock/lockdlg.cc M kdesktop/minicli.cpp M kfind/kfind.cpp M kfind/kfinddlg.cpp M kicker/applets/lockout/lockout.cpp M kicker/extensions/kasbar/kastasker.cpp M kicker/kicker/core/panelextension.cpp M kicker/kicker/ui/k_mnu.cpp M kicker/kicker/ui/k_new_mnu.cpp M kicker/kicker/ui/service_mnu.cpp M kicker/menuext/tom/tom.cc M klipper/toplevel.cpp M konqueror/konq_mainwindow.cc M konqueror/shellcmdplugin/kshellcmdplugin.cpp M konsole/konsole/konsole.cpp M ksmserver/shutdowndlg.cpp M ksplashml/themeengine/standard/themestandard.cpp M ksplashml/themeengine/standard/wndstatus.cpp M ksystraycmd/ksystraycmd.cpp M tdeprint/tdeprintfax/tdeprintfax.cpp M tdm/kfrontend/kgdialog.cpp M tdm/kfrontend/tdmshutdown.cpp |
||
diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc
index 02f0731..e200366 100644
--- a/kdesktop/krootwm.cc
+++ b/kdesktop/krootwm.cc
@@ -131,7 +131,7 @@
if (kapp->authorize("run_command"))
{
- new TDEAction(i18n("Run Command..."), "run", 0, TQT_TQOBJECT(m_pDesktop), TQT_SLOT( slotExecuteCommand() ), m_actionCollection, "exec" );
+ new TDEAction(i18n("Run Command..."), "system-run", 0, TQT_TQOBJECT(m_pDesktop), TQT_SLOT( slotExecuteCommand() ), m_actionCollection, "exec" );
new TDEAction(i18n("Open Terminal Here..." ), "terminal", CTRL+Key_T, this, TQT_SLOT( slotOpenTerminal() ),
m_actionCollection, "open_terminal" );
}
@@ -188,12 +188,12 @@
// Icons in sync with kicker
if (kapp->authorize("lock_screen"))
{
- new TDEAction(i18n("Lock Session"), "lock", 0, this, TQT_SLOT( slotLock() ),
+ new TDEAction(i18n("Lock Session"), "system-lock-screen", 0, this, TQT_SLOT( slotLock() ),
m_actionCollection, "lock" );
}
if (kapp->authorize("logout"))
{
- new TDEAction(i18n("Log Out \"%1\"...").arg(KUser().loginName()), "exit", 0,
+ new TDEAction(i18n("Log Out \"%1\"...").arg(KUser().loginName()), "system-log-out", 0,
this, TQT_SLOT( slotLogout() ), m_actionCollection, "logout" );
}
@@ -203,7 +203,7 @@
TQT_SLOT( slotNewSession() ), m_actionCollection, "newsession" );
if (kapp->authorize("lock_screen"))
{
- new TDEAction(i18n("Lock Current && Start New Session"), "lock", 0, this,
+ new TDEAction(i18n("Lock Current && Start New Session"), "system-lock-screen", 0, this,
TQT_SLOT( slotLockNNewSession() ), m_actionCollection, "lockNnewsession" );
}
}
diff --git a/kdesktop/lock/autologout.cc b/kdesktop/lock/autologout.cc
index 0861eae..7d6bf6f 100644
--- a/kdesktop/lock/autologout.cc
+++ b/kdesktop/lock/autologout.cc
@@ -49,7 +49,7 @@
frame->setLineWidth(2);
TQLabel *pixLabel = new TQLabel( frame, "pixlabel" );
- pixLabel->setPixmap(DesktopIcon("exit"));
+ pixLabel->setPixmap(DesktopIcon("system-log-out"));
TQLabel *greetLabel = new TQLabel(i18n("<nobr><qt><b>Automatic Log Out</b></qt><nobr>"), frame);
TQLabel *infoLabel = new TQLabel(i18n("<qt>To prevent being logged out, resume using this session by moving the mouse or pressing a key.</qt>"), frame);
diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc
index bfa7276..7b53484 100644
--- a/kdesktop/lock/lockdlg.cc
+++ b/kdesktop/lock/lockdlg.cc
@@ -119,7 +119,7 @@
TQLabel *pixLabel = NULL;
if (!trinity_desktop_lock_use_system_modal_dialogs) {
pixLabel = new TQLabel( frame, "pixlabel" );
- pixLabel->setPixmap(DesktopIcon("lock"));
+ pixLabel->setPixmap(DesktopIcon("system-lock-screen"));
}
KUser user;
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp
index dc1fa94..c8149ad 100644
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
@@ -80,7 +80,7 @@
m_autoCheckedRunInTerm(false), m_pURLCompletion(NULL), m_pEXECompletion(NULL)
{
setPlainCaption( i18n("Run Command") );
- KWin::setIcons( winId(), DesktopIcon("run"), SmallIcon("run") );
+ KWin::setIcons( winId(), DesktopIcon("system-run"), SmallIcon("system-run") );
TQVBoxLayout* mainLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
m_dlg = new MinicliDlgUI (this);
diff --git a/kfind/kfind.cpp b/kfind/kfind.cpp
index b1afe1b..ca4ceb0 100644
--- a/kfind/kfind.cpp
+++ b/kfind/kfind.cpp
@@ -72,7 +72,7 @@
mSearch = new KPushButton( KGuiItem(i18n("&Find"), "find"), mButtonBox );
mButtonBox->setSpacing( (tabWidget->sizeHint().height()-4*mSearch->sizeHint().height()) / 4);
connect( mSearch, TQT_SIGNAL(clicked()), this, TQT_SLOT( startSearch() ) );
- mStop = new KPushButton( KGuiItem(i18n("Stop"), "stop"), mButtonBox );
+ mStop = new KPushButton( KGuiItem(i18n("Stop"), "process-stop"), mButtonBox );
connect( mStop, TQT_SIGNAL(clicked()), this, TQT_SLOT( stopSearch() ) );
mSave = new KPushButton( KStdGuiItem::saveAs(), mButtonBox );
connect( mSave, TQT_SIGNAL(clicked()), this, TQT_SLOT( saveResults() ) );
diff --git a/kfind/kfinddlg.cpp b/kfind/kfinddlg.cpp
index efae231..7810e34 100644
--- a/kfind/kfinddlg.cpp
+++ b/kfind/kfinddlg.cpp
@@ -27,7 +27,7 @@
: KDialogBase( Plain, TQString::null,
User1 | User2 | Apply | Close | Help, Apply,
parent, name, true, false,
- KGuiItem(i18n("Stop"), "stop"),
+ KGuiItem(i18n("Stop"), "process-stop"),
KStdGuiItem::saveAs())
{
TQWidget::setCaption( i18n("Find Files/Folders" ) );
diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp
index 8547b1b..d4c14c9 100644
--- a/kicker/applets/lockout/lockout.cpp
+++ b/kicker/applets/lockout/lockout.cpp
@@ -77,8 +77,8 @@
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 @@
{
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 @@
{
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::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 0d908fa..d10805a 100644
--- a/kicker/extensions/kasbar/kastasker.cpp
+++ b/kicker/extensions/kasbar/kastasker.cpp
@@ -207,7 +207,7 @@
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 cf91da2..93bd235 100644
--- a/kicker/kicker/core/panelextension.cpp
+++ b/kicker/kicker/core/panelextension.cpp
@@ -361,13 +361,13 @@
_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 6f8ddc4..9d1d70f 100644
--- a/kicker/kicker/ui/k_mnu.cpp
+++ b/kicker/kicker/ui/k_mnu.cpp
@@ -366,7 +366,7 @@
// 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 @@
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 @@
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 500bc54..886ae70 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -936,7 +936,7 @@
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 @@
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 @@
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 @@
// run command
if (kapp->authorize("run_command"))
** Diff limit reached (max: 250 lines) **
|
||
| e2c5ea4c | 2014-10-12 17:56:39 | Timothy Pearson |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase |
||
|
M ConfigureChecks.cmake M cmake M config.h.cmake M kate/data/externaltools M kcontrol/clock/main.cpp M kcontrol/info/info_openbsd.cpp M kcontrol/tdefontinst/tdefontinst/GetPid.c M kcontrol/tdm/tdm-shut.cpp M kdesktop/CMakeLists.txt M kdesktop/lock/lockprocess.cc M kicker/applets/naughty/NaughtyProcessMonitor.cpp M konsole/konsole/CMakeLists.txt M ksysguard/gui/SensorDisplayLib/ProcessList.cc M nsplugins/viewer/CMakeLists.txt M tdeioslave/nfs/CMakeLists.txt M tdeioslave/smtp/smtp.cc M tdm/backend/ctrl.c M tdm/backend/getfd.c M twin/utils.cpp |
||
** Diff limit reached (max: 250 lines) ** |
||