diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-13 20:10:11 -0500 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-13 20:10:11 -0500 |
commit | ce1138c8ba3865132c2ea42d119f68a5417458ad (patch) | |
tree | 40453be7f11591c2a5851c86af291692a1a824b3 | |
parent | bab4f22f92cb4960c7a7c17845813de2082ffdc9 (diff) | |
download | tdelibs-ce1138c8ba3865132c2ea42d119f68a5417458ad.tar.gz tdelibs-ce1138c8ba3865132c2ea42d119f68a5417458ad.zip |
Bring mail_forward, mail_new, mail_replyall, mail_reply, mail_send, player_pause, player_play, player_stop, player_rew, player_fwd, player_start, player_end, rotate_ccw, rotate_cw, window_fullscreen, window_nofullscreen, window_new, viewmagfit, viewmag+, viewmag1, and viewmag- icons into XDG compliance
-rw-r--r-- | arts/kde/kvideowidget.cpp | 2 | ||||
-rw-r--r-- | kate/part/kateview.cpp | 4 | ||||
-rw-r--r-- | pics/crystalsvg/cr16-action-mail-forward.png (renamed from pics/crystalsvg/cr16-action-mail_forward.png) | bin | 890 -> 890 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr16-action-mail-message-new.png (renamed from pics/crystalsvg/cr16-action-mail_new.png) | bin | 756 -> 756 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr16-action-mail-reply-all.png (renamed from pics/crystalsvg/cr16-action-mail_replyall.png) | bin | 928 -> 928 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr16-action-mail-reply-sender.png (renamed from pics/crystalsvg/cr16-action-mail_reply.png) | bin | 889 -> 889 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr16-action-mail-send.png (renamed from pics/crystalsvg/cr16-action-mail_send.png) | bin | 893 -> 893 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr16-action-media-playback-pause.png (renamed from pics/crystalsvg/cr16-action-player_pause.png) | bin | 319 -> 319 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr16-action-media-playback-start.png (renamed from pics/crystalsvg/cr16-action-player_play.png) | bin | 352 -> 352 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr16-action-media-playback-stop.png (renamed from pics/crystalsvg/cr16-action-player_stop.png) | bin | 316 -> 316 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr16-action-media-seek-backward.png (renamed from pics/crystalsvg/cr16-action-player_rew.png) | bin | 412 -> 412 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr16-action-media-seek-forward.png (renamed from pics/crystalsvg/cr16-action-player_fwd.png) | bin | 412 -> 412 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr16-action-media-skip-backward.png (renamed from pics/crystalsvg/cr16-action-player_start.png) | bin | 364 -> 364 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr16-action-media-skip-forward.png (renamed from pics/crystalsvg/cr16-action-player_end.png) | bin | 363 -> 363 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr16-action-object-rotate-left.png (renamed from pics/crystalsvg/cr16-action-rotate_ccw.png) | bin | 746 -> 746 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr16-action-object-rotate-right.png (renamed from pics/crystalsvg/cr16-action-rotate_cw.png) | bin | 749 -> 749 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr16-action-view-fullscreen.png (renamed from pics/crystalsvg/cr16-action-window_fullscreen.png) | bin | 785 -> 785 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr16-action-view-restore.png (renamed from pics/crystalsvg/cr16-action-window_nofullscreen.png) | bin | 772 -> 772 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr16-action-window-new.png (renamed from pics/crystalsvg/cr16-action-window_new.png) | bin | 642 -> 642 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr16-action-zoom-fit-best.png (renamed from pics/crystalsvg/cr16-action-viewmagfit.png) | bin | 846 -> 846 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr16-action-zoom-in.png (renamed from pics/crystalsvg/cr16-action-viewmag+.png) | bin | 810 -> 810 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr16-action-zoom-original.png (renamed from pics/crystalsvg/cr16-action-viewmag1.png) | bin | 840 -> 840 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr16-action-zoom-out.png (renamed from pics/crystalsvg/cr16-action-viewmag-.png) | bin | 800 -> 800 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr22-action-mail-forward.png (renamed from pics/crystalsvg/cr22-action-mail_forward.png) | bin | 1391 -> 1391 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr22-action-mail-message-new.png (renamed from pics/crystalsvg/cr22-action-mail_new.png) | bin | 1129 -> 1129 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr22-action-mail-reply-all.png (renamed from pics/crystalsvg/cr22-action-mail_replyall.png) | bin | 1563 -> 1563 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr22-action-mail-reply-sender.png (renamed from pics/crystalsvg/cr22-action-mail_reply.png) | bin | 1437 -> 1437 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr22-action-mail-send.png (renamed from pics/crystalsvg/cr22-action-mail_send.png) | bin | 1428 -> 1428 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr22-action-media-playback-pause.png (renamed from pics/crystalsvg/cr22-action-player_pause.png) | bin | 1191 -> 1191 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr22-action-media-playback-start.png (renamed from pics/crystalsvg/cr22-action-player_play.png) | bin | 1263 -> 1263 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr22-action-media-playback-stop.png (renamed from pics/crystalsvg/cr22-action-player_stop.png) | bin | 1122 -> 1122 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr22-action-media-seek-backward.png (renamed from pics/crystalsvg/cr22-action-player_rew.png) | bin | 1271 -> 1271 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr22-action-media-seek-forward.png (renamed from pics/crystalsvg/cr22-action-player_fwd.png) | bin | 1262 -> 1262 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr22-action-media-skip-backward.png (renamed from pics/crystalsvg/cr22-action-player_start.png) | bin | 1265 -> 1265 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr22-action-media-skip-forward.png (renamed from pics/crystalsvg/cr22-action-player_end.png) | bin | 1265 -> 1265 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr22-action-object-rotate-left.png (renamed from pics/crystalsvg/cr22-action-rotate_ccw.png) | bin | 1156 -> 1156 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr22-action-object-rotate-right.png (renamed from pics/crystalsvg/cr22-action-rotate_cw.png) | bin | 1164 -> 1164 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr22-action-view-fullscreen.png (renamed from pics/crystalsvg/cr22-action-window_fullscreen.png) | bin | 912 -> 912 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr22-action-view-restore.png (renamed from pics/crystalsvg/cr22-action-window_nofullscreen.png) | bin | 927 -> 927 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr22-action-window-new.png (renamed from pics/crystalsvg/cr22-action-window_new.png) | bin | 799 -> 799 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr22-action-zoom-fit-best.png (renamed from pics/crystalsvg/cr22-action-viewmagfit.png) | bin | 1111 -> 1111 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr22-action-zoom-in.png (renamed from pics/crystalsvg/cr22-action-viewmag+.png) | bin | 1145 -> 1145 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr22-action-zoom-original.png (renamed from pics/crystalsvg/cr22-action-viewmag1.png) | bin | 1128 -> 1128 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr22-action-zoom-out.png (renamed from pics/crystalsvg/cr22-action-viewmag-.png) | bin | 1080 -> 1080 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr32-action-mail-forward.png (renamed from pics/crystalsvg/cr32-action-mail_forward.png) | bin | 2426 -> 2426 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr32-action-mail-message-new.png (renamed from pics/crystalsvg/cr32-action-mail_new.png) | bin | 1729 -> 1729 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr32-action-mail-reply-all.png (renamed from pics/crystalsvg/cr32-action-mail_replyall.png) | bin | 2685 -> 2685 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr32-action-mail-reply-sender.png (renamed from pics/crystalsvg/cr32-action-mail_reply.png) | bin | 2444 -> 2444 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr32-action-mail-send.png (renamed from pics/crystalsvg/cr32-action-mail_send.png) | bin | 2447 -> 2447 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr32-action-media-playback-pause.png (renamed from pics/crystalsvg/cr32-action-player_pause.png) | bin | 1505 -> 1505 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr32-action-media-playback-start.png (renamed from pics/crystalsvg/cr32-action-player_play.png) | bin | 1581 -> 1581 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr32-action-media-playback-stop.png (renamed from pics/crystalsvg/cr32-action-player_stop.png) | bin | 1450 -> 1450 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr32-action-media-seek-backward.png (renamed from pics/crystalsvg/cr32-action-player_rew.png) | bin | 1557 -> 1557 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr32-action-media-seek-forward.png (renamed from pics/crystalsvg/cr32-action-player_fwd.png) | bin | 1567 -> 1567 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr32-action-media-skip-backward.png (renamed from pics/crystalsvg/cr32-action-player_start.png) | bin | 1588 -> 1588 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr32-action-media-skip-forward.png (renamed from pics/crystalsvg/cr32-action-player_end.png) | bin | 1580 -> 1580 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr32-action-object-rotate-left.png (renamed from pics/crystalsvg/cr32-action-rotate_ccw.png) | bin | 1772 -> 1772 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr32-action-object-rotate-right.png (renamed from pics/crystalsvg/cr32-action-rotate_cw.png) | bin | 1810 -> 1810 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr32-action-view-fullscreen.png (renamed from pics/crystalsvg/cr32-action-window_fullscreen.png) | bin | 1198 -> 1198 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr32-action-view-restore.png (renamed from pics/crystalsvg/cr32-action-window_nofullscreen.png) | bin | 1202 -> 1202 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr32-action-window-new.png (renamed from pics/crystalsvg/cr32-action-window_new.png) | bin | 1175 -> 1175 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr32-action-zoom-fit-best.png (renamed from pics/crystalsvg/cr32-action-viewmagfit.png) | bin | 1774 -> 1774 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr32-action-zoom-in.png (renamed from pics/crystalsvg/cr32-action-viewmag+.png) | bin | 1783 -> 1783 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr32-action-zoom-original.png (renamed from pics/crystalsvg/cr32-action-viewmag1.png) | bin | 1789 -> 1789 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr32-action-zoom-out.png (renamed from pics/crystalsvg/cr32-action-viewmag-.png) | bin | 1749 -> 1749 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr48-action-mail-message-new.png (renamed from pics/crystalsvg/cr48-action-mail_new.png) | bin | 2779 -> 2779 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr48-action-object-rotate-left.png (renamed from pics/crystalsvg/cr48-action-rotate_ccw.png) | bin | 2906 -> 2906 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr48-action-object-rotate-right.png (renamed from pics/crystalsvg/cr48-action-rotate_cw.png) | bin | 2983 -> 2983 bytes | |||
-rw-r--r-- | pics/crystalsvg/cr64-action-media-playback-start.png (renamed from pics/crystalsvg/cr64-action-player_play.png) | bin | 4865 -> 4865 bytes | |||
-rw-r--r-- | tdehtml/tdehtml_ext.cpp | 4 | ||||
-rw-r--r-- | tdehtml/tdehtml_part.cpp | 4 | ||||
-rw-r--r-- | tdehtml/tdehtmlview.cpp | 2 | ||||
-rw-r--r-- | tdeio/tdefile/knotifydialog.cpp | 2 | ||||
-rw-r--r-- | tdeui/kbugreport.cpp | 2 | ||||
-rw-r--r-- | tdeui/kpixmapregionselectorwidget.cpp | 4 | ||||
-rw-r--r-- | tdeui/kstdaction_p.h | 10 | ||||
-rw-r--r-- | tdeui/tdeactionclasses.cpp | 4 | ||||
-rw-r--r-- | tdeui/tests/kxmlguitest.cpp | 2 |
78 files changed, 20 insertions, 20 deletions
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 Binary files differindex 8673653d1..8673653d1 100644 --- a/pics/crystalsvg/cr16-action-mail_forward.png +++ b/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 Binary files differindex e6efb7a30..e6efb7a30 100644 --- a/pics/crystalsvg/cr16-action-mail_new.png +++ b/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 Binary files differindex c839a8ace..c839a8ace 100644 --- a/pics/crystalsvg/cr16-action-mail_replyall.png +++ b/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 Binary files differindex 7bb70b96b..7bb70b96b 100644 --- a/pics/crystalsvg/cr16-action-mail_reply.png +++ b/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 Binary files differindex 62b053433..62b053433 100644 --- a/pics/crystalsvg/cr16-action-mail_send.png +++ b/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 Binary files differindex 4c894ce4c..4c894ce4c 100644 --- a/pics/crystalsvg/cr16-action-player_pause.png +++ b/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 Binary files differindex 487b1c37e..487b1c37e 100644 --- a/pics/crystalsvg/cr16-action-player_play.png +++ b/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 Binary files differindex 304df64ea..304df64ea 100644 --- a/pics/crystalsvg/cr16-action-player_stop.png +++ b/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 Binary files differindex e92366c47..e92366c47 100644 --- a/pics/crystalsvg/cr16-action-player_rew.png +++ b/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 Binary files differindex 6ad608338..6ad608338 100644 --- a/pics/crystalsvg/cr16-action-player_fwd.png +++ b/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 Binary files differindex 676c9e7ba..676c9e7ba 100644 --- a/pics/crystalsvg/cr16-action-player_start.png +++ b/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 Binary files differindex 83afbc403..83afbc403 100644 --- a/pics/crystalsvg/cr16-action-player_end.png +++ b/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 Binary files differindex 08e2adb51..08e2adb51 100644 --- a/pics/crystalsvg/cr16-action-rotate_ccw.png +++ b/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 Binary files differindex 36e35b7d0..36e35b7d0 100644 --- a/pics/crystalsvg/cr16-action-rotate_cw.png +++ b/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 Binary files differindex a8c35c4ed..a8c35c4ed 100644 --- a/pics/crystalsvg/cr16-action-window_fullscreen.png +++ b/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 Binary files differindex 9310a4713..9310a4713 100644 --- a/pics/crystalsvg/cr16-action-window_nofullscreen.png +++ b/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 Binary files differindex 43b0c6cfd..43b0c6cfd 100644 --- a/pics/crystalsvg/cr16-action-window_new.png +++ b/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 Binary files differindex 001ea7aab..001ea7aab 100644 --- a/pics/crystalsvg/cr16-action-viewmagfit.png +++ b/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 Binary files differindex d2b139c8b..d2b139c8b 100644 --- a/pics/crystalsvg/cr16-action-viewmag+.png +++ b/pics/crystalsvg/cr16-action-zoom-in.png diff --git a/pics/crystalsvg/cr16-action-viewmag1.png b/pics/crystalsvg/cr16-action-zoom-original.png Binary files differindex 2e25700b0..2e25700b0 100644 --- a/pics/crystalsvg/cr16-action-viewmag1.png +++ b/pics/crystalsvg/cr16-action-zoom-original.png diff --git a/pics/crystalsvg/cr16-action-viewmag-.png b/pics/crystalsvg/cr16-action-zoom-out.png Binary files differindex 2ae727f35..2ae727f35 100644 --- a/pics/crystalsvg/cr16-action-viewmag-.png +++ b/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 Binary files differindex 919b41ea8..919b41ea8 100644 --- a/pics/crystalsvg/cr22-action-mail_forward.png +++ b/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 Binary files differindex 828a20351..828a20351 100644 --- a/pics/crystalsvg/cr22-action-mail_new.png +++ b/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 Binary files differindex 742a40b76..742a40b76 100644 --- a/pics/crystalsvg/cr22-action-mail_replyall.png +++ b/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 Binary files differindex e0f50a703..e0f50a703 100644 --- a/pics/crystalsvg/cr22-action-mail_reply.png +++ b/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 Binary files differindex a802f04ae..a802f04ae 100644 --- a/pics/crystalsvg/cr22-action-mail_send.png +++ b/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 Binary files differindex b14e50702..b14e50702 100644 --- a/pics/crystalsvg/cr22-action-player_pause.png +++ b/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 Binary files differindex bc7336cba..bc7336cba 100644 --- a/pics/crystalsvg/cr22-action-player_play.png +++ b/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 Binary files differindex 2a7e1bf24..2a7e1bf24 100644 --- a/pics/crystalsvg/cr22-action-player_stop.png +++ b/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 Binary files differindex 1da6d2639..1da6d2639 100644 --- a/pics/crystalsvg/cr22-action-player_rew.png +++ b/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 Binary files differindex b9c794f4b..b9c794f4b 100644 --- a/pics/crystalsvg/cr22-action-player_fwd.png +++ b/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 Binary files differindex d7daf0174..d7daf0174 100644 --- a/pics/crystalsvg/cr22-action-player_start.png +++ b/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 Binary files differindex abc530ce3..abc530ce3 100644 --- a/pics/crystalsvg/cr22-action-player_end.png +++ b/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 Binary files differindex 99b414f9a..99b414f9a 100644 --- a/pics/crystalsvg/cr22-action-rotate_ccw.png +++ b/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 Binary files differindex 129aba3ac..129aba3ac 100644 --- a/pics/crystalsvg/cr22-action-rotate_cw.png +++ b/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 Binary files differindex 4242f9787..4242f9787 100644 --- a/pics/crystalsvg/cr22-action-window_fullscreen.png +++ b/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 Binary files differindex b934ff2d5..b934ff2d5 100644 --- a/pics/crystalsvg/cr22-action-window_nofullscreen.png +++ b/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 Binary files differindex 4d0a40a0b..4d0a40a0b 100644 --- a/pics/crystalsvg/cr22-action-window_new.png +++ b/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 Binary files differindex f34f459a5..f34f459a5 100644 --- a/pics/crystalsvg/cr22-action-viewmagfit.png +++ b/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 Binary files differindex a424b6196..a424b6196 100644 --- a/pics/crystalsvg/cr22-action-viewmag+.png +++ b/pics/crystalsvg/cr22-action-zoom-in.png diff --git a/pics/crystalsvg/cr22-action-viewmag1.png b/pics/crystalsvg/cr22-action-zoom-original.png Binary files differindex 14473674f..14473674f 100644 --- a/pics/crystalsvg/cr22-action-viewmag1.png +++ b/pics/crystalsvg/cr22-action-zoom-original.png diff --git a/pics/crystalsvg/cr22-action-viewmag-.png b/pics/crystalsvg/cr22-action-zoom-out.png Binary files differindex fc5364a62..fc5364a62 100644 --- a/pics/crystalsvg/cr22-action-viewmag-.png +++ b/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 Binary files differindex 85cfef42f..85cfef42f 100644 --- a/pics/crystalsvg/cr32-action-mail_forward.png +++ b/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 Binary files differindex 95553d882..95553d882 100644 --- a/pics/crystalsvg/cr32-action-mail_new.png +++ b/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 Binary files differindex 8a1d3b39a..8a1d3b39a 100644 --- a/pics/crystalsvg/cr32-action-mail_replyall.png +++ b/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 Binary files differindex 170f2be45..170f2be45 100644 --- a/pics/crystalsvg/cr32-action-mail_reply.png +++ b/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 Binary files differindex 01bd04655..01bd04655 100644 --- a/pics/crystalsvg/cr32-action-mail_send.png +++ b/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 Binary files differindex c30cfc1a4..c30cfc1a4 100644 --- a/pics/crystalsvg/cr32-action-player_pause.png +++ b/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 Binary files differindex 2fe3df459..2fe3df459 100644 --- a/pics/crystalsvg/cr32-action-player_play.png +++ b/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 Binary files differindex 24e01f2ef..24e01f2ef 100644 --- a/pics/crystalsvg/cr32-action-player_stop.png +++ b/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 Binary files differindex ca44d8510..ca44d8510 100644 --- a/pics/crystalsvg/cr32-action-player_rew.png +++ b/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 Binary files differindex 5c9fd91b0..5c9fd91b0 100644 --- a/pics/crystalsvg/cr32-action-player_fwd.png +++ b/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 Binary files differindex f5ac4e0d9..f5ac4e0d9 100644 --- a/pics/crystalsvg/cr32-action-player_start.png +++ b/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 Binary files differindex 9649ed9a6..9649ed9a6 100644 --- a/pics/crystalsvg/cr32-action-player_end.png +++ b/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 Binary files differindex 79c9a7509..79c9a7509 100644 --- a/pics/crystalsvg/cr32-action-rotate_ccw.png +++ b/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 Binary files differindex e123acff0..e123acff0 100644 --- a/pics/crystalsvg/cr32-action-rotate_cw.png +++ b/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 Binary files differindex 5c9864f58..5c9864f58 100644 --- a/pics/crystalsvg/cr32-action-window_fullscreen.png +++ b/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 Binary files differindex bff406c34..bff406c34 100644 --- a/pics/crystalsvg/cr32-action-window_nofullscreen.png +++ b/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 Binary files differindex b7eadc065..b7eadc065 100644 --- a/pics/crystalsvg/cr32-action-window_new.png +++ b/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 Binary files differindex 0c68edabf..0c68edabf 100644 --- a/pics/crystalsvg/cr32-action-viewmagfit.png +++ b/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 Binary files differindex 8f15c1d14..8f15c1d14 100644 --- a/pics/crystalsvg/cr32-action-viewmag+.png +++ b/pics/crystalsvg/cr32-action-zoom-in.png diff --git a/pics/crystalsvg/cr32-action-viewmag1.png b/pics/crystalsvg/cr32-action-zoom-original.png Binary files differindex 68e45b600..68e45b600 100644 --- a/pics/crystalsvg/cr32-action-viewmag1.png +++ b/pics/crystalsvg/cr32-action-zoom-original.png diff --git a/pics/crystalsvg/cr32-action-viewmag-.png b/pics/crystalsvg/cr32-action-zoom-out.png Binary files differindex cc8ff5055..cc8ff5055 100644 --- a/pics/crystalsvg/cr32-action-viewmag-.png +++ b/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 Binary files differindex c7e11707d..c7e11707d 100644 --- a/pics/crystalsvg/cr48-action-mail_new.png +++ b/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 Binary files differindex 9c57bcb9b..9c57bcb9b 100644 --- a/pics/crystalsvg/cr48-action-rotate_ccw.png +++ b/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 Binary files differindex 7d8e13c57..7d8e13c57 100644 --- a/pics/crystalsvg/cr48-action-rotate_cw.png +++ b/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 Binary files differindex 679dc86af..679dc86af 100644 --- a/pics/crystalsvg/cr64-action-player_play.png +++ b/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<p>" "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<p>" "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" ); |