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

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

Browse Source
pull/2/head
Timothy Pearson 10 years ago
parent ad7c595221
commit 1346f68987
24 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File

8
kdesktop/krootwm.cc
Unescape View File

@ -131,7 +131,7 @@ KRootWm::KRootWm(KDesktop* _desktop) : TQObject(_desktop), startup(FALSE)
if (kapp->authorize("run_command")) 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() ), new TDEAction(i18n("Open Terminal Here..." ), "terminal", CTRL+Key_T, this, TQT_SLOT( slotOpenTerminal() ),
m_actionCollection, "open_terminal" ); m_actionCollection, "open_terminal" );
} }
@ -188,12 +188,12 @@ KRootWm::KRootWm(KDesktop* _desktop) : TQObject(_desktop), startup(FALSE)
// Icons in sync with kicker // Icons in sync with kicker
if (kapp->authorize("lock_screen")) 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" ); m_actionCollection, "lock" );
} }
if (kapp->authorize("logout")) 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" ); this, TQT_SLOT( slotLogout() ), m_actionCollection, "logout" );
} }
@ -203,7 +203,7 @@ KRootWm::KRootWm(KDesktop* _desktop) : TQObject(_desktop), startup(FALSE)
TQT_SLOT( slotNewSession() ), m_actionCollection, "newsession" ); TQT_SLOT( slotNewSession() ), m_actionCollection, "newsession" );
if (kapp->authorize("lock_screen")) 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" ); TQT_SLOT( slotLockNNewSession() ), m_actionCollection, "lockNnewsession" );
} }
} }

2
kdesktop/lock/autologout.cc
Unescape View File

@ -49,7 +49,7 @@ AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog"
frame->setLineWidth(2); frame->setLineWidth(2);
TQLabel *pixLabel = new TQLabel( frame, "pixlabel" ); 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 *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); 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);

2
kdesktop/lock/lockdlg.cc
Unescape View File

@ -119,7 +119,7 @@ void PasswordDlg::init(GreeterPluginHandle *plugin)
TQLabel *pixLabel = NULL; TQLabel *pixLabel = NULL;
if (!trinity_desktop_lock_use_system_modal_dialogs) { if (!trinity_desktop_lock_use_system_modal_dialogs) {
pixLabel = new TQLabel( frame, "pixlabel" ); pixLabel = new TQLabel( frame, "pixlabel" );
pixLabel->setPixmap(DesktopIcon("lock")); pixLabel->setPixmap(DesktopIcon("system-lock-screen"));
} }
KUser user; KUser user;

2
kdesktop/minicli.cpp
Unescape View File

@ -80,7 +80,7 @@ Minicli::Minicli( TQWidget *parent, const char *name)
m_autoCheckedRunInTerm(false), m_pURLCompletion(NULL), m_pEXECompletion(NULL) m_autoCheckedRunInTerm(false), m_pURLCompletion(NULL), m_pEXECompletion(NULL)
{ {
setPlainCaption( i18n("Run Command") ); 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() ); TQVBoxLayout* mainLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
m_dlg = new MinicliDlgUI (this); m_dlg = new MinicliDlgUI (this);

2
kfind/kfind.cpp
Unescape View File

@ -72,7 +72,7 @@ Kfind::Kfind(TQWidget *parent, const char *name)
mSearch = new KPushButton( KGuiItem(i18n("&Find"), "find"), mButtonBox ); mSearch = new KPushButton( KGuiItem(i18n("&Find"), "find"), mButtonBox );
mButtonBox->setSpacing( (tabWidget->sizeHint().height()-4*mSearch->sizeHint().height()) / 4); mButtonBox->setSpacing( (tabWidget->sizeHint().height()-4*mSearch->sizeHint().height()) / 4);
connect( mSearch, TQT_SIGNAL(clicked()), this, TQT_SLOT( startSearch() ) ); 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() ) ); connect( mStop, TQT_SIGNAL(clicked()), this, TQT_SLOT( stopSearch() ) );
mSave = new KPushButton( KStdGuiItem::saveAs(), mButtonBox ); mSave = new KPushButton( KStdGuiItem::saveAs(), mButtonBox );
connect( mSave, TQT_SIGNAL(clicked()), this, TQT_SLOT( saveResults() ) ); connect( mSave, TQT_SIGNAL(clicked()), this, TQT_SLOT( saveResults() ) );

