From 58964048b37c52bbb841d7ec9386a75d9bf8fbc7 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 13 Oct 2014 15:43:58 -0500 Subject: Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance --- knotes/knote.cpp | 8 ++++---- knotes/knoteedit.cpp | 10 +++++----- knotes/knotesapp.cpp | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'knotes') diff --git a/knotes/knote.cpp b/knotes/knote.cpp index 59380b56f..16f626436 100644 --- a/knotes/knote.cpp +++ b/knotes/knote.cpp @@ -104,14 +104,14 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char * // create the menu items for the note - not the editor... // rename, mail, print, save as, insert date, alarm, close, delete, new note - new TDEAction( i18n("New"), "filenew", 0, + new TDEAction( i18n("New"), "document-new", 0, TQT_TQOBJECT(this),TQT_SLOT(slotRequestNewNote()) , actionCollection(), "new_note" ); new TDEAction( i18n("Rename..."), "text", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRename()), actionCollection(), "rename_note" ); m_readOnly = new TDEToggleAction( i18n("Lock"), "system-lock-screen" , 0, TQT_TQOBJECT(this), TQT_SLOT(slotUpdateReadOnly()), actionCollection(), "lock_note" ); m_readOnly->setCheckedState( KGuiItem( i18n("Unlock"), "unlock" ) ); - new TDEAction( i18n("Hide"), "fileclose" , Key_Escape, + new TDEAction( i18n("Hide"), "window-close" , Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(slotClose()), actionCollection(), "hide_note" ); new TDEAction( i18n("Delete"), "knotes_delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotKill()), actionCollection(), "delete_note" ); @@ -125,7 +125,7 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char * TQT_TQOBJECT(this), TQT_SLOT(slotSend()), actionCollection(), "send_note" ); new TDEAction( i18n("Mail..."), "mail_send", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMail()), actionCollection(), "mail_note" ); - new TDEAction( i18n("Save As..."), "filesaveas", 0, + new TDEAction( i18n("Save As..."), "document-save-as", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), actionCollection(), "save_note" ); KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), actionCollection(), "print_note" ); new TDEAction( i18n("Preferences..."), "configure", 0, @@ -394,7 +394,7 @@ void KNote::slotKill( bool force ) if ( !force && KMessageBox::warningContinueCancel( this, i18n("Do you really want to delete note %1?").arg( m_label->text() ), - i18n("Confirm Delete"), KGuiItem( i18n("&Delete"), "editdelete" ), + i18n("Confirm Delete"), KGuiItem( i18n("&Delete"), "edit-delete" ), "ConfirmDeleteNote" ) != KMessageBox::Continue ) diff --git a/knotes/knoteedit.cpp b/knotes/knoteedit.cpp index fff0bebf1..87b5070a9 100644 --- a/knotes/knoteedit.cpp +++ b/knotes/knoteedit.cpp @@ -529,15 +529,15 @@ TQPopupMenu *KNoteEdit::createPopupMenu( const TQPoint &pos ) TQPopupMenu *menu = TQTextEdit::createPopupMenu( pos ); if ( isReadOnly() ) - menu->changeItem( menu->idAt(0), SmallIconSet("editcopy"), menu->text( menu->idAt(0) ) ); + menu->changeItem( menu->idAt(0), SmallIconSet("edit-copy"), menu->text( menu->idAt(0) ) ); else { int id = menu->idAt(0); menu->changeItem( id - IdUndo, SmallIconSet("edit-undo"), menu->text( id - IdUndo) ); menu->changeItem( id - IdRedo, SmallIconSet("edit-redo"), menu->text( id - IdRedo) ); - menu->changeItem( id - IdCut, SmallIconSet("editcut"), menu->text( id - IdCut) ); - menu->changeItem( id - IdCopy, SmallIconSet("editcopy"), menu->text( id - IdCopy) ); - menu->changeItem( id - IdPaste, SmallIconSet("editpaste"), menu->text( id - IdPaste) ); - menu->changeItem( id - IdClear, SmallIconSet("editclear"), menu->text( id - IdClear) ); + menu->changeItem( id - IdCut, SmallIconSet("edit-cut"), menu->text( id - IdCut) ); + menu->changeItem( id - IdCopy, SmallIconSet("edit-copy"), menu->text( id - IdCopy) ); + menu->changeItem( id - IdPaste, SmallIconSet("edit-paste"), menu->text( id - IdPaste) ); + menu->changeItem( id - IdClear, SmallIconSet("edit-clear"), menu->text( id - IdClear) ); menu->insertSeparator(); id = menu->insertItem( SmallIconSet( "spellcheck" ), i18n( "Check Spelling..." ), diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp index 14fd625b9..5cc2635c2 100644 --- a/knotes/knotesapp.cpp +++ b/knotes/knotesapp.cpp @@ -111,13 +111,13 @@ KNotesApp::KNotesApp() KNote::setStyle( KNotesGlobalConfig::style() ); // create the GUI... - new TDEAction( i18n("New Note"), "filenew", 0, + new TDEAction( i18n("New Note"), "document-new", 0, TQT_TQOBJECT(this), TQT_SLOT(newNote()), actionCollection(), "new_note" ); - new TDEAction( i18n("New Note From Clipboard"), "editpaste", 0, + new TDEAction( i18n("New Note From Clipboard"), "edit-paste", 0, TQT_TQOBJECT(this), TQT_SLOT(newNoteFromClipboard()), actionCollection(), "new_note_clipboard" ); new TDEAction( i18n("Show All Notes"), "knotes", 0, TQT_TQOBJECT(this), TQT_SLOT(showAllNotes()), actionCollection(), "show_all_notes" ); - new TDEAction( i18n("Hide All Notes"), "fileclose", 0, + new TDEAction( i18n("Hide All Notes"), "window-close", 0, TQT_TQOBJECT(this), TQT_SLOT(hideAllNotes()), actionCollection(), "hide_all_notes" ); new KHelpMenu( this, kapp->aboutData(), false, actionCollection() ); -- cgit v1.2.1