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
285ed33941
12 changed files with 42 additions and 42 deletions
  1. +5
    -5
      kexi/formeditor/richtextdialog.cpp
  2. +5
    -5
      kivio/kiviopart/kivio_view.cpp
  3. +5
    -5
      kivio/plugins/kiviotexttool/stenciltexteditor.cpp
  4. +1
    -1
      kpresenter/KPrConfig.cpp
  5. +8
    -8
      kpresenter/KPrView.cpp
  6. +1
    -1
      kspread/dialogs/kspread_dlg_preference.cc
  7. +6
    -6
      kspread/kspread_view.cc
  8. +1
    -1
      kword/KWConfig.cpp
  9. +6
    -6
      kword/KWView.cpp
  10. +2
    -2
      lib/kformula/kformuladocument.cc
  11. +1
    -1
      lib/kotext/KoLanguageTab.cpp
  12. +1
    -1
      tools/spell/main.cc

+ 5
- 5
kexi/formeditor/richtextdialog.cpp View File

@@ -54,9 +54,9 @@ RichTextDialog::RichTextDialog(TQWidget *parent, const TQString &text)
m_toolbar->insertWidget(TBColor, 30, m_colCombo);
connect(m_colCombo, TQT_SIGNAL(activated(const TQColor&)), this, TQT_SLOT(changeColor(const TQColor&)));

m_toolbar->insertButton("text_bold", TBBold, true, i18n("Bold"));
m_toolbar->insertButton("text_italic", TBItalic, true, i18n("Italic"));
m_toolbar->insertButton("text_under", TBUnder, true, i18n("Underline"));
m_toolbar->insertButton("format-text-bold", TBBold, true, i18n("Bold"));
m_toolbar->insertButton("format-text-italic", TBItalic, true, i18n("Italic"));
m_toolbar->insertButton("format-text-underline", TBUnder, true, i18n("Underline"));
m_toolbar->setToggle(TBBold, true);
m_toolbar->setToggle(TBItalic, true);
m_toolbar->setToggle(TBUnder, true);
@@ -69,13 +69,13 @@ RichTextDialog::RichTextDialog(TQWidget *parent, const TQString &text)
m_toolbar->insertSeparator();

TDEToolBarRadioGroup *group = new TDEToolBarRadioGroup(m_toolbar);
m_toolbar->insertButton("text_left", TBLeft, true, i18n("Left Align"));
m_toolbar->insertButton("format-text-direction-ltr", TBLeft, true, i18n("Left Align"));
m_toolbar->setToggle(TBLeft, true);
group->addButton(TBLeft);
m_toolbar->insertButton("text_center", TBCenter, true, i18n("Centered"));
m_toolbar->setToggle(TBCenter, true);
group->addButton(TBCenter);
m_toolbar->insertButton("text_right", TBRight, true, i18n("Right Align"));
m_toolbar->insertButton("format-text-direction-rtl", TBRight, true, i18n("Right Align"));
m_toolbar->setToggle(TBRight, true);
group->addButton(TBRight);
m_toolbar->insertButton("text_block", TBJustify, true, i18n("Justified"));


+ 5
- 5
kivio/kiviopart/kivio_view.cpp View File

@@ -433,16 +433,16 @@ void KivioView::setupActions()
m_setTextColor = new TTDESelectColorAction( i18n("Text Color"), TTDESelectColorAction::TextColor, actionCollection(), "setTextColor" );
connect( m_setTextColor, TQT_SIGNAL(activated()), TQT_SLOT(setTextColor()) );

m_setBold = new TDEToggleAction( i18n("Toggle Bold Text"), "text_bold", 0, actionCollection(), "setFontBold" );
m_setBold = new TDEToggleAction( i18n("Toggle Bold Text"), "format-text-bold", 0, actionCollection(), "setFontBold" );
connect( m_setBold, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleFontBold(bool)) );

m_setItalics = new TDEToggleAction( i18n("Toggle Italics Text"), "text_italic", 0, actionCollection(), "setFontItalics" );
m_setItalics = new TDEToggleAction( i18n("Toggle Italics Text"), "format-text-italic", 0, actionCollection(), "setFontItalics" );
connect( m_setItalics, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleFontItalics(bool)) );

