Initial add support for fervor lib which allow check for updates

This commit is contained in:
jfmcarreira committed 2014-06-15 13:46:15 +01:00
1 parent cb5cd1cfcc
commit db59d81f57
8 files changed
+47 -5

No files matched your search

+6
View File
@@ -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
+9 -2
View File
@@ -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}" )
status(" Modules List:" "${MODULES_LIST}" )
+2 -1
View File
@@ -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} )
+2
View File
@@ -44,6 +44,8 @@
/* FFMPEG */
#cmakedefine USE_FFMPEG
/* Fervor update lib */
#cmakedefine USE_FERVOR
/* PIXFC-SSE lib */
#cmakedefine USE_PIXFC
Submodule
+1
Submodule fervor added at 9980f27bab.
+10 -1
View File
@@ -24,14 +24,23 @@
#include <QApplication>
#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();
}
+16 -1
View File
@@ -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 <QtWidgets>
@@ -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()
+1
View File
@@ -221,6 +221,7 @@ private:
PREVIOUS_WINDOWS_ACT,
NEXT_WINDOWS_ACT,
SEPARATOR_ACT,
UPDATE_ACT,
ABOUT_ACT,
ABOUTQT_ACT,
TOTAL_ACT,