[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdemultimedia/noatun/library
From:       Stefan Gehn <sgehn () gmx ! net>
Date:       2004-01-18 16:11:54
Message-ID: 20040118161154.B7FD3906D () office ! kde ! org
[Download RAW message or body]

CVS commit by metz: 

use kde standard icons in noatun... and thanks everbody for approving the patch for \
KDE 3.2 (not)


  M +12 -11    noatunstdaction.cpp   1.19


--- kdemultimedia/noatun/library/noatunstdaction.cpp  #1.18:1.19
@@ -36,5 +36,5 @@ PlayAction::PlayAction(QObject *parent, 
 void PlayAction::playing()
 {
-        setIconSet(QIconSet(SmallIcon("noatunpause")));
+        setIconSet(QIconSet(SmallIcon("player_pause")));
         setText(i18n("Pause"));
 }
@@ -42,5 +42,5 @@ void PlayAction::playing()
 void PlayAction::notplaying()
 {
-        setIconSet(QIconSet(SmallIcon("noatunplay")));
+        setIconSet(QIconSet(SmallIcon("player_play")));
         setText(i18n("Play"));
 }
@@ -48,5 +48,5 @@ void PlayAction::notplaying()
 
 PlaylistAction::PlaylistAction(QObject *parent, const char *name)
-        : KToggleAction(i18n("Show Playlist"), 0, napp->player(), \
SLOT(toggleListView()), parent, name) +        : KToggleAction(i18n("Show Playlist"), \
"playlist", 0, napp->player(), SLOT(toggleListView()), parent, name)  {
         connect(napp->player(), SIGNAL(playlistShown()),  SLOT(shown()));
@@ -244,15 +244,15 @@ KAction *effects(QObject *parent, const 
 KAction *equalizer(QObject *parent, const char *name)
 {
-        return new KAction(i18n("E&qualizer..."), 0, napp, SLOT(equalizerView()), \
parent, name); +        return new KAction(i18n("E&qualizer..."), "equalizer", 0, \
napp, SLOT(equalizerView()), parent, name);  }
 
 KAction *back(QObject *parent, const char *name)
 {
-        return new KAction(i18n("&Back"), "noatunback", 0, napp->player(), \
SLOT(back()), parent, name); +        return new KAction(i18n("&Back"), \
"player_start", 0, napp->player(), SLOT(back()), parent, name);  }
 
 KAction *stop(QObject *parent, const char *name)
 {
-        StereoButtonAction *action = new StereoButtonAction(i18n("Stop"), \
"noatunstop", 0, napp->player(), SLOT(stop()), parent, name); +        \
StereoButtonAction *action = new StereoButtonAction(i18n("Stop"), "player_stop", 0, \
                napp->player(), SLOT(stop()), parent, name);
         QObject::connect(napp->player(), SIGNAL(playing()), action, SLOT(enable()));
         QObject::connect(napp->player(), SIGNAL(paused()), action, SLOT(enable()));
@@ -267,10 +267,10 @@ KAction *stop(QObject *parent, const cha
 KAction *forward(QObject *parent, const char *name)
 {
-        return new KAction(i18n("&Forward"), "noatunforward", 0, napp->player(), \
SLOT(forward()), parent, name); +        return new KAction(i18n("&Forward"), \
"player_end", 0, napp->player(), SLOT(forward()), parent, name);  }
 
 KAction *play(QObject *parent, const char *name)
 {
-        StereoButtonAction *action = new StereoButtonAction(i18n("&Play"), \
"1rightarrow", 0, napp->player(), SLOT(playpause()), parent, name); +        \
StereoButtonAction *action = new StereoButtonAction(i18n("&Play"), "player_play", 0, \
                napp->player(), SLOT(playpause()), parent, name);
         QObject::connect(napp->player(), SIGNAL(playing()), action, \
                SLOT(disable()));
         QObject::connect(napp->player(), SIGNAL(paused()), action, SLOT(enable()));
@@ -327,7 +327,7 @@ KPopupMenu *ContextMenu::contextMenu()
 KPopupMenu *ContextMenu::createContextMenu(QWidget *p)
 {
-        KPopupMenu *contextMenu = new KPopupMenu(p, 0);
+        KPopupMenu *contextMenu = new KPopupMenu(p, "NoatunContextMenu");
 
-        KHelpMenu *helpmenu = new KHelpMenu(contextMenu, kapp->aboutData());
+        KHelpMenu *helpmenu = new KHelpMenu(contextMenu, kapp->aboutData(), false);
         KActionCollection* actions = new KActionCollection(helpmenu);
 
@@ -337,4 +337,5 @@ KPopupMenu *ContextMenu::createContextMe
         contextMenu->insertSeparator();
         KStdAction::preferences(napp, SLOT(preferences()), \
actions)->plug(contextMenu); +        \
NoatunStdAction::playlist(contextMenu)->plug(contextMenu);  \
NoatunStdAction::effects(contextMenu)->plug(contextMenu);  \
NoatunStdAction::equalizer(napp)->plug(contextMenu);


[prev in list] [next in list] [prev in thread] [next in thread]