merge master in dev_properties_side_bar
This commit is contained in:
1 parent
54ebc81150
commit
e3e5e83f8b
6 files changed
+82
-34
No files matched your search
@@ -116,6 +116,8 @@ private:
|
||||
Void loadFile( QString fileName );
|
||||
//! Playing functions
|
||||
Void setTimerStatus();
|
||||
Void updateCurrFrameNum();
|
||||
Void updateTotalFrameNum( UInt total_frame_num = 0 );
|
||||
|
||||
Void updateMenus();
|
||||
Void updateProperties();
|
||||
@@ -135,6 +137,8 @@ private:
|
||||
Bool m_bIsPlaying;
|
||||
QVector<SubWindowHandle*> m_acPlayingSubWindows;
|
||||
QSlider *m_pcFrameSlider;
|
||||
QLabel *m_pcCurrFrameNumLabel;
|
||||
QLabel *m_pcTotalFrameNumLabel;
|
||||
|
||||
|
||||
QSignalMapper *mapperZoom;
|
||||
|
||||
Reference in new issue
Block a user