Frame slider and Play bar can be hidden separately
This commit is contained in:
Jeremy Bullock
parent
49d9d15c85
commit
83d04e8b46
3 changed files with 104 additions and 63 deletions
|
|
@ -283,6 +283,8 @@ public:
|
|||
void pressButton(EGadget buttonId);
|
||||
|
||||
void showHideAllParts(bool);
|
||||
void showHidePlaybar(bool);
|
||||
void showHideFrameSlider(bool);
|
||||
|
||||
void enableProgressBar(bool enable);
|
||||
void setProgressBarStatus(const std::vector<UCHAR> *status);
|
||||
|
|
|
|||
|
|
@ -67,11 +67,10 @@
|
|||
|
||||
enum CV_Parts {
|
||||
CVPARTS_None = 0,
|
||||
CVPARTS_TOOLBAR = 0x1,
|
||||
CVPARTS_TOOLOPTIONS = 0x2,
|
||||
CVPARTS_FLIPCONSOLE = 0x4,
|
||||
CVPARTS_PLAYBAR = 0x1,
|
||||
CVPARTS_FRAMESLIDER = 0x4,
|
||||
CVPARTS_End = 0x8,
|
||||
CVPARTS_ALL = CVPARTS_TOOLBAR | CVPARTS_TOOLOPTIONS | CVPARTS_FLIPCONSOLE
|
||||
CVPARTS_ALL = CVPARTS_PLAYBAR | CVPARTS_FRAMESLIDER
|
||||
};
|
||||
|
||||
using namespace DVGui;
|
||||
|
|
@ -182,7 +181,6 @@ SceneViewerPanel::SceneViewerPanel(QWidget *parent, Qt::WFlags flags)
|
|||
->getFrameRate());
|
||||
updateFrameRange(), updateFrameMarkers();
|
||||
|
||||
|
||||
setLayout(mainLayout);
|
||||
|
||||
m_visiblePartsFlag = CVPARTS_ALL;
|
||||
|
|
@ -199,7 +197,8 @@ SceneViewerPanel::SceneViewerPanel(QWidget *parent, Qt::WFlags flags)
|
|||
|
||||
void SceneViewerPanel::updateShowHide() {
|
||||
// flip console
|
||||
m_flipConsole->showHideAllParts(m_visiblePartsFlag & CVPARTS_FLIPCONSOLE);
|
||||
m_flipConsole->showHidePlaybar(m_visiblePartsFlag & CVPARTS_PLAYBAR);
|
||||
m_flipConsole->showHideFrameSlider(m_visiblePartsFlag & CVPARTS_FRAMESLIDER);
|
||||
update();
|
||||
}
|
||||
|
||||
|
|
@ -207,30 +206,36 @@ void SceneViewerPanel::updateShowHide() {
|
|||
/*! showing the show/hide commands
|
||||
*/
|
||||
|
||||
void SceneViewerPanel::contextMenuEvent(QContextMenuEvent* event) {
|
||||
QMenu* menu = new QMenu(this);
|
||||
void SceneViewerPanel::contextMenuEvent(QContextMenuEvent *event) {
|
||||
QMenu *menu = new QMenu(this);
|
||||
addShowHideContextMenu(menu);
|
||||
menu->exec(event->globalPos());
|
||||
}
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
void SceneViewerPanel::addShowHideContextMenu(QMenu* menu) {
|
||||
QMenu* showHideMenu = menu->addMenu(tr("GUI Show / Hide"));
|
||||
void SceneViewerPanel::addShowHideContextMenu(QMenu *menu) {
|
||||
QMenu *showHideMenu = menu->addMenu(tr("GUI Show / Hide"));
|
||||
|
||||
// actions
|
||||
QAction *playbarSHAct = showHideMenu->addAction(tr("Playback Toolbar"));
|
||||
QAction *frameSliderSHAct = showHideMenu->addAction(tr("Frame Slider"));
|
||||
|
||||
QAction* flipConsoleSHAct = showHideMenu->addAction(tr("Console"));
|
||||
flipConsoleSHAct->setCheckable(true);
|
||||
flipConsoleSHAct->setChecked(m_visiblePartsFlag & CVPARTS_FLIPCONSOLE);
|
||||
flipConsoleSHAct->setData((UINT)CVPARTS_FLIPCONSOLE);
|
||||
playbarSHAct->setCheckable(true);
|
||||
playbarSHAct->setChecked(m_visiblePartsFlag & CVPARTS_PLAYBAR);
|
||||
playbarSHAct->setData((UINT)CVPARTS_PLAYBAR);
|
||||
|
||||
QActionGroup* showHideActGroup = new QActionGroup(this);
|
||||
frameSliderSHAct->setCheckable(true);
|
||||
frameSliderSHAct->setChecked(m_visiblePartsFlag & CVPARTS_FRAMESLIDER);
|
||||
frameSliderSHAct->setData((UINT)CVPARTS_FRAMESLIDER);
|
||||
|
||||
QActionGroup *showHideActGroup = new QActionGroup(this);
|
||||
showHideActGroup->setExclusive(false);
|
||||
showHideActGroup->addAction(flipConsoleSHAct);
|
||||
showHideActGroup->addAction(playbarSHAct);
|
||||
showHideActGroup->addAction(frameSliderSHAct);
|
||||
|
||||
connect(showHideActGroup, SIGNAL(triggered(QAction*)), this,
|
||||
SLOT(onShowHideActionTriggered(QAction*)));
|
||||
connect(showHideActGroup, SIGNAL(triggered(QAction *)), this,
|
||||
SLOT(onShowHideActionTriggered(QAction *)));
|
||||
|
||||
showHideMenu->addSeparator();
|
||||
showHideMenu->addAction(CommandManager::instance()->getAction(MI_ViewCamera));
|
||||
|
|
@ -247,7 +252,7 @@ void SceneViewerPanel::addShowHideContextMenu(QMenu* menu) {
|
|||
/*! slot function for show/hide the parts
|
||||
*/
|
||||
|
||||
void SceneViewerPanel::onShowHideActionTriggered(QAction* act) {
|
||||
void SceneViewerPanel::onShowHideActionTriggered(QAction *act) {
|
||||
CV_Parts part = (CV_Parts)act->data().toUInt();
|
||||
assert(part < CVPARTS_End);
|
||||
|
||||
|
|
@ -323,8 +328,8 @@ void SceneViewerPanel::showEvent(QShowEvent *event) {
|
|||
ret = ret && connect(sceneHandle, SIGNAL(nameSceneChanged()), this,
|
||||
SLOT(changeWindowTitle()));
|
||||
ret =
|
||||
ret && connect(sceneHandle, SIGNAL(preferenceChanged(const QString&)),
|
||||
m_flipConsole, SLOT(onPreferenceChanged(const QString&)));
|
||||
ret && connect(sceneHandle, SIGNAL(preferenceChanged(const QString &)),
|
||||
m_flipConsole, SLOT(onPreferenceChanged(const QString &)));
|
||||
ret = ret && connect(levelHandle, SIGNAL(xshLevelSwitched(TXshLevel *)), this,
|
||||
SLOT(onXshLevelSwitched(TXshLevel *)));
|
||||
ret = ret && connect(levelHandle, SIGNAL(xshLevelChanged()), this,
|
||||
|
|
@ -387,8 +392,8 @@ void SceneViewerPanel::hideEvent(QHideEvent *event) {
|
|||
|
||||
disconnect(app->getCurrentTool(), SIGNAL(toolSwitched()), m_sceneViewer,
|
||||
SLOT(onToolSwitched()));
|
||||
disconnect(app->getCurrentScene(), SIGNAL(preferenceChanged(const QString&)),
|
||||
m_flipConsole, SLOT(onPreferenceChanged(const QString&)));
|
||||
disconnect(app->getCurrentScene(), SIGNAL(preferenceChanged(const QString &)),
|
||||
m_flipConsole, SLOT(onPreferenceChanged(const QString &)));
|
||||
|
||||
m_flipConsole->setActive(false);
|
||||
}
|
||||
|
|
@ -835,11 +840,11 @@ void SceneViewerPanel::setVisiblePartsFlag(UINT flag) {
|
|||
}
|
||||
|
||||
// SaveLoadQSettings
|
||||
void SceneViewerPanel::save(QSettings& settings) const {
|
||||
void SceneViewerPanel::save(QSettings &settings) const {
|
||||
settings.setValue("visibleParts", m_visiblePartsFlag);
|
||||
}
|
||||
|
||||
void SceneViewerPanel::load(QSettings& settings) {
|
||||
void SceneViewerPanel::load(QSettings &settings) {
|
||||
m_visiblePartsFlag = settings.value("visibleParts", CVPARTS_ALL).toUInt();
|
||||
updateShowHide();
|
||||
}
|
||||
|
|
@ -429,7 +429,9 @@ enum {
|
|||
eShowDefineLoadBox = 0x400,
|
||||
eShowUseLoadBox = 0x800,
|
||||
eShowViewerControls = 0x1000,
|
||||
eShowHowMany = 0x2000
|
||||
eShowSound = 0x2000,
|
||||
eShowLocator = 0x4000,
|
||||
eShowHowMany = 0x8000
|
||||
};
|
||||
|
||||
FlipConsole::FlipConsole(QVBoxLayout *mainLayout, std::vector<int> gadgetsMask,
|
||||
|
|
@ -542,6 +544,18 @@ void FlipConsole::showHideAllParts(bool isShow) {
|
|||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
void FlipConsole::showHidePlaybar(bool isShow) {
|
||||
m_playToolBarContainer->setVisible(isShow);
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
void FlipConsole::showHideFrameSlider(bool isShow) {
|
||||
m_frameSliderFrame->setVisible(isShow);
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
void showEvent(QShowEvent *);
|
||||
void hideEvent(QHideEvent *);
|
||||
|
||||
|
|
@ -992,10 +1006,20 @@ void FlipConsole::applyCustomizeMask() {
|
|||
enableButton(eDefineSubCamera, m_customizeMask & eShowDefineSubCamera);
|
||||
enableButton(eDefineLoadBox, m_customizeMask & eShowDefineLoadBox);
|
||||
enableButton(eUseLoadBox, m_customizeMask & eShowUseLoadBox);
|
||||
if (m_subcamSep)
|
||||
m_subcamSep->setVisible(m_customizeMask & eShowDefineSubCamera ||
|
||||
m_customizeMask & eShowDefineLoadBox ||
|
||||
m_customizeMask & eShowUseLoadBox);
|
||||
if (m_subcamSep) {
|
||||
int count = m_gadgetsMask.size();
|
||||
bool hasDefineLoadBox =
|
||||
std::find(m_gadgetsMask.begin(), m_gadgetsMask.end(), eDefineLoadBox) ==
|
||||
m_gadgetsMask.end();
|
||||
bool hasUseLoadBox = std::find(m_gadgetsMask.begin(), m_gadgetsMask.end(),
|
||||
eUseLoadBox) == m_gadgetsMask.end();
|
||||
bool hasDefineSubCam = std::find(m_gadgetsMask.begin(), m_gadgetsMask.end(),
|
||||
eDefineSubCamera) == m_gadgetsMask.end();
|
||||
m_subcamSep->setVisible(
|
||||
(hasDefineSubCam && m_customizeMask & eShowDefineSubCamera) ||
|
||||
(hasDefineLoadBox && m_customizeMask & eShowDefineLoadBox) ||
|
||||
(hasUseLoadBox && m_customizeMask & eShowUseLoadBox));
|
||||
}
|
||||
|
||||
enableButton(eWhiteBg, m_customizeMask & eShowBg);
|
||||
enableButton(eBlackBg, m_customizeMask & eShowBg);
|
||||
|
|
@ -1016,6 +1040,9 @@ void FlipConsole::applyCustomizeMask() {
|
|||
enableButton(eNext, m_customizeMask & eShowVcr);
|
||||
enableButton(eLast, m_customizeMask & eShowVcr);
|
||||
|
||||
enableButton(eSound, m_customizeMask & eShowSound);
|
||||
enableButton(eLocator, m_customizeMask & eShowLocator);
|
||||
|
||||
if (m_vcrSep) m_vcrSep->setVisible(m_customizeMask & eShowVcr);
|
||||
|
||||
enableButton(eMatte, m_customizeMask & eShowcolorFilter);
|
||||
|
|
@ -1094,8 +1121,6 @@ void FlipConsole::createCustomizeMenu(bool withCustomWidget) {
|
|||
hasButton(m_gadgetsMask, eBlackBg) ||
|
||||
hasButton(m_gadgetsMask, eCheckBg))
|
||||
addMenuItem(eShowBg, tr("Background Colors"), menu);
|
||||
if (hasButton(m_gadgetsMask, eRate))
|
||||
addMenuItem(eShowFramerate, tr("Framerate"), menu);
|
||||
|
||||
addMenuItem(eShowVcr, tr("Playback Controls"), menu);
|
||||
|
||||
|
|
@ -1103,11 +1128,17 @@ void FlipConsole::createCustomizeMenu(bool withCustomWidget) {
|
|||
hasButton(m_gadgetsMask, eBlue) || hasButton(m_gadgetsMask, eMatte))
|
||||
addMenuItem(eShowcolorFilter, tr("Color Channels"), menu);
|
||||
|
||||
if (withCustomWidget) addMenuItem(eShowCustom, tr("Set Key"), menu);
|
||||
if (hasButton(m_gadgetsMask, eSound))
|
||||
addMenuItem(eShowSound, tr("Sound"), menu);
|
||||
|
||||
if (hasButton(m_gadgetsMask, eHisto))
|
||||
addMenuItem(eShowHisto, tr("Histogram"), menu);
|
||||
|
||||
if (hasButton(m_gadgetsMask, eLocator))
|
||||
addMenuItem(eShowLocator, tr("Locator"), menu);
|
||||
|
||||
if (withCustomWidget) addMenuItem(eShowCustom, tr("Set Key"), menu);
|
||||
|
||||
if (hasButton(m_gadgetsMask, eFilledRaster))
|
||||
addMenuItem(eFilledRaster, tr("Display Areas as Filled"), menu);
|
||||
|
||||
|
|
@ -1118,6 +1149,9 @@ void FlipConsole::createCustomizeMenu(bool withCustomWidget) {
|
|||
hasButton(m_gadgetsMask, eResetView))
|
||||
addMenuItem(eShowViewerControls, tr("Viewer Controls"), menu);
|
||||
|
||||
if (hasButton(m_gadgetsMask, eRate))
|
||||
addMenuItem(eShowFramerate, tr("Framerate"), menu);
|
||||
|
||||
bool ret = connect(menu, SIGNAL(triggered(QAction *)), this,
|
||||
SLOT(onCustomizeButtonPressed(QAction *)));
|
||||
assert(ret);
|
||||
|
|
|
|||
Loading…
Reference in a new issue