From ce1138c8ba3865132c2ea42d119f68a5417458ad Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 13 Oct 2014 20:10:11 -0500 Subject: 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 --- tdeui/kbugreport.cpp | 2 +- tdeui/kpixmapregionselectorwidget.cpp | 4 ++-- tdeui/kstdaction_p.h | 10 +++++----- tdeui/tdeactionclasses.cpp | 4 ++-- tdeui/tests/kxmlguitest.cpp | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) (limited to 'tdeui') 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" ); -- cgit v1.2.1