Merge branch 'devel' into features_recentfilelist

This commit is contained in:
jfmcarreira committed 2014-10-04 12:47:55 +01:00
commit fdc4d8b923
4 files changed
+40 -23

No files matched your search

+2 -2
View File
@@ -886,7 +886,7 @@ Void plaYUVerApp::updatePixelValueStatusBar( const QPoint & pos, PlaYUVerFrame*
Void plaYUVerApp::dragEnterEvent( QDragEnterEvent *event )
{
//setText(tr("<drop content>"));
setBackgroundRole( QPalette::Highlight );
mdiArea->setBackgroundRole( QPalette::Highlight );
event->acceptProposedAction();
}
@@ -1277,7 +1277,7 @@ Void plaYUVerApp::createMenus()
m_arrayMenu[DOCK_VIEW_MENU] = createPopupMenu();
if( m_arrayMenu[DOCK_VIEW_MENU] )
{
actionPopupMenu = m_arrayMenu[VIEW_MENU]->addMenu( m_arrayMenu[DOCK_VIEW_MENU] );
QAction *actionPopupMenu = m_arrayMenu[VIEW_MENU]->addMenu( m_arrayMenu[DOCK_VIEW_MENU] );
actionPopupMenu->setText( tr( "&Toolbars/Docks" ) );
}
+23 -11
View File
@@ -62,7 +62,9 @@ protected:
private Q_SLOTS:
//! File functions
/**
* File functions slots
*/
void open();
void save();
void format();
@@ -72,7 +74,9 @@ private Q_SLOTS:
void closeActiveWindow();
void closeAll();
//! Playing functions
/**
* Playing functions slots
*/
void play();
void pause();
void stop();
@@ -95,13 +99,10 @@ private Q_SLOTS:
void normalSize();
void zoomToFit();
//! Show a message box with some information about the plaYUVerApp App
void about();
void chageSubWindowSelection();
void updateWindowMenu();
//! Drag and drop functions
void updateWindowMenu();s
void dragEnterEvent( QDragEnterEvent *event );
void dropEvent( QDropEvent *event );
@@ -135,7 +136,7 @@ private:
QPainter painter( viewport() );
QSize logoSize = 2 * size() / 3;
QPixmap pixFinalLogo = m_pixmapLogo.scaled(logoSize,Qt::KeepAspectRatio);
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;
@@ -143,11 +144,9 @@ private:
painter.drawPixmap( x, y, pixFinalLogo );
}
private:
// Store the logo image.
QPixmap m_pixmapLogo;
};
//QMdiArea *mdiArea;
PlaYUVerMdiArea *mdiArea;
SubWindowHandle *m_pcCurrentSubWindow;
ModulesHandle *m_pcModulesHandle;
@@ -165,7 +164,9 @@ private:
Void zoomToFitAll();
//! Playing functions
/**
* Playing functions
*/
UInt64 getMaxFrameNumber();
Void startPlay();
Void setTimerStatus();
@@ -196,6 +197,8 @@ private:
QLabel *m_pcTotalFrameNumLabel;
QDoubleSpinBox *m_pcZoomFactorSBox;
QSignalMapper *mapperZoom;
QSignalMapper *mapperSeekVideo;
QSignalMapper *mapperWindow;
@@ -220,6 +223,9 @@ private:
};
QVector<QMenu*> m_arrayMenu;
/**
* Array of side bars for the main app
*/
enum SIDEBAR_LIST
{
STREAM_DOCK = 0,
@@ -233,6 +239,9 @@ private:
FramePropertiesSideBar* m_pcFrameProperties;
QualityMeasurementSidebar* m_pcQualityMeasurement;
/**
* Array of tool bars for the main app
*/
enum TOOLBAR_LIST
{
FILE_TOOLBAR = 0,
@@ -242,6 +251,9 @@ private:
};
QVector<QToolBar*> m_arrayToolBars;
/**
* Array of actions for the main app
*/
enum APP_ACTION_LIST
{
OPEN_ACT = 0,
@@ -278,7 +290,7 @@ private:
TOTAL_ACT,
};
QVector<QAction*> m_arrayActions;
QAction *actionPopupMenu;
//QAction *actionPopupMenu;
// Tools Actions;
QActionGroup *actionGroupTools;