Merge branch 'devel' into features_recentfilelist

Conflicts:
	source/app/SubWindowHandle.h
	source/app/plaYUVerApp.h
This commit is contained in:
jfmcarreira committed 2014-10-03 01:44:38 +01:00
commit e9b5630ca3
38 files changed
+1392 -426

No files matched your search

+34 -3
View File
@@ -37,6 +37,7 @@
#include "ModulesHandle.h"
#include "PropertiesSidebar.h"
#include "QualityMeasurementSidebar.h"
#include "AboutDialog.h"
namespace plaYUVer
{
@@ -118,7 +119,36 @@ private Q_SLOTS:
void setSelectionTool();
private:
QMdiArea *mdiArea;
class PlaYUVerMdiArea: public QMdiArea
{
public:
PlaYUVerMdiArea( QWidget *parent = 0 ) :
QMdiArea( parent ),
m_pixmapLogo( ":/images/playuver-backgroud-logo.png" )
{
}
protected:
void paintEvent( QPaintEvent *event )
{
QMdiArea::paintEvent( event );
QPainter painter( viewport() );
QSize logoSize = 2 * size() / 3;
QPixmap pixFinalLogo = m_pixmapLogo.scaled(logoSize,Qt::KeepAspectRatio);
// Calculate the logo position - the bottom right corner of the mdi area.
int x = width() / 2 - pixFinalLogo.width() / 2;
int y = height() / 2 - pixFinalLogo.height() / 2;
painter.drawPixmap( x, y, pixFinalLogo );
}
private:
// Store the logo image.
QPixmap m_pixmapLogo;
};
//QMdiArea *mdiArea;
PlaYUVerMdiArea *mdiArea;
SubWindowHandle *m_pcCurrentSubWindow;
ModulesHandle *m_pcModulesHandle;
@@ -160,7 +190,6 @@ private:
static SubWindowHandle* findSubWindow( const QMdiArea* mdiArea, const QString& fileName );
static SubWindowHandle* findSubWindow( const QMdiArea* mdiArea, const SubWindowHandle* subWindow );
QVector<SubWindowHandle*> m_acPlayingSubWindows;
QSlider *m_pcFrameSlider;
QLabel *m_pcCurrFrameNumLabel;
@@ -229,7 +258,7 @@ private:
ZOOM_FIT_ACT,
ZOOM_NORMAL_ACT,
PLAY_ACT,
PAUSE_ACT,
/*PAUSE_ACT,*/
STOP_ACT,
VIDEO_FORWARD_ACT,
VIDEO_BACKWARD_ACT,
@@ -259,6 +288,8 @@ private:
PlaYUVerRecentFileListInfo m_aRecentFileStreamInfo;
AboutDialog* m_pcAboutDialog;
};
} // NAMESPACE