Changed clang format to new agreement
This commit is contained in:
Jeremy Borgman
committed by
borgmanJeremy
borgmanJeremy
parent
2cbccc3d0a
commit
0d5386edd4
@@ -40,130 +40,126 @@ CaptureLauncher::CaptureLauncher(QWidget* parent)
|
||||
: QWidget(parent)
|
||||
, m_id(0)
|
||||
{
|
||||
setAttribute(Qt::WA_DeleteOnClose);
|
||||
connect(Controller::getInstance(),
|
||||
&Controller::captureTaken,
|
||||
this,
|
||||
&CaptureLauncher::captureTaken);
|
||||
connect(Controller::getInstance(),
|
||||
&Controller::captureFailed,
|
||||
this,
|
||||
&CaptureLauncher::captureFailed);
|
||||
setAttribute(Qt::WA_DeleteOnClose);
|
||||
connect(Controller::getInstance(),
|
||||
&Controller::captureTaken,
|
||||
this,
|
||||
&CaptureLauncher::captureTaken);
|
||||
connect(Controller::getInstance(),
|
||||
&Controller::captureFailed,
|
||||
this,
|
||||
&CaptureLauncher::captureFailed);
|
||||
|
||||
m_imageLabel = new ImageLabel(this);
|
||||
bool ok;
|
||||
m_imageLabel->setScreenshot(ScreenGrabber().grabEntireDesktop(ok));
|
||||
if (!ok) {
|
||||
}
|
||||
m_imageLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
|
||||
connect(m_imageLabel,
|
||||
&ImageLabel::dragInitiated,
|
||||
this,
|
||||
&CaptureLauncher::startDrag);
|
||||
m_imageLabel = new ImageLabel(this);
|
||||
bool ok;
|
||||
m_imageLabel->setScreenshot(ScreenGrabber().grabEntireDesktop(ok));
|
||||
if (!ok) {
|
||||
}
|
||||
m_imageLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
|
||||
connect(m_imageLabel,
|
||||
&ImageLabel::dragInitiated,
|
||||
this,
|
||||
&CaptureLauncher::startDrag);
|
||||
|
||||
QGridLayout* layout = new QGridLayout(this);
|
||||
layout->addWidget(m_imageLabel, 0, 0);
|
||||
QGridLayout* layout = new QGridLayout(this);
|
||||
layout->addWidget(m_imageLabel, 0, 0);
|
||||
|
||||
m_CaptureModeLabel = new QLabel(tr("<b>Capture Mode</b>"));
|
||||
m_CaptureModeLabel = new QLabel(tr("<b>Capture Mode</b>"));
|
||||
|
||||
m_captureType = new QComboBox();
|
||||
m_captureType->setMinimumWidth(240);
|
||||
// TODO remember number
|
||||
m_captureType->insertItem(
|
||||
1, tr("Rectangular Region"), CaptureRequest::GRAPHICAL_MODE);
|
||||
m_captureType->insertItem(
|
||||
2, tr("Full Screen (All Monitors)"), CaptureRequest::FULLSCREEN_MODE);
|
||||
// m_captureType->insertItem(3, tr("Single Screen"),
|
||||
// CaptureRequest::SCREEN_MODE);
|
||||
m_captureType = new QComboBox();
|
||||
m_captureType->setMinimumWidth(240);
|
||||
// TODO remember number
|
||||
m_captureType->insertItem(
|
||||
1, tr("Rectangular Region"), CaptureRequest::GRAPHICAL_MODE);
|
||||
m_captureType->insertItem(
|
||||
2, tr("Full Screen (All Monitors)"), CaptureRequest::FULLSCREEN_MODE);
|
||||
// m_captureType->insertItem(3, tr("Single Screen"),
|
||||
// CaptureRequest::SCREEN_MODE);
|
||||
|
||||
m_delaySpinBox = new QSpinBox();
|
||||
m_delaySpinBox->setSingleStep(1.0);
|
||||
m_delaySpinBox->setMinimum(0.0);
|
||||
m_delaySpinBox->setMaximum(999.0);
|
||||
m_delaySpinBox->setSpecialValueText(tr("No Delay"));
|
||||
m_delaySpinBox->setMinimumWidth(160);
|
||||
// with QT 5.7 qOverload<int>(&QSpinBox::valueChanged),
|
||||
connect(m_delaySpinBox,
|
||||
static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged),
|
||||
this,
|
||||
[this](int val) {
|
||||
QString sufix = val == 1 ? tr(" second") : tr(" seconds");
|
||||
this->m_delaySpinBox->setSuffix(sufix);
|
||||
});
|
||||
m_delaySpinBox = new QSpinBox();
|
||||
m_delaySpinBox->setSingleStep(1.0);
|
||||
m_delaySpinBox->setMinimum(0.0);
|
||||
m_delaySpinBox->setMaximum(999.0);
|
||||
m_delaySpinBox->setSpecialValueText(tr("No Delay"));
|
||||
m_delaySpinBox->setMinimumWidth(160);
|
||||
// with QT 5.7 qOverload<int>(&QSpinBox::valueChanged),
|
||||
connect(m_delaySpinBox,
|
||||
static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged),
|
||||
this,
|
||||
[this](int val) {
|
||||
QString sufix = val == 1 ? tr(" second") : tr(" seconds");
|
||||
this->m_delaySpinBox->setSuffix(sufix);
|
||||
});
|
||||
|
||||
m_launchButton = new QPushButton(tr("Take new screenshot"));
|
||||
m_launchButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
|
||||
connect(m_launchButton,
|
||||
&QPushButton::pressed,
|
||||
this,
|
||||
&CaptureLauncher::startCapture);
|
||||
m_launchButton->setFocus();
|
||||
m_launchButton = new QPushButton(tr("Take new screenshot"));
|
||||
m_launchButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
|
||||
connect(m_launchButton,
|
||||
&QPushButton::pressed,
|
||||
this,
|
||||
&CaptureLauncher::startCapture);
|
||||
m_launchButton->setFocus();
|
||||
|
||||
QFormLayout* captureModeForm = new QFormLayout;
|
||||
captureModeForm->addRow(tr("Area:"), m_captureType);
|
||||
captureModeForm->addRow(tr("Delay:"), m_delaySpinBox);
|
||||
captureModeForm->setContentsMargins(24, 0, 0, 0);
|
||||
QFormLayout* captureModeForm = new QFormLayout;
|
||||
captureModeForm->addRow(tr("Area:"), m_captureType);
|
||||
captureModeForm->addRow(tr("Delay:"), m_delaySpinBox);
|
||||
captureModeForm->setContentsMargins(24, 0, 0, 0);
|
||||
|
||||
m_mainLayout = new QVBoxLayout();
|
||||
m_mainLayout->addStretch(1);
|
||||
m_mainLayout->addWidget(m_CaptureModeLabel);
|
||||
m_mainLayout->addLayout(captureModeForm);
|
||||
m_mainLayout->addStretch(10);
|
||||
m_mainLayout->addWidget(m_launchButton, 1, Qt::AlignCenter);
|
||||
m_mainLayout->setContentsMargins(10, 0, 0, 10);
|
||||
layout->addLayout(m_mainLayout, 0, 1);
|
||||
layout->setColumnMinimumWidth(0, 320);
|
||||
layout->setColumnMinimumWidth(1, 320);
|
||||
m_mainLayout = new QVBoxLayout();
|
||||
m_mainLayout->addStretch(1);
|
||||
m_mainLayout->addWidget(m_CaptureModeLabel);
|
||||
m_mainLayout->addLayout(captureModeForm);
|
||||
m_mainLayout->addStretch(10);
|
||||
m_mainLayout->addWidget(m_launchButton, 1, Qt::AlignCenter);
|
||||
m_mainLayout->setContentsMargins(10, 0, 0, 10);
|
||||
layout->addLayout(m_mainLayout, 0, 1);
|
||||
layout->setColumnMinimumWidth(0, 320);
|
||||
layout->setColumnMinimumWidth(1, 320);
|
||||
}
|
||||
|
||||
// HACK:
|
||||
// https://github.com/KDE/spectacle/blob/fa1e780b8bf3df3ac36c410b9ece4ace041f401b/src/Gui/KSMainWindow.cpp#L70
|
||||
void
|
||||
CaptureLauncher::startCapture()
|
||||
void CaptureLauncher::startCapture()
|
||||
{
|
||||
hide();
|
||||
auto mode = static_cast<CaptureRequest::CaptureMode>(
|
||||
m_captureType->currentData().toInt());
|
||||
CaptureRequest req(mode, 600 + m_delaySpinBox->value() * 1000);
|
||||
m_id = req.id();
|
||||
Controller::getInstance()->requestCapture(req);
|
||||
hide();
|
||||
auto mode = static_cast<CaptureRequest::CaptureMode>(
|
||||
m_captureType->currentData().toInt());
|
||||
CaptureRequest req(mode, 600 + m_delaySpinBox->value() * 1000);
|
||||
m_id = req.id();
|
||||
Controller::getInstance()->requestCapture(req);
|
||||
}
|
||||
|
||||
void
|
||||
CaptureLauncher::startDrag()
|
||||
void CaptureLauncher::startDrag()
|
||||
{
|
||||
QDrag* dragHandler = new QDrag(this);
|
||||
QMimeData* mimeData = new QMimeData;
|
||||
mimeData->setImageData(m_imageLabel->pixmap());
|
||||
dragHandler->setMimeData(mimeData);
|
||||
QDrag* dragHandler = new QDrag(this);
|
||||
QMimeData* mimeData = new QMimeData;
|
||||
mimeData->setImageData(m_imageLabel->pixmap());
|
||||
dragHandler->setMimeData(mimeData);
|
||||
|
||||
dragHandler->setPixmap(m_imageLabel->pixmap()->scaled(
|
||||
256, 256, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation));
|
||||
dragHandler->exec();
|
||||
dragHandler->setPixmap(m_imageLabel->pixmap()->scaled(
|
||||
256, 256, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation));
|
||||
dragHandler->exec();
|
||||
}
|
||||
|
||||
void
|
||||
CaptureLauncher::captureTaken(uint id, QPixmap p)
|
||||
void CaptureLauncher::captureTaken(uint id, QPixmap p)
|
||||
{
|
||||
if (id == m_id) {
|
||||
m_id = 0;
|
||||
m_imageLabel->setScreenshot(p);
|
||||
show();
|
||||
}
|
||||
if (id == m_id) {
|
||||
m_id = 0;
|
||||
m_imageLabel->setScreenshot(p);
|
||||
show();
|
||||
}
|
||||
|
||||
auto mode = static_cast<CaptureRequest::CaptureMode>(
|
||||
m_captureType->currentData().toInt());
|
||||
auto mode = static_cast<CaptureRequest::CaptureMode>(
|
||||
m_captureType->currentData().toInt());
|
||||
|
||||
if (mode == CaptureRequest::FULLSCREEN_MODE) {
|
||||
ScreenshotSaver().saveToFilesystemGUI(p);
|
||||
}
|
||||
if (mode == CaptureRequest::FULLSCREEN_MODE) {
|
||||
ScreenshotSaver().saveToFilesystemGUI(p);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
CaptureLauncher::captureFailed(uint id)
|
||||
void CaptureLauncher::captureFailed(uint id)
|
||||
{
|
||||
if (id == m_id) {
|
||||
m_id = 0;
|
||||
show();
|
||||
}
|
||||
if (id == m_id) {
|
||||
m_id = 0;
|
||||
show();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user