Browse Source

Bring centrejust, leftjust, rightjust, text_left, text_right, text_bold, text_italic, text_under, text_strike, and spellcheck icons into XDG compliance

tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
1bc23e19f6
3 changed files with 22 additions and 22 deletions
  1. +10
    -10
      kmail/kmcomposewin.cpp
  2. +7
    -7
      knotes/knoteedit.cpp
  3. +5
    -5
      libtdepim/komposer/plugins/default/defaulteditor.cpp

+ 10
- 10
kmail/kmcomposewin.cpp View File

@@ -1340,7 +1340,7 @@ void KMComposeWin::setupActions(void)
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 @@ void KMComposeWin::setupActions(void)
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 @@ void KMComposeWin::setupActions(void)
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");


+ 7
- 7
knotes/knoteedit.cpp View File

@@ -68,13 +68,13 @@ KNoteEdit::KNoteEdit( TDEActionCollection *actions, TQWidget *parent, const char
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 @@ KNoteEdit::KNoteEdit( TDEActionCollection *actions, TQWidget *parent, const char
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 @@ TQPopupMenu *KNoteEdit::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..." ),
TQT_TQOBJECT(this), TQT_SLOT( checkSpelling() ) );

if( text().isEmpty() )


+ 5
- 5
libtdepim/komposer/plugins/default/defaulteditor.cpp View File

@@ -144,18 +144,18 @@ DefaultEditor::createActions( TDEActionCollection *ac )
//
// 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 @@ DefaultEditor::createActions( TDEActionCollection *ac )
//
// 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 @@ DefaultEditor::createActions( TDEActionCollection *ac )
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)) );


Loading…
Cancel
Save