mirror of
https://github.com/WarmUpTill/SceneSwitcher.git
synced 2026-08-26 03:06:17 -05:00
Add Qt version checks to support Qt5
This commit is contained in:
@@ -9,6 +9,7 @@
|
||||
#include <QBuffer>
|
||||
#include <QToolTip>
|
||||
#include <QMessageBox>
|
||||
#include <QtGlobal>
|
||||
|
||||
const std::string MacroConditionVideo::id = "video";
|
||||
|
||||
@@ -542,12 +543,23 @@ void MacroConditionVideoEdit::ImageBrowseButtonClicked()
|
||||
"AdvSceneSwitcher.condition.video.askFileAction"),
|
||||
QMessageBox::Yes | QMessageBox::No |
|
||||
QMessageBox::Cancel);
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||
msgBox.setButtonText(
|
||||
QMessageBox::Yes,
|
||||
obs_module_text(
|
||||
"AdvSceneSwitcher.condition.video.askFileAction.file"));
|
||||
msgBox.setButtonText(
|
||||
QMessageBox::No,
|
||||
obs_module_text(
|
||||
"AdvSceneSwitcher.condition.video.askFileAction.screenshot"));
|
||||
#else
|
||||
auto yes = msgBox.button(QMessageBox::StandardButton::Yes);
|
||||
yes->setText(obs_module_text(
|
||||
"AdvSceneSwitcher.condition.video.askFileAction.file"));
|
||||
auto no = msgBox.button(QMessageBox::StandardButton::No);
|
||||
no->setText(obs_module_text(
|
||||
"AdvSceneSwitcher.condition.video.askFileAction.screenshot"));
|
||||
#endif
|
||||
msgBox.setWindowFlags(Qt::Window | Qt::WindowTitleHint |
|
||||
Qt::CustomizeWindowHint);
|
||||
const auto result = msgBox.exec();
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
#include <QDrag>
|
||||
#include <QMimeData>
|
||||
#include <QScrollBar>
|
||||
#include <QtGlobal>
|
||||
|
||||
MacroSegmentList::MacroSegmentList(QWidget *parent)
|
||||
: QScrollArea(parent),
|
||||
@@ -155,7 +156,11 @@ bool MacroSegmentList::eventFilter(QObject *object, QEvent *event)
|
||||
void MacroSegmentList::mousePressEvent(QMouseEvent *event)
|
||||
{
|
||||
if (event->button() == Qt::LeftButton) {
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||
_dragPosition = GetDragIndex(event->globalPos());
|
||||
#else
|
||||
_dragPosition = GetDragIndex(event->globalPosition().toPoint());
|
||||
#endif
|
||||
emit SelectionChagned(_dragPosition);
|
||||
} else {
|
||||
_dragPosition = -1;
|
||||
@@ -263,7 +268,11 @@ void MacroSegmentList::dragMoveEvent(QDragMoveEvent *event)
|
||||
return;
|
||||
}
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||
_dragCursorPos = (mapToGlobal(event->pos()));
|
||||
#else
|
||||
_dragCursorPos = (mapToGlobal(event->position().toPoint()));
|
||||
#endif
|
||||
CheckDropLine(_dragCursorPos);
|
||||
}
|
||||
|
||||
@@ -409,6 +418,16 @@ void MacroSegmentList::dropEvent(QDropEvent *event)
|
||||
{
|
||||
HideLastDropLine();
|
||||
auto widget = qobject_cast<QWidget *>(event->source());
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||
if (widget && !widget->geometry().contains(event->pos()) &&
|
||||
widgetIsInLayout(widget, _contentLayout)) {
|
||||
int dropPosition = GetDropIndex(mapToGlobal(event->pos()));
|
||||
if (dropPosition == -1) {
|
||||
return;
|
||||
}
|
||||
emit Reorder(dropPosition, _dragPosition);
|
||||
}
|
||||
#else
|
||||
if (widget &&
|
||||
!widget->geometry().contains(event->position().toPoint()) &&
|
||||
widgetIsInLayout(widget, _contentLayout)) {
|
||||
@@ -419,5 +438,6 @@ void MacroSegmentList::dropEvent(QDropEvent *event)
|
||||
}
|
||||
emit Reorder(dropPosition, _dragPosition);
|
||||
}
|
||||
#endif
|
||||
_dragPosition = -1;
|
||||
}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#include <QtGlobal>
|
||||
#include <QFileDialog>
|
||||
#include <QTextStream>
|
||||
#include <QDateTime>
|
||||
@@ -114,7 +115,11 @@ void SwitcherData::writeToStatusFile(const QString &msg)
|
||||
QFile file(QString::fromStdString(fileIO.writePath));
|
||||
if (file.open(QIODevice::ReadWrite)) {
|
||||
QTextStream stream(&file);
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||
stream << msg << endl;
|
||||
#else
|
||||
stream << msg << Qt::endl;
|
||||
#endif
|
||||
}
|
||||
file.close();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user