Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI: Add scene setup wizard #3470

Closed
wants to merge 1 commit into from
Closed

UI: Add scene setup wizard #3470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions UI/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,8 @@ set(obs_SOURCES
obs-proxy-style.cpp
locked-checkbox.cpp
visibility-checkbox.cpp
media-slider.cpp)
media-slider.cpp
scene-wizard.cpp)

set(obs_HEADERS
${obs_PLATFORM_HEADERS}
Expand Down Expand Up @@ -322,7 +323,8 @@ set(obs_HEADERS
log-viewer.hpp
obs-proxy-style.hpp
obs-proxy-style.hpp
media-slider.hpp)
media-slider.hpp
scene-wizard.hpp)

set(obs_importers_HEADERS
importers/importers.hpp)
Expand Down Expand Up @@ -362,7 +364,8 @@ set(obs_UI
forms/OBSUpdate.ui
forms/OBSRemux.ui
forms/OBSImporter.ui
forms/OBSAbout.ui)
forms/OBSAbout.ui
forms/OBSSceneWizard.ui)

set(obs_QRC
forms/obs.qrc)
Expand Down
13 changes: 13 additions & 0 deletions UI/data/locale/en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1053,3 +1053,16 @@ ContextBar.MediaControls.PlaylistNext="Next in Playlist"
ContextBar.MediaControls.PlaylistPrevious="Previous in Playlist"
ContextBar.MediaControls.MediaProperties="Media Properties"
ContextBar.MediaControls.BlindSeek="Media Seek Widget"

# SceneWizard
SceneWizard="Scene Wizard"
RunSceneWizard="Run Scene Wizard"
SceneWizard.OptionsQuestion="How do you want to use OBS?"
SceneWizard.ImportButton="I want to import my existing scenes"
SceneWizard.TemplateButton="I want to choose a scene template"
SceneWizard.SetupOwnButton="I will setup OBS on my own"
SceneWizard.SelectTemplate="Select template"
SceneWizard.NoTemplates="No templates available"
SceneWizard.SelectWebcam="Select webcam"
SceneWizard.SelectMicrophone="Select microphone"
SceneWizard.SelectDesktopAudio="Select desktop audio"
Empty file added UI/data/templates/mac/.keep
View file
Open in desktop
Empty file.
Empty file added UI/data/templates/nix/.keep
View file
Open in desktop
Empty file.
Empty file added UI/data/templates/windows/.keep
View file
Open in desktop
Empty file.
17 changes: 17 additions & 0 deletions UI/data/themes/Acri.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1152,3 +1152,20 @@ QSlider::handle:horizontal[themeID="tBarSlider"] {
* [themeID="previousIcon"] {
qproperty-icon: url(./Dark/media/media_previous.svg);
}

/* Scene wizard */

QListWidget[themeID="templateList"] {
background-color: #181819;
border: none;
}

QListWidget::item:selected[themeID="templateList"] {
background-color: #162458;
color: rgb(225, 224, 225);
}

QListWidget::item[themeID="templateList"] {
border: 0px;
padding: 10px;
}
17 changes: 17 additions & 0 deletions UI/data/themes/Dark.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,3 +878,20 @@ QSlider::handle:horizontal[themeID="tBarSlider"] {
* [themeID="previousIcon"] {
qproperty-icon: url(./Dark/media/media_previous.svg);
}

/* Scene wizard */

QListWidget[themeID="templateList"] {
background-color: rgb(58, 57, 58);
border: none;
}

QListWidget::item:selected[themeID="templateList"] {
background-color: rgb(88, 87, 88);
color: rgb(225, 224, 225);
}

QListWidget::item[themeID="templateList"] {
border: 0px;
padding: 10px;
}
17 changes: 17 additions & 0 deletions UI/data/themes/Rachni.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1459,3 +1459,20 @@ QPushButton#sourceFiltersButton {
* [themeID="nextIcon"] {
qproperty-icon: url(./Dark/media/media_next.svg);
}

/* Scene wizard */

QListWidget[themeID="templateList"] {
background-color: rgb(49, 54, 59); /* Blue-gray */
border: none;
}

QListWidget::item:selected[themeID="templateList"] {
background-color: rgb(0, 188, 212);; /* Cyan (Primary) */
color: rgb(225, 224, 225);
}

QListWidget::item[themeID="templateList"] {
border: 0px;
padding: 10px;
}
7 changes: 7 additions & 0 deletions UI/data/themes/System.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,3 +296,10 @@ QSlider::handle:horizontal[themeID="tBarSlider"] {
* [themeID="previousIcon"] {
qproperty-icon: url(./Dark/media/media_previous.svg);
}

/* Scene wizard */

QListWidget::item[themeID="templateList"] {
border: 0px;
padding: 10px;
}
21 changes: 14 additions & 7 deletions UI/forms/OBSBasic.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@
<x>0</x>
<y>0</y>
<width>1079</width>
<height>21</height>
<height>22</height>
</rect>
</property>
<widget class="QMenu" name="menu_File">
Expand Down Expand Up @@ -587,6 +587,8 @@
<property name="title">
<string>Basic.MainMenu.SceneCollection</string>
</property>
<addaction name="actionRunSceneWizard"/>
<addaction name="separator"/>
<addaction name="actionNewSceneCollection"/>
<addaction name="actionDupSceneCollection"/>
<addaction name="actionRenameSceneCollection"/>
Expand Down Expand Up @@ -649,7 +651,7 @@
<widget class="OBSBasicStatusBar" name="statusbar"/>
<widget class="OBSDock" name="scenesDock">
<property name="features">
<set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable</set>
<set>QDockWidget::AllDockWidgetFeatures</set>
</property>
<property name="windowTitle">
<string>Basic.Main.Scenes</string>
Expand Down Expand Up @@ -784,7 +786,7 @@
</widget>
<widget class="OBSDock" name="sourcesDock">
<property name="features">
<set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable</set>
<set>QDockWidget::AllDockWidgetFeatures</set>
</property>
<property name="windowTitle">
<string>Basic.Main.Sources</string>
Expand Down Expand Up @@ -920,7 +922,7 @@
</widget>
<widget class="OBSDock" name="mixerDock">
<property name="features">
<set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable</set>
<set>QDockWidget::AllDockWidgetFeatures</set>
</property>
<property name="windowTitle">
<string>Mixer</string>
Expand Down Expand Up @@ -971,7 +973,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>94</width>
<width>74</width>
<height>16</height>
</rect>
</property>
Expand Down Expand Up @@ -1060,7 +1062,7 @@
</widget>
<widget class="OBSDock" name="transitionsDock">
<property name="features">
<set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable</set>
<set>QDockWidget::AllDockWidgetFeatures</set>
</property>
<property name="windowTitle">
<string>Basic.SceneTransitions</string>
Expand Down Expand Up @@ -1221,7 +1223,7 @@
</widget>
<widget class="OBSDock" name="controlsDock">
<property name="features">
<set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable</set>
<set>QDockWidget::AllDockWidgetFeatures</set>
</property>
<property name="windowTitle">
<string>Basic.Main.Controls</string>
Expand Down Expand Up @@ -2005,6 +2007,11 @@
<string>Basic.MainMenu.View.ContextBar</string>
</property>
</action>
<action name="actionRunSceneWizard">
<property name="text">
<string>RunSceneWizard</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>
Expand Down
Loading