Minor code arrangements

This commit is contained in:
jfmcarreira committed 2014-10-04 12:47:49 +01:00
1 parent bd1d56a89a
commit ba2b3bfca5
2 files changed
+24 -12

No files matched your search

+1 -1
View File
@@ -1278,7 +1278,7 @@ Void plaYUVerApp::createMenus()
m_arrayMenu[DOCK_VIEW_MENU] = createPopupMenu(); m_arrayMenu[DOCK_VIEW_MENU] = createPopupMenu();
if( m_arrayMenu[DOCK_VIEW_MENU] ) 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" ) ); actionPopupMenu->setText( tr( "&Toolbars/Docks" ) );
} }
+23 -11
View File
@@ -57,7 +57,9 @@ protected:
private Q_SLOTS: private Q_SLOTS:
//! File functions /**
* File functions slots
*/
void open(); void open();
void save(); void save();
void format(); void format();
@@ -67,7 +69,9 @@ private Q_SLOTS:
void closeActiveWindow(); void closeActiveWindow();
void closeAll(); void closeAll();
//! Playing functions /**
* Playing functions slots
*/
void play(); void play();
void pause(); void pause();
void stop(); void stop();
@@ -90,13 +94,10 @@ private Q_SLOTS:
void normalSize(); void normalSize();
void zoomToFit(); void zoomToFit();
//! Show a message box with some information about the plaYUVerApp App
void about(); void about();
void chageSubWindowSelection(); void chageSubWindowSelection();
void updateWindowMenu(); void updateWindowMenu();s
//! Drag and drop functions
void dragEnterEvent( QDragEnterEvent *event ); void dragEnterEvent( QDragEnterEvent *event );
void dropEvent( QDropEvent *event ); void dropEvent( QDropEvent *event );
@@ -130,7 +131,7 @@ private:
QPainter painter( viewport() ); QPainter painter( viewport() );
QSize logoSize = 2 * size() / 3; 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. // Calculate the logo position - the bottom right corner of the mdi area.
int x = width() / 2 - pixFinalLogo.width() / 2; int x = width() / 2 - pixFinalLogo.width() / 2;
@@ -138,11 +139,9 @@ private:
painter.drawPixmap( x, y, pixFinalLogo ); painter.drawPixmap( x, y, pixFinalLogo );
} }
private: private:
// Store the logo image.
QPixmap m_pixmapLogo; QPixmap m_pixmapLogo;
}; };
//QMdiArea *mdiArea;
PlaYUVerMdiArea *mdiArea; PlaYUVerMdiArea *mdiArea;
SubWindowHandle *m_pcCurrentSubWindow; SubWindowHandle *m_pcCurrentSubWindow;
ModulesHandle *m_pcModulesHandle; ModulesHandle *m_pcModulesHandle;
@@ -157,7 +156,9 @@ private:
Void zoomToFitAll(); Void zoomToFitAll();
//! Playing functions /**
* Playing functions
*/
UInt64 getMaxFrameNumber(); UInt64 getMaxFrameNumber();
Void startPlay(); Void startPlay();
Void setTimerStatus(); Void setTimerStatus();
@@ -188,6 +189,8 @@ private:
QLabel *m_pcTotalFrameNumLabel; QLabel *m_pcTotalFrameNumLabel;
QDoubleSpinBox *m_pcZoomFactorSBox; QDoubleSpinBox *m_pcZoomFactorSBox;
QSignalMapper *mapperZoom; QSignalMapper *mapperZoom;
QSignalMapper *mapperSeekVideo; QSignalMapper *mapperSeekVideo;
QSignalMapper *mapperWindow; QSignalMapper *mapperWindow;
@@ -212,6 +215,9 @@ private:
}; };
QVector<QMenu*> m_arrayMenu; QVector<QMenu*> m_arrayMenu;
/**
* Array of side bars for the main app
*/
enum SIDEBAR_LIST enum SIDEBAR_LIST
{ {
STREAM_DOCK = 0, STREAM_DOCK = 0,
@@ -225,6 +231,9 @@ private:
FramePropertiesSideBar* m_pcFrameProperties; FramePropertiesSideBar* m_pcFrameProperties;
QualityMeasurementSidebar* m_pcQualityMeasurement; QualityMeasurementSidebar* m_pcQualityMeasurement;
/**
* Array of tool bars for the main app
*/
enum TOOLBAR_LIST enum TOOLBAR_LIST
{ {
FILE_TOOLBAR = 0, FILE_TOOLBAR = 0,
@@ -234,6 +243,9 @@ private:
}; };
QVector<QToolBar*> m_arrayToolBars; QVector<QToolBar*> m_arrayToolBars;
/**
* Array of actions for the main app
*/
enum APP_ACTION_LIST enum APP_ACTION_LIST
{ {
OPEN_ACT = 0, OPEN_ACT = 0,
@@ -270,7 +282,7 @@ private:
TOTAL_ACT, TOTAL_ACT,
}; };
QVector<QAction*> m_arrayActions; QVector<QAction*> m_arrayActions;
QAction *actionPopupMenu; //QAction *actionPopupMenu;
// Tools Actions; // Tools Actions;
QActionGroup *actionGroupTools; QActionGroup *actionGroupTools;