Branch: master

012fc85d 2014-10-14 00:15:28 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 src/noteedit.cpp
M src/tagsedit.cpp
diff --git a/src/noteedit.cpp b/src/noteedit.cpp
index 22b382d..89ddb21 100644
--- a/src/noteedit.cpp
+++ b/src/noteedit.cpp
@@ -820,16 +820,16 @@
 	richTextColor->setColor(textColor);
 	action = new KWidgetAction(richTextColor, i18n("Color"), TDEShortcut(), 0, TQT_SLOT(), actionCollection, "richtext_color");
 
-	richTextBold      = new TDEToggleAction( i18n("Bold"),        "text_bold",   "Ctrl+B", actionCollection, "richtext_bold"      );
-	richTextItalic    = new TDEToggleAction( i18n("Italic"),      "text_italic", "Ctrl+I", actionCollection, "richtext_italic"    );
-	richTextUnderline = new TDEToggleAction( i18n("Underline"),   "text_under",  "Ctrl+U", actionCollection, "richtext_underline" );
+	richTextBold      = new TDEToggleAction( i18n("Bold"),        "format-text-bold",   "Ctrl+B", actionCollection, "richtext_bold"      );
+	richTextItalic    = new TDEToggleAction( i18n("Italic"),      "format-text-italic", "Ctrl+I", actionCollection, "richtext_italic"    );
+	richTextUnderline = new TDEToggleAction( i18n("Underline"),   "format-text-underline",  "Ctrl+U", actionCollection, "richtext_underline" );
 
 //	richTextSuper     = new TDEToggleAction( i18n("Superscript"), "text_super",  "",       actionCollection, "richtext_super"     );
 //	richTextSub       = new TDEToggleAction( i18n("Subscript"),   "text_sub",    "",       actionCollection, "richtext_sub"       );
 
-	richTextLeft      = new TDEToggleAction( i18n("Align Left"),  "text_left",   "",       actionCollection, "richtext_left"      );
+	richTextLeft      = new TDEToggleAction( i18n("Align Left"),  "format-text-direction-ltr",   "",       actionCollection, "richtext_left"      );
 	richTextCenter    = new TDEToggleAction( i18n("Centered"),    "text_center", "",       actionCollection, "richtext_center"    );
-	richTextRight     = new TDEToggleAction( i18n("Align Right"), "text_right",  "",       actionCollection, "richtext_right"     );
+	richTextRight     = new TDEToggleAction( i18n("Align Right"), "format-text-direction-rtl",  "",       actionCollection, "richtext_right"     );
 	richTextJustified = new TDEToggleAction( i18n("Justified"),   "text_block",  "",       actionCollection, "richtext_block"     );
 
 	richTextLeft->setExclusiveGroup("rt_justify");
diff --git a/src/tagsedit.cpp b/src/tagsedit.cpp
index d53434f..f20aeb3 100644
--- a/src/tagsedit.cpp
+++ b/src/tagsedit.cpp
@@ -429,26 +429,26 @@
 	backgroundColorLayout->addWidget(m_backgroundColor);
 	backgroundColorLayout->addStretch();
 
-	TQIconSet boldIconSet = kapp->iconLoader()->loadIconSet("text_bold", TDEIcon::Small);
+	TQIconSet boldIconSet = kapp->iconLoader()->loadIconSet("format-text-bold", TDEIcon::Small);
 	m_bold = new TQPushButton(boldIconSet, "", stateWidget);
 	m_bold->setToggleButton(true);
 	int size = TQMAX(m_bold->sizeHint().width(), m_bold->sizeHint().height());
 	m_bold->setFixedSize(size, size); // Make it square!
 	TQToolTip::add(m_bold, i18n("Bold"));
 
-	TQIconSet underlineIconSet = kapp->iconLoader()->loadIconSet("text_under", TDEIcon::Small);
+	TQIconSet underlineIconSet = kapp->iconLoader()->loadIconSet("format-text-underline", TDEIcon::Small);
 	m_underline = new TQPushButton(underlineIconSet, "", stateWidget);
 	m_underline->setToggleButton(true);
 	m_underline->setFixedSize(size, size); // Make it square!
 	TQToolTip::add(m_underline, i18n("Underline"));
 
-	TQIconSet italicIconSet = kapp->iconLoader()->loadIconSet("text_italic", TDEIcon::Small);
+	TQIconSet italicIconSet = kapp->iconLoader()->loadIconSet("format-text-italic", TDEIcon::Small);
 	m_italic = new TQPushButton(italicIconSet, "", stateWidget);
 	m_italic->setToggleButton(true);
 	m_italic->setFixedSize(size, size); // Make it square!
 	TQToolTip::add(m_italic, i18n("Italic"));
 
-	TQIconSet strikeIconSet = kapp->iconLoader()->loadIconSet("text_strike", TDEIcon::Small);
+	TQIconSet strikeIconSet = kapp->iconLoader()->loadIconSet("format-text-strikethrough", TDEIcon::Small);
 	m_strike = new TQPushButton(strikeIconSet, "", stateWidget);
 	m_strike->setToggleButton(true);
 	m_strike->setFixedSize(size, size); // Make it square!