From c128ab57b3b5f3a57427a78cef7d5d4236cc9822 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 13 Oct 2014 12:48:00 -0500 Subject: [PATCH] Bring undo, redo, find, and revert icons into XDG compliance --- lib/kofficeui/KoCommandHistory.cpp | 4 ++-- lib/koproperty/editor.cpp | 2 +- lib/kotext/KoAutoFormatDia.cpp | 2 +- lib/kotext/KoCompletionDia.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/kofficeui/KoCommandHistory.cpp b/lib/kofficeui/KoCommandHistory.cpp index 53eaba864..4f81388cb 100644 --- a/lib/kofficeui/KoCommandHistory.cpp +++ b/lib/kofficeui/KoCommandHistory.cpp @@ -90,7 +90,7 @@ KoCommandHistory::KoCommandHistory(TDEActionCollection * actionCollection, bool d=new KoCommandHistoryPrivate(); if (withMenus) { - TDEToolBarPopupAction * undo = new TDEToolBarPopupAction( i18n("&Undo"), "undo", + TDEToolBarPopupAction * undo = new TDEToolBarPopupAction( i18n("&Undo"), "edit-undo", TDEStdAccel::undo(), this, TQT_SLOT( undo() ), actionCollection, /*KStdAction::stdName( KStdAction::Undo )*/"koffice_undo" ); connect( undo->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotUndoAboutToShow() ) ); @@ -109,7 +109,7 @@ KoCommandHistory::KoCommandHistory(TDEActionCollection * actionCollection, bool connect( d->m_undoListBox, TQT_SIGNAL( changeNumberOfSelectedItem( int )), this, TQT_SLOT( slotChangeUndoNumberOfSelectedItem( int ))); - TDEToolBarPopupAction * redo = new TDEToolBarPopupAction( i18n("&Redo"), "redo", + TDEToolBarPopupAction * redo = new TDEToolBarPopupAction( i18n("&Redo"), "edit-redo", TDEStdAccel::redo(), this, TQT_SLOT( redo() ), actionCollection, /*KStdAction::stdName( KStdAction::Redo )*/ "koffice_redo"); diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp index 6ba0e2955..d4c61ec21 100644 --- a/lib/koproperty/editor.cpp +++ b/lib/koproperty/editor.cpp @@ -138,7 +138,7 @@ Editor::Editor(TQWidget *parent, bool autoSync, const char *name) d->undoButton->setFocusPolicy(TQ_NoFocus); setFocusPolicy(TQ_ClickFocus); d->undoButton->setMinimumSize(TQSize(5,5)); // allow to resize undoButton even below pixmap size - d->undoButton->setPixmap(SmallIcon("undo")); + d->undoButton->setPixmap(SmallIcon("edit-undo")); TQToolTip::add(d->undoButton, i18n("Undo changes")); d->undoButton->hide(); connect(d->undoButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(undo())); diff --git a/lib/kotext/KoAutoFormatDia.cpp b/lib/kotext/KoAutoFormatDia.cpp index 0c565ac1a..6b48af1fc 100644 --- a/lib/kotext/KoAutoFormatDia.cpp +++ b/lib/kotext/KoAutoFormatDia.cpp @@ -169,7 +169,7 @@ void KoAutoFormatExceptionWidget::slotExceptionListSelected() KoAutoFormatDia::KoAutoFormatDia( TQWidget *parent, const char *name, KoAutoFormat * autoFormat ) : KDialogBase( Tabbed, i18n("Autocorrection"), Ok | Cancel | User1, Ok, - parent, name, true, true, KGuiItem( i18n( "&Reset" ), "undo" )), + parent, name, true, true, KGuiItem( i18n( "&Reset" ), "edit-undo" )), oSimpleBegin( autoFormat->getConfigTypographicSimpleQuotes().begin ), oSimpleEnd( autoFormat->getConfigTypographicSimpleQuotes().end ), oDoubleBegin( autoFormat->getConfigTypographicDoubleQuotes().begin ), diff --git a/lib/kotext/KoCompletionDia.cpp b/lib/kotext/KoCompletionDia.cpp index c500cca40..9def0ec86 100644 --- a/lib/kotext/KoCompletionDia.cpp +++ b/lib/kotext/KoCompletionDia.cpp @@ -36,7 +36,7 @@ KoCompletionDia::KoCompletionDia( TQWidget *parent, const char *name, KoAutoFormat * autoFormat ) : KDialogBase( parent, name , true, i18n( "Completion" ), Ok|Cancel|User1, - Ok, true, KGuiItem( i18n( "&Reset" ), "undo" ) ) + Ok, true, KGuiItem( i18n( "&Reset" ), "edit-undo" ) ) { TQVBox *page = makeVBoxMainWidget(); m_widget = new KoCompletion(page, autoFormat);