mirror of
https://github.com/WarmUpTill/SceneSwitcher.git
synced 2026-04-24 14:58:19 -05:00
Move GetSettingsWindow() to ui-helpers
This commit is contained in:
parent
a523081d77
commit
863c84026e
|
|
@ -762,11 +762,6 @@ void OpenSettingsWindow()
|
|||
}
|
||||
}
|
||||
|
||||
QWidget *GetSettingsWindow()
|
||||
{
|
||||
return SettingsWindowIsOpened() ? AdvSceneSwitcher::window : nullptr;
|
||||
}
|
||||
|
||||
void AdvSceneSwitcher::HighligthMacroSettingsButton(bool enable)
|
||||
{
|
||||
static QObject *highlight = nullptr;
|
||||
|
|
|
|||
|
|
@ -411,7 +411,6 @@ public slots:
|
|||
};
|
||||
|
||||
void OpenSettingsWindow();
|
||||
QWidget *GetSettingsWindow();
|
||||
void HighligthMacroSettingsButton(bool enable);
|
||||
|
||||
} // namespace advss
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
#include "advanced-scene-switcher.hpp"
|
||||
#include "layout-helpers.hpp"
|
||||
#include "macro.hpp"
|
||||
#include "ui-helpers.hpp"
|
||||
|
||||
#include <QDialogButtonBox>
|
||||
#include <QStandardItemModel>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
#include "ui-helpers.hpp"
|
||||
#include "advanced-scene-switcher.hpp"
|
||||
#include "non-modal-dialog.hpp"
|
||||
#include "obs-module-helper.hpp"
|
||||
#include "plugin-state-helpers.hpp"
|
||||
|
||||
#include <obs-frontend-api.h>
|
||||
#include <QGraphicsColorizeEffect>
|
||||
|
|
@ -102,7 +104,10 @@ int FindIdxInRagne(QComboBox *list, int start, int stop,
|
|||
return foundIdx;
|
||||
}
|
||||
|
||||
QWidget *GetSettingsWindow();
|
||||
QWidget *GetSettingsWindow()
|
||||
{
|
||||
return SettingsWindowIsOpened() ? AdvSceneSwitcher::window : nullptr;
|
||||
}
|
||||
|
||||
bool DisplayMessage(const QString &msg, bool question, bool modal)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ EXPORT void DisplayTrayMessage(const QString &title, const QString &msg,
|
|||
const QIcon &icon = QIcon());
|
||||
|
||||
EXPORT std::string GetThemeTypeName();
|
||||
EXPORT QWidget *GetSettingsWindow();
|
||||
|
||||
void QeueUITask(void (*task)(void *param), void *param);
|
||||
|
||||
|
|
|
|||
|
|
@ -298,8 +298,6 @@ VariableSelectionDialog::VariableSelectionDialog(QWidget *parent)
|
|||
setLayout(layout);
|
||||
}
|
||||
|
||||
QWidget *GetSettingsWindow();
|
||||
|
||||
bool VariableSelectionDialog::AskForVariable(std::string &varName)
|
||||
{
|
||||
VariableSelectionDialog dialog(GetSettingsWindow());
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user