From bab4f22f92cb4960c7a7c17845813de2082ffdc9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 13 Oct 2014 15:43:57 -0500 Subject: Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance --- tdeui/kcombobox.cpp | 2 +- tdeui/keditcl2.cpp | 10 +++++----- tdeui/kedittoolbar.cpp | 4 ++-- tdeui/klineedit.cpp | 8 ++++---- tdeui/kstdaction.h | 2 +- tdeui/kstdaction_p.h | 28 ++++++++++++++-------------- tdeui/kstdguiitem.cpp | 12 ++++++------ tdeui/ktabbar.cpp | 2 +- tdeui/ktextbrowser.cpp | 10 +++++----- tdeui/ktextedit.cpp | 10 +++++----- tdeui/tdeaction.h | 2 +- tdeui/tests/twindowtest.cpp | 18 +++++++++--------- 12 files changed, 54 insertions(+), 54 deletions(-) (limited to 'tdeui') diff --git a/tdeui/kcombobox.cpp b/tdeui/kcombobox.cpp index d6d3d0f46..3b2b770ee 100644 --- a/tdeui/kcombobox.cpp +++ b/tdeui/kcombobox.cpp @@ -729,7 +729,7 @@ void KHistoryComboEditor::virtual_hook( int id, void* data ) KHistoryComboEditor::KHistoryComboEditor( const TQStringList& entries, TQWidget *parent ) : KDialogBase( parent, "khistorycomboeditor", true, i18n( "History Editor" ), KDialogBase::Close | KDialogBase::User1, KDialogBase::User1, true, - KGuiItem( i18n( "&Delete Entry" ), "editdelete") ), d(0) + KGuiItem( i18n( "&Delete Entry" ), "edit-delete") ), d(0) { TQVBox* box = new TQVBox( this ); box->setSpacing( KDialog::spacingHint() ); diff --git a/tdeui/keditcl2.cpp b/tdeui/keditcl2.cpp index 4a3a22eeb..0c147e4b8 100644 --- a/tdeui/keditcl2.cpp +++ b/tdeui/keditcl2.cpp @@ -1112,15 +1112,15 @@ TQPopupMenu *KEdit::createPopupMenu( const TQPoint& pos ) TQPopupMenu *menu = TQMultiLineEdit::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) ); } return menu; diff --git a/tdeui/kedittoolbar.cpp b/tdeui/kedittoolbar.cpp index bfb575c79..1afca42ce 100644 --- a/tdeui/kedittoolbar.cpp +++ b/tdeui/kedittoolbar.cpp @@ -767,10 +767,10 @@ void KEditToolbarWidget::setupLayout() this, TQT_SLOT(slotToolbarSelected(const TQString&))); // TQPushButton *new_toolbar = new TQPushButton(i18n("&New"), this); -// new_toolbar->setPixmap(BarIcon("filenew", TDEIcon::SizeSmall)); +// new_toolbar->setPixmap(BarIcon("document-new", TDEIcon::SizeSmall)); // new_toolbar->setEnabled(false); // disabled until implemented // TQPushButton *del_toolbar = new TQPushButton(i18n("&Delete"), this); -// del_toolbar->setPixmap(BarIcon("editdelete", TDEIcon::SizeSmall)); +// del_toolbar->setPixmap(BarIcon("edit-delete", TDEIcon::SizeSmall)); // del_toolbar->setEnabled(false); // disabled until implemented // our list of inactive actions diff --git a/tdeui/klineedit.cpp b/tdeui/klineedit.cpp index f41ebd22c..92afc91fd 100644 --- a/tdeui/klineedit.cpp +++ b/tdeui/klineedit.cpp @@ -868,10 +868,10 @@ TQPopupMenu *KLineEdit::createPopupMenu() int id = popup->idAt(0); popup->changeItem( id - IdUndo, SmallIconSet("edit-undo"), popup->text( id - IdUndo) ); popup->changeItem( id - IdRedo, SmallIconSet("edit-redo"), popup->text( id - IdRedo) ); - popup->changeItem( id - IdCut, SmallIconSet("editcut"), popup->text( id - IdCut) ); - popup->changeItem( id - IdCopy, SmallIconSet("editcopy"), popup->text( id - IdCopy) ); - popup->changeItem( id - IdPaste, SmallIconSet("editpaste"), popup->text( id - IdPaste) ); - popup->changeItem( id - IdClear, SmallIconSet("editclear"), popup->text( id - IdClear) ); + popup->changeItem( id - IdCut, SmallIconSet("edit-cut"), popup->text( id - IdCut) ); + popup->changeItem( id - IdCopy, SmallIconSet("edit-copy"), popup->text( id - IdCopy) ); + popup->changeItem( id - IdPaste, SmallIconSet("edit-paste"), popup->text( id - IdPaste) ); + popup->changeItem( id - IdClear, SmallIconSet("edit-clear"), popup->text( id - IdClear) ); // If a completion object is present and the input // widget is not read-only, show the Text Completion diff --git a/tdeui/kstdaction.h b/tdeui/kstdaction.h index 31b80618c..db1199757 100644 --- a/tdeui/kstdaction.h +++ b/tdeui/kstdaction.h @@ -50,7 +50,7 @@ class TDEToggleFullScreenAction; * for regular actions. For example, if you previously had: * * \code - * TDEAction *newAct = new TDEAction(i18n("&New"), TQIconSet(BarIcon("filenew")), + * TDEAction *newAct = new TDEAction(i18n("&New"), TQIconSet(BarIcon("document-new")), * TDEStdAccel::shortcut(TDEStdAccel::New), this, * TQT_SLOT(fileNew()), actionCollection()); * \endcode diff --git a/tdeui/kstdaction_p.h b/tdeui/kstdaction_p.h index 407d76fa1..f481f2e8b 100644 --- a/tdeui/kstdaction_p.h +++ b/tdeui/kstdaction_p.h @@ -37,25 +37,25 @@ struct KStdActionInfo static const KStdActionInfo g_rgActionInfo[] = { - { New, TDEStdAccel::New, "file_new", I18N_NOOP("&New"), 0, "filenew" }, - { Open, TDEStdAccel::Open, "file_open", I18N_NOOP("&Open..."), 0, "fileopen" }, - { OpenRecent, TDEStdAccel::AccelNone, "file_open_recent", I18N_NOOP("Open &Recent"), 0, "fileopen" }, - { Save, TDEStdAccel::Save, "file_save", I18N_NOOP("&Save"), 0, "filesave" }, - { SaveAs, TDEStdAccel::AccelNone, "file_save_as", I18N_NOOP("Save &As..."), 0, "filesaveas" }, + { New, TDEStdAccel::New, "file_new", I18N_NOOP("&New"), 0, "document-new" }, + { Open, TDEStdAccel::Open, "file_open", I18N_NOOP("&Open..."), 0, "document-open" }, + { OpenRecent, TDEStdAccel::AccelNone, "file_open_recent", I18N_NOOP("Open &Recent"), 0, "document-open" }, + { Save, TDEStdAccel::Save, "file_save", I18N_NOOP("&Save"), 0, "document-save" }, + { SaveAs, TDEStdAccel::AccelNone, "file_save_as", I18N_NOOP("Save &As..."), 0, "document-save-as" }, { Revert, TDEStdAccel::AccelNone, "file_revert", I18N_NOOP("Re&vert"), 0, "revert" }, - { Close, TDEStdAccel::Close, "file_close", I18N_NOOP("&Close"), 0, "fileclose" }, - { Print, TDEStdAccel::Print, "file_print", I18N_NOOP("&Print..."), 0, "fileprint" }, - { PrintPreview, TDEStdAccel::AccelNone, "file_print_preview", I18N_NOOP("Print Previe&w..."), 0, "filequickprint" }, + { Close, TDEStdAccel::Close, "file_close", I18N_NOOP("&Close"), 0, "window-close" }, + { Print, TDEStdAccel::Print, "file_print", I18N_NOOP("&Print..."), 0, "document-print" }, + { PrintPreview, TDEStdAccel::AccelNone, "file_print_preview", I18N_NOOP("Print Previe&w..."), 0, "document-print-preview" }, { Mail, TDEStdAccel::AccelNone, "file_mail", I18N_NOOP("&Mail..."), 0, "mail_send" }, { Quit, TDEStdAccel::Quit, "file_quit", I18N_NOOP("&Quit"), 0, "exit" }, { Undo, TDEStdAccel::Undo, "edit_undo", I18N_NOOP("&Undo"), 0, "edit-undo" }, { Redo, TDEStdAccel::Redo, "edit_redo", I18N_NOOP("Re&do"), 0, "edit-redo" }, - { Cut, TDEStdAccel::Cut, "edit_cut", I18N_NOOP("Cu&t"), 0, "editcut" }, - { Copy, TDEStdAccel::Copy, "edit_copy", I18N_NOOP("&Copy"), 0, "editcopy" }, - { Paste, TDEStdAccel::Paste, "edit_paste", I18N_NOOP("&Paste"), 0, "editpaste" }, - { PasteText, TDEStdAccel::Paste, "edit_paste", I18N_NOOP("&Paste"), 0, "editpaste" }, - { Clear, TDEStdAccel::AccelNone, "edit_clear", I18N_NOOP("C&lear"), 0, "editclear" }, + { Cut, TDEStdAccel::Cut, "edit_cut", I18N_NOOP("Cu&t"), 0, "edit-cut" }, + { Copy, TDEStdAccel::Copy, "edit_copy", I18N_NOOP("&Copy"), 0, "edit-copy" }, + { Paste, TDEStdAccel::Paste, "edit_paste", I18N_NOOP("&Paste"), 0, "edit-paste" }, + { PasteText, TDEStdAccel::Paste, "edit_paste", I18N_NOOP("&Paste"), 0, "edit-paste" }, + { Clear, TDEStdAccel::AccelNone, "edit_clear", I18N_NOOP("C&lear"), 0, "edit-clear" }, { SelectAll, TDEStdAccel::SelectAll, "edit_select_all", I18N_NOOP("Select &All"), 0, 0 }, { Deselect, TDEStdAccel::Deselect, "edit_deselect", I18N_NOOP("Dese&lect"), 0, 0 }, { Find, TDEStdAccel::Find, "edit_find", I18N_NOOP("&Find..."), 0, "edit-find" }, @@ -78,7 +78,7 @@ static const KStdActionInfo g_rgActionInfo[] = // The following three have special i18n() needs for sLabel { Back, TDEStdAccel::Back, "go_back", 0, 0, "back" }, { Forward, TDEStdAccel::Forward, "go_forward", 0, 0, "forward" }, - { Home, TDEStdAccel::Home, "go_home", 0, 0, "gohome" }, + { Home, TDEStdAccel::Home, "go_home", 0, 0, "go-home" }, { Prior, TDEStdAccel::Prior, "go_previous", I18N_NOOP("&Previous Page"), 0, "back" }, { Next, TDEStdAccel::Next, "go_next", I18N_NOOP("&Next Page"), 0, "forward" }, { Goto, TDEStdAccel::AccelNone, "go_goto", I18N_NOOP("&Go To..."), 0, 0 }, diff --git a/tdeui/kstdguiitem.cpp b/tdeui/kstdguiitem.cpp index db8c26b91..a763c4b6c 100644 --- a/tdeui/kstdguiitem.cpp +++ b/tdeui/kstdguiitem.cpp @@ -124,7 +124,7 @@ KGuiItem KStdGuiItem::discard() KGuiItem KStdGuiItem::save() { - return KGuiItem( i18n( "&Save" ), "filesave", i18n( "Save data" ) ); + return KGuiItem( i18n( "&Save" ), "document-save", i18n( "Save data" ) ); } KGuiItem KStdGuiItem::dontSave() @@ -135,7 +135,7 @@ KGuiItem KStdGuiItem::dontSave() KGuiItem KStdGuiItem::saveAs() { - return KGuiItem( i18n( "Save &As..." ), "filesaveas", + return KGuiItem( i18n( "Save &As..." ), "document-save-as", i18n( "Save file with another name" ) ); } @@ -171,7 +171,7 @@ KGuiItem KStdGuiItem::help() KGuiItem KStdGuiItem::close() { - return KGuiItem( i18n( "&Close" ), "fileclose", + return KGuiItem( i18n( "&Close" ), "window-close", i18n( "Close the current window or document" ) ); } @@ -204,7 +204,7 @@ TQPair KStdGuiItem::backAndForward() KGuiItem KStdGuiItem::print() { - return KGuiItem( i18n( "&Print..." ), "fileprint", + return KGuiItem( i18n( "&Print..." ), "document-print", i18n( "Opens the print dialog to print " "the current document" ) ); } @@ -217,13 +217,13 @@ KGuiItem KStdGuiItem::cont() KGuiItem KStdGuiItem::del() { - return KGuiItem( i18n( "&Delete" ), "editdelete", + return KGuiItem( i18n( "&Delete" ), "edit-delete", i18n( "Delete item(s)" ) ); } KGuiItem KStdGuiItem::open() { - return KGuiItem( i18n( "&Open..." ), "fileopen", + return KGuiItem( i18n( "&Open..." ), "document-open", i18n( "Open file" ) ); } diff --git a/tdeui/ktabbar.cpp b/tdeui/ktabbar.cpp index 911162f14..a49719519 100644 --- a/tdeui/ktabbar.cpp +++ b/tdeui/ktabbar.cpp @@ -191,7 +191,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) } mHoverCloseButton = new TQPushButton( this ); - mHoverCloseButton->setIconSet( TDEGlobal::iconLoader()->loadIconSet("fileclose", TDEIcon::Toolbar, TDEIcon::SizeSmall) ); + mHoverCloseButton->setIconSet( TDEGlobal::iconLoader()->loadIconSet("window-close", TDEIcon::Toolbar, TDEIcon::SizeSmall) ); mHoverCloseButton->setGeometry( rect ); TQToolTip::add(mHoverCloseButton,i18n("Close this tab")); mHoverCloseButton->setFlat(true); diff --git a/tdeui/ktextbrowser.cpp b/tdeui/ktextbrowser.cpp index d8405bf7a..a0331ccf7 100644 --- a/tdeui/ktextbrowser.cpp +++ b/tdeui/ktextbrowser.cpp @@ -125,15 +125,15 @@ TQPopupMenu *KTextBrowser::createPopupMenu( const TQPoint & pos ) TQPopupMenu *popup = TQTextBrowser::createPopupMenu( pos ); if ( isReadOnly() ) - popup->changeItem( popup->idAt(0), SmallIconSet("editcopy"), popup->text( popup->idAt(0) ) ); + popup->changeItem( popup->idAt(0), SmallIconSet("edit-copy"), popup->text( popup->idAt(0) ) ); else { int id = popup->idAt(0); popup->changeItem( id - IdUndo, SmallIconSet("edit-undo"), popup->text( id - IdUndo) ); popup->changeItem( id - IdRedo, SmallIconSet("edit-redo"), popup->text( id - IdRedo) ); - popup->changeItem( id - IdCut, SmallIconSet("editcut"), popup->text( id - IdCut) ); - popup->changeItem( id - IdCopy, SmallIconSet("editcopy"), popup->text( id - IdCopy) ); - popup->changeItem( id - IdPaste, SmallIconSet("editpaste"), popup->text( id - IdPaste) ); - popup->changeItem( id - IdClear, SmallIconSet("editclear"), popup->text( id - IdClear) ); + popup->changeItem( id - IdCut, SmallIconSet("edit-cut"), popup->text( id - IdCut) ); + popup->changeItem( id - IdCopy, SmallIconSet("edit-copy"), popup->text( id - IdCopy) ); + popup->changeItem( id - IdPaste, SmallIconSet("edit-paste"), popup->text( id - IdPaste) ); + popup->changeItem( id - IdClear, SmallIconSet("edit-clear"), popup->text( id - IdClear) ); } return popup; diff --git a/tdeui/ktextedit.cpp b/tdeui/ktextedit.cpp index 03cd006a4..74b9f30cd 100644 --- a/tdeui/ktextedit.cpp +++ b/tdeui/ktextedit.cpp @@ -217,15 +217,15 @@ TQPopupMenu *KTextEdit::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/tdeui/tdeaction.h b/tdeui/tdeaction.h index 5919c9641..cc803022f 100644 --- a/tdeui/tdeaction.h +++ b/tdeui/tdeaction.h @@ -133,7 +133,7 @@ class TDEMainWindow; * * Here is an example of enabling a "New [document]" action * \code - * TDEAction *newAct = new TDEAction(i18n("&New"), "filenew", + * TDEAction *newAct = new TDEAction(i18n("&New"), "document-new", * TDEStdAccel::shortcut(TDEStdAccel::New), * this, TQT_SLOT(fileNew()), * actionCollection(), "new"); diff --git a/tdeui/tests/twindowtest.cpp b/tdeui/tests/twindowtest.cpp index 2d60692dd..f826f13b0 100644 --- a/tdeui/tests/twindowtest.cpp +++ b/tdeui/tests/twindowtest.cpp @@ -112,17 +112,17 @@ setAutoSaveSettings(); // First four buttons - pix = BarIcon("filenew"); + pix = BarIcon("document-new"); itemId = tb->insertButton(pix, 0, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNew()), true, "Create.. (toggles upper button)", 50); - pix = BarIcon("fileopen"); + pix = BarIcon("document-open"); tb->insertButton(pix, 1, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpen()), false, "Open"); pix = BarIcon("filefloppy"); tb->insertButton(pix, 2, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSave()), true, "Save (beep or delayed popup)"); tb->setDelayedPopup(2, itemsMenu); - pix = BarIcon("fileprint"); + pix = BarIcon("document-print"); tb->insertButton(pix, 3, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPrint()), true, "Print (enables/disables open)"); @@ -156,12 +156,12 @@ setAutoSaveSettings(); tb1 = new TDEToolBar(this, TQMainWindow::DockTop); // this one is normal and has separators - pix = BarIcon("filenew"); + pix = BarIcon("document-new"); tb1->insertButton(pix, 0, true, "Create new file2 (Toggle)"); tb1->setToggle(0); tb1->addConnection (0, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggle(bool))); - pix = BarIcon("fileopen"); + pix = BarIcon("document-open"); tb1->insertButton(pix, 1, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpen()), true, "Open (starts progres in sb)"); @@ -172,16 +172,16 @@ setAutoSaveSettings(); true, "Save file2 (autorepeat)"); tb1->setAutoRepeat(2); - pix = BarIcon("fileprint"); + pix = BarIcon("document-print"); tb1->insertButton(pix, 3, itemsMenu, true, "Print (pops menu)"); tb1->insertSeparator (); /**** RADIO BUTTONS */ - pix = BarIcon("filenew"); + pix = BarIcon("document-new"); tb1->insertButton(pix, 4, true, "Radiobutton1"); tb1->setToggle(4); - pix = BarIcon("fileopen"); + pix = BarIcon("document-open"); tb1->insertButton(pix, 5, true, "Radiobutton2"); tb1->setToggle(5); @@ -189,7 +189,7 @@ setAutoSaveSettings(); tb1->insertButton(pix, 6, true, "Radiobutton3"); tb1->setToggle(6); - pix = BarIcon("fileprint"); + pix = BarIcon("document-print"); tb1->insertButton(pix, 7, true, "Radiobutton4"); tb1->setToggle(7); -- cgit v1.2.1