Fix mac bugs
This commit is contained in:
parent
f059427809
commit
b767aaaf4f
2 changed files with 26 additions and 22 deletions
|
@ -945,36 +945,36 @@ StopMotionController::StopMotionController(QWidget *parent) : QWidget(parent) {
|
||||||
SLOT(setPage(int)));
|
SLOT(setPage(int)));
|
||||||
|
|
||||||
// Control Page
|
// Control Page
|
||||||
ret = ret && connect(refreshCamListButton, SIGNAL(pressed()), this,
|
ret = ret && connect(refreshCamListButton, SIGNAL(clicked()), this,
|
||||||
SLOT(refreshCameraListCalled()));
|
SLOT(refreshCameraListCalled()));
|
||||||
ret = ret && connect(m_cameraListCombo, SIGNAL(activated(int)), this,
|
ret = ret && connect(m_cameraListCombo, SIGNAL(activated(int)), this,
|
||||||
SLOT(onCameraListComboActivated(int)));
|
SLOT(onCameraListComboActivated(int)));
|
||||||
ret = ret && connect(m_resolutionCombo, SIGNAL(activated(const QString &)),
|
ret = ret && connect(m_resolutionCombo, SIGNAL(activated(const QString &)),
|
||||||
this, SLOT(onResolutionComboActivated(const QString &)));
|
this, SLOT(onResolutionComboActivated(const QString &)));
|
||||||
if (m_captureFilterSettingsBtn)
|
if (m_captureFilterSettingsBtn)
|
||||||
ret = ret && connect(m_captureFilterSettingsBtn, SIGNAL(pressed()), this,
|
ret = ret && connect(m_captureFilterSettingsBtn, SIGNAL(clicked()), this,
|
||||||
SLOT(onCaptureFilterSettingsBtnPressed()));
|
SLOT(onCaptureFilterSettingsBtnPressed()));
|
||||||
ret = ret && connect(m_fileFormatOptionButton, SIGNAL(pressed()), this,
|
ret = ret && connect(m_fileFormatOptionButton, SIGNAL(clicked()), this,
|
||||||
SLOT(onFileFormatOptionButtonPressed()));
|
SLOT(onFileFormatOptionButtonPressed()));
|
||||||
ret = ret && connect(m_levelNameEdit, SIGNAL(levelNameEdited()), this,
|
ret = ret && connect(m_levelNameEdit, SIGNAL(levelNameEdited()), this,
|
||||||
SLOT(onLevelNameEdited()));
|
SLOT(onLevelNameEdited()));
|
||||||
ret = ret &&
|
ret = ret &&
|
||||||
connect(nextLevelButton, SIGNAL(pressed()), this, SLOT(onNextName()));
|
connect(nextLevelButton, SIGNAL(clicked()), this, SLOT(onNextName()));
|
||||||
ret = ret && connect(m_previousLevelButton, SIGNAL(pressed()), this,
|
ret = ret && connect(m_previousLevelButton, SIGNAL(clicked()), this,
|
||||||
SLOT(onPreviousName()));
|
SLOT(onPreviousName()));
|
||||||
ret = ret && connect(nextOpenLevelButton, SIGNAL(pressed()), this,
|
ret = ret && connect(nextOpenLevelButton, SIGNAL(clicked()), this,
|
||||||
SLOT(onNextNewLevel()));
|
SLOT(onNextNewLevel()));
|
||||||
ret = ret &&
|
ret = ret &&
|
||||||
connect(nextFrameButton, SIGNAL(pressed()), this, SLOT(onNextFrame()));
|
connect(nextFrameButton, SIGNAL(clicked()), this, SLOT(onNextFrame()));
|
||||||
ret = ret &&
|
ret = ret &&
|
||||||
connect(lastFrameButton, SIGNAL(pressed()), this, SLOT(onLastFrame()));
|
connect(lastFrameButton, SIGNAL(clicked()), this, SLOT(onLastFrame()));
|
||||||
ret = ret && connect(m_previousFrameButton, SIGNAL(pressed()), this,
|
ret = ret && connect(m_previousFrameButton, SIGNAL(clicked()), this,
|
||||||
SLOT(onPreviousFrame()));
|
SLOT(onPreviousFrame()));
|
||||||
ret = ret && connect(nextXSheetFrameButton, SIGNAL(pressed()), this,
|
ret = ret && connect(nextXSheetFrameButton, SIGNAL(clicked()), this,
|
||||||
SLOT(onNextXSheetFrame()));
|
SLOT(onNextXSheetFrame()));
|
||||||
ret = ret && connect(m_previousXSheetFrameButton, SIGNAL(pressed()), this,
|
ret = ret && connect(m_previousXSheetFrameButton, SIGNAL(clicked()), this,
|
||||||
SLOT(onPreviousXSheetFrame()));
|
SLOT(onPreviousXSheetFrame()));
|
||||||
ret = ret && connect(m_setToCurrentXSheetFrameButton, SIGNAL(pressed()), this,
|
ret = ret && connect(m_setToCurrentXSheetFrameButton, SIGNAL(clicked()), this,
|
||||||
SLOT(setToCurrentXSheetFrame()));
|
SLOT(setToCurrentXSheetFrame()));
|
||||||
ret = ret && connect(m_onionOpacityFld, SIGNAL(valueEditedByHand()), this,
|
ret = ret && connect(m_onionOpacityFld, SIGNAL(valueEditedByHand()), this,
|
||||||
SLOT(onOnionOpacityFldEdited()));
|
SLOT(onOnionOpacityFldEdited()));
|
||||||
|
@ -1078,17 +1078,17 @@ StopMotionController::StopMotionController(QWidget *parent) : QWidget(parent) {
|
||||||
connect(m_zoomButton, SIGNAL(clicked()), this, SLOT(onZoomPressed()));
|
connect(m_zoomButton, SIGNAL(clicked()), this, SLOT(onZoomPressed()));
|
||||||
ret = ret && connect(m_pickZoomButton, SIGNAL(clicked()), this,
|
ret = ret && connect(m_pickZoomButton, SIGNAL(clicked()), this,
|
||||||
SLOT(onPickZoomPressed()));
|
SLOT(onPickZoomPressed()));
|
||||||
ret = ret && connect(m_focusNearButton, SIGNAL(pressed()), this,
|
ret = ret && connect(m_focusNearButton, SIGNAL(clicked()), this,
|
||||||
SLOT(onFocusNear()));
|
SLOT(onFocusNear()));
|
||||||
ret = ret &&
|
ret = ret &&
|
||||||
connect(m_focusFarButton, SIGNAL(pressed()), this, SLOT(onFocusFar()));
|
connect(m_focusFarButton, SIGNAL(clicked()), this, SLOT(onFocusFar()));
|
||||||
ret = ret && connect(m_focusNear2Button, SIGNAL(pressed()), this,
|
ret = ret && connect(m_focusNear2Button, SIGNAL(clicked()), this,
|
||||||
SLOT(onFocusNear2()));
|
SLOT(onFocusNear2()));
|
||||||
ret = ret && connect(m_focusFar2Button, SIGNAL(pressed()), this,
|
ret = ret && connect(m_focusFar2Button, SIGNAL(clicked()), this,
|
||||||
SLOT(onFocusFar2()));
|
SLOT(onFocusFar2()));
|
||||||
ret = ret && connect(m_focusNear3Button, SIGNAL(pressed()), this,
|
ret = ret && connect(m_focusNear3Button, SIGNAL(clicked()), this,
|
||||||
SLOT(onFocusNear3()));
|
SLOT(onFocusNear3()));
|
||||||
ret = ret && connect(m_focusFar3Button, SIGNAL(pressed()), this,
|
ret = ret && connect(m_focusFar3Button, SIGNAL(clicked()), this,
|
||||||
SLOT(onFocusFar3()));
|
SLOT(onFocusFar3()));
|
||||||
ret = ret &&
|
ret = ret &&
|
||||||
connect(m_stopMotion->m_canon, SIGNAL(apertureChangedSignal(QString)),
|
connect(m_stopMotion->m_canon, SIGNAL(apertureChangedSignal(QString)),
|
||||||
|
@ -1193,7 +1193,7 @@ StopMotionController::StopMotionController(QWidget *parent) : QWidget(parent) {
|
||||||
SLOT(onScreen3OverlayToggled(bool)));
|
SLOT(onScreen3OverlayToggled(bool)));
|
||||||
ret = ret && connect(m_lightTestTimer, SIGNAL(timeout()), this,
|
ret = ret && connect(m_lightTestTimer, SIGNAL(timeout()), this,
|
||||||
SLOT(onTestLightsTimeout()));
|
SLOT(onTestLightsTimeout()));
|
||||||
ret = ret && connect(m_testLightsButton, SIGNAL(pressed()), this,
|
ret = ret && connect(m_testLightsButton, SIGNAL(clicked()), this,
|
||||||
SLOT(onTestLightsPressed()));
|
SLOT(onTestLightsPressed()));
|
||||||
ret = ret &&
|
ret = ret &&
|
||||||
connect(m_stopMotion->m_light, SIGNAL(screen1ColorChanged(TPixel32)),
|
connect(m_stopMotion->m_light, SIGNAL(screen1ColorChanged(TPixel32)),
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
#include <QDialog>
|
#include <QDialog>
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QDesktopWidget>
|
#include <QDesktopWidget>
|
||||||
|
#include <QWindow>
|
||||||
|
|
||||||
TEnv::IntVar StopMotionBlackCapture("StopMotionBlackCapture", 0);
|
TEnv::IntVar StopMotionBlackCapture("StopMotionBlackCapture", 0);
|
||||||
|
|
||||||
|
@ -146,13 +147,16 @@ void StopMotionLight::showOverlays() {
|
||||||
|
|
||||||
void StopMotionLight::hideOverlays() {
|
void StopMotionLight::hideOverlays() {
|
||||||
if ((getBlackCapture() || m_useScreen1Overlay)) {
|
if ((getBlackCapture() || m_useScreen1Overlay)) {
|
||||||
m_fullScreen1->hide();
|
m_fullScreen1->close();
|
||||||
|
m_fullScreen1->windowHandle()->close();
|
||||||
}
|
}
|
||||||
if (m_screenCount > 1 && (getBlackCapture() || m_useScreen2Overlay)) {
|
if (m_screenCount > 1 && (getBlackCapture() || m_useScreen2Overlay)) {
|
||||||
m_fullScreen2->hide();
|
m_fullScreen2->close();
|
||||||
|
m_fullScreen2->windowHandle()->close();
|
||||||
}
|
}
|
||||||
if (m_screenCount > 2 && (getBlackCapture() || m_useScreen3Overlay)) {
|
if (m_screenCount > 2 && (getBlackCapture() || m_useScreen3Overlay)) {
|
||||||
m_fullScreen3->hide();
|
m_fullScreen3->close();
|
||||||
|
m_fullScreen3->windowHandle()->close();
|
||||||
}
|
}
|
||||||
m_overlaysReady = false;
|
m_overlaysReady = false;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue