diff --git a/source/app/plaYUVerApp.cpp b/source/app/plaYUVerApp.cpp index 6a9580e..0efbbf5 100644 --- a/source/app/plaYUVerApp.cpp +++ b/source/app/plaYUVerApp.cpp @@ -227,7 +227,6 @@ Void plaYUVerApp::loadAll() } } - Void plaYUVerApp::closeActiveWindow() { SubWindowHandle *currSubWindow = activeSubWindow(); @@ -970,7 +969,7 @@ Void plaYUVerApp::createActions() m_pcFrameSlider = new QSlider; m_pcFrameSlider->setOrientation( Qt::Horizontal ); m_pcFrameSlider->setMaximumWidth( 100 ); - m_pcFrameSlider->setMaximumWidth( 300 ); + m_pcFrameSlider->setMaximumWidth( /* 300 */ 2000 ); m_pcFrameSlider->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Fixed ) ); m_pcFrameSlider->setEnabled( false ); connect( m_pcFrameSlider, SIGNAL( sliderMoved(int) ), this, SLOT( seekSliderEvent(int) ) ); @@ -1093,36 +1092,46 @@ Void plaYUVerApp::createMenus() Void plaYUVerApp::createToolBars() { - toolbarFile = addToolBar( tr( "File" ) ); - toolbarFile->addAction( m_arrayActions[OPEN_ACT] ); - toolbarFile->addAction( m_arrayActions[SAVE_ACT] ); - toolbarFile->addAction( m_arrayActions[FORMAT_ACT] ); - toolbarFile->addAction( m_arrayActions[CLOSE_ACT] ); + m_arrayToolBars.resize( TOTAL_TOOLBAR ); - toolbarView = addToolBar( tr( "Zoom" ) ); - toolbarView->addAction( m_arrayActions[ZOOM_IN_ACT] ); - toolbarView->addAction( m_arrayActions[ZOOM_OUT_ACT] ); - toolbarView->addAction( m_arrayActions[ZOOM_NORMAL_ACT] ); - toolbarView->addAction( m_arrayActions[ZOOM_FIT_ACT] ); + m_arrayToolBars[FILE_TOOLBAR] = new QToolBar( tr( "File" ) ); + m_arrayToolBars[FILE_TOOLBAR]->addAction( m_arrayActions[OPEN_ACT] ); + m_arrayToolBars[FILE_TOOLBAR]->addAction( m_arrayActions[SAVE_ACT] ); + m_arrayToolBars[FILE_TOOLBAR]->addAction( m_arrayActions[FORMAT_ACT] ); + m_arrayToolBars[FILE_TOOLBAR]->addAction( m_arrayActions[CLOSE_ACT] ); - toolbarVideo = addToolBar( tr( "Video" ) ); - toolbarVideo->addAction( m_arrayActions[PLAY_ACT] ); - toolbarVideo->addAction( m_arrayActions[PAUSE_ACT] ); - toolbarVideo->addAction( m_arrayActions[STOP_ACT] ); - toolbarVideo->addAction( m_arrayActions[VIDEO_BACKWARD_ACT] ); - toolbarVideo->addWidget( m_pcFrameSlider ); - toolbarVideo->addAction( m_arrayActions[VIDEO_FORWARD_ACT] ); + m_arrayToolBars[FILE_TOOLBAR]->setMovable( false ); + addToolBar( Qt::TopToolBarArea, m_arrayToolBars[FILE_TOOLBAR] ); - toolbarVideo->addWidget( new QLabel ); + m_arrayToolBars[VIEW_TOOLBAR] = new QToolBar( tr( "View" ) ); + m_arrayToolBars[VIEW_TOOLBAR]->addAction( m_arrayActions[ZOOM_IN_ACT] ); + m_arrayToolBars[VIEW_TOOLBAR]->addAction( m_arrayActions[ZOOM_OUT_ACT] ); + m_arrayToolBars[VIEW_TOOLBAR]->addAction( m_arrayActions[ZOOM_NORMAL_ACT] ); + m_arrayToolBars[VIEW_TOOLBAR]->addAction( m_arrayActions[ZOOM_FIT_ACT] ); + + m_arrayToolBars[FILE_TOOLBAR]->setMovable( false ); + addToolBar( Qt::TopToolBarArea, m_arrayToolBars[VIEW_TOOLBAR] ); + + m_arrayToolBars[VIDEO_TOOLBAR] = new QToolBar( tr( "Video" ) ); + m_arrayToolBars[VIDEO_TOOLBAR]->setAllowedAreas( Qt::BottomToolBarArea ); + m_arrayToolBars[VIDEO_TOOLBAR]->addAction( m_arrayActions[PLAY_ACT] ); + m_arrayToolBars[VIDEO_TOOLBAR]->addAction( m_arrayActions[PAUSE_ACT] ); + m_arrayToolBars[VIDEO_TOOLBAR]->addAction( m_arrayActions[STOP_ACT] ); + m_arrayToolBars[VIDEO_TOOLBAR]->addAction( m_arrayActions[VIDEO_BACKWARD_ACT] ); + m_arrayToolBars[VIDEO_TOOLBAR]->addWidget( m_pcFrameSlider ); + m_arrayToolBars[VIDEO_TOOLBAR]->addAction( m_arrayActions[VIDEO_FORWARD_ACT] ); + m_arrayToolBars[VIDEO_TOOLBAR]->addWidget( new QLabel ); m_pcCurrFrameNumLabel = new QLabel; m_pcCurrFrameNumLabel->setText( "-" ); - toolbarVideo->addWidget( m_pcCurrFrameNumLabel ); + m_arrayToolBars[VIDEO_TOOLBAR]->addWidget( m_pcCurrFrameNumLabel ); QLabel *forwardslash = new QLabel; forwardslash->setText( "/" ); - toolbarVideo->addWidget( forwardslash ); + m_arrayToolBars[VIDEO_TOOLBAR]->addWidget( forwardslash ); m_pcTotalFrameNumLabel = new QLabel; m_pcTotalFrameNumLabel->setText( "-" ); - toolbarVideo->addWidget( m_pcTotalFrameNumLabel ); + m_arrayToolBars[VIDEO_TOOLBAR]->addWidget( m_pcTotalFrameNumLabel ); + + addToolBar( Qt::BottomToolBarArea, m_arrayToolBars[VIDEO_TOOLBAR] ); } Void plaYUVerApp::createDockWidgets() diff --git a/source/app/plaYUVerApp.h b/source/app/plaYUVerApp.h index b8d5f4f..e1465cb 100644 --- a/source/app/plaYUVerApp.h +++ b/source/app/plaYUVerApp.h @@ -184,9 +184,14 @@ private: StreamPropertiesSideBar* m_pcStreamProperties; FramePropertiesSideBar* m_pcFrameProperties; - QToolBar *toolbarFile; - QToolBar *toolbarView; - QToolBar *toolbarVideo; + enum TOOLBAR_LIST + { + FILE_TOOLBAR = 0, + VIEW_TOOLBAR, + VIDEO_TOOLBAR, + TOTAL_TOOLBAR, + }; + QVector m_arrayToolBars; enum APP_ACTION_LIST {