From fb8bf3265acbac9435beadec42bbd2574b9c50ed Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sun, 15 Jun 2014 18:19:42 +0100 Subject: [PATCH 1/9] Save visibility of the side bar docks --- source/app/PlaYUVerSettings.cpp | 12 ++++++++++++ source/app/PlaYUVerSettings.h | 3 +++ source/app/plaYUVerApp.cpp | 8 ++++++++ 3 files changed, 23 insertions(+) diff --git a/source/app/PlaYUVerSettings.cpp b/source/app/PlaYUVerSettings.cpp index f01f241..8e82d68 100755 --- a/source/app/PlaYUVerSettings.cpp +++ b/source/app/PlaYUVerSettings.cpp @@ -73,6 +73,18 @@ Void PlaYUVerSettings::setSelectedTool( Int tool ) m_settings.setValue( "MainWindow/SelectedTool", tool ); } +Void PlaYUVerSettings::setDockVisibility( Bool statusStreamProperties, Bool statusFrameProperties ) +{ + m_settings.setValue( "Dock/StreamProperties", statusStreamProperties ); + m_settings.setValue( "Dock/FrameProperties", statusFrameProperties ); +} + +Void PlaYUVerSettings::getDockVisibility( Bool& statusStreamProperties, Bool& statusFrameProperties ) +{ + statusStreamProperties = m_settings.value( "Dock/StreamProperties", true ).toBool(); + statusFrameProperties = m_settings.value( "Dock/FrameProperties", true ).toBool(); +} + // - - - - - - - - - - - - PLaying Settings - - - - - - - - - - - - - - - - Bool PlaYUVerSettings::getRepeat() diff --git a/source/app/PlaYUVerSettings.h b/source/app/PlaYUVerSettings.h index bb7f98c..889ef5c 100755 --- a/source/app/PlaYUVerSettings.h +++ b/source/app/PlaYUVerSettings.h @@ -56,6 +56,9 @@ public: Bool getVideoLock(); Void setPlayingSettings( Bool repeat, Bool lock ); + Void setDockVisibility( Bool statusStreamProperties, Bool statusFrameProperties ); + Void getDockVisibility( Bool& statusStreamProperties, Bool& statusFrameProperties ); + // - - - - - - - - - - - - Grid Settings - - - - - - - - - - - - - - - GridManager::Style gridStyle(); Void setGridStyle( GridManager::Style v ); diff --git a/source/app/plaYUVerApp.cpp b/source/app/plaYUVerApp.cpp index 0efbbf5..a141000 100644 --- a/source/app/plaYUVerApp.cpp +++ b/source/app/plaYUVerApp.cpp @@ -1171,6 +1171,13 @@ Void plaYUVerApp::readSettings() setAllSubWindowTool(); m_arrayActions[VIDEO_LOOP_ACT]->setChecked( settings.getRepeat() ); m_arrayActions[VIDEO_LOCK_ACT]->setChecked( settings.getVideoLock() ); + Bool visibleStreamProp, visibleFrameProp; + settings.getDockVisibility( visibleStreamProp, visibleFrameProp ); + if( !visibleStreamProp ) + m_arraySideBars[STREAM_SIDEBAR]->close(); + if( !visibleFrameProp ) + m_arraySideBars[FRAME_SIDEBAR]->close(); + } Void plaYUVerApp::writeSettings() @@ -1180,6 +1187,7 @@ Void plaYUVerApp::writeSettings() settings.setMainWindowSize( size() ); settings.setLastOpenPath( m_cLastOpenPath ); settings.setSelectedTool( ( Int )m_appTool ); + settings.setDockVisibility( m_pcStreamProperties->isVisible(), m_pcFrameProperties->isVisible() ); settings.setPlayingSettings( m_arrayActions[VIDEO_LOOP_ACT]->isChecked(), m_arrayActions[VIDEO_LOCK_ACT]->isChecked() ); } From 8a42c6fb9edf0992f30d39e1247b1a14e328fce0 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sun, 15 Jun 2014 18:30:12 +0100 Subject: [PATCH 2/9] Fix setting constructor --- source/app/PlaYUVerSettings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/app/PlaYUVerSettings.cpp b/source/app/PlaYUVerSettings.cpp index 8e82d68..13bd8db 100755 --- a/source/app/PlaYUVerSettings.cpp +++ b/source/app/PlaYUVerSettings.cpp @@ -28,7 +28,7 @@ namespace plaYUVer { PlaYUVerSettings::PlaYUVerSettings() : - m_settings( "IT", "YUV Player" ) + m_settings( "pixLRA", "plaYUVer" ) { } // - - - - - - - - - - - - Main Window Settings - - - - - - - - - - - - - - - - From e690b5fb93741efafbe76b506fffc33aa6dd5c95 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sun, 15 Jun 2014 13:46:15 +0100 Subject: [PATCH 3/9] Initial add support for fervor lib which allow check for updates --- .gitmodules | 6 ++++++ CMakeLists.txt | 11 +++++++++-- cmake/LibQT.cmake | 3 ++- config.h.in | 2 ++ fervor | 1 + source/app/main.cpp | 11 ++++++++++- source/app/plaYUVerApp.cpp | 17 ++++++++++++++++- source/app/plaYUVerApp.h | 1 + 8 files changed, 47 insertions(+), 5 deletions(-) create mode 100644 .gitmodules create mode 160000 fervor diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..9d054d1 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "source/lib/fervor"] + path = source/lib/fervor + url = https://github.com/pypt/fervor.git +[submodule "fervor"] + path = fervor + url = https://github.com/pypt/fervor.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 8ed599f..4c9e7a5 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,8 +49,9 @@ ADD_OPTION(PLAYUVER_WERROR "Warnings as errors" OFF ) ADD_OPTION(PLAYUVER_THREADED_MODULES "Warnings as errors" ON ) ADD_OPTION(USE_QT4 "Build with QT4" OFF ) ADD_OPTION(USE_OPENCV "Add OpenCV support" OFF ) -ADD_OPTION(USE_PIXFC "Add PIXFC support" OFF ) ADD_OPTION(USE_FFMPEG "Add FFMPEG support" OFF ) +ADD_OPTION(USE_FERVOR "Add Fervor support" OFF ) +ADD_OPTION(USE_PIXFC "Add PIXFC support" OFF ) ###################################################################################### # Dependencies @@ -67,6 +68,11 @@ IF( USE_OPENCV ) ENDIF() INCLUDE( cmake/LibPixfc.cmake ) INCLUDE( cmake/LibFFmpeg.cmake ) +IF( USE_FERVOR ) + ADD_SUBDIRECTORY( fervor ) + INCLUDE_DIRECTORIES( fervor ) + LIST(APPEND LINKER_LIBS "Fervor" ) +ENDIF() ###################################################################################### # PlaYUVer modules build @@ -131,6 +137,7 @@ status("Dependencies:") status(" QT:" USE_QT4 THEN "QT4" ELSE "QT5" ) status(" OpenCV:" USE_OPENCV THEN YES ELSE NO) status(" FFMPEG:" USE_FFMPEG THEN YES ELSE NO) +status(" Fervor:" USE_FERVOR THEN YES ELSE NO) status(" Pixfc-sse:" USE_PIXFC THEN YES ELSE NO) status("Features:") -status(" Modules List:" "${MODULES_LIST}" ) \ No newline at end of file +status(" Modules List:" "${MODULES_LIST}" ) diff --git a/cmake/LibQT.cmake b/cmake/LibQT.cmake index 8de8f11..787cb50 100644 --- a/cmake/LibQT.cmake +++ b/cmake/LibQT.cmake @@ -8,7 +8,7 @@ IF( WIN32 ) ENDIF() IF( USE_QT4 ) - FIND_PACKAGE( Qt4 REQUIRED QtCore QtGui ) + FIND_PACKAGE( Qt4 REQUIRED QtCore QtGui QtNetwork ) IF( NOT QT4_FOUND) SET(USE_QT4 FALSE) ENDIF() @@ -25,6 +25,7 @@ IF( NOT USE_QT4 ) FIND_PACKAGE( Qt5Core REQUIRED ) FIND_PACKAGE( Qt5Gui REQUIRED ) FIND_PACKAGE( Qt5Widgets REQUIRED ) + FIND_PACKAGE( Qt5Network REQUIRED ) INCLUDE_DIRECTORIES( ${Qt5Widgets_INCLUDE_DIRS} ${Qt5Core_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ) # QT5_WRAP_CPP( HEADERS_MOC_FILES ${HEADERS_FILES} ) diff --git a/config.h.in b/config.h.in index 13bc617..e73d935 100644 --- a/config.h.in +++ b/config.h.in @@ -44,6 +44,8 @@ /* FFMPEG */ #cmakedefine USE_FFMPEG +/* Fervor update lib */ +#cmakedefine USE_FERVOR /* PIXFC-SSE lib */ #cmakedefine USE_PIXFC diff --git a/fervor b/fervor new file mode 160000 index 0000000..9980f27 --- /dev/null +++ b/fervor @@ -0,0 +1 @@ +Subproject commit 9980f27babbb895844921139c57f839c7e84391b diff --git a/source/app/main.cpp b/source/app/main.cpp index 36114d2..4c979ae 100755 --- a/source/app/main.cpp +++ b/source/app/main.cpp @@ -24,14 +24,23 @@ #include #include "plaYUVerApp.h" - +#ifdef USE_FERVOR +#include "fvupdater.h" +#endif using namespace plaYUVer; int main( int argc, char *argv[] ) { QApplication a( argc, argv ); + QApplication::setApplicationName("playuver"); + QApplication::setApplicationVersion("0.1"); + QApplication::setOrganizationName("playuver"); + QApplication::setOrganizationDomain("playuver.pixlra"); plaYUVerApp w; w.show(); w.parseArgs( argc, argv ); +#ifdef USE_FERVOR + FvUpdater::sharedUpdater()->SetFeedURL("/home/joaoc/Programming/PlaYUVerDev/playuver/app-update.xml"); +#endif return a.exec(); } diff --git a/source/app/plaYUVerApp.cpp b/source/app/plaYUVerApp.cpp index a141000..ed4ed0c 100644 --- a/source/app/plaYUVerApp.cpp +++ b/source/app/plaYUVerApp.cpp @@ -26,6 +26,9 @@ #include "SubWindowHandle.h" #include "InputStream.h" #include "DialogSubWindowSelector.h" +#ifdef USE_FERVOR +#include "fvupdater.h" +#endif #if( QT_VERSION_PLAYUVER == 5 ) #include @@ -969,7 +972,7 @@ Void plaYUVerApp::createActions() m_pcFrameSlider = new QSlider; m_pcFrameSlider->setOrientation( Qt::Horizontal ); m_pcFrameSlider->setMaximumWidth( 100 ); - m_pcFrameSlider->setMaximumWidth( /* 300 */ 2000 ); + 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) ) ); @@ -1021,6 +1024,13 @@ Void plaYUVerApp::createActions() // ------------ About ------------ +#ifdef USE_FERVOR + m_arrayActions[UPDATE_ACT] = new QAction( tr( "&Update" ), this ); + m_arrayActions[UPDATE_ACT]->setStatusTip( tr( "Check for updates" ) ); + connect(m_arrayActions[UPDATE_ACT], SIGNAL(clicked()), + FvUpdater::sharedUpdater(), SLOT(CheckForUpdatesNotSilent())); +#endif + m_arrayActions[ABOUT_ACT] = new QAction( tr( "&About" ), this ); m_arrayActions[ABOUT_ACT]->setStatusTip( tr( "Show the application's About box" ) ); connect( m_arrayActions[ABOUT_ACT], SIGNAL( triggered() ), this, SLOT( about() ) ); @@ -1086,8 +1096,13 @@ Void plaYUVerApp::createMenus() menuBar()->addSeparator(); m_arrayMenu[ABOUT_MENU] = menuBar()->addMenu( tr( "&Help" ) ); +#ifdef USE_FERVOR + m_arrayMenu[ABOUT_MENU]->addAction( m_arrayActions[UPDATE_ACT] ); +#endif + m_arrayMenu[ABOUT_MENU]->addSeparator(); m_arrayMenu[ABOUT_MENU]->addAction( m_arrayActions[ABOUT_ACT] ); m_arrayMenu[ABOUT_MENU]->addAction( m_arrayActions[ABOUTQT_ACT] ); + } Void plaYUVerApp::createToolBars() diff --git a/source/app/plaYUVerApp.h b/source/app/plaYUVerApp.h index e1465cb..26c2c4a 100644 --- a/source/app/plaYUVerApp.h +++ b/source/app/plaYUVerApp.h @@ -221,6 +221,7 @@ private: PREVIOUS_WINDOWS_ACT, NEXT_WINDOWS_ACT, SEPARATOR_ACT, + UPDATE_ACT, ABOUT_ACT, ABOUTQT_ACT, TOTAL_ACT, From 74ab6ab314db320d99e4ba4ae5e9eee24771ecc1 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sun, 15 Jun 2014 18:41:12 +0100 Subject: [PATCH 4/9] improve fevor cmake variables and some fixes in version number --- CMakeLists.txt | 13 ++++++++++++- cmake/Install.cmake | 6 +++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c9e7a5..9830aea 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,10 +7,19 @@ cmake_minimum_required( VERSION 2.8.9 ) ###################################################################################### # Project Definition ###################################################################################### + +IF(UNIX) + EXECUTE_PROCESS(COMMAND "date" "+%Y%m%d" OUTPUT_VARIABLE DAY) + string(STRIP ${DAY} DAY) +ENDIF(UNIX) + SET( PROJECT_NAME playuver ) SET( PLAYUVER_VERSION_MAJOR "0" ) SET( PLAYUVER_VERSION_MINOR "0" ) -SET( PLAYUVER_VERSION_PATH "9999" ) +SET( PLAYUVER_VERSION_PATCH "9999" ) +#SET( PLAYUVER_VERSION_PATCH ${DAY} ) +SET( PLAYUVER_VERSION "${PLAYUVER_VERSION_MAJOR}.${PLAYUVER_VERSION_MINOR}.${PLAYUVER_VERSION_PATCH}") + PROJECT( ${PROJECT_NAME} ) INCLUDE( cmake/CMakeMacros.cmake ) @@ -69,6 +78,8 @@ ENDIF() INCLUDE( cmake/LibPixfc.cmake ) INCLUDE( cmake/LibFFmpeg.cmake ) IF( USE_FERVOR ) + SET( FERVOR_APP_NAME ${PROJECT_NAME} ) + SET( FERVOR_APP_VERSION ${PLAYUVER_VERSION} ) ADD_SUBDIRECTORY( fervor ) INCLUDE_DIRECTORIES( fervor ) LIST(APPEND LINKER_LIBS "Fervor" ) diff --git a/cmake/Install.cmake b/cmake/Install.cmake index 4e235c1..b06a425 100644 --- a/cmake/Install.cmake +++ b/cmake/Install.cmake @@ -51,7 +51,7 @@ ENDIF() ###################################################################################### SET(CPACK_GENERATOR "DEB") -SET(CPACK_PACKAGE_NAME "playuver") +SET(CPACK_PACKAGE_NAME ${PROJECT_NAME}) SET(CPACK_DEBIAN_PACKAGE_DESCRIPTION "plaYUVer is an open-source QT based raw video player") SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Joao Carreira (jfmcarreira@gmail.com), Luis Lucas (luisfrlucas@gmail.com)") SET(CPACK_PACKAGE_CONTACT "Joao Carreira (jfmcarreira@gmail.com), Luis Lucas (luisfrlucas@gmail.com)") @@ -59,7 +59,7 @@ SET(CPACK_PACKAGE_CONTACT "Joao Carreira (jfmcarreira@gmail.com), Luis Lucas (lu SET(CPACK_PACKAGE_VERSION_MAJOR ${PLAYUVER_VERSION_MAJOR}) SET(CPACK_PACKAGE_VERSION_MINOR ${PLAYUVER_VERSION_MINOR}) SET(CPACK_PACKAGE_VERSION_PATCH ${PLAYUVER_VERSION_PATH}) -SET(CPACK_PACKAGE_VERSION "${PLAYUVER_VERSION_MAJOR}.${PLAYUVER_VERSION_MINOR}.${PLAYUVER_VERSION_PATH}") +SET(CPACK_PACKAGE_VERSION ${PLAYUVER_VERSION}) SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64") SET(CPACK_DEBIAN_PACKAGE_DEPENDS "") @@ -86,6 +86,6 @@ IF(UNIX) string(STRIP ${DAY} DAY) ENDIF(UNIX) -SET( CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}${APPEND_VERSION}-Linux-${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}-${DAY}" ) +SET( CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}${APPEND_VERSION}-Linux-${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}" ) INCLUDE(CPack) From 97b0338870fda120b508f785abcb9130b83723c0 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sun, 15 Jun 2014 18:42:20 +0100 Subject: [PATCH 5/9] fix project name --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9830aea..fa4ff6a 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ IF(UNIX) string(STRIP ${DAY} DAY) ENDIF(UNIX) -SET( PROJECT_NAME playuver ) +SET( PROJECT_NAME "playuver" ) SET( PLAYUVER_VERSION_MAJOR "0" ) SET( PLAYUVER_VERSION_MINOR "0" ) SET( PLAYUVER_VERSION_PATCH "9999" ) From 477904f0abd5c10af0832ab987279d0dc2abb7cb Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sun, 15 Jun 2014 19:13:35 +0100 Subject: [PATCH 6/9] reset submodules --- .gitmodules | 6 ------ fervor | 1 - 2 files changed, 7 deletions(-) delete mode 100644 .gitmodules delete mode 160000 fervor diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 9d054d1..0000000 --- a/.gitmodules +++ /dev/null @@ -1,6 +0,0 @@ -[submodule "source/lib/fervor"] - path = source/lib/fervor - url = https://github.com/pypt/fervor.git -[submodule "fervor"] - path = fervor - url = https://github.com/pypt/fervor.git diff --git a/fervor b/fervor deleted file mode 160000 index 9980f27..0000000 --- a/fervor +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9980f27babbb895844921139c57f839c7e84391b From 569a4095573dcd0bff6772a91d04cb6b763a3411 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sun, 15 Jun 2014 21:02:16 +0100 Subject: [PATCH 7/9] improve the use of fervor lib in main cmake file --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fa4ff6a..b04c59a 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,8 +80,8 @@ INCLUDE( cmake/LibFFmpeg.cmake ) IF( USE_FERVOR ) SET( FERVOR_APP_NAME ${PROJECT_NAME} ) SET( FERVOR_APP_VERSION ${PLAYUVER_VERSION} ) - ADD_SUBDIRECTORY( fervor ) - INCLUDE_DIRECTORIES( fervor ) + ADD_SUBDIRECTORY( source/lib/fervor-lib ) + INCLUDE_DIRECTORIES( source/lib/fervor-lib ) LIST(APPEND LINKER_LIBS "Fervor" ) ENDIF() From 13615f5fdc1ef351991451f3a98286605d360e3c Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sun, 15 Jun 2014 21:06:31 +0100 Subject: [PATCH 8/9] Fix +x file atribute --- CMakeLists.txt | 0 Doxyfile | 0 source/app/ConfigureFormatDialog.cpp | 0 source/app/ConfigureFormatDialog.h | 0 source/app/DialogSubWindowSelector.cpp | 0 source/app/DialogSubWindowSelector.h | 0 source/app/GridManager.cpp | 0 source/app/GridManager.h | 0 source/app/HistogramWidget.cpp | 0 source/app/HistogramWidget.h | 0 source/app/InputStream.cpp | 0 source/app/InputStream.h | 0 source/app/PlaYUVerSettings.cpp | 0 source/app/PlaYUVerSettings.h | 0 source/app/PropertiesSidebar.cpp | 0 source/app/PropertiesSidebar.h | 0 source/app/ViewArea.cpp | 0 source/app/ViewArea.h | 0 source/app/main.cpp | 0 source/lib/PlaYUVerFrame.cpp | 0 source/lib/PlaYUVerFrame.h | 0 source/lib/PlaYUVerFrameStatistics.cpp | 0 source/lib/PlaYUVerFrameStatistics.h | 0 source/lib/ffmpeg/LibAvContextHandle.cpp | 0 source/lib/ffmpeg/LibAvContextHandle.h | 0 25 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 CMakeLists.txt mode change 100755 => 100644 Doxyfile mode change 100755 => 100644 source/app/ConfigureFormatDialog.cpp mode change 100755 => 100644 source/app/ConfigureFormatDialog.h mode change 100755 => 100644 source/app/DialogSubWindowSelector.cpp mode change 100755 => 100644 source/app/DialogSubWindowSelector.h mode change 100755 => 100644 source/app/GridManager.cpp mode change 100755 => 100644 source/app/GridManager.h mode change 100755 => 100644 source/app/HistogramWidget.cpp mode change 100755 => 100644 source/app/HistogramWidget.h mode change 100755 => 100644 source/app/InputStream.cpp mode change 100755 => 100644 source/app/InputStream.h mode change 100755 => 100644 source/app/PlaYUVerSettings.cpp mode change 100755 => 100644 source/app/PlaYUVerSettings.h mode change 100755 => 100644 source/app/PropertiesSidebar.cpp mode change 100755 => 100644 source/app/PropertiesSidebar.h mode change 100755 => 100644 source/app/ViewArea.cpp mode change 100755 => 100644 source/app/ViewArea.h mode change 100755 => 100644 source/app/main.cpp mode change 100755 => 100644 source/lib/PlaYUVerFrame.cpp mode change 100755 => 100644 source/lib/PlaYUVerFrame.h mode change 100755 => 100644 source/lib/PlaYUVerFrameStatistics.cpp mode change 100755 => 100644 source/lib/PlaYUVerFrameStatistics.h mode change 100755 => 100644 source/lib/ffmpeg/LibAvContextHandle.cpp mode change 100755 => 100644 source/lib/ffmpeg/LibAvContextHandle.h diff --git a/CMakeLists.txt b/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/Doxyfile b/Doxyfile old mode 100755 new mode 100644 diff --git a/source/app/ConfigureFormatDialog.cpp b/source/app/ConfigureFormatDialog.cpp old mode 100755 new mode 100644 diff --git a/source/app/ConfigureFormatDialog.h b/source/app/ConfigureFormatDialog.h old mode 100755 new mode 100644 diff --git a/source/app/DialogSubWindowSelector.cpp b/source/app/DialogSubWindowSelector.cpp old mode 100755 new mode 100644 diff --git a/source/app/DialogSubWindowSelector.h b/source/app/DialogSubWindowSelector.h old mode 100755 new mode 100644 diff --git a/source/app/GridManager.cpp b/source/app/GridManager.cpp old mode 100755 new mode 100644 diff --git a/source/app/GridManager.h b/source/app/GridManager.h old mode 100755 new mode 100644 diff --git a/source/app/HistogramWidget.cpp b/source/app/HistogramWidget.cpp old mode 100755 new mode 100644 diff --git a/source/app/HistogramWidget.h b/source/app/HistogramWidget.h old mode 100755 new mode 100644 diff --git a/source/app/InputStream.cpp b/source/app/InputStream.cpp old mode 100755 new mode 100644 diff --git a/source/app/InputStream.h b/source/app/InputStream.h old mode 100755 new mode 100644 diff --git a/source/app/PlaYUVerSettings.cpp b/source/app/PlaYUVerSettings.cpp old mode 100755 new mode 100644 diff --git a/source/app/PlaYUVerSettings.h b/source/app/PlaYUVerSettings.h old mode 100755 new mode 100644 diff --git a/source/app/PropertiesSidebar.cpp b/source/app/PropertiesSidebar.cpp old mode 100755 new mode 100644 diff --git a/source/app/PropertiesSidebar.h b/source/app/PropertiesSidebar.h old mode 100755 new mode 100644 diff --git a/source/app/ViewArea.cpp b/source/app/ViewArea.cpp old mode 100755 new mode 100644 diff --git a/source/app/ViewArea.h b/source/app/ViewArea.h old mode 100755 new mode 100644 diff --git a/source/app/main.cpp b/source/app/main.cpp old mode 100755 new mode 100644 diff --git a/source/lib/PlaYUVerFrame.cpp b/source/lib/PlaYUVerFrame.cpp old mode 100755 new mode 100644 diff --git a/source/lib/PlaYUVerFrame.h b/source/lib/PlaYUVerFrame.h old mode 100755 new mode 100644 diff --git a/source/lib/PlaYUVerFrameStatistics.cpp b/source/lib/PlaYUVerFrameStatistics.cpp old mode 100755 new mode 100644 diff --git a/source/lib/PlaYUVerFrameStatistics.h b/source/lib/PlaYUVerFrameStatistics.h old mode 100755 new mode 100644 diff --git a/source/lib/ffmpeg/LibAvContextHandle.cpp b/source/lib/ffmpeg/LibAvContextHandle.cpp old mode 100755 new mode 100644 diff --git a/source/lib/ffmpeg/LibAvContextHandle.h b/source/lib/ffmpeg/LibAvContextHandle.h old mode 100755 new mode 100644 From fc16c76ae4ea09b6087498c9400e2a8726fe810f Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sun, 15 Jun 2014 21:11:33 +0100 Subject: [PATCH 9/9] allow playing toolbar to be placed on top and bottom --- source/app/plaYUVerApp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/app/plaYUVerApp.cpp b/source/app/plaYUVerApp.cpp index ed4ed0c..70db4cc 100644 --- a/source/app/plaYUVerApp.cpp +++ b/source/app/plaYUVerApp.cpp @@ -1128,7 +1128,7 @@ Void plaYUVerApp::createToolBars() 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]->setAllowedAreas( Qt::TopToolBarArea | 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] );