mirror of
https://github.com/obsproject/obs-studio.git
synced 2026-10-29 18:34:44 +08:00
frontend: Unify naming of Idian Playground
It's called Idian Playground in some places and Widget Playground in others. Idian Playground is more precise so let's use that.
This commit is contained in:
committed by
Ryan Foster
parent
c527f9e34c
commit
de9fcd6b42
@@ -1,11 +1,11 @@
|
||||
option(ENABLE_WIDGET_PLAYGROUND "Enable building custom widget demo window" OFF)
|
||||
option(ENABLE_IDIAN_PLAYGROUND "Enable building custom idian widget demo window" OFF)
|
||||
|
||||
if(ENABLE_WIDGET_PLAYGROUND)
|
||||
if(ENABLE_IDIAN_PLAYGROUND)
|
||||
target_sources(
|
||||
obs-studio
|
||||
PRIVATE forms/OBSIdianPlayground.ui dialogs/OBSIdianPlayground.hpp dialogs/OBSIdianPlayground.cpp
|
||||
)
|
||||
target_enable_feature(obs-studio "Widget Playground" ENABLE_WIDGET_PLAYGROUND)
|
||||
target_enable_feature(obs-studio "Idian Playground" ENABLE_IDIAN_PLAYGROUND)
|
||||
else()
|
||||
target_disable_feature(obs-studio "Widget Playground")
|
||||
target_disable_feature(obs-studio "Idian Playground")
|
||||
endif()
|
||||
|
||||
@@ -937,7 +937,7 @@
|
||||
<string>Basic.MainMenu.Tools</string>
|
||||
</property>
|
||||
<addaction name="autoConfigure"/>
|
||||
<addaction name="widgetPlayground"/>
|
||||
<addaction name="idianPlayground"/>
|
||||
<addaction name="separator"/>
|
||||
</widget>
|
||||
<widget class="QMenu" name="menuDocks">
|
||||
@@ -2166,9 +2166,9 @@
|
||||
<string>PasteDuplicate</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="widgetPlayground">
|
||||
<action name="idianPlayground">
|
||||
<property name="text">
|
||||
<string>Widget Playground</string>
|
||||
<string>Idian Playground</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="autoConfigure2">
|
||||
|
||||
@@ -422,8 +422,8 @@ OBSBasic::OBSBasic(QWidget *parent) : OBSMainWindow(parent), undo_s(ui), ui(new
|
||||
ui->actionE_xit->setShortcut(Qt::CTRL | Qt::Key_Q);
|
||||
#endif
|
||||
|
||||
#ifndef ENABLE_WIDGET_PLAYGROUND
|
||||
ui->widgetPlayground->setVisible(false);
|
||||
#ifndef ENABLE_IDIAN_PLAYGROUND
|
||||
ui->idianPlayground->setVisible(false);
|
||||
#endif
|
||||
|
||||
auto addNudge = [this](const QKeySequence &seq, MoveDir direction, int distance) {
|
||||
|
||||
@@ -630,7 +630,7 @@ private slots:
|
||||
|
||||
void on_autoConfigure_triggered();
|
||||
void on_stats_triggered();
|
||||
void on_widgetPlayground_triggered();
|
||||
void on_idianPlayground_triggered();
|
||||
|
||||
void on_resetUI_triggered();
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
#endif
|
||||
#include <wizards/AutoConfig.hpp>
|
||||
|
||||
#ifdef ENABLE_WIDGET_PLAYGROUND
|
||||
#ifdef ENABLE_IDIAN_PLAYGROUND
|
||||
#include "dialogs/OBSIdianPlayground.hpp"
|
||||
#endif
|
||||
|
||||
@@ -639,9 +639,9 @@ void OBSBasic::on_stats_triggered()
|
||||
stats = statsDlg;
|
||||
}
|
||||
|
||||
void OBSBasic::on_widgetPlayground_triggered()
|
||||
void OBSBasic::on_idianPlayground_triggered()
|
||||
{
|
||||
#ifdef ENABLE_WIDGET_PLAYGROUND
|
||||
#ifdef ENABLE_IDIAN_PLAYGROUND
|
||||
OBSIdianPlayground playground(this);
|
||||
playground.setModal(true);
|
||||
playground.show();
|
||||
|
||||
Reference in New Issue
Block a user