diff --git a/source/plaYUVerApp.cpp b/source/plaYUVerApp.cpp index f2439d0..7886aa7 100644 --- a/source/plaYUVerApp.cpp +++ b/source/plaYUVerApp.cpp @@ -21,6 +21,10 @@ * \brief Main definition of the plaYUVerApp app */ +#include "plaYUVerApp.h" +#include "SubWindowHandle.h" +#include "InputStream.h" + #if( QT_VERSION_PLAYUVER == 5 ) #include #elif( QT_VERSION_PLAYUVER == 4 ) @@ -28,11 +32,6 @@ #endif #include -#include "TypeDef.h" -#include "plaYUVerApp.h" -#include "SubWindowHandle.h" -#include "InputStream.h" - namespace plaYUVer { @@ -47,7 +46,7 @@ plaYUVerApp::plaYUVerApp() //mdiArea->setVerticalScrollBarPolicy( Qt::ScrollBarAsNeeded ); connect( mdiArea, SIGNAL( subWindowActivated(QMdiSubWindow*) ), this, SLOT( chageSubWindowSelection() ) ); - connect( mdiArea, SIGNAL( subWindowActivated(QMdiSubWindow*) ), this, SLOT( updateMenus() ) ); + //connect( mdiArea, SIGNAL( subWindowActivated(QMdiSubWindow*) ), this, SLOT( updateMenus() ) ); mapperWindow = new QSignalMapper( this ); connect( mapperWindow, SIGNAL( mapped(QWidget*) ), this, SLOT( setActiveSubWindow(QWidget*) ) ); @@ -463,12 +462,20 @@ Void plaYUVerApp::createToolBars() toolbarVideo->addAction( actionVideoPlay ); toolbarVideo->addAction( actionVideoPause ); toolbarVideo->addAction( actionVideoStop ); + /* toolbarVideo->addAction( actionVideoBackward ); toolbarVideo->addAction( actionVideoForward ); toolbarVideo->addAction( actionVideoLoop ); toolbarVideo->addAction( actionVideoLock ); toolbarVideo->addAction( actionVideoInterlace ); toolbarVideo->addAction( actionVideoCenter ); + */ + m_pcFrameSlider = new QSlider; + m_pcFrameSlider->setOrientation( Qt::Horizontal ); + m_pcFrameSlider->setMaximumWidth( 100 ); + m_pcFrameSlider->setMaximumWidth( 100 ); + m_pcFrameSlider->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Fixed ) ); + toolbarVideo->addWidget( m_pcFrameSlider ); } Void plaYUVerApp::createStatusBar() diff --git a/source/plaYUVerApp.h b/source/plaYUVerApp.h index 2f0feaa..fb23bca 100644 --- a/source/plaYUVerApp.h +++ b/source/plaYUVerApp.h @@ -26,15 +26,14 @@ #include "config.h" +#if( QT_VERSION_PLAYUVER == 5 ) +#include +#elif( QT_VERSION_PLAYUVER == 4 ) +#include +#endif #include #include "TypeDef.h" -class QAction; -class QMenu; -class QMdiArea; -class QMdiSubWindow; -class QSignalMapper; - namespace plaYUVer { @@ -107,6 +106,8 @@ private: SubWindowHandle *activeSubWindow(); QMdiSubWindow *findSubWindow( const QString &fileName ); + QSlider *m_pcFrameSlider; + QSignalMapper *mapperZoom; QSignalMapper *mapperWindow;