summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-13 20:09:57 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-13 20:09:57 -0500
commitfa2cf6df2175f07ed443c1fc1eef875053059a5f (patch)
tree2b40207569f9a1eb68b7438cde597a97aa487bad
parent5f6bb27441c88c11c47c4b478b24bad1563f0318 (diff)
downloadkmplayer-fa2cf6df2175f07ed443c1fc1eef875053059a5f.tar.gz
kmplayer-fa2cf6df2175f07ed443c1fc1eef875053059a5f.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--src/kmplayer_part.cpp6
-rw-r--r--src/kmplayerapp.cpp8
-rw-r--r--src/kmplayercontrolpanel.cpp2
3 files changed, 8 insertions, 8 deletions
diff --git a/src/kmplayer_part.cpp b/src/kmplayer_part.cpp
index ff8aa1d..6bf0e5b 100644
--- a/src/kmplayer_part.cpp
+++ b/src/kmplayer_part.cpp
@@ -160,9 +160,9 @@ KDE_NO_CDTOR_EXPORT KMPlayerPart::KMPlayerPart (TQWidget * wparent, const char *
m_browserextension,
TQT_SLOT (slotRequestOpenURL (const KURL &, const TQString &)));
#endif
- /*TDEAction *playact =*/ new TDEAction(i18n("P&lay"), TQString ("player_play"), TDEShortcut (), this, TQT_SLOT(play ()), actionCollection (), "play");
- /*TDEAction *pauseact =*/ new TDEAction(i18n("&Pause"), TQString ("player_pause"), TDEShortcut (), this, TQT_SLOT(pause ()), actionCollection (), "pause");
- /*TDEAction *stopact =*/ new TDEAction(i18n("&Stop"), TQString ("player_stop"), TDEShortcut (), this, TQT_SLOT(stop ()), actionCollection (), "stop");
+ /*TDEAction *playact =*/ new TDEAction(i18n("P&lay"), TQString ("media-playback-start"), TDEShortcut (), this, TQT_SLOT(play ()), actionCollection (), "play");
+ /*TDEAction *pauseact =*/ new TDEAction(i18n("&Pause"), TQString ("media-playback-pause"), TDEShortcut (), this, TQT_SLOT(pause ()), actionCollection (), "pause");
+ /*TDEAction *stopact =*/ new TDEAction(i18n("&Stop"), TQString ("media-playback-stop"), TDEShortcut (), this, TQT_SLOT(stop ()), actionCollection (), "stop");
new TDEAction (i18n ("Increase Volume"), TQString ("player_volume"), TDEShortcut (), this, TQT_SLOT (increaseVolume ()), actionCollection (), "edit_volume_up");
new TDEAction (i18n ("Decrease Volume"), TQString ("player_volume"), TDEShortcut (), this, TQT_SLOT (decreaseVolume ()), actionCollection (), "edit_volume_down");
Source * urlsource = m_sources ["urlsource"];
diff --git a/src/kmplayerapp.cpp b/src/kmplayerapp.cpp
index 3cdf62f..2482a91 100644
--- a/src/kmplayerapp.cpp
+++ b/src/kmplayerapp.cpp
@@ -594,7 +594,7 @@ KDE_NO_EXPORT void KMPlayerApp::initActions () {
new TDEAction (i18n ("Pla&y List"), TQString ("player_playlist"), TDEShortcut (), m_player, TQT_SLOT (showPlayListWindow ()), ac, "view_playlist");
new TDEAction (i18n ("Minimal mode"), TQString ("empty"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT (slotMinimalMode ()), ac, "view_minimal");
new TDEAction (i18n ("50%"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT (zoom50 ()), ac, "view_zoom_50");
- new TDEAction (i18n ("100%"), TQString ("viewmagfit"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT (zoom100 ()), ac, "view_zoom_100");
+ new TDEAction (i18n ("100%"), TQString ("zoom-fit-best"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT (zoom100 ()), ac, "view_zoom_100");
new TDEAction (i18n ("150%"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT (zoom150 ()), ac, "view_zoom_150");
new TDEAction (i18n ("200%"), 0, TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT (zoom200 ()), ac, "view_zoom_200");
new TDEAction (i18n ("300%"), 0, TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT (zoom300 ()), ac, "view_zoom_300");
@@ -609,9 +609,9 @@ KDE_NO_EXPORT void KMPlayerApp::initActions () {
#else
viewFullscreen = new TDEAction (i18n("&Full Screen"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(fullScreen ()), ac, "view_fullscreen");
#endif
- /*TDEAction *playact =*/ new TDEAction (i18n ("P&lay"), TQString ("player_play"), TDEShortcut (), m_player, TQT_SLOT (play ()), ac, "play");
- /*TDEAction *pauseact =*/ new TDEAction (i18n ("&Pause"), TQString ("player_pause"), TDEShortcut (), m_player, TQT_SLOT (pause ()), ac, "pause");
- /*TDEAction *stopact =*/ new TDEAction (i18n ("&Stop"), TQString ("player_stop"), TDEShortcut (), m_player, TQT_SLOT (stop ()), ac, "stop");
+ /*TDEAction *playact =*/ new TDEAction (i18n ("P&lay"), TQString ("media-playback-start"), TDEShortcut (), m_player, TQT_SLOT (play ()), ac, "play");
+ /*TDEAction *pauseact =*/ new TDEAction (i18n ("&Pause"), TQString ("media-playback-pause"), TDEShortcut (), m_player, TQT_SLOT (pause ()), ac, "pause");
+ /*TDEAction *stopact =*/ new TDEAction (i18n ("&Stop"), TQString ("media-playback-stop"), TDEShortcut (), m_player, TQT_SLOT (stop ()), ac, "stop");
/*TDEAction *artsctrl =*/ new TDEAction (i18n ("&Arts Control"), TQString ("player_volume"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT (startArtsControl ()), ac, "view_arts_control");
viewToolBar = KStdAction::showToolbar(TQT_TQOBJECT(this), TQT_SLOT(slotViewToolBar()), ac, "showtoolbar");
viewStatusBar =KStdAction::showStatusbar(TQT_TQOBJECT(this),TQT_SLOT(slotViewStatusBar()),ac, "showstatusbar");
diff --git a/src/kmplayercontrolpanel.cpp b/src/kmplayercontrolpanel.cpp
index 519eb74..7ac2d1c 100644
--- a/src/kmplayercontrolpanel.cpp
+++ b/src/kmplayercontrolpanel.cpp
@@ -387,7 +387,7 @@ KDE_NO_CDTOR_EXPORT ControlPanel::ControlPanel(TQWidget * parent, View * view)
m_popupMenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("player_playlist"), TDEIcon::Small, 0, true), i18n ("Play&list"), menu_playlist);
m_popupMenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("empty"), TDEIcon::Small, 0, true), i18n ("Minimal mode"), menu_minimal);
m_popupMenu->setAccel (TQKeySequence (TQt::Key_M), menu_minimal);
- m_popupMenu->insertItem (TDEGlobal::iconLoader()->loadIconSet (TQString ("window_fullscreen"), TDEIcon::Small, 0, true), i18n ("&Full Screen"), menu_fullscreen);
+ m_popupMenu->insertItem (TDEGlobal::iconLoader()->loadIconSet (TQString ("view-fullscreen"), TDEIcon::Small, 0, true), i18n ("&Full Screen"), menu_fullscreen);
m_popupMenu->setAccel (TQKeySequence (TQt::Key_F), menu_fullscreen);
m_zoomMenu = new KMPlayerPopupMenu (this);
m_zoomMenu->insertItem (i18n ("50%"), menu_zoom50);