m_setUnderline = new TDEToggleAction( i18n("Toggle Underline Text"), "text_under", 0, actionCollection(), "setFontUnderline" );
m_setUnderline = new TDEToggleAction( i18n("Toggle Underline Text"), "format-text-underline", 0, actionCollection(), "setFontUnderline" );
connect( m_setUnderline, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleFontUnderline(bool)));

m_textAlignLeft = new TDEToggleAction( i18n( "Align &Left" ), "text_left", CTRL + Key_L,
m_textAlignLeft = new TDEToggleAction( i18n( "Align &Left" ), "format-text-direction-ltr", CTRL + Key_L,
TQT_TQOBJECT(this), TQT_SLOT( textAlignLeft() ),
actionCollection(), "textAlignLeft" );
m_textAlignLeft->setExclusiveGroup( "align" );
@@ -451,7 +451,7 @@ void KivioView::setupActions()
actionCollection(), "textAlignCenter" );
m_textAlignCenter->setExclusiveGroup( "align" );
m_textAlignCenter->setChecked( TRUE );
m_textAlignRight = new TDEToggleAction( i18n( "Align &Right" ), "text_right", CTRL + ALT + Key_R,
m_textAlignRight = new TDEToggleAction( i18n( "Align &Right" ), "format-text-direction-rtl", CTRL + ALT + Key_R,
TQT_TQOBJECT(this), TQT_SLOT( textAlignRight() ),
actionCollection(), "textAlignRight" );
m_textAlignRight->setExclusiveGroup( "align" );


+ 5
- 5
kivio/plugins/kiviotexttool/stenciltexteditor.cpp View File

@@ -43,15 +43,15 @@ StencilTextEditor::StencilTextEditor(const TQString& caption, TQWidget *parent,
m_mainWidget = new StencilTextEditorUI(this);
setMainWidget(m_mainWidget);

m_mainWidget->m_boldButton->setIconSet(SmallIconSet("text_bold", 16));
m_mainWidget->m_italicsButton->setIconSet(SmallIconSet("text_italic", 16));
m_mainWidget->m_underLineButton->setIconSet(SmallIconSet("text_under", 16));
m_mainWidget->m_boldButton->setIconSet(SmallIconSet("format-text-bold", 16));
m_mainWidget->m_italicsButton->setIconSet(SmallIconSet("format-text-italic", 16));
m_mainWidget->m_underLineButton->setIconSet(SmallIconSet("format-text-underline", 16));

TQPopupMenu* menu = new TQPopupMenu(m_mainWidget->m_hAlignButton, "hAlignMenu");
menu->setCheckable(true);
menu->insertItem(SmallIconSet("text_left", 16), i18n("Align Left"), TQt::AlignLeft);
menu->insertItem(SmallIconSet("format-text-direction-ltr", 16), i18n("Align Left"), TQt::AlignLeft);
menu->insertItem(SmallIconSet("text_center", 16), i18n("Align Center"), TQt::AlignHCenter);
menu->insertItem(SmallIconSet("text_right", 16), i18n("Align Right"), TQt::AlignRight);
menu->insertItem(SmallIconSet("format-text-direction-rtl", 16), i18n("Align Right"), TQt::AlignRight);
m_mainWidget->m_hAlignButton->setPopup(menu);
connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setHorizontalAlign(int)));
connect(m_mainWidget->m_hAlignButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(showHAlignPopup()));


+ 1
- 1
kpresenter/KPrConfig.cpp View File

@@ -94,7 +94,7 @@ KPrConfig::KPrConfig( KPrView* parent )
_colorBackground = new KPrConfigureColorBackground( parent, page );

page = addVBoxPage( i18n("Spelling"), i18n("Spellchecker Behavior"),
BarIcon("spellcheck", TDEIcon::SizeMedium) );
BarIcon("tools-check-spelling", TDEIcon::SizeMedium) );
_spellPage=new KPrConfigureSpellPage(parent, page);

