diff --git a/arts/kde/kvideowidget.cpp b/arts/kde/kvideowidget.cpp
index f3a8c9030..f78c5c5db 100644
--- a/arts/kde/kvideowidget.cpp
+++ b/arts/kde/kvideowidget.cpp
@@ -101,7 +101,7 @@ void KVideoWidget::init(void)
videoHeight = 0;
// Setup actions
- new TDEToggleAction( i18n("Fullscreen &Mode"), "window_fullscreen",
+ new TDEToggleAction( i18n("Fullscreen &Mode"), "view-fullscreen",
CTRL+SHIFT+Key_F, TQT_TQOBJECT(this), TQT_SLOT(fullscreenActivated()),
actionCollection(), "fullscreen_mode" );
new TDERadioAction( i18n("&Half Size"), ALT+Key_0,
diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp
index 603d7dc3c..9bd819ebe 100644
--- a/kate/part/kateview.cpp
+++ b/kate/part/kateview.cpp
@@ -334,10 +334,10 @@ void KateView::setupActions()
m_deSelect = a=KStdAction::deselect(TQT_TQOBJECT(this), TQT_SLOT(clearSelection()), ac);
a->setWhatsThis(i18n("If you have selected something within the current document, this will no longer be selected."));
- a=new TDEAction(i18n("Enlarge Font"), "viewmag+", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotIncFontSizes()), ac, "incFontSizes");
+ a=new TDEAction(i18n("Enlarge Font"), "zoom-in", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotIncFontSizes()), ac, "incFontSizes");
a->setWhatsThis(i18n("This increases the display font size."));
- a=new TDEAction(i18n("Shrink Font"), "viewmag-", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotDecFontSizes()), ac, "decFontSizes");
+ a=new TDEAction(i18n("Shrink Font"), "zoom-out", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotDecFontSizes()), ac, "decFontSizes");
a->setWhatsThis(i18n("This decreases the display font size."));
a= m_toggleBlockSelection = new TDEToggleAction(
diff --git a/pics/crystalsvg/cr16-action-mail_forward.png b/pics/crystalsvg/cr16-action-mail-forward.png
similarity index 100%
rename from pics/crystalsvg/cr16-action-mail_forward.png
rename to pics/crystalsvg/cr16-action-mail-forward.png
diff --git a/pics/crystalsvg/cr16-action-mail_new.png b/pics/crystalsvg/cr16-action-mail-message-new.png
similarity index 100%
rename from pics/crystalsvg/cr16-action-mail_new.png
rename to pics/crystalsvg/cr16-action-mail-message-new.png
diff --git a/pics/crystalsvg/cr16-action-mail_replyall.png b/pics/crystalsvg/cr16-action-mail-reply-all.png
similarity index 100%
rename from pics/crystalsvg/cr16-action-mail_replyall.png
rename to pics/crystalsvg/cr16-action-mail-reply-all.png
diff --git a/pics/crystalsvg/cr16-action-mail_reply.png b/pics/crystalsvg/cr16-action-mail-reply-sender.png
similarity index 100%
rename from pics/crystalsvg/cr16-action-mail_reply.png
rename to pics/crystalsvg/cr16-action-mail-reply-sender.png
diff --git a/pics/crystalsvg/cr16-action-mail_send.png b/pics/crystalsvg/cr16-action-mail-send.png
similarity index 100%
rename from pics/crystalsvg/cr16-action-mail_send.png
rename to pics/crystalsvg/cr16-action-mail-send.png
diff --git a/pics/crystalsvg/cr16-action-player_pause.png b/pics/crystalsvg/cr16-action-media-playback-pause.png
similarity index 100%
rename from pics/crystalsvg/cr16-action-player_pause.png
rename to pics/crystalsvg/cr16-action-media-playback-pause.png
diff --git a/pics/crystalsvg/cr16-action-player_play.png b/pics/crystalsvg/cr16-action-media-playback-start.png
similarity index 100%
rename from pics/crystalsvg/cr16-action-player_play.png
rename to pics/crystalsvg/cr16-action-media-playback-start.png
diff --git a/pics/crystalsvg/cr16-action-player_stop.png b/pics/crystalsvg/cr16-action-media-playback-stop.png
similarity index 100%
rename from pics/crystalsvg/cr16-action-player_stop.png
rename to pics/crystalsvg/cr16-action-media-playback-stop.png
diff --git a/pics/crystalsvg/cr16-action-player_rew.png b/pics/crystalsvg/cr16-action-media-seek-backward.png
similarity index 100%
rename from pics/crystalsvg/cr16-action-player_rew.png
rename to pics/crystalsvg/cr16-action-media-seek-backward.png
diff --git a/pics/crystalsvg/cr16-action-player_fwd.png b/pics/crystalsvg/cr16-action-media-seek-forward.png
similarity index 100%
rename from pics/crystalsvg/cr16-action-player_fwd.png
rename to pics/crystalsvg/cr16-action-media-seek-forward.png
diff --git a/pics/crystalsvg/cr16-action-player_start.png b/pics/crystalsvg/cr16-action-media-skip-backward.png
similarity index 100%
rename from pics/crystalsvg/cr16-action-player_start.png
rename to pics/crystalsvg/cr16-action-media-skip-backward.png
diff --git a/pics/crystalsvg/cr16-action-player_end.png b/pics/crystalsvg/cr16-action-media-skip-forward.png
similarity index 100%
rename from pics/crystalsvg/cr16-action-player_end.png
rename to pics/crystalsvg/cr16-action-media-skip-forward.png
diff --git a/pics/crystalsvg/cr16-action-rotate_ccw.png b/pics/crystalsvg/cr16-action-object-rotate-left.png
similarity index 100%
rename from pics/crystalsvg/cr16-action-rotate_ccw.png
rename to pics/crystalsvg/cr16-action-object-rotate-left.png
diff --git a/pics/crystalsvg/cr16-action-rotate_cw.png b/pics/crystalsvg/cr16-action-object-rotate-right.png
similarity index 100%
rename from pics/crystalsvg/cr16-action-rotate_cw.png
rename to pics/crystalsvg/cr16-action-object-rotate-right.png
diff --git a/pics/crystalsvg/cr16-action-window_fullscreen.png b/pics/crystalsvg/cr16-action-view-fullscreen.png
similarity index 100%
rename from pics/crystalsvg/cr16-action-window_fullscreen.png
rename to pics/crystalsvg/cr16-action-view-fullscreen.png
diff --git a/pics/crystalsvg/cr16-action-window_nofullscreen.png b/pics/crystalsvg/cr16-action-view-restore.png
similarity index 100%
rename from pics/crystalsvg/cr16-action-window_nofullscreen.png
rename to pics/crystalsvg/cr16-action-view-restore.png
diff --git a/pics/crystalsvg/cr16-action-window_new.png b/pics/crystalsvg/cr16-action-window-new.png
similarity index 100%
rename from pics/crystalsvg/cr16-action-window_new.png
rename to pics/crystalsvg/cr16-action-window-new.png
diff --git a/pics/crystalsvg/cr16-action-viewmagfit.png b/pics/crystalsvg/cr16-action-zoom-fit-best.png
similarity index 100%
rename from pics/crystalsvg/cr16-action-viewmagfit.png
rename to pics/crystalsvg/cr16-action-zoom-fit-best.png
diff --git a/pics/crystalsvg/cr16-action-viewmag+.png b/pics/crystalsvg/cr16-action-zoom-in.png
similarity index 100%
rename from pics/crystalsvg/cr16-action-viewmag+.png
rename to pics/crystalsvg/cr16-action-zoom-in.png
diff --git a/pics/crystalsvg/cr16-action-viewmag1.png b/pics/crystalsvg/cr16-action-zoom-original.png
similarity index 100%
rename from pics/crystalsvg/cr16-action-viewmag1.png
rename to pics/crystalsvg/cr16-action-zoom-original.png
diff --git a/pics/crystalsvg/cr16-action-viewmag-.png b/pics/crystalsvg/cr16-action-zoom-out.png
similarity index 100%
rename from pics/crystalsvg/cr16-action-viewmag-.png
rename to pics/crystalsvg/cr16-action-zoom-out.png
diff --git a/pics/crystalsvg/cr22-action-mail_forward.png b/pics/crystalsvg/cr22-action-mail-forward.png
similarity index 100%
rename from pics/crystalsvg/cr22-action-mail_forward.png
rename to pics/crystalsvg/cr22-action-mail-forward.png
diff --git a/pics/crystalsvg/cr22-action-mail_new.png b/pics/crystalsvg/cr22-action-mail-message-new.png
similarity index 100%
rename from pics/crystalsvg/cr22-action-mail_new.png
rename to pics/crystalsvg/cr22-action-mail-message-new.png
diff --git a/pics/crystalsvg/cr22-action-mail_replyall.png b/pics/crystalsvg/cr22-action-mail-reply-all.png
similarity index 100%
rename from pics/crystalsvg/cr22-action-mail_replyall.png
rename to pics/crystalsvg/cr22-action-mail-reply-all.png
diff --git a/pics/crystalsvg/cr22-action-mail_reply.png b/pics/crystalsvg/cr22-action-mail-reply-sender.png
similarity index 100%
rename from pics/crystalsvg/cr22-action-mail_reply.png
rename to pics/crystalsvg/cr22-action-mail-reply-sender.png
diff --git a/pics/crystalsvg/cr22-action-mail_send.png b/pics/crystalsvg/cr22-action-mail-send.png
similarity index 100%
rename from pics/crystalsvg/cr22-action-mail_send.png
rename to pics/crystalsvg/cr22-action-mail-send.png
diff --git a/pics/crystalsvg/cr22-action-player_pause.png b/pics/crystalsvg/cr22-action-media-playback-pause.png
similarity index 100%
rename from pics/crystalsvg/cr22-action-player_pause.png
rename to pics/crystalsvg/cr22-action-media-playback-pause.png
diff --git a/pics/crystalsvg/cr22-action-player_play.png b/pics/crystalsvg/cr22-action-media-playback-start.png
similarity index 100%
rename from pics/crystalsvg/cr22-action-player_play.png
rename to pics/crystalsvg/cr22-action-media-playback-start.png
diff --git a/pics/crystalsvg/cr22-action-player_stop.png b/pics/crystalsvg/cr22-action-media-playback-stop.png
similarity index 100%
rename from pics/crystalsvg/cr22-action-player_stop.png
rename to pics/crystalsvg/cr22-action-media-playback-stop.png
diff --git a/pics/crystalsvg/cr22-action-player_rew.png b/pics/crystalsvg/cr22-action-media-seek-backward.png
similarity index 100%
rename from pics/crystalsvg/cr22-action-player_rew.png
rename to pics/crystalsvg/cr22-action-media-seek-backward.png
diff --git a/pics/crystalsvg/cr22-action-player_fwd.png b/pics/crystalsvg/cr22-action-media-seek-forward.png
similarity index 100%
rename from pics/crystalsvg/cr22-action-player_fwd.png
rename to pics/crystalsvg/cr22-action-media-seek-forward.png
diff --git a/pics/crystalsvg/cr22-action-player_start.png b/pics/crystalsvg/cr22-action-media-skip-backward.png
similarity index 100%
rename from pics/crystalsvg/cr22-action-player_start.png
rename to pics/crystalsvg/cr22-action-media-skip-backward.png
diff --git a/pics/crystalsvg/cr22-action-player_end.png b/pics/crystalsvg/cr22-action-media-skip-forward.png
similarity index 100%
rename from pics/crystalsvg/cr22-action-player_end.png
rename to pics/crystalsvg/cr22-action-media-skip-forward.png
diff --git a/pics/crystalsvg/cr22-action-rotate_ccw.png b/pics/crystalsvg/cr22-action-object-rotate-left.png
similarity index 100%
rename from pics/crystalsvg/cr22-action-rotate_ccw.png
rename to pics/crystalsvg/cr22-action-object-rotate-left.png
diff --git a/pics/crystalsvg/cr22-action-rotate_cw.png b/pics/crystalsvg/cr22-action-object-rotate-right.png
similarity index 100%
rename from pics/crystalsvg/cr22-action-rotate_cw.png
rename to pics/crystalsvg/cr22-action-object-rotate-right.png
diff --git a/pics/crystalsvg/cr22-action-window_fullscreen.png b/pics/crystalsvg/cr22-action-view-fullscreen.png
similarity index 100%
rename from pics/crystalsvg/cr22-action-window_fullscreen.png
rename to pics/crystalsvg/cr22-action-view-fullscreen.png
diff --git a/pics/crystalsvg/cr22-action-window_nofullscreen.png b/pics/crystalsvg/cr22-action-view-restore.png
similarity index 100%
rename from pics/crystalsvg/cr22-action-window_nofullscreen.png
rename to pics/crystalsvg/cr22-action-view-restore.png
diff --git a/pics/crystalsvg/cr22-action-window_new.png b/pics/crystalsvg/cr22-action-window-new.png
similarity index 100%
rename from pics/crystalsvg/cr22-action-window_new.png
rename to pics/crystalsvg/cr22-action-window-new.png
diff --git a/pics/crystalsvg/cr22-action-viewmagfit.png b/pics/crystalsvg/cr22-action-zoom-fit-best.png
similarity index 100%
rename from pics/crystalsvg/cr22-action-viewmagfit.png
rename to pics/crystalsvg/cr22-action-zoom-fit-best.png
diff --git a/pics/crystalsvg/cr22-action-viewmag+.png b/pics/crystalsvg/cr22-action-zoom-in.png
similarity index 100%
rename from pics/crystalsvg/cr22-action-viewmag+.png
rename to pics/crystalsvg/cr22-action-zoom-in.png
diff --git a/pics/crystalsvg/cr22-action-viewmag1.png b/pics/crystalsvg/cr22-action-zoom-original.png
similarity index 100%
rename from pics/crystalsvg/cr22-action-viewmag1.png
rename to pics/crystalsvg/cr22-action-zoom-original.png
diff --git a/pics/crystalsvg/cr22-action-viewmag-.png b/pics/crystalsvg/cr22-action-zoom-out.png
similarity index 100%
rename from pics/crystalsvg/cr22-action-viewmag-.png
rename to pics/crystalsvg/cr22-action-zoom-out.png
diff --git a/pics/crystalsvg/cr32-action-mail_forward.png b/pics/crystalsvg/cr32-action-mail-forward.png
similarity index 100%
rename from pics/crystalsvg/cr32-action-mail_forward.png
rename to pics/crystalsvg/cr32-action-mail-forward.png
diff --git a/pics/crystalsvg/cr32-action-mail_new.png b/pics/crystalsvg/cr32-action-mail-message-new.png
similarity index 100%
rename from pics/crystalsvg/cr32-action-mail_new.png
rename to pics/crystalsvg/cr32-action-mail-message-new.png
diff --git a/pics/crystalsvg/cr32-action-mail_replyall.png b/pics/crystalsvg/cr32-action-mail-reply-all.png
similarity index 100%
rename from pics/crystalsvg/cr32-action-mail_replyall.png
rename to pics/crystalsvg/cr32-action-mail-reply-all.png
diff --git a/pics/crystalsvg/cr32-action-mail_reply.png b/pics/crystalsvg/cr32-action-mail-reply-sender.png
similarity index 100%
rename from pics/crystalsvg/cr32-action-mail_reply.png
rename to pics/crystalsvg/cr32-action-mail-reply-sender.png
diff --git a/pics/crystalsvg/cr32-action-mail_send.png b/pics/crystalsvg/cr32-action-mail-send.png
similarity index 100%
rename from pics/crystalsvg/cr32-action-mail_send.png
rename to pics/crystalsvg/cr32-action-mail-send.png
diff --git a/pics/crystalsvg/cr32-action-player_pause.png b/pics/crystalsvg/cr32-action-media-playback-pause.png
similarity index 100%
rename from pics/crystalsvg/cr32-action-player_pause.png
rename to pics/crystalsvg/cr32-action-media-playback-pause.png
diff --git a/pics/crystalsvg/cr32-action-player_play.png b/pics/crystalsvg/cr32-action-media-playback-start.png
similarity index 100%
rename from pics/crystalsvg/cr32-action-player_play.png
rename to pics/crystalsvg/cr32-action-media-playback-start.png
diff --git a/pics/crystalsvg/cr32-action-player_stop.png b/pics/crystalsvg/cr32-action-media-playback-stop.png
similarity index 100%
rename from pics/crystalsvg/cr32-action-player_stop.png
rename to pics/crystalsvg/cr32-action-media-playback-stop.png
diff --git a/pics/crystalsvg/cr32-action-player_rew.png b/pics/crystalsvg/cr32-action-media-seek-backward.png
similarity index 100%
rename from pics/crystalsvg/cr32-action-player_rew.png
rename to pics/crystalsvg/cr32-action-media-seek-backward.png
diff --git a/pics/crystalsvg/cr32-action-player_fwd.png b/pics/crystalsvg/cr32-action-media-seek-forward.png
similarity index 100%
rename from pics/crystalsvg/cr32-action-player_fwd.png
rename to pics/crystalsvg/cr32-action-media-seek-forward.png
diff --git a/pics/crystalsvg/cr32-action-player_start.png b/pics/crystalsvg/cr32-action-media-skip-backward.png
similarity index 100%
rename from pics/crystalsvg/cr32-action-player_start.png
rename to pics/crystalsvg/cr32-action-media-skip-backward.png
diff --git a/pics/crystalsvg/cr32-action-player_end.png b/pics/crystalsvg/cr32-action-media-skip-forward.png
similarity index 100%
rename from pics/crystalsvg/cr32-action-player_end.png
rename to pics/crystalsvg/cr32-action-media-skip-forward.png
diff --git a/pics/crystalsvg/cr32-action-rotate_ccw.png b/pics/crystalsvg/cr32-action-object-rotate-left.png
similarity index 100%
rename from pics/crystalsvg/cr32-action-rotate_ccw.png
rename to pics/crystalsvg/cr32-action-object-rotate-left.png
diff --git a/pics/crystalsvg/cr32-action-rotate_cw.png b/pics/crystalsvg/cr32-action-object-rotate-right.png
similarity index 100%
rename from pics/crystalsvg/cr32-action-rotate_cw.png
rename to pics/crystalsvg/cr32-action-object-rotate-right.png
diff --git a/pics/crystalsvg/cr32-action-window_fullscreen.png b/pics/crystalsvg/cr32-action-view-fullscreen.png
similarity index 100%
rename from pics/crystalsvg/cr32-action-window_fullscreen.png
rename to pics/crystalsvg/cr32-action-view-fullscreen.png
diff --git a/pics/crystalsvg/cr32-action-window_nofullscreen.png b/pics/crystalsvg/cr32-action-view-restore.png
similarity index 100%
rename from pics/crystalsvg/cr32-action-window_nofullscreen.png
rename to pics/crystalsvg/cr32-action-view-restore.png
diff --git a/pics/crystalsvg/cr32-action-window_new.png b/pics/crystalsvg/cr32-action-window-new.png
similarity index 100%
rename from pics/crystalsvg/cr32-action-window_new.png
rename to pics/crystalsvg/cr32-action-window-new.png
diff --git a/pics/crystalsvg/cr32-action-viewmagfit.png b/pics/crystalsvg/cr32-action-zoom-fit-best.png
similarity index 100%
rename from pics/crystalsvg/cr32-action-viewmagfit.png
rename to pics/crystalsvg/cr32-action-zoom-fit-best.png
diff --git a/pics/crystalsvg/cr32-action-viewmag+.png b/pics/crystalsvg/cr32-action-zoom-in.png
similarity index 100%
rename from pics/crystalsvg/cr32-action-viewmag+.png
rename to pics/crystalsvg/cr32-action-zoom-in.png
diff --git a/pics/crystalsvg/cr32-action-viewmag1.png b/pics/crystalsvg/cr32-action-zoom-original.png
similarity index 100%
rename from pics/crystalsvg/cr32-action-viewmag1.png
rename to pics/crystalsvg/cr32-action-zoom-original.png
diff --git a/pics/crystalsvg/cr32-action-viewmag-.png b/pics/crystalsvg/cr32-action-zoom-out.png
similarity index 100%
rename from pics/crystalsvg/cr32-action-viewmag-.png
rename to pics/crystalsvg/cr32-action-zoom-out.png
diff --git a/pics/crystalsvg/cr48-action-mail_new.png b/pics/crystalsvg/cr48-action-mail-message-new.png
similarity index 100%
rename from pics/crystalsvg/cr48-action-mail_new.png
rename to pics/crystalsvg/cr48-action-mail-message-new.png
diff --git a/pics/crystalsvg/cr48-action-rotate_ccw.png b/pics/crystalsvg/cr48-action-object-rotate-left.png
similarity index 100%
rename from pics/crystalsvg/cr48-action-rotate_ccw.png
rename to pics/crystalsvg/cr48-action-object-rotate-left.png
diff --git a/pics/crystalsvg/cr48-action-rotate_cw.png b/pics/crystalsvg/cr48-action-object-rotate-right.png
similarity index 100%
rename from pics/crystalsvg/cr48-action-rotate_cw.png
rename to pics/crystalsvg/cr48-action-object-rotate-right.png
diff --git a/pics/crystalsvg/cr64-action-player_play.png b/pics/crystalsvg/cr64-action-media-playback-start.png
similarity index 100%
rename from pics/crystalsvg/cr64-action-player_play.png
rename to pics/crystalsvg/cr64-action-media-playback-start.png
diff --git a/tdehtml/tdehtml_ext.cpp b/tdehtml/tdehtml_ext.cpp
index 0148d8aa6..9c1ab2aaf 100644
--- a/tdehtml/tdehtml_ext.cpp
+++ b/tdehtml/tdehtml_ext.cpp
@@ -515,7 +515,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
if ( selectedText.contains("://") && KURL(selectedText).isValid() )
- new TDEAction( i18n( "Open '%1'" ).arg( selectedText ), "window_new", 0,
+ new TDEAction( i18n( "Open '%1'" ).arg( selectedText ), "window-new", 0,
d->m_tdehtml->browserExtension(), TQT_SLOT( openSelection() ), actionCollection(), "openSelection" );
}
else if ( url.isEmpty() && !isImage )
@@ -547,7 +547,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
{
if ( tdehtml->parentPart() )
{
- new TDEAction( i18n( "Open in New &Window" ), "window_new", 0, this, TQT_SLOT( slotFrameInWindow() ),
+ new TDEAction( i18n( "Open in New &Window" ), "window-new", 0, this, TQT_SLOT( slotFrameInWindow() ),
actionCollection(), "frameinwindow" );
new TDEAction( i18n( "Open in &This Window" ), 0, this, TQT_SLOT( slotFrameInTop() ),
actionCollection(), "frameintop" );
diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp
index b138e91e6..9c3613372 100644
--- a/tdehtml/tdehtml_part.cpp
+++ b/tdehtml/tdehtml_part.cpp
@@ -358,13 +358,13 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof )
if ( prof == BrowserViewGUI ) {
d->m_paIncZoomFactor = new TDEHTMLZoomFactorAction( this, true, i18n(
- "Enlarge Font" ), "viewmag+", "CTRL++;CTRL+=", this,
+ "Enlarge Font" ), "zoom-in", "CTRL++;CTRL+=", this,
TQT_SLOT( slotIncZoomFast() ), actionCollection(), "incFontSizes" );
d->m_paIncZoomFactor->setWhatsThis( i18n( "Enlarge Font"
"Make the font in this window bigger. "
"Click and hold down the mouse button for a menu with all available font sizes." ) );
d->m_paDecZoomFactor = new TDEHTMLZoomFactorAction( this, false, i18n(
- "Shrink Font" ), "viewmag-", CTRL + Key_Minus, this,
+ "Shrink Font" ), "zoom-out", CTRL + Key_Minus, this,
TQT_SLOT( slotDecZoomFast() ), actionCollection(), "decFontSizes" );
d->m_paDecZoomFactor->setWhatsThis( i18n( "Shrink Font
"
"Make the font in this window smaller. "
diff --git a/tdehtml/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp
index 9e921809c..901c02321 100644
--- a/tdehtml/tdehtmlview.cpp
+++ b/tdehtml/tdehtmlview.cpp
@@ -1269,7 +1269,7 @@ void TDEHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse )
if ( ( mailtoCursor || newWindowCursor ) && isVisible() && hasFocus() ) {
#ifdef Q_WS_X11
- TQPixmap icon_pixmap = TDEGlobal::iconLoader()->loadIcon( mailtoCursor ? "mail_generic" : "window_new", TDEIcon::Small, 0, TDEIcon::DefaultState, 0, true );
+ TQPixmap icon_pixmap = TDEGlobal::iconLoader()->loadIcon( mailtoCursor ? "mail_generic" : "window-new", TDEIcon::Small, 0, TDEIcon::DefaultState, 0, true );
if (d->cursor_icon_widget) {
const TQPixmap *pm = d->cursor_icon_widget->backgroundPixmap();
diff --git a/tdeio/tdefile/knotifydialog.cpp b/tdeio/tdefile/knotifydialog.cpp
index 8397a5e74..fbc947c57 100644
--- a/tdeio/tdefile/knotifydialog.cpp
+++ b/tdeio/tdefile/knotifydialog.cpp
@@ -263,7 +263,7 @@ KNotifyWidget::KNotifyWidget( TQWidget *parent, const char *name,
d->toolTip = new KNotifyToolTip( header );
- m_playButton->setIconSet( SmallIconSet( "player_play" ) );
+ m_playButton->setIconSet( SmallIconSet( "media-playback-start" ) );
connect( m_playButton, TQT_SIGNAL( clicked() ), TQT_SLOT( playSound() ));
connect( m_listview, TQT_SIGNAL( currentChanged( TQListViewItem * ) ),
diff --git a/tdeui/kbugreport.cpp b/tdeui/kbugreport.cpp
index f275f9e55..20946b5b1 100644
--- a/tdeui/kbugreport.cpp
+++ b/tdeui/kbugreport.cpp
@@ -133,7 +133,7 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const TDEAboutData *abou
glay->addWidget( tmpLabel, row, 1 );
TQWhatsThis::add( tmpLabel, qwtstr );
- setButtonOK( KGuiItem( i18n("&Send"), "mail_send", i18n( "Send bug report." ),
+ setButtonOK( KGuiItem( i18n("&Send"), "mail-send", i18n( "Send bug report." ),
i18n( "Send this bug report to %1." ).arg( m_aboutData->bugAddress() ) ) );
}
diff --git a/tdeui/kpixmapregionselectorwidget.cpp b/tdeui/kpixmapregionselectorwidget.cpp
index 21ac875db..7083dac72 100644
--- a/tdeui/kpixmapregionselectorwidget.cpp
+++ b/tdeui/kpixmapregionselectorwidget.cpp
@@ -140,12 +140,12 @@ TDEPopupMenu *KPixmapRegionSelectorWidget::createPopupMenu()
TDEPopupMenu *popup=new TDEPopupMenu(this, "PixmapRegionSelectorPopup");
popup->insertTitle(i18n("Image Operations"));
- TDEAction *action = new TDEAction(i18n("&Rotate Clockwise"), "rotate_cw",
+ TDEAction *action = new TDEAction(i18n("&Rotate Clockwise"), "object-rotate-right",
0, TQT_TQOBJECT(this), TQT_SLOT(rotateClockwise()),
TQT_TQOBJECT(popup), "rotateclockwise");
action->plug(popup);
- action = new TDEAction(i18n("Rotate &Counterclockwise"), "rotate_ccw",
+ action = new TDEAction(i18n("Rotate &Counterclockwise"), "object-rotate-left",
0, TQT_TQOBJECT(this), TQT_SLOT(rotateCounterclockwise()),
TQT_TQOBJECT(popup), "rotatecounterclockwise");
action->plug(popup);
diff --git a/tdeui/kstdaction_p.h b/tdeui/kstdaction_p.h
index f481f2e8b..e1e1fde05 100644
--- a/tdeui/kstdaction_p.h
+++ b/tdeui/kstdaction_p.h
@@ -46,7 +46,7 @@ static const KStdActionInfo g_rgActionInfo[] =
{ Close, TDEStdAccel::Close, "file_close", I18N_NOOP("&Close"), 0, "window-close" },
{ Print, TDEStdAccel::Print, "file_print", I18N_NOOP("&Print..."), 0, "document-print" },
{ PrintPreview, TDEStdAccel::AccelNone, "file_print_preview", I18N_NOOP("Print Previe&w..."), 0, "document-print-preview" },
- { Mail, TDEStdAccel::AccelNone, "file_mail", I18N_NOOP("&Mail..."), 0, "mail_send" },
+ { Mail, TDEStdAccel::AccelNone, "file_mail", I18N_NOOP("&Mail..."), 0, "mail-send" },
{ Quit, TDEStdAccel::Quit, "file_quit", I18N_NOOP("&Quit"), 0, "exit" },
{ Undo, TDEStdAccel::Undo, "edit_undo", I18N_NOOP("&Undo"), 0, "edit-undo" },
@@ -64,12 +64,12 @@ static const KStdActionInfo g_rgActionInfo[] =
{ FindPrev, TDEStdAccel::FindPrev, "edit_find_last", I18N_NOOP("Find Pre&vious"), 0, "go-previous" },
{ Replace, TDEStdAccel::Replace, "edit_replace", I18N_NOOP("&Replace..."), 0, 0 },
- { ActualSize, TDEStdAccel::AccelNone, "view_actual_size", I18N_NOOP("&Actual Size"), 0, "viewmag1" },
+ { ActualSize, TDEStdAccel::AccelNone, "view_actual_size", I18N_NOOP("&Actual Size"), 0, "zoom-original" },
{ FitToPage, TDEStdAccel::AccelNone, "view_fit_to_page", I18N_NOOP("&Fit to Page"), 0, "view_fit_window" },
{ FitToWidth, TDEStdAccel::AccelNone, "view_fit_to_width", I18N_NOOP("Fit to Page &Width"), 0, "view_fit_width" },
{ FitToHeight, TDEStdAccel::AccelNone, "view_fit_to_height", I18N_NOOP("Fit to Page &Height"), 0, "view_fit_height" },
- { ZoomIn, TDEStdAccel::ZoomIn, "view_zoom_in", I18N_NOOP("Zoom &In"), 0, "viewmag+" },
- { ZoomOut, TDEStdAccel::ZoomOut, "view_zoom_out", I18N_NOOP("Zoom &Out"), 0, "viewmag-" },
+ { ZoomIn, TDEStdAccel::ZoomIn, "view_zoom_in", I18N_NOOP("Zoom &In"), 0, "zoom-in" },
+ { ZoomOut, TDEStdAccel::ZoomOut, "view_zoom_out", I18N_NOOP("Zoom &Out"), 0, "zoom-out" },
{ Zoom, TDEStdAccel::AccelNone, "view_zoom", I18N_NOOP("&Zoom..."), 0, "viewmag" },
// KDE4: give Redisplay the shortcut TDEStdAccel::AccelReload
{ Redisplay, TDEStdAccel::AccelNone, "view_redisplay", I18N_NOOP("&Redisplay"), 0, "reload" },
@@ -95,7 +95,7 @@ static const KStdActionInfo g_rgActionInfo[] =
{ ShowMenubar, TDEStdAccel::ShowMenubar, "options_show_menubar", I18N_NOOP("Show &Menubar"), 0, "showmenu" },
{ ShowToolbar, TDEStdAccel::AccelNone, "options_show_toolbar", I18N_NOOP("Show &Toolbar"), 0, 0 },
{ ShowStatusbar, TDEStdAccel::AccelNone, "options_show_statusbar", I18N_NOOP("Show St&atusbar"), 0, 0 },
- { FullScreen, TDEStdAccel::FullScreen, "fullscreen", I18N_NOOP("F&ull Screen Mode"), 0, "window_fullscreen" },
+ { FullScreen, TDEStdAccel::FullScreen, "fullscreen", I18N_NOOP("F&ull Screen Mode"), 0, "view-fullscreen" },
{ SaveOptions, TDEStdAccel::AccelNone, "options_save_options", I18N_NOOP("&Save Settings"), 0, 0 },
{ KeyBindings, TDEStdAccel::AccelNone, "options_configure_keybinding", I18N_NOOP("Configure S&hortcuts..."), 0,"configure_shortcuts" },
{ Preferences, TDEStdAccel::AccelNone, "options_configure", I18N_NOOP("&Configure %1..."), 0, "configure" },
diff --git a/tdeui/tdeactionclasses.cpp b/tdeui/tdeactionclasses.cpp
index 80f646869..7747fe983 100644
--- a/tdeui/tdeactionclasses.cpp
+++ b/tdeui/tdeactionclasses.cpp
@@ -2091,12 +2091,12 @@ void TDEToggleFullScreenAction::setChecked( bool c )
if (c)
{
setText(i18n("Exit F&ull Screen Mode"));
- setIcon("window_nofullscreen");
+ setIcon("view-restore");
}
else
{
setText(i18n("F&ull Screen Mode"));
- setIcon("window_fullscreen");
+ setIcon("view-fullscreen");
}
TDEToggleAction::setChecked( c );
}
diff --git a/tdeui/tests/kxmlguitest.cpp b/tdeui/tests/kxmlguitest.cpp
index 1a79526aa..b72e9dc68 100644
--- a/tdeui/tests/kxmlguitest.cpp
+++ b/tdeui/tests/kxmlguitest.cpp
@@ -47,7 +47,7 @@ int main( int argc, char **argv )
Client *part = new Client;
- (void)new TDEAction( "decfont", "viewmag-", 0, 0, 0, part->actionCollection(), "decFontSizes" );
+ (void)new TDEAction( "decfont", "zoom-out", 0, 0, 0, part->actionCollection(), "decFontSizes" );
(void)new TDEAction( "sec", "unlock", Qt::ALT + Qt::Key_1, part, TQT_SLOT( slotSec() ), part->actionCollection(), "security" );
part->setXMLFile( "./kxmlguitest_part.rc" );