0d026fc2 | 2014-10-13 20:10:10 | Timothy Pearson |
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 |
||
M kmines/main.cpp M libtdegames/kstdgameaction.cpp |
||
diff --git a/kmines/main.cpp b/kmines/main.cpp index c77afa8..2ff678b 100644 --- a/kmines/main.cpp +++ b/kmines/main.cpp @@ -110,7 +110,7 @@ (void)new TDEAction(KGuiItem(i18n("View Log"), "viewmag"), 0, TQT_TQOBJECT(_status), TQT_SLOT(viewLog()), actionCollection(), "log_view"); - (void)new TDEAction(KGuiItem(i18n("Replay Log"), "player_play"), + (void)new TDEAction(KGuiItem(i18n("Replay Log"), "media-playback-start"), 0, TQT_TQOBJECT(_status), TQT_SLOT(replayLog()), actionCollection(), "log_replay"); (void)new TDEAction(KGuiItem(i18n("Save Log..."), "document-save"), 0, diff --git a/libtdegames/kstdgameaction.cpp b/libtdegames/kstdgameaction.cpp index a4b81d2..a4cec45 100644 --- a/libtdegames/kstdgameaction.cpp +++ b/libtdegames/kstdgameaction.cpp @@ -64,7 +64,7 @@ { KStdGameAction::Save, TDEStdAccel::Save, 0, "game_save", I18N_NOOP("&Save"), 0, "document-save" }, { KStdGameAction::SaveAs, TDEStdAccel::AccelNone, 0, "game_save_as", I18N_NOOP("Save &As..."), 0, "document-save-as" }, { KStdGameAction::End, TDEStdAccel::End, 0, "game_end", I18N_NOOP("&End Game"), 0, "window-close" }, - { KStdGameAction::Pause, TDEStdAccel::AccelNone, TQt::Key_P, "game_pause", I18N_NOOP("Pa&use"), 0, "player_pause" }, + { KStdGameAction::Pause, TDEStdAccel::AccelNone, TQt::Key_P, "game_pause", I18N_NOOP("Pa&use"), 0, "media-playback-pause" }, { KStdGameAction::Highscores, TDEStdAccel::AccelNone, TQt::CTRL+TQt::Key_H, "game_highscores", I18N_NOOP("Show &Highscores"), 0, "highscore" }, { KStdGameAction::Print, TDEStdAccel::Print, 0, "game_print", I18N_NOOP("&Print..."), 0, "document-print" }, { KStdGameAction::Quit, TDEStdAccel::Quit, 0, "game_quit", I18N_NOOP("&Quit"), 0, "exit" }, |
||
0aa01941 | 2014-10-13 20:11:44 | Timothy Pearson |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdegames |
||
M cmake |
||
diff --git a/cmake b/cmake index 08c6f54..47d7755 160000 --- a/cmake +++ b/cmake -Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c +Subproject commit 47d775518c382c77f663a70bb23fad93e6810090 |