From 96608b99bfe246795e234c0440b0d52f533280a5 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 14 Oct 2014 00:15:37 -0500 Subject: [PATCH] Bring centrejust, leftjust, rightjust, text_left, text_right, text_bold, text_italic, text_under, text_strike, and spellcheck icons into XDG compliance --- kate/part/katedocument.cpp | 2 +- kate/part/kateschema.cpp | 8 ++++---- kate/part/katespell.cpp | 4 ++-- ...xt_bold.png => cr16-action-format-text-bold.png} | Bin ...ng => cr16-action-format-text-direction-ltr.png} | Bin ...ng => cr16-action-format-text-direction-rtl.png} | Bin ...talic.png => cr16-action-format-text-italic.png} | Bin ...ng => cr16-action-format-text-strikethrough.png} | Bin ...er.png => cr16-action-format-text-underline.png} | Bin ...eck.png => cr16-action-tools-check-spelling.png} | Bin ...st.png => cr22-action-format-justify-center.png} | Bin ...just.png => cr22-action-format-justify-left.png} | Bin ...ust.png => cr22-action-format-justify-right.png} | Bin ...xt_bold.png => cr22-action-format-text-bold.png} | Bin ...ng => cr22-action-format-text-direction-ltr.png} | Bin ...ng => cr22-action-format-text-direction-rtl.png} | Bin ...talic.png => cr22-action-format-text-italic.png} | Bin ...ng => cr22-action-format-text-strikethrough.png} | Bin ...er.png => cr22-action-format-text-underline.png} | Bin ...eck.png => cr22-action-tools-check-spelling.png} | Bin ...st.png => cr32-action-format-justify-center.png} | Bin ...just.png => cr32-action-format-justify-left.png} | Bin ...ust.png => cr32-action-format-justify-right.png} | Bin ...xt_bold.png => cr32-action-format-text-bold.png} | Bin ...ng => cr32-action-format-text-direction-ltr.png} | Bin ...ng => cr32-action-format-text-direction-rtl.png} | Bin ...talic.png => cr32-action-format-text-italic.png} | Bin ...ng => cr32-action-format-text-strikethrough.png} | Bin ...er.png => cr32-action-format-text-underline.png} | Bin ...eck.png => cr32-action-tools-check-spelling.png} | Bin tdeparts/tests/plugin_spellcheck.cpp | 2 +- tdeui/kstdaction_p.h | 2 +- tdeui/ktextedit.cpp | 2 +- 33 files changed, 10 insertions(+), 10 deletions(-) rename pics/crystalsvg/{cr16-action-text_bold.png => cr16-action-format-text-bold.png} (100%) rename pics/crystalsvg/{cr16-action-text_left.png => cr16-action-format-text-direction-ltr.png} (100%) rename pics/crystalsvg/{cr16-action-text_right.png => cr16-action-format-text-direction-rtl.png} (100%) rename pics/crystalsvg/{cr16-action-text_italic.png => cr16-action-format-text-italic.png} (100%) rename pics/crystalsvg/{cr16-action-text_strike.png => cr16-action-format-text-strikethrough.png} (100%) rename pics/crystalsvg/{cr16-action-text_under.png => cr16-action-format-text-underline.png} (100%) rename pics/crystalsvg/{cr16-action-spellcheck.png => cr16-action-tools-check-spelling.png} (100%) rename pics/crystalsvg/{cr22-action-centrejust.png => cr22-action-format-justify-center.png} (100%) rename pics/crystalsvg/{cr22-action-leftjust.png => cr22-action-format-justify-left.png} (100%) rename pics/crystalsvg/{cr22-action-rightjust.png => cr22-action-format-justify-right.png} (100%) rename pics/crystalsvg/{cr22-action-text_bold.png => cr22-action-format-text-bold.png} (100%) rename pics/crystalsvg/{cr22-action-text_left.png => cr22-action-format-text-direction-ltr.png} (100%) rename pics/crystalsvg/{cr22-action-text_right.png => cr22-action-format-text-direction-rtl.png} (100%) rename pics/crystalsvg/{cr22-action-text_italic.png => cr22-action-format-text-italic.png} (100%) rename pics/crystalsvg/{cr22-action-text_strike.png => cr22-action-format-text-strikethrough.png} (100%) rename pics/crystalsvg/{cr22-action-text_under.png => cr22-action-format-text-underline.png} (100%) rename pics/crystalsvg/{cr22-action-spellcheck.png => cr22-action-tools-check-spelling.png} (100%) rename pics/crystalsvg/{cr32-action-centrejust.png => cr32-action-format-justify-center.png} (100%) rename pics/crystalsvg/{cr32-action-leftjust.png => cr32-action-format-justify-left.png} (100%) rename pics/crystalsvg/{cr32-action-rightjust.png => cr32-action-format-justify-right.png} (100%) rename pics/crystalsvg/{cr32-action-text_bold.png => cr32-action-format-text-bold.png} (100%) rename pics/crystalsvg/{cr32-action-text_left.png => cr32-action-format-text-direction-ltr.png} (100%) rename pics/crystalsvg/{cr32-action-text_right.png => cr32-action-format-text-direction-rtl.png} (100%) rename pics/crystalsvg/{cr32-action-text_italic.png => cr32-action-format-text-italic.png} (100%) rename pics/crystalsvg/{cr32-action-text_strike.png => cr32-action-format-text-strikethrough.png} (100%) rename pics/crystalsvg/{cr32-action-text_under.png => cr32-action-format-text-underline.png} (100%) rename pics/crystalsvg/{cr32-action-spellcheck.png => cr32-action-tools-check-spelling.png} (100%) diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp index 7488fec05..f81b8eb0d 100644 --- a/kate/part/katedocument.cpp +++ b/kate/part/katedocument.cpp @@ -522,7 +522,7 @@ TQPixmap KateDocument::configPagePixmap (uint number, int size) const return BarIcon("edit", size); case 4: - return BarIcon("rightjust", size); + return BarIcon("format-justify-right", size); case 5: return BarIcon("document-save", size); diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp index 5b71c92e8..f7977fac6 100644 --- a/kate/part/kateschema.cpp +++ b/kate/part/kateschema.cpp @@ -1051,10 +1051,10 @@ KateStyleListView::KateStyleListView( TQWidget *parent, bool showUseDefaults ) { setSorting( -1 ); // disable sorting, let the styles appear in their defined order addColumn( i18n("Context") ); - addColumn( SmallIconSet("text_bold"), TQString::null ); - addColumn( SmallIconSet("text_italic"), TQString::null ); - addColumn( SmallIconSet("text_under"), TQString::null ); - addColumn( SmallIconSet("text_strike"), TQString::null ); + addColumn( SmallIconSet("format-text-bold"), TQString::null ); + addColumn( SmallIconSet("format-text-italic"), TQString::null ); + addColumn( SmallIconSet("format-text-underline"), TQString::null ); + addColumn( SmallIconSet("format-text-strikethrough"), TQString::null ); addColumn( i18n("Normal") ); addColumn( i18n("Selected") ); addColumn( i18n("Background") ); diff --git a/kate/part/katespell.cpp b/kate/part/katespell.cpp index 494e52894..e68008470 100644 --- a/kate/part/katespell.cpp +++ b/kate/part/katespell.cpp @@ -54,10 +54,10 @@ KateSpell::~KateSpell() void KateSpell::createActions( TDEActionCollection* ac ) { KStdAction::spelling( this, TQT_SLOT(spellcheck()), ac ); - TDEAction *a = new TDEAction( i18n("Spelling (from cursor)..."), "spellcheck", 0, this, TQT_SLOT(spellcheckFromCursor()), ac, "tools_spelling_from_cursor" ); + TDEAction *a = new TDEAction( i18n("Spelling (from cursor)..."), "tools-check-spelling", 0, this, TQT_SLOT(spellcheckFromCursor()), ac, "tools_spelling_from_cursor" ); a->setWhatsThis(i18n("Check the document's spelling from the cursor and forward")); - m_spellcheckSelection = new TDEAction( i18n("Spellcheck Selection..."), "spellcheck", 0, this, TQT_SLOT(spellcheckSelection()), ac, "tools_spelling_selection" ); + m_spellcheckSelection = new TDEAction( i18n("Spellcheck Selection..."), "tools-check-spelling", 0, this, TQT_SLOT(spellcheckSelection()), ac, "tools_spelling_selection" ); m_spellcheckSelection->setWhatsThis(i18n("Check spelling of the selected text")); } diff --git a/pics/crystalsvg/cr16-action-text_bold.png b/pics/crystalsvg/cr16-action-format-text-bold.png similarity index 100% rename from pics/crystalsvg/cr16-action-text_bold.png rename to pics/crystalsvg/cr16-action-format-text-bold.png diff --git a/pics/crystalsvg/cr16-action-text_left.png b/pics/crystalsvg/cr16-action-format-text-direction-ltr.png similarity index 100% rename from pics/crystalsvg/cr16-action-text_left.png rename to pics/crystalsvg/cr16-action-format-text-direction-ltr.png diff --git a/pics/crystalsvg/cr16-action-text_right.png b/pics/crystalsvg/cr16-action-format-text-direction-rtl.png similarity index 100% rename from pics/crystalsvg/cr16-action-text_right.png rename to pics/crystalsvg/cr16-action-format-text-direction-rtl.png diff --git a/pics/crystalsvg/cr16-action-text_italic.png b/pics/crystalsvg/cr16-action-format-text-italic.png similarity index 100% rename from pics/crystalsvg/cr16-action-text_italic.png rename to pics/crystalsvg/cr16-action-format-text-italic.png diff --git a/pics/crystalsvg/cr16-action-text_strike.png b/pics/crystalsvg/cr16-action-format-text-strikethrough.png similarity index 100% rename from pics/crystalsvg/cr16-action-text_strike.png rename to pics/crystalsvg/cr16-action-format-text-strikethrough.png diff --git a/pics/crystalsvg/cr16-action-text_under.png b/pics/crystalsvg/cr16-action-format-text-underline.png similarity index 100% rename from pics/crystalsvg/cr16-action-text_under.png rename to pics/crystalsvg/cr16-action-format-text-underline.png diff --git a/pics/crystalsvg/cr16-action-spellcheck.png b/pics/crystalsvg/cr16-action-tools-check-spelling.png similarity index 100% rename from pics/crystalsvg/cr16-action-spellcheck.png rename to pics/crystalsvg/cr16-action-tools-check-spelling.png diff --git a/pics/crystalsvg/cr22-action-centrejust.png b/pics/crystalsvg/cr22-action-format-justify-center.png similarity index 100% rename from pics/crystalsvg/cr22-action-centrejust.png rename to pics/crystalsvg/cr22-action-format-justify-center.png diff --git a/pics/crystalsvg/cr22-action-leftjust.png b/pics/crystalsvg/cr22-action-format-justify-left.png similarity index 100% rename from pics/crystalsvg/cr22-action-leftjust.png rename to pics/crystalsvg/cr22-action-format-justify-left.png diff --git a/pics/crystalsvg/cr22-action-rightjust.png b/pics/crystalsvg/cr22-action-format-justify-right.png similarity index 100% rename from pics/crystalsvg/cr22-action-rightjust.png rename to pics/crystalsvg/cr22-action-format-justify-right.png diff --git a/pics/crystalsvg/cr22-action-text_bold.png b/pics/crystalsvg/cr22-action-format-text-bold.png similarity index 100% rename from pics/crystalsvg/cr22-action-text_bold.png rename to pics/crystalsvg/cr22-action-format-text-bold.png diff --git a/pics/crystalsvg/cr22-action-text_left.png b/pics/crystalsvg/cr22-action-format-text-direction-ltr.png similarity index 100% rename from pics/crystalsvg/cr22-action-text_left.png rename to pics/crystalsvg/cr22-action-format-text-direction-ltr.png diff --git a/pics/crystalsvg/cr22-action-text_right.png b/pics/crystalsvg/cr22-action-format-text-direction-rtl.png similarity index 100% rename from pics/crystalsvg/cr22-action-text_right.png rename to pics/crystalsvg/cr22-action-format-text-direction-rtl.png diff --git a/pics/crystalsvg/cr22-action-text_italic.png b/pics/crystalsvg/cr22-action-format-text-italic.png similarity index 100% rename from pics/crystalsvg/cr22-action-text_italic.png rename to pics/crystalsvg/cr22-action-format-text-italic.png diff --git a/pics/crystalsvg/cr22-action-text_strike.png b/pics/crystalsvg/cr22-action-format-text-strikethrough.png similarity index 100% rename from pics/crystalsvg/cr22-action-text_strike.png rename to pics/crystalsvg/cr22-action-format-text-strikethrough.png diff --git a/pics/crystalsvg/cr22-action-text_under.png b/pics/crystalsvg/cr22-action-format-text-underline.png similarity index 100% rename from pics/crystalsvg/cr22-action-text_under.png rename to pics/crystalsvg/cr22-action-format-text-underline.png diff --git a/pics/crystalsvg/cr22-action-spellcheck.png b/pics/crystalsvg/cr22-action-tools-check-spelling.png similarity index 100% rename from pics/crystalsvg/cr22-action-spellcheck.png rename to pics/crystalsvg/cr22-action-tools-check-spelling.png diff --git a/pics/crystalsvg/cr32-action-centrejust.png b/pics/crystalsvg/cr32-action-format-justify-center.png similarity index 100% rename from pics/crystalsvg/cr32-action-centrejust.png rename to pics/crystalsvg/cr32-action-format-justify-center.png diff --git a/pics/crystalsvg/cr32-action-leftjust.png b/pics/crystalsvg/cr32-action-format-justify-left.png similarity index 100% rename from pics/crystalsvg/cr32-action-leftjust.png rename to pics/crystalsvg/cr32-action-format-justify-left.png diff --git a/pics/crystalsvg/cr32-action-rightjust.png b/pics/crystalsvg/cr32-action-format-justify-right.png similarity index 100% rename from pics/crystalsvg/cr32-action-rightjust.png rename to pics/crystalsvg/cr32-action-format-justify-right.png diff --git a/pics/crystalsvg/cr32-action-text_bold.png b/pics/crystalsvg/cr32-action-format-text-bold.png similarity index 100% rename from pics/crystalsvg/cr32-action-text_bold.png rename to pics/crystalsvg/cr32-action-format-text-bold.png diff --git a/pics/crystalsvg/cr32-action-text_left.png b/pics/crystalsvg/cr32-action-format-text-direction-ltr.png similarity index 100% rename from pics/crystalsvg/cr32-action-text_left.png rename to pics/crystalsvg/cr32-action-format-text-direction-ltr.png diff --git a/pics/crystalsvg/cr32-action-text_right.png b/pics/crystalsvg/cr32-action-format-text-direction-rtl.png similarity index 100% rename from pics/crystalsvg/cr32-action-text_right.png rename to pics/crystalsvg/cr32-action-format-text-direction-rtl.png diff --git a/pics/crystalsvg/cr32-action-text_italic.png b/pics/crystalsvg/cr32-action-format-text-italic.png similarity index 100% rename from pics/crystalsvg/cr32-action-text_italic.png rename to pics/crystalsvg/cr32-action-format-text-italic.png diff --git a/pics/crystalsvg/cr32-action-text_strike.png b/pics/crystalsvg/cr32-action-format-text-strikethrough.png similarity index 100% rename from pics/crystalsvg/cr32-action-text_strike.png rename to pics/crystalsvg/cr32-action-format-text-strikethrough.png diff --git a/pics/crystalsvg/cr32-action-text_under.png b/pics/crystalsvg/cr32-action-format-text-underline.png similarity index 100% rename from pics/crystalsvg/cr32-action-text_under.png rename to pics/crystalsvg/cr32-action-format-text-underline.png diff --git a/pics/crystalsvg/cr32-action-spellcheck.png b/pics/crystalsvg/cr32-action-tools-check-spelling.png similarity index 100% rename from pics/crystalsvg/cr32-action-spellcheck.png rename to pics/crystalsvg/cr32-action-tools-check-spelling.png diff --git a/tdeparts/tests/plugin_spellcheck.cpp b/tdeparts/tests/plugin_spellcheck.cpp index d7cf06eac..ae7af326f 100644 --- a/tdeparts/tests/plugin_spellcheck.cpp +++ b/tdeparts/tests/plugin_spellcheck.cpp @@ -12,7 +12,7 @@ PluginSpellCheck::PluginSpellCheck( TQObject* parent, const char* name, : Plugin( parent, name ) { (void) new TDEAction( "&Select current line (plugin)", 0, this, TQT_SLOT(slotSpellCheck()), - actionCollection(), "spellcheck" ); + actionCollection(), "tools-check-spelling" ); } PluginSpellCheck::~PluginSpellCheck() diff --git a/tdeui/kstdaction_p.h b/tdeui/kstdaction_p.h index e1e1fde05..b89c32c40 100644 --- a/tdeui/kstdaction_p.h +++ b/tdeui/kstdaction_p.h @@ -90,7 +90,7 @@ static const KStdActionInfo g_rgActionInfo[] = { AddBookmark, TDEStdAccel::AddBookmark, "bookmark_add", I18N_NOOP("&Add Bookmark"), 0, "bookmark_add" }, { EditBookmarks, TDEStdAccel::AccelNone, "bookmark_edit", I18N_NOOP("&Edit Bookmarks"), 0, "bookmark" }, - { Spelling, TDEStdAccel::AccelNone, "tools_spelling", I18N_NOOP("&Spelling..."), 0, "spellcheck" }, + { Spelling, TDEStdAccel::AccelNone, "tools_spelling", I18N_NOOP("&Spelling..."), 0, "tools-check-spelling" }, { ShowMenubar, TDEStdAccel::ShowMenubar, "options_show_menubar", I18N_NOOP("Show &Menubar"), 0, "showmenu" }, { ShowToolbar, TDEStdAccel::AccelNone, "options_show_toolbar", I18N_NOOP("Show &Toolbar"), 0, 0 }, diff --git a/tdeui/ktextedit.cpp b/tdeui/ktextedit.cpp index 74b9f30cd..3ebb1375f 100644 --- a/tdeui/ktextedit.cpp +++ b/tdeui/ktextedit.cpp @@ -228,7 +228,7 @@ TQPopupMenu *KTextEdit::createPopupMenu( const TQPoint &pos ) menu->changeItem( id - IdClear, SmallIconSet("edit-clear"), menu->text( id - IdClear) ); menu->insertSeparator(); - id = menu->insertItem( SmallIconSet( "spellcheck" ), i18n( "Check Spelling..." ), + id = menu->insertItem( SmallIconSet( "tools-check-spelling" ), i18n( "Check Spelling..." ), this, TQT_SLOT( checkSpelling() ) ); if( text().isEmpty() )