From a19ce6ad349c047b7feb2ad49c5a066d7dd2c745 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 13 Oct 2014 12:50:00 -0500 Subject: [PATCH] Bring undo, redo, find, and revert icons into XDG compliance --- kappfinder/toplevel.cpp | 2 +- kate/app/kategrepdialog.cpp | 4 ++-- kcontrol/kcontrol/proxywidget.cpp | 2 +- kfind/kfind.cpp | 2 +- kfind/kfinddlg.cpp | 2 +- kicker/kicker/ui/k_new_mnu.cpp | 8 ++++---- konqueror/konq_extensionmanager.cc | 2 +- konsole/konsole/konsole.cpp | 2 +- ksmserver/shutdowndlg.cpp | 2 +- ksysguard/gui/ksysguard.cc | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/kappfinder/toplevel.cpp b/kappfinder/toplevel.cpp index 25bbec9e7..01295bf55 100644 --- a/kappfinder/toplevel.cpp +++ b/kappfinder/toplevel.cpp @@ -77,7 +77,7 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name layout->addWidget( mSummary ); KButtonBox* bbox = new KButtonBox( this ); - mScanButton = bbox->addButton( KGuiItem( i18n( "Scan" ), "find"), TQT_TQOBJECT(this), TQT_SLOT( slotScan() ) ); + mScanButton = bbox->addButton( KGuiItem( i18n( "Scan" ), "edit-find"), TQT_TQOBJECT(this), TQT_SLOT( slotScan() ) ); bbox->addStretch( 5 ); mSelectButton = bbox->addButton( i18n( "Select All" ), TQT_TQOBJECT(this), TQT_SLOT( slotSelectAll() ) ); diff --git a/kate/app/kategrepdialog.cpp b/kate/app/kategrepdialog.cpp index b180fd516..7713400aa 100644 --- a/kate/app/kategrepdialog.cpp +++ b/kate/app/kategrepdialog.cpp @@ -183,7 +183,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name) KButtonBox *actionbox = new KButtonBox(this, Qt::Vertical); layout->addWidget(actionbox, 0, 2); actionbox->addStretch(); - btnSearch = static_cast(actionbox->addButton(KGuiItem(i18n("Find"),"find"))); + btnSearch = static_cast(actionbox->addButton(KGuiItem(i18n("Find"),"edit-find"))); btnSearch->setDefault(true); btnClear = static_cast(actionbox->addButton( KStdGuiItem::clear() )); actionbox->addStretch(); @@ -472,7 +472,7 @@ void GrepTool::childExited() // int status = childproc->exitStatus(); lbResult->unsetCursor(); btnClear->setEnabled( true ); - btnSearch->setGuiItem( KGuiItem(i18n("Find"), "find") ); + btnSearch->setGuiItem( KGuiItem(i18n("Find"), "edit-find") ); if ( ! errbuf.isEmpty() ) { diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp index f937493fa..94c1b5dd4 100644 --- a/kcontrol/kcontrol/proxywidget.cpp +++ b/kcontrol/kcontrol/proxywidget.cpp @@ -208,7 +208,7 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name, _handbook= new KPushButton( KGuiItem(KStdGuiItem::help().text(),"contents"), this ); _default = new KPushButton( KStdGuiItem::defaults(), this ); _apply = new KPushButton( KStdGuiItem::apply(), this ); - _reset = new KPushButton( KGuiItem( i18n( "&Reset" ), "undo" ), this ); + _reset = new KPushButton( KGuiItem( i18n( "&Reset" ), "edit-undo" ), this ); _root = new KPushButton( KGuiItem(i18n( "&Administrator Mode" )), this ); bool mayModify = (!run_as_root || !_client->useRootOnlyMsg()) && !KCGlobal::isInfoCenter(); diff --git a/kfind/kfind.cpp b/kfind/kfind.cpp index ca4ceb0de..1675d9d71 100644 --- a/kfind/kfind.cpp +++ b/kfind/kfind.cpp @@ -69,7 +69,7 @@ Kfind::Kfind(TQWidget *parent, const char *name) lay->addStretch(1); mTopLayout->addWidget(mButtonBox); - mSearch = new KPushButton( KGuiItem(i18n("&Find"), "find"), mButtonBox ); + mSearch = new KPushButton( KGuiItem(i18n("&Find"), "edit-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"), "process-stop"), mButtonBox ); diff --git a/kfind/kfinddlg.cpp b/kfind/kfinddlg.cpp index 7810e34b7..29e3010b4 100644 --- a/kfind/kfinddlg.cpp +++ b/kfind/kfinddlg.cpp @@ -37,7 +37,7 @@ KfindDlg::KfindDlg(const KURL & url, TQWidget *parent, const char *name) enableButton(User1, false); // Disable "Stop" enableButton(User2, false); // Disable "Save As..." - setButtonApply(KGuiItem(i18n("&Find"), "find")); + setButtonApply(KGuiItem(i18n("&Find"), "edit-find")); isResultReported = false; diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index 886ae7011..2fb6f1ed1 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -404,7 +404,7 @@ KMenu::KMenu() m_searchFrame->stackUnder( m_resizeHandle ); m_isresizing = false; - m_searchPixmap->setPixmap( BarIcon( "find", 32 ) ); + m_searchPixmap->setPixmap( BarIcon( "edit-find", 32 ) ); TQFont f = font(); f.setPointSize( kMax( 7, (f.pointSize() * 4 / 5 ) + KickerSettings::kickoffFontPointSizeOffset() ) ); @@ -1337,7 +1337,7 @@ void KMenu::insertStaticExitItems() m_exitView->leftView()->insertSeparator( nId++, i18n("Session"), index++ ); if (kapp->authorize("logout")) - m_exitView->leftView()->insertItem( "undo", i18n( "Logout" ), + m_exitView->leftView()->insertItem( "edit-undo", i18n( "Logout" ), i18n( "End session" ), "kicker:/logout", nId++, index++ ); if (kapp->authorize("lock_screen")) m_exitView->leftView()->insertItem( "system-lock-screen", i18n( "Lock" ), @@ -2496,7 +2496,7 @@ void KMenu::doQuery (bool return_pressed) // start search plugin only with at least 3 characters if (query_str.length()<3 || !m_search_plugin || (m_search_plugin && !m_search_plugin->daemonRunning()) ) { - m_searchPixmap->setPixmap( BarIcon( "find", 32 ) ); + m_searchPixmap->setPixmap( BarIcon( "edit-find", 32 ) ); fillOverflowCategory(); if (query_str.length()>2 && m_current_menu_items.isEmpty()) reportError (i18n("No matches found")); @@ -2568,7 +2568,7 @@ void KMenu::insertSearchResult(HitMenuItem* item) void KMenu::searchOver() { - m_searchPixmap->setPixmap( BarIcon( "find", 32 ) ); + m_searchPixmap->setPixmap( BarIcon( "edit-find", 32 ) ); fillOverflowCategory(); if (m_current_menu_items.isEmpty()) { kdDebug() << "No matches found" << endl; diff --git a/konqueror/konq_extensionmanager.cc b/konqueror/konq_extensionmanager.cc index 0bda1db98..ab5080596 100644 --- a/konqueror/konq_extensionmanager.cc +++ b/konqueror/konq_extensionmanager.cc @@ -41,7 +41,7 @@ public: KonqExtensionManager::KonqExtensionManager(TQWidget *parent, KonqMainWindow *mainWindow, KParts::ReadOnlyPart* activePart) : KDialogBase(Plain, i18n("Configure"), Default | Cancel | Apply | Ok | User1, - Ok, parent, "extensionmanager", false, true, KGuiItem(i18n("&Reset"), "undo")) + Ok, parent, "extensionmanager", false, true, KGuiItem(i18n("&Reset"), "edit-undo")) { d = new KonqExtensionManagerPrivate; showButton(User1, false); diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp index 53ab1bec2..bdfae69f6 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -1111,7 +1111,7 @@ void Konsole::makeBasicGUI() TQT_SLOT(slotClearTerminal()), m_shortcuts, "clear_terminal"); m_resetClearTerminal = new TDEAction(i18n("&Reset && Clear Terminal"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotResetClearTerminal()), m_shortcuts, "reset_clear_terminal"); - m_findHistory = new TDEAction(i18n("&Find in History..."), "find", 0, TQT_TQOBJECT(this), + m_findHistory = new TDEAction(i18n("&Find in History..."), "edit-find", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFindHistory()), m_shortcuts, "find_history"); m_findHistory->setEnabled(b_histEnabled); diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp index 388cb8d80..6b3b02428 100644 --- a/ksmserver/shutdowndlg.cpp +++ b/ksmserver/shutdowndlg.cpp @@ -781,7 +781,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, buttonlay->addStretch( 1 ); // End session - KPushButton* btnLogout = new KPushButton( KGuiItem( i18n("&End Current Session"), "undo"), frame ); + KPushButton* btnLogout = new KPushButton( KGuiItem( i18n("&End Current Session"), "edit-undo"), frame ); TQToolTip::add( btnLogout, i18n( "

End Current Session

Log out of the current session to login with a different user

" ) ); btnFont = btnLogout->font(); buttonlay->addWidget( btnLogout ); diff --git a/ksysguard/gui/ksysguard.cc b/ksysguard/gui/ksysguard.cc index 0e8f810e1..2e62465f7 100644 --- a/ksysguard/gui/ksysguard.cc +++ b/ksysguard/gui/ksysguard.cc @@ -133,7 +133,7 @@ TopLevel::TopLevel( const char *name ) new TDEAction( i18n( "&Worksheet Properties" ), "configure", 0, TQT_TQOBJECT(mWorkSpace), TQT_SLOT( configure() ), actionCollection(), "configure_sheet" ); - new TDEAction( i18n( "Load Standard Sheets" ), "revert", + new TDEAction( i18n( "Load Standard Sheets" ), "document-revert", 0, TQT_TQOBJECT(this), TQT_SLOT( resetWorkSheets() ), actionCollection(), "revert_all_worksheets" );