2
kfind/kfinddlg.cpp
Unescape View File

@ -27,7 +27,7 @@ KfindDlg::KfindDlg(const KURL & url, TQWidget *parent, const char *name)
: KDialogBase( Plain, TQString::null, : KDialogBase( Plain, TQString::null,
User1 | User2 | Apply | Close | Help, Apply, User1 | User2 | Apply | Close | Help, Apply,
parent, name, true, false, parent, name, true, false,
KGuiItem(i18n("Stop"), "stop"), KGuiItem(i18n("Stop"), "process-stop"),
KStdGuiItem::saveAs()) KStdGuiItem::saveAs())
{ {
TQWidget::setCaption( i18n("Find Files/Folders" ) ); TQWidget::setCaption( i18n("Find Files/Folders" ) );

12
kicker/applets/lockout/lockout.cpp
Unescape View File

@ -77,8 +77,8 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name
TQToolTip::add( lockButton, i18n("Lock the session") ); TQToolTip::add( lockButton, i18n("Lock the session") );
TQToolTip::add( logoutButton, i18n("Log out") ); TQToolTip::add( logoutButton, i18n("Log out") );
lockButton->setPixmap( SmallIcon( "lock" )); lockButton->setPixmap( SmallIcon( "system-lock-screen" ));
logoutButton->setPixmap( SmallIcon( "exit" )); logoutButton->setPixmap( SmallIcon( "system-log-out" ));
bTransparent = conf->readBoolEntry( "Transparent", bTransparent ); bTransparent = conf->readBoolEntry( "Transparent", bTransparent );
@ -200,7 +200,7 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e )
{ {
TQPopupMenu *popup = new TQPopupMenu(); TQPopupMenu *popup = new TQPopupMenu();
popup->insertItem( SmallIcon( "lock" ), i18n("Lock Session"), popup->insertItem( SmallIcon( "system-lock-screen" ), i18n("Lock Session"),
this, TQT_SLOT( lock() ) ); this, TQT_SLOT( lock() ) );
popup->insertSeparator(); popup->insertSeparator();
@ -223,7 +223,7 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e )
{ {
TQPopupMenu *popup = new TQPopupMenu(); TQPopupMenu *popup = new TQPopupMenu();
popup->insertItem( SmallIcon( "exit" ), i18n("&Log Out..."), popup->insertItem( SmallIcon( "system-log-out" ), i18n("&Log Out..."),
this, TQT_SLOT( logout() ) ); this, TQT_SLOT( logout() ) );
popup->insertSeparator(); popup->insertSeparator();
//popup->insertItem( i18n( "&Transparent" ), 100 ); //popup->insertItem( i18n( "&Transparent" ), 100 );
@ -271,8 +271,8 @@ void Lockout::slotLogoutPrefs()
void Lockout::slotIconChanged() void Lockout::slotIconChanged()
{ {
lockButton->setPixmap( SmallIcon( "lock" )); lockButton->setPixmap( SmallIcon( "system-lock-screen" ));
logoutButton->setPixmap( SmallIcon( "exit" )); logoutButton->setPixmap( SmallIcon( "system-log-out" ));
} }
#include "lockout.moc" #include "lockout.moc"

2
kicker/extensions/kasbar/kastasker.cpp
Unescape View File

@ -207,7 +207,7 @@ TDEPopupMenu *KasTasker::contextMenu()
if ( standalone_ ) { if ( standalone_ ) {
menu->insertSeparator(); menu->insertSeparator();
menu->insertItem( SmallIcon("exit"), i18n("&Quit"), tqApp, TQT_SLOT( quit() ) ); menu->insertItem( SmallIcon("system-log-out"), i18n("&Quit"), tqApp, TQT_SLOT( quit() ) );
} }
} }

4
kicker/kicker/core/panelextension.cpp
Unescape View File

@ -361,13 +361,13 @@ void PanelExtension::slotBuildOpMenu()
_opMnu->insertSeparator(); _opMnu->insertSeparator();
} }
_opMnu->insertItem(SmallIconSet("lock"), i18n("&Lock Panels"), _opMnu->insertItem(SmallIconSet("system-lock-screen"), i18n("&Lock Panels"),
Kicker::the(), TQT_SLOT(toggleLock())); Kicker::the(), TQT_SLOT(toggleLock()));
} }
else if (!Kicker::the()->isKioskImmutable()) else if (!Kicker::the()->isKioskImmutable())
{ {
_opMnu->insertItem(kickerImmutable? SmallIconSet("unlock") : _opMnu->insertItem(kickerImmutable? SmallIconSet("unlock") :
SmallIconSet("lock"), SmallIconSet("system-lock-screen"),
kickerImmutable ? i18n("Un&lock Panels") : kickerImmutable ? i18n("Un&lock Panels") :
i18n("&Lock Panels"), i18n("&Lock Panels"),
Kicker::the(), TQT_SLOT(toggleLock())); Kicker::the(), TQT_SLOT(toggleLock()));

8
kicker/kicker/ui/k_mnu.cpp
Unescape View File

@ -366,7 +366,7 @@ void PanelKMenu::initialize()
// run command // run command
if (kapp->authorize("run_command")) if (kapp->authorize("run_command"))
{ {
insertItem(KickerLib::menuIconSet("run"), insertItem(KickerLib::menuIconSet("system-run"),
i18n("Run Command..."), i18n("Run Command..."),
this, this,
TQT_SLOT( slotRunCommand())); TQT_SLOT( slotRunCommand()));
@ -393,12 +393,12 @@ void PanelKMenu::initialize()
if (kapp->authorize("lock_screen")) 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")) 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 #if 0
@ -474,7 +474,7 @@ void PanelKMenu::slotPopulateSessions()
if (kapp->authorize("start_new_session") && (p = dm.numReserve()) >= 0) if (kapp->authorize("start_new_session") && (p = dm.numReserve()) >= 0)
{ {
if (kapp->authorize("lock_screen")) { 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 ); sessionsMenu->insertItem(SmallIconSet("switchuser"), i18n("Start New Session"), 101 );
if (!p) { if (!p) {

10
kicker/kicker/ui/k_new_mnu.cpp
Unescape View File

@ -936,7 +936,7 @@ void KMenu::slotGoExitSubMenu(const TQString& url)
m_exitView->rightView()->insertItem( "switchuser", i18n( "Start New Session" ), m_exitView->rightView()->insertItem( "switchuser", i18n( "Start New Session" ),
i18n( "Start a parallel session" ), "kicker:/switchuser", nId++, index++ ); 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++ ); i18n( "Lock screen and start a parallel session" ), "kicker:/switchuserafterlock", nId++, index++ );
SessList sess; SessList sess;
@ -1340,7 +1340,7 @@ void KMenu::insertStaticExitItems()
m_exitView->leftView()->insertItem( "undo", i18n( "Logout" ), m_exitView->leftView()->insertItem( "undo", i18n( "Logout" ),
i18n( "End session" ), "kicker:/logout", nId++, index++ ); i18n( "End session" ), "kicker:/logout", nId++, index++ );
if (kapp->authorize("lock_screen")) 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++ ); i18n( "Lock screen" ), "kicker:/lock", nId++, index++ );
TDEConfig ksmserver("ksmserverrc", false, false); TDEConfig ksmserver("ksmserverrc", false, false);
@ -1372,7 +1372,7 @@ void KMenu::insertStaticExitItems()
if ( maysd ) if ( maysd )
{ {
m_exitView->leftView()->insertSeparator( nId++, i18n("System"), index++ ); 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++ ); i18n( "Turn off computer" ), "kicker:/shutdown", nId++, index++ );
m_exitView->leftView()->insertItem( "reload", i18n( "&Restart Computer" ).replace("&",""), m_exitView->leftView()->insertItem( "reload", i18n( "&Restart Computer" ).replace("&",""),
@ -1418,7 +1418,7 @@ void KMenu::insertStaticItems()
// run command // run command
if (kapp->authorize("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++ ); "", "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("/")))) if (kapp->authorize("run_command") && (m_popupService || (!m_popupPath.menuPath.isEmpty() && !m_popupPath.menuPath.endsWith("/"))))
{ {
hasEntries = true; hasEntries = true;
m_popupMenu->insertItem(SmallIconSet("run"), m_popupMenu->insertItem(SmallIconSet("system-run"),
i18n("Put Into Run Dialog"), PutIntoRunDialog); i18n("Put Into Run Dialog"), PutIntoRunDialog);
} }
} }

2
kicker/kicker/ui/service_mnu.cpp
Unescape View File

@ -617,7 +617,7 @@ void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev)
if (kapp->authorize("run_command")) if (kapp->authorize("run_command"))
{ {
hasEntries = true; hasEntries = true;
popupMenu_->insertItem(SmallIconSet("run"), popupMenu_->insertItem(SmallIconSet("system-run"),
i18n("Put Into Run Dialog"), PutIntoRunDialog); i18n("Put Into Run Dialog"), PutIntoRunDialog);
} }
break; break;

10
kicker/menuext/tom/tom.cc
Unescape View File

@ -98,9 +98,9 @@ class runMenuWidget : public TQWidget, public QMenuItem
textRect = fontMetrics().boundingRect(i18n("Run:")); textRect = fontMetrics().boundingRect(i18n("Run:"));
runLayout->setSpacing(KDialog::spacingHint()); runLayout->setSpacing(KDialog::spacingHint());
runLayout->addSpacing((KDialog::spacingHint() * 3) + TDEIcon::SizeMedium + textRect.width()); 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); /*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; cout << "foo is: " << foo.width() << " by " << foo.height() << endl;
l1->setPixmap(foo); l1->setPixmap(foo);
runLayout->addWidget(l1);*/ runLayout->addWidget(l1);*/
@ -486,7 +486,7 @@ void TOM::initialize()
} }
else if (kapp->authorize("run_command")) 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 // RECENTLY USED ITEMS
@ -512,7 +512,7 @@ void TOM::initialize()
// if we have no destinations, put the run command here // if we have no destinations, put the run command here
if (numDests == 0 && kapp->authorize("run_command")) 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())); i18n("Logout %1").arg(username), this, TQT_SLOT(logout()));
} }

2
klipper/toplevel.cpp
Unescape View File

@ -174,7 +174,7 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config )
"configureAction" ); "configureAction" );
configureAction->setGroup( defaultGroup ); configureAction->setGroup( defaultGroup );
quitAction = new TDEAction( i18n("&Quit"), quitAction = new TDEAction( i18n("&Quit"),
"exit", "system-log-out",
0, 0,
TQT_TQOBJECT(this), TQT_TQOBJECT(this),
TQT_SLOT( slotQuit() ), TQT_SLOT( slotQuit() ),

10
konqueror/konq_mainwindow.cc
Unescape View File

@ -1849,9 +1849,9 @@ void KonqMainWindow::slotReloadStop() {
} }
void KonqMainWindow::toggleReloadStopButton(bool isReload) { void KonqMainWindow::toggleReloadStopButton(bool isReload) {
//m_paStop = new TDEAction( i18n( "&Stop" ), "stop", Key_Escape, this, TQT_SLOT( slotStop() ), actionCollection(), "stop" ); //m_paStop = new TDEAction( i18n( "&Stop" ), "process-stop", Key_Escape, this, TQT_SLOT( slotStop() ), actionCollection(), "stop" );
if (isReload) { if (isReload) {
m_paReloadStop->setIcon("stop"); m_paReloadStop->setIcon("process-stop");
m_paReloadStop->setWhatsThis( i18n( "Stop loading the document<p>" m_paReloadStop->setWhatsThis( i18n( "Stop loading the document<p>"
"All network transfers will be stopped and Konqueror will display the content " "All network transfers will be stopped and Konqueror will display the content "
"that has been received so far." ) ); "that has been received so far." ) );
@ -3950,7 +3950,7 @@ void KonqMainWindow::initActions()
m_paCopy = KStdAction::copy( 0, 0, actionCollection(), "copy" ); m_paCopy = KStdAction::copy( 0, 0, actionCollection(), "copy" );
m_paPaste = KStdAction::paste( 0, 0, actionCollection(), "paste" ); m_paPaste = KStdAction::paste( 0, 0, actionCollection(), "paste" );
m_paStop = new TDEAction( i18n( "&Stop" ), "stop", Key_Escape, TQT_TQOBJECT(this), TQT_SLOT( slotStop() ), actionCollection(), "stop" ); m_paStop = new TDEAction( i18n( "&Stop" ), "process-stop", Key_Escape, TQT_TQOBJECT(this), TQT_SLOT( slotStop() ), actionCollection(), "stop" );
m_paRename = new TDEAction( i18n( "&Rename" ), /*"editrename",*/ Key_F2, actionCollection(), "rename" ); m_paRename = new TDEAction( i18n( "&Rename" ), /*"editrename",*/ Key_F2, actionCollection(), "rename" );
m_paTrash = new TDEAction( i18n( "&Move to Trash" ), "edittrash", Key_Delete, actionCollection(), "trash" ); m_paTrash = new TDEAction( i18n( "&Move to Trash" ), "edittrash", Key_Delete, actionCollection(), "trash" );
@ -5325,7 +5325,7 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e )
m_pViewManager->showTab( view ); m_pViewManager->showTab( view );
if ( KMessageBox::warningContinueCancel( this, if ( KMessageBox::warningContinueCancel( this,
i18n("This tab contains changes that have not been submitted.\nClosing the window will discard these changes."), i18n("This tab contains changes that have not been submitted.\nClosing the window will discard these changes."),
i18n("Discard Changes?"), KGuiItem(i18n("&Discard Changes"),"exit"), "discardchangesclose") != KMessageBox::Continue ) i18n("Discard Changes?"), KGuiItem(i18n("&Discard Changes"),"system-log-out"), "discardchangesclose") != KMessageBox::Continue )
{ {
e->ignore(); e->ignore();
m_pViewManager->showTab( originalView ); m_pViewManager->showTab( originalView );
@ -5343,7 +5343,7 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e )
if (prop.isValid() && prop.toBool()) if (prop.isValid() && prop.toBool())
if ( KMessageBox::warningContinueCancel( this, if ( KMessageBox::warningContinueCancel( this,
i18n("This page contains changes that have not been submitted.\nClosing the window will discard these changes."), i18n("This page contains changes that have not been submitted.\nClosing the window will discard these changes."),
i18n("Discard Changes?"), KGuiItem(i18n("&Discard Changes"),"exit"), "discardchangesclose") != KMessageBox::Continue ) i18n("Discard Changes?"), KGuiItem(i18n("&Discard Changes"),"system-log-out"), "discardchangesclose") != KMessageBox::Continue )
{ {
e->ignore(); e->ignore();
return; return;

2
konqueror/shellcmdplugin/kshellcmdplugin.cpp
Unescape View File

@ -33,7 +33,7 @@ KShellCmdPlugin::KShellCmdPlugin( TQObject* parent, const char* name,
if (!kapp->authorize("shell_access")) if (!kapp->authorize("shell_access"))
return; return;
new TDEAction( i18n( "&Execute Shell Command..." ), "run", CTRL+Key_E, this, new TDEAction( i18n( "&Execute Shell Command..." ), "system-run", CTRL+Key_E, this,
TQT_SLOT( slotExecuteShellCommand() ), actionCollection(), "executeshellcommand" ); TQT_SLOT( slotExecuteShellCommand() ), actionCollection(), "executeshellcommand" );
} }

6
konsole/konsole/konsole.cpp
Unescape View File

@ -1,5 +1,5 @@
/* /*
This file is part of Konsole, an X terminal. This file is part of Konsole, an X terminal.
Copyright (C) 1996 by Matthias Ettrich <ettrich@kde.org> Copyright (C) 1996 by Matthias Ettrich <ettrich@kde.org>
Copyright (C) 1997,1998 by Lars Doelle <lars.doelle@on-line.de> Copyright (C) 1997,1998 by Lars Doelle <lars.doelle@on-line.de>
@ -15,7 +15,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA. 02110-1301 USA.
-------------------------------------------------------------- --------------------------------------------------------------
@ -1183,7 +1183,7 @@ void Konsole::makeBasicGUI()
m_closeSession = new TDEAction(i18n("C&lose Session"), "fileclose", 0, TQT_TQOBJECT(this), m_closeSession = new TDEAction(i18n("C&lose Session"), "fileclose", 0, TQT_TQOBJECT(this),
TQT_SLOT(confirmCloseCurrentSession()), m_shortcuts, "close_session"); TQT_SLOT(confirmCloseCurrentSession()), m_shortcuts, "close_session");
m_print = new TDEAction(i18n("&Print Screen..."), "fileprint", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPrint() ), m_shortcuts, "file_print"); m_print = new TDEAction(i18n("&Print Screen..."), "fileprint", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPrint() ), m_shortcuts, "file_print");
m_quit = new TDEAction(i18n("&Quit"), "exit", 0, TQT_TQOBJECT(this), TQT_SLOT( close() ), m_shortcuts, "file_quit"); m_quit = new TDEAction(i18n("&Quit"), "system-log-out", 0, TQT_TQOBJECT(this), TQT_SLOT( close() ), m_shortcuts, "file_quit");
TDEShortcut shortcut(Qt::CTRL+Qt::ALT+Qt::Key_N); TDEShortcut shortcut(Qt::CTRL+Qt::ALT+Qt::Key_N);
shortcut.append(TDEShortcut(Qt::CTRL+Qt::SHIFT+Qt::Key_N)); shortcut.append(TDEShortcut(Qt::CTRL+Qt::SHIFT+Qt::Key_N));

6
ksmserver/shutdowndlg.cpp
Unescape View File

@ -963,7 +963,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
// Shutdown // Shutdown
FlatButton* btnHalt = new FlatButton( frame ); FlatButton* btnHalt = new FlatButton( frame );
btnHalt->setTextLabel( i18n("&Turn Off"), false ); btnHalt->setTextLabel( i18n("&Turn Off"), false );
btnHalt->setPixmap( DesktopIcon( "exit") ); btnHalt->setPixmap( DesktopIcon( "system-log-out") );
int i = btnHalt->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1 int i = btnHalt->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1
btnHalt->setAccel( "ALT+" + btnHalt->textLabel().lower()[i+1] ) ; btnHalt->setAccel( "ALT+" + btnHalt->textLabel().lower()[i+1] ) ;
hbuttonbox2->addWidget ( btnHalt ); hbuttonbox2->addWidget ( btnHalt );
@ -987,7 +987,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
{ {
if (maysd) { if (maysd) {
// Shutdown // Shutdown
KPushButton* btnHalt = new KPushButton( KGuiItem( i18n("&Turn Off Computer"), "exit"), frame ); KPushButton* btnHalt = new KPushButton( KGuiItem( i18n("&Turn Off Computer"), "system-log-out"), frame );
TQToolTip::add( btnHalt, i18n( "<qt><h3>Turn Off Computer</h3><p>Log out of the current session and turn off the computer</p></qt>" ) ); TQToolTip::add( btnHalt, i18n( "<qt><h3>Turn Off Computer</h3><p>Log out of the current session and turn off the computer</p></qt>" ) );
btnHalt->setFont( btnFont ); btnHalt->setFont( btnFont );
buttonlay->addWidget( btnHalt ); buttonlay->addWidget( btnHalt );
@ -1337,7 +1337,7 @@ KSMDelayedMessageBox::KSMDelayedMessageBox( TDEApplication::ShutdownType sdtype,
m_title->setText( i18n( "Would you like to turn off your computer?" ) ); m_title->setText( i18n( "Would you like to turn off your computer?" ) );
m_template = i18n( "This computer will turn off automatically\n" m_template = i18n( "This computer will turn off automatically\n"
"after %1 seconds." ); "after %1 seconds." );
m_logo->setPixmap( BarIcon( "exit", 48 ) ); m_logo->setPixmap( BarIcon( "system-log-out", 48 ) );
} else if ( sdtype == TDEApplication::ShutdownTypeReboot ) } else if ( sdtype == TDEApplication::ShutdownTypeReboot )
{ {
if (bootOption.isEmpty()) if (bootOption.isEmpty())

4
ksplashml/themeengine/standard/themestandard.cpp
Unescape View File

@ -34,7 +34,7 @@ ThemeStandard::ThemeStandard( TQWidget *parent, const char *name, const TQString
:ThemeEngine( parent, name, args ), mIcon(0L), mPrevIcon(0L), mIconCount(0), mStdIconWidth(-1), :ThemeEngine( parent, name, args ), mIcon(0L), mPrevIcon(0L), mIconCount(0), mStdIconWidth(-1),
mIconPos(WndIcon::HBottomLeft), mSbAtTop(false), mSbVisible(true), mSbPbVisible(true), mSbFontName("helvetica"), mIconPos(WndIcon::HBottomLeft), mSbAtTop(false), mSbVisible(true), mSbPbVisible(true), mSbFontName("helvetica"),
mSbFontSz(16), mSbFontBold(true), mSbFontItalic(false), mSbFont(TQFont()), mSbFg(TQColor()), mSbBg(TQColor()), mSbFontSz(16), mSbFontBold(true), mSbFontItalic(false), mSbFont(TQFont()), mSbFg(TQColor()), mSbBg(TQColor()),
mSbIcon("run"), mIconsVisible(true), mIconsJumping(true), mSplashScreen("(Default)") mSbIcon("system-run"), mIconsVisible(true), mIconsJumping(true), mSplashScreen("(Default)")
{ {
_readSettings(); _readSettings();
_initUi(); _initUi();
@ -158,7 +158,7 @@ void ThemeStandard::_readSettings()
mSbFg = cfg->readColorEntry( "Statusbar Foreground", &TQt::white ); mSbFg = cfg->readColorEntry( "Statusbar Foreground", &TQt::white );
mSbBg = cfg->readColorEntry( "Statusbar Background", &TQt::black ); mSbBg = cfg->readColorEntry( "Statusbar Background", &TQt::black );
mSbIcon = cfg->readEntry( "Statusbar Icon", "run" ); mSbIcon = cfg->readEntry( "Statusbar Icon", "system-run" );
mIconsVisible = cfg->readBoolEntry( "Icons Visible", true); mIconsVisible = cfg->readBoolEntry( "Icons Visible", true);
mIconsJumping = cfg->readBoolEntry( "Icons Jumping", true); mIconsJumping = cfg->readBoolEntry( "Icons Jumping", true);
mIconPos = (WndIcon::Position)cfg->readNumEntry( "Icon Position", 0 ); mIconPos = (WndIcon::Position)cfg->readNumEntry( "Icon Position", 0 );

2
ksplashml/themeengine/standard/wndstatus.cpp
Unescape View File

@ -50,7 +50,7 @@ WndStatus::WndStatus( TQPalette /*pal*/,
// TDEGlobalSettings::splashScreenDesktopGeometry(); cannot be used here. // TDEGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
TQLabel *pix = new TQLabel( this ); TQLabel *pix = new TQLabel( this );
TQPixmap _icon( SmallIcon(icon.isNull()||icon.isEmpty()?TQString("run"):icon) ); TQPixmap _icon( SmallIcon(icon.isNull()||icon.isEmpty()?TQString("system-run"):icon) );
pix->setPixmap( _icon ); pix->setPixmap( _icon );
setStretchFactor(pix,0); setStretchFactor(pix,0);
pix->setFixedWidth(16); pix->setFixedWidth(16);

2
ksystraycmd/ksystraycmd.cpp
Unescape View File

@ -234,7 +234,7 @@ void KSysTrayCmd::execContextMenu( const TQPoint &pos )
menu->insertTitle( *pixmap(), i18n( "KSysTrayCmd" ) ); menu->insertTitle( *pixmap(), i18n( "KSysTrayCmd" ) );
int hideShowId = menu->insertItem( isVisible ? i18n( "&Hide" ) : i18n( "&Restore" ) ); int hideShowId = menu->insertItem( isVisible ? i18n( "&Hide" ) : i18n( "&Restore" ) );
int undockId = menu->insertItem( SmallIcon("close"), i18n( "&Undock" ) ); int undockId = menu->insertItem( SmallIcon("close"), i18n( "&Undock" ) );
int quitId = menu->insertItem( SmallIcon("exit"), i18n( "&Quit" ) ); int quitId = menu->insertItem( SmallIcon("system-log-out"), i18n( "&Quit" ) );
int cmd = menu->exec( pos ); int cmd = menu->exec( pos );

2
tdeprint/tdeprintfax/tdeprintfax.cpp
Unescape View File

@ -191,7 +191,7 @@ void KdeprintFax::initActions()
new TDEAction(i18n("&Add File..."), "filenew", Qt::Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotAdd()), actionCollection(), "file_add"); new TDEAction(i18n("&Add File..."), "filenew", Qt::Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotAdd()), actionCollection(), "file_add");
new TDEAction(i18n("&Remove File"), "remove", Qt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), actionCollection(), "file_remove"); new TDEAction(i18n("&Remove File"), "remove", Qt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), actionCollection(), "file_remove");
new TDEAction(i18n("&Send Fax"), "connect_established", Qt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotFax()), actionCollection(), "fax_send"); new TDEAction(i18n("&Send Fax"), "connect_established", Qt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotFax()), actionCollection(), "fax_send");
new TDEAction(i18n("A&bort"), "stop", Qt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(slotAbort()), actionCollection(), "fax_stop"); new TDEAction(i18n("A&bort"), "process-stop", Qt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(slotAbort()), actionCollection(), "fax_stop");
new TDEAction(i18n("A&ddress Book"), "kaddressbook", Qt::CTRL+Qt::Key_A, TQT_TQOBJECT(this), TQT_SLOT(slotKab()), actionCollection(), "fax_ab"); new TDEAction(i18n("A&ddress Book"), "kaddressbook", Qt::CTRL+Qt::Key_A, TQT_TQOBJECT(this), TQT_SLOT(slotKab()), actionCollection(), "fax_ab");
new TDEAction(i18n("V&iew Log"), "contents", Qt::CTRL+Qt::Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotViewLog()), actionCollection(), "fax_log"); new TDEAction(i18n("V&iew Log"), "contents", Qt::CTRL+Qt::Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotViewLog()), actionCollection(), "fax_log");
new TDEAction(i18n("Vi&ew File"), "filefind", Qt::CTRL+Qt::Key_O, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "file_view"); new TDEAction(i18n("Vi&ew File"), "filefind", Qt::CTRL+Qt::Key_O, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "file_view");

2
tdm/kfrontend/kgdialog.cpp
Unescape View File

@ -86,7 +86,7 @@ KGDialog::completeMenu()
if (_allowShutdown != SHUT_NONE) { if (_allowShutdown != SHUT_NONE) {
ensureMenu(); ensureMenu();
optMenu->insertItem(SmallIconSet( "exit" ), i18n("&Shutdown..."), this, TQT_SLOT(slotShutdown(int)), ALT+Key_S ); optMenu->insertItem(SmallIconSet( "system-log-out" ), i18n("&Shutdown..."), this, TQT_SLOT(slotShutdown(int)), ALT+Key_S );
TQAccel *accel = new TQAccel( this ); TQAccel *accel = new TQAccel( this );
accel->insertItem( ALT+CTRL+Key_Delete ); accel->insertItem( ALT+CTRL+Key_Delete );
connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotShutdown( int )) ); connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotShutdown( int )) );

4
tdm/kfrontend/tdmshutdown.cpp
Unescape View File

@ -530,7 +530,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent )
// Shutdown // Shutdown
FlatButton* btnHalt = new FlatButton( lfrm ); FlatButton* btnHalt = new FlatButton( lfrm );
btnHalt->setTextLabel( i18n("&Turn Off"), false ); btnHalt->setTextLabel( i18n("&Turn Off"), false );
btnHalt->setPixmap( DesktopIcon( "exit") ); btnHalt->setPixmap( DesktopIcon( "system-log-out") );
i = btnHalt->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1 i = btnHalt->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1
btnHalt->setAccel( "ALT+" + btnHalt->textLabel().lower()[i+1] ) ; btnHalt->setAccel( "ALT+" + btnHalt->textLabel().lower()[i+1] ) ;
hbuttonbox->addWidget ( btnHalt ); hbuttonbox->addWidget ( btnHalt );
@ -565,7 +565,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent )
buttonlay->addStretch( 1 ); buttonlay->addStretch( 1 );
KPushButton *btnHalt = new KPushButton *btnHalt = new
KPushButton( KGuiItem( i18n("&Turn Off Computer"), "exit" ), this ); KPushButton( KGuiItem( i18n("&Turn Off Computer"), "system-log-out" ), this );
buttonlay->addWidget( btnHalt ); buttonlay->addWidget( btnHalt );
connect( btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt()) ); connect( btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt()) );

Write Preview
Loading…
Cancel
Save