| 1bc23e19 | 2014-10-14 00:15:37 | Timothy Pearson |
Bring centrejust, leftjust, rightjust, text_left, text_right, text_bold, text_italic, text_under, text_strike, and spellcheck icons into XDG compliance |
||
|
M kmail/kmcomposewin.cpp M knotes/knoteedit.cpp M libtdepim/komposer/plugins/default/defaulteditor.cpp |
||
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index ae3868a..c0b66ab 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -1340,7 +1340,7 @@
KStdAction::findNext(TQT_TQOBJECT(this), TQT_SLOT(slotSearchAgain()), actionCollection());
KStdAction::replace (TQT_TQOBJECT(this), TQT_SLOT(slotReplace()), actionCollection());
- KStdAction::spelling (TQT_TQOBJECT(this), TQT_SLOT(slotSpellcheck()), actionCollection(), "spellcheck");
+ KStdAction::spelling (TQT_TQOBJECT(this), TQT_SLOT(slotSpellcheck()), actionCollection(), "tools-check-spelling");
mPasteQuotation = new TDEAction (i18n("Pa&ste as Quotation"),0,TQT_TQOBJECT(this),TQT_SLOT( slotPasteClipboardAsQuotation()),
actionCollection(), "paste_quoted");
@@ -1389,7 +1389,7 @@
mSnippetAction->setChecked( GlobalSettings::self()->showSnippetManager() );
mAutoSpellCheckingAction =
- new TDEToggleAction( i18n( "&Automatic Spellchecking" ), "spellcheck", 0,
+ new TDEToggleAction( i18n( "&Automatic Spellchecking" ), "tools-check-spelling", 0,
actionCollection(), "options_auto_spellchecking" );
const bool spellChecking = GlobalSettings::self()->autoSpellChecking();
mAutoSpellCheckingAction->setEnabled( !GlobalSettings::self()->useExternalEditor() );
@@ -1580,25 +1580,25 @@
connect( fontSizeAction, TQT_SIGNAL( fontSizeChanged( int ) ),
TQT_SLOT( slotSizeAction( int ) ) );
- alignLeftAction = new TDEToggleAction (i18n("Align Left"), "text_left", 0,
+ alignLeftAction = new TDEToggleAction (i18n("Align Left"), "format-text-direction-ltr", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotAlignLeft()), actionCollection(),
"align_left");
alignLeftAction->setChecked( true );
- alignRightAction = new TDEToggleAction (i18n("Align Right"), "text_right", 0,
+ alignRightAction = new TDEToggleAction (i18n("Align Right"), "format-text-direction-rtl", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotAlignRight()), actionCollection(),
"align_right");
alignCenterAction = new TDEToggleAction (i18n("Align Center"), "text_center", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotAlignCenter()), actionCollection(),
"align_center");
- textBoldAction = new TDEToggleAction( i18n("&Bold"), "text_bold", CTRL+Key_B,
+ textBoldAction = new TDEToggleAction( i18n("&Bold"), "format-text-bold", CTRL+Key_B,
TQT_TQOBJECT(this), TQT_SLOT(slotTextBold()),
- actionCollection(), "text_bold");
- textItalicAction = new TDEToggleAction( i18n("&Italic"), "text_italic", CTRL+Key_I,
+ actionCollection(), "format-text-bold");
+ textItalicAction = new TDEToggleAction( i18n("&Italic"), "format-text-italic", CTRL+Key_I,
TQT_TQOBJECT(this), TQT_SLOT(slotTextItalic()),
- actionCollection(), "text_italic");
- textUnderAction = new TDEToggleAction( i18n("&Underline"), "text_under", CTRL+Key_U,
+ actionCollection(), "format-text-italic");
+ textUnderAction = new TDEToggleAction( i18n("&Underline"), "format-text-underline", CTRL+Key_U,
TQT_TQOBJECT(this), TQT_SLOT(slotTextUnder()),
- actionCollection(), "text_under");
+ actionCollection(), "format-text-underline");
actionFormatReset = new TDEAction( i18n( "Reset Font Settings" ), "eraser", 0,
TQT_TQOBJECT(this), TQT_SLOT( slotFormatReset() ),
actionCollection(), "format_reset");
diff --git a/knotes/knoteedit.cpp b/knotes/knoteedit.cpp
index 87b5070..1316bc3 100644
--- a/knotes/knoteedit.cpp
+++ b/knotes/knoteedit.cpp
@@ -68,13 +68,13 @@
KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT(selectAll()), actions );
// create the actions modifying the text format
- m_textBold = new TDEToggleAction( i18n("Bold"), "text_bold", CTRL + Key_B, 0, 0,
+ m_textBold = new TDEToggleAction( i18n("Bold"), "format-text-bold", CTRL + Key_B, 0, 0,
actions, "format_bold" );
- m_textItalic = new TDEToggleAction( i18n("Italic"), "text_italic", CTRL + Key_I, 0, 0,
+ m_textItalic = new TDEToggleAction( i18n("Italic"), "format-text-italic", CTRL + Key_I, 0, 0,
actions, "format_italic" );
- m_textUnderline = new TDEToggleAction( i18n("Underline"), "text_under", CTRL + Key_U, 0, 0,
+ m_textUnderline = new TDEToggleAction( i18n("Underline"), "format-text-underline", CTRL + Key_U, 0, 0,
actions, "format_underline" );
- m_textStrikeOut = new TDEToggleAction( i18n("Strike Out"), "text_strike", CTRL + Key_S, 0, 0,
+ m_textStrikeOut = new TDEToggleAction( i18n("Strike Out"), "format-text-strikethrough", CTRL + Key_S, 0, 0,
actions, "format_strikeout" );
connect( m_textBold, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setBold(bool)) );
@@ -82,14 +82,14 @@
connect( m_textUnderline, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setUnderline(bool)) );
connect( m_textStrikeOut, TQT_SIGNAL(toggled(bool)), TQT_SLOT(textStrikeOut(bool)) );
- m_textAlignLeft = new TDEToggleAction( i18n("Align Left"), "text_left", ALT + Key_L,
+ m_textAlignLeft = new TDEToggleAction( i18n("Align Left"), "format-text-direction-ltr", ALT + Key_L,
TQT_TQOBJECT(this), TQT_SLOT(textAlignLeft()),
actions, "format_alignleft" );
m_textAlignLeft->setChecked( true ); // just a dummy, will be updated later
m_textAlignCenter = new TDEToggleAction( i18n("Align Center"), "text_center", ALT + Key_C,
TQT_TQOBJECT(this), TQT_SLOT(textAlignCenter()),
actions, "format_aligncenter" );
- m_textAlignRight = new TDEToggleAction( i18n("Align Right"), "text_right", ALT + Key_R,
+ m_textAlignRight = new TDEToggleAction( i18n("Align Right"), "format-text-direction-rtl", ALT + Key_R,
TQT_TQOBJECT(this), TQT_SLOT(textAlignRight()),
actions, "format_alignright" );
m_textAlignBlock = new TDEToggleAction( i18n("Align Block"), "text_block", ALT + Key_B,
@@ -540,7 +540,7 @@
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..." ),
TQT_TQOBJECT(this), TQT_SLOT( checkSpelling() ) );
if( text().isEmpty() )
diff --git a/libtdepim/komposer/plugins/default/defaulteditor.cpp b/libtdepim/komposer/plugins/default/defaulteditor.cpp
index 82c04e3..fe059b9 100644
--- a/libtdepim/komposer/plugins/default/defaulteditor.cpp
+++ b/libtdepim/komposer/plugins/default/defaulteditor.cpp
@@ -144,18 +144,18 @@
//
// Character Formatting
//
- m_actionBold = new TDEToggleAction( i18n("&Bold"), "text_bold", CTRL+Key_B,
+ m_actionBold = new TDEToggleAction( i18n("&Bold"), "format-text-bold", CTRL+Key_B,
ac, "format_bold" );
connect( m_actionBold, TQT_SIGNAL(toggled(bool)),
m_textEdit, TQT_SLOT(setBold(bool)) );
- m_actionItalic = new TDEToggleAction( i18n("&Italic"), "text_italic", CTRL+Key_I,
+ m_actionItalic = new TDEToggleAction( i18n("&Italic"), "format-text-italic", CTRL+Key_I,
ac, "format_italic" );
connect( m_actionItalic, TQT_SIGNAL(toggled(bool)),
m_textEdit, TQT_SLOT(setItalic(bool) ));
- m_actionUnderline = new TDEToggleAction( i18n("&Underline"), "text_under", CTRL+Key_U,
+ m_actionUnderline = new TDEToggleAction( i18n("&Underline"), "format-text-underline", CTRL+Key_U,
ac, "format_underline" );
connect( m_actionUnderline, TQT_SIGNAL(toggled(bool)),
@@ -182,7 +182,7 @@
//
// Alignment
//
- m_actionAlignLeft = new TDEToggleAction( i18n("Align &Left"), "text_left", 0,
+ m_actionAlignLeft = new TDEToggleAction( i18n("Align &Left"), "format-text-direction-ltr", 0,
ac, "format_align_left" );
connect( m_actionAlignLeft, TQT_SIGNAL(toggled(bool)),
this, TQT_SLOT(setAlignLeft(bool)) );
@@ -192,7 +192,7 @@
connect( m_actionAlignCenter, TQT_SIGNAL(toggled(bool)),
this, TQT_SLOT(setAlignCenter(bool)) );
- m_actionAlignRight = new TDEToggleAction( i18n("Align &Right"), "text_right", 0,
+ m_actionAlignRight = new TDEToggleAction( i18n("Align &Right"), "format-text-direction-rtl", 0,
ac, "format_align_right" );
connect( m_actionAlignRight, TQT_SIGNAL(toggled(bool)),
this, TQT_SLOT(setAlignRight(bool)) );
|
||