1 files changed, 13 insertions, 3 deletions

diff --git a/noncore/multimedia/opieplayer3/mwindow.h b/noncore/multimedia/opieplayer3/mwindow.h
index 28f820f..10c7a29 100644
--- a/noncore/multimedia/opieplayer3/mwindow.h
+++ b/noncore/multimedia/opieplayer3/mwindow.h
@@ -55,36 +55,42 @@ class PlaylistView;
 class QToolBar;

 class QPopupMenu;

 class QMenuBar;

 class AudioWidget;

 class VideoWidget;

 class PlaylistItem;

+class QSlider;

 

 class PMainWindow : public QMainWindow {

     Q_OBJECT

 public:

     static QString appName() { return QString::fromLatin1("opie-mediaplayer3" ); }

     PMainWindow(QWidget*, const char*, WFlags );

     virtual ~PMainWindow();

 

 public slots:

     virtual void slotVideoclicked();

 protected:

+

+    /* GUI parts */

     static const int stack_list = 0;

     static const int stack_file = 1;

     static const int stack_audio = 2;

     static const int stack_video = 3;

     Opie::Ui::OWidgetStack *m_stack;

     Opie::Ui::OFileSelector*m_sfl;

     PlaylistView*m_playList;

     AudioWidget*m_AudioPlayer;

     VideoWidget*m_VideoPlayer;

+    QWidget*m_MainBox;

+    QSlider*m_scrollBar;

 

-    QAction*a_appendFiles,*a_removeFiles,*a_showPlaylist,*a_playAction,*a_deleteItem,*a_stopAction;

-    QAction*a_playNext,*a_playPrevious,*a_ShowFull,*a_stopPlay;

-    QActionGroup*playersGroup;

+    QAction*a_appendFiles,*a_removeFiles,*a_showPlaylist,*a_playAction,*a_stopAction;

+    QAction*a_playNext,*a_playPrevious,*a_ShowFull,*a_stopPlay,*a_ShowMedia;

+    QAction*a_addDir,*a_loadPlaylist,*a_savePlaylist;

+    QActionGroup*playersGroup,*playlistOnly;

     QToolBar*m_toolBar;

     QPopupMenu *fileMenu,*dispMenu,*playMenu;

     QMenuBar*m_menuBar;

     XINE::Lib*m_PlayLib;

 

     void setupActions();

@@ -94,12 +100,13 @@ protected:
     void setupVideo(bool full);

     void hideVideo();

 

     bool m_playing:1;

     int m_CurrentPos;

     PlaylistItem*m_LastItem;

+    void mediaWindowraised();

 

 protected slots:

     virtual void fileSelected(const DocLnk&);

     virtual void slotAppendFiles();

     virtual void slotRemoveFiles();

     virtual void slotShowList();

@@ -109,12 +116,15 @@ protected slots:
     virtual void slotPlayCurrent();

     virtual void slotStopped();

     virtual void slotCheckPos();

     virtual void slotToggleFull(bool);

     virtual void slotUserStop();

     virtual void slotGoNext();

+    virtual void slotTogglePlay(bool);

+    virtual void slotShowMediaWindow();

+    virtual void slotListChanged(int);

 

 signals:

     void sigPos(int);

 };

 

 #endif