page = addVBoxPage( i18n("Misc"), i18n("Misc"),


+ 8
- 8
kpresenter/KPrView.cpp View File

@@ -2541,19 +2541,19 @@ void KPrView::setupActions()
connect( actionTextFontFamily , TQT_SIGNAL( activated( const TQString & ) ),
TQT_TQOBJECT(this), TQT_SLOT( fontSelected( const TQString & ) ) );

actionTextBold = new TDEToggleAction( i18n( "&Bold" ), "text_bold", CTRL + TQt::Key_B,
actionTextBold = new TDEToggleAction( i18n( "&Bold" ), "format-text-bold", CTRL + TQt::Key_B,
TQT_TQOBJECT(this), TQT_SLOT( textBold() ),
actionCollection(), "text_bold" );
actionCollection(), "format-text-bold" );

actionTextItalic = new TDEToggleAction( i18n( "&Italic" ), "text_italic", CTRL + TQt::Key_I,
actionTextItalic = new TDEToggleAction( i18n( "&Italic" ), "format-text-italic", CTRL + TQt::Key_I,
TQT_TQOBJECT(this), TQT_SLOT( textItalic() ),
actionCollection(), "text_italic" );
actionCollection(), "format-text-italic" );

actionTextUnderline = new TDEToggleAction( i18n( "&Underline" ), "text_under", CTRL + TQt::Key_U,
actionTextUnderline = new TDEToggleAction( i18n( "&Underline" ), "format-text-underline", CTRL + TQt::Key_U,
TQT_TQOBJECT(this), TQT_SLOT( textUnderline() ),
actionCollection(), "text_underline" );

actionFormatStrikeOut = new TDEToggleAction( i18n( "&Strike Out" ), "text_strike", 0 ,
actionFormatStrikeOut = new TDEToggleAction( i18n( "&Strike Out" ), "format-text-strikethrough", 0 ,
TQT_TQOBJECT(this), TQT_SLOT( textStrikeOut() ),
actionCollection(), "format_strike" );

@@ -2563,7 +2563,7 @@ void KPrView::setupActions()
actionTextColor->setDefaultColor(TQColor());


actionTextAlignLeft = new TDEToggleAction( i18n( "Align &Left" ), "text_left", ALT + TQt::Key_L,
actionTextAlignLeft = new TDEToggleAction( i18n( "Align &Left" ), "format-text-direction-ltr", ALT + TQt::Key_L,
TQT_TQOBJECT(this), TQT_SLOT( textAlignLeft() ),
actionCollection(), "text_alignleft" );
actionTextAlignLeft->setExclusiveGroup( "align" );
@@ -2574,7 +2574,7 @@ void KPrView::setupActions()
actionCollection(), "text_aligncenter" );
actionTextAlignCenter->setExclusiveGroup( "align" );

actionTextAlignRight = new TDEToggleAction( i18n( "Align &Right" ), "text_right", ALT + TQt::Key_R,
actionTextAlignRight = new TDEToggleAction( i18n( "Align &Right" ), "format-text-direction-rtl", ALT + TQt::Key_R,
TQT_TQOBJECT(this), TQT_SLOT( textAlignRight() ),
actionCollection(), "text_alignright" );
actionTextAlignRight->setExclusiveGroup( "align" );


+ 1
- 1
kspread/dialogs/kspread_dlg_preference.cc View File

@@ -81,7 +81,7 @@ PreferenceDialog::PreferenceDialog( View* parent, const char* /*name*/)
_layoutPage=new configureLayoutPage(parent,page6 );

TQVBox *page7 = addVBoxPage( i18n("Spelling"), i18n("Spell Checker Behavior"),
BarIcon("spellcheck", TDEIcon::SizeMedium) );
BarIcon("tools-check-spelling", TDEIcon::SizeMedium) );
_spellPage=new configureSpellPage(parent,page7);

if (KoSpeaker::isKttsdInstalled()) {


+ 6
- 6
kspread/kspread_view.cc View File

@@ -478,22 +478,22 @@ void View::Private::initActions()
0, TQT_TQOBJECT(view), TQT_SLOT( defaultSelection() ), ac, "default" );
actions->defaultFormat->setToolTip( i18n("Resets to the default format.") );

actions->bold = new TDEToggleAction( i18n("Bold"), "text_bold",
actions->bold = new TDEToggleAction( i18n("Bold"), "format-text-bold",
TQt::CTRL+TQt::Key_B, ac, "bold");
TQT_BASE_OBJECT_NAME::connect( actions->bold, TQT_SIGNAL( toggled( bool) ),
TQT_TQOBJECT(view), TQT_SLOT( bold( bool ) ) );

actions->italic = new TDEToggleAction( i18n("Italic"), "text_italic",
actions->italic = new TDEToggleAction( i18n("Italic"), "format-text-italic",
TQt::CTRL+TQt::Key_I, ac, "italic");
TQT_BASE_OBJECT_NAME::connect( actions->italic, TQT_SIGNAL( toggled( bool) ),
TQT_TQOBJECT(view), TQT_SLOT( italic( bool ) ) );

actions->underline = new TDEToggleAction( i18n("Underline"), "text_under",
actions->underline = new TDEToggleAction( i18n("Underline"), "format-text-underline",
TQt::CTRL+TQt::Key_U, ac, "underline");
TQT_BASE_OBJECT_NAME::connect( actions->underline, TQT_SIGNAL( toggled( bool) ),
TQT_TQOBJECT(view), TQT_SLOT( underline( bool ) ) );

actions->strikeOut = new TDEToggleAction( i18n("Strike Out"), "text_strike",
actions->strikeOut = new TDEToggleAction( i18n("Strike Out"), "format-text-strikethrough",
0, ac, "strikeout");
TQT_BASE_OBJECT_NAME::connect( actions->strikeOut, TQT_SIGNAL( toggled( bool) ),
TQT_TQOBJECT(view), TQT_SLOT( strikeOut( bool ) ) );
@@ -519,7 +519,7 @@ void View::Private::initActions()
ac, "textColor",true );
actions->textColor->setDefaultColor(TQColor());

actions->alignLeft = new TDEToggleAction( i18n("Align Left"), "text_left",
actions->alignLeft = new TDEToggleAction( i18n("Align Left"), "format-text-direction-ltr",
0, ac, "left");
TQT_BASE_OBJECT_NAME::connect( actions->alignLeft, TQT_SIGNAL( toggled( bool ) ),
TQT_TQOBJECT(view), TQT_SLOT( alignLeft( bool ) ) );
@@ -533,7 +533,7 @@ void View::Private::initActions()
actions->alignCenter->setExclusiveGroup( "Align" );
actions->alignCenter->setToolTip(i18n("Center the cell contents."));

actions->alignRight = new TDEToggleAction( i18n("Align Right"), "text_right",
actions->alignRight = new TDEToggleAction( i18n("Align Right"), "format-text-direction-rtl",
0, ac, "right");
TQT_BASE_OBJECT_NAME::connect( actions->alignRight, TQT_SIGNAL( toggled( bool ) ),
TQT_TQOBJECT(view), TQT_SLOT( alignRight( bool ) ) );


+ 1
- 1
kword/KWConfig.cpp View File

@@ -94,7 +94,7 @@ KWConfig::KWConfig( KWView* parent )
m_defaultDocPage=new ConfigureDefaultDocPage(parent, page4);

TQVBox *page = addVBoxPage( i18n("Spelling"), i18n("Spell Checker Behavior"),
loadIcon("spellcheck") );
loadIcon("tools-check-spelling") );
m_spellPage = new ConfigureSpellPage(parent, page);

TQVBox *page5 = addVBoxPage( i18n("Formula"), i18n("Formula Defaults"),


+ 6
- 6
kword/KWView.cpp View File

@@ -912,20 +912,20 @@ void KWView::setupActions()

// ----------------------- More format actions, for the toolbar only

m_actionFormatBold = new TDEToggleAction( i18n( "&Bold" ), "text_bold", TQt::CTRL + TQt::Key_B,
m_actionFormatBold = new TDEToggleAction( i18n( "&Bold" ), "format-text-bold", TQt::CTRL + TQt::Key_B,
TQT_TQOBJECT(this), TQT_SLOT( textBold() ),
actionCollection(), "format_bold" );
m_actionFormatItalic = new TDEToggleAction( i18n( "&Italic" ), "text_italic", TQt::CTRL + TQt::Key_I,
m_actionFormatItalic = new TDEToggleAction( i18n( "&Italic" ), "format-text-italic", TQt::CTRL + TQt::Key_I,
TQT_TQOBJECT(this), TQT_SLOT( textItalic() ),
actionCollection(), "format_italic" );
m_actionFormatUnderline = new TDEToggleAction( i18n( "&Underline" ), "text_under", TQt::CTRL + TQt::Key_U,
m_actionFormatUnderline = new TDEToggleAction( i18n( "&Underline" ), "format-text-underline", TQt::CTRL + TQt::Key_U,
TQT_TQOBJECT(this), TQT_SLOT( textUnderline() ),
actionCollection(), "format_underline" );
m_actionFormatStrikeOut = new TDEToggleAction( i18n( "&Strike Out" ), "text_strike", 0 ,
m_actionFormatStrikeOut = new TDEToggleAction( i18n( "&Strike Out" ), "format-text-strikethrough", 0 ,
TQT_TQOBJECT(this), TQT_SLOT( textStrikeOut() ),
actionCollection(), "format_strike" );

m_actionFormatAlignLeft = new TDEToggleAction( i18n( "Align &Left" ), "text_left", TQt::CTRL + TQt::Key_L,
m_actionFormatAlignLeft = new TDEToggleAction( i18n( "Align &Left" ), "format-text-direction-ltr", TQt::CTRL + TQt::Key_L,
TQT_TQOBJECT(this), TQT_SLOT( textAlignLeft() ),
actionCollection(), "format_alignleft" );
m_actionFormatAlignLeft->setExclusiveGroup( "align" );
@@ -934,7 +934,7 @@ void KWView::setupActions()
TQT_TQOBJECT(this), TQT_SLOT( textAlignCenter() ),
actionCollection(), "format_aligncenter" );
m_actionFormatAlignCenter->setExclusiveGroup( "align" );
m_actionFormatAlignRight = new TDEToggleAction( i18n( "Align &Right" ), "text_right", TQt::CTRL + TQt::ALT + TQt::Key_R,
m_actionFormatAlignRight = new TDEToggleAction( i18n( "Align &Right" ), "format-text-direction-rtl", TQt::CTRL + TQt::ALT + TQt::Key_R,
TQT_TQOBJECT(this), TQT_SLOT( textAlignRight() ),
actionCollection(), "format_alignright" );
m_actionFormatAlignRight->setExclusiveGroup( "align" );


+ 2
- 2
lib/kformula/kformuladocument.cc View File

@@ -616,11 +616,11 @@ void DocumentWrapper::createActions( TDEActionCollection* collection )
collection, "formula_syntaxhighlighting");
//m_syntaxHighlightingAction->setChecked( m_contextStyle->syntaxHighlighting() );

m_formatBoldAction = new TDEToggleAction( i18n( "&Bold" ), "text_bold",
m_formatBoldAction = new TDEToggleAction( i18n( "&Bold" ), "format-text-bold",
0, //CTRL + Key_B,
this, TQT_SLOT( textBold() ),
collection, "formula_format_bold" );
m_formatItalicAction = new TDEToggleAction( i18n( "&Italic" ), "text_italic",
m_formatItalicAction = new TDEToggleAction( i18n( "&Italic" ), "format-text-italic",
0, //CTRL + Key_I,
this, TQT_SLOT( textItalic() ),
collection, "formula_format_italic" );


+ 1
- 1
lib/kotext/KoLanguageTab.cpp View File

@@ -43,7 +43,7 @@ KoLanguageTab::KoLanguageTab( KSpell2::Broker::Ptr broker, TQWidget* parent, con
for ( ; itName != langNames.end() && itTag != langTags.end(); ++itName, ++itTag )
{
if ( spellCheckLanguages.find( *itTag ) != spellCheckLanguages.end() )
languageKComboBox->insertItem( SmallIcon( "spellcheck" ), *itName );
languageKComboBox->insertItem( SmallIcon( "tools-check-spelling" ), *itName );
else
languageKComboBox->insertItem( *itName );
}


+ 1
- 1
tools/spell/main.cc View File

@@ -52,7 +52,7 @@ SpellChecker::SpellChecker( TQObject* parent, const char* name, const TQStringLi

bool SpellChecker::run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype )
{
if ( command != "spellcheck" )
if ( command != "tools-check-spelling" )
{
kdDebug(31000) << "SpellChecker does only accept the command 'spellcheck'" << endl;
kdDebug(31000) << " The commands " << command << " is not accepted" << endl;


Loading…
Cancel
Save