|
@@ -7,7 +7,7 @@
|
|
|
<rect>
|
|
|
<x>0</x>
|
|
|
<y>0</y>
|
|
|
- <width>1079</width>
|
|
|
+ <width>1086</width>
|
|
|
<height>729</height>
|
|
|
</rect>
|
|
|
</property>
|
|
@@ -176,7 +176,7 @@
|
|
|
</widget>
|
|
|
</item>
|
|
|
<item>
|
|
|
- <widget class="OBSBasicPreview" name="preview">
|
|
|
+ <widget class="OBSBasicPreview" name="preview" native="true">
|
|
|
<property name="sizePolicy">
|
|
|
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
|
|
<horstretch>0</horstretch>
|
|
@@ -486,8 +486,8 @@
|
|
|
<rect>
|
|
|
<x>0</x>
|
|
|
<y>0</y>
|
|
|
- <width>1079</width>
|
|
|
- <height>21</height>
|
|
|
+ <width>1086</width>
|
|
|
+ <height>22</height>
|
|
|
</rect>
|
|
|
</property>
|
|
|
<widget class="QMenu" name="menu_File">
|
|
@@ -677,6 +677,11 @@
|
|
|
<addaction name="actionSceneListMode"/>
|
|
|
<addaction name="actionSceneGridMode"/>
|
|
|
</widget>
|
|
|
+ <widget class="QMenu" name="multiviewProjectorMenu">
|
|
|
+ <property name="title">
|
|
|
+ <string>MultiviewProjector</string>
|
|
|
+ </property>
|
|
|
+ </widget>
|
|
|
<action name="resetUI">
|
|
|
<property name="text">
|
|
|
<string>Basic.MainMenu.View.ResetUI</string>
|
|
@@ -706,11 +711,6 @@
|
|
|
<addaction name="separator"/>
|
|
|
<addaction name="actionAlwaysOnTop"/>
|
|
|
</widget>
|
|
|
- <widget class="QMenu" name="multiviewProjectorMenu">
|
|
|
- <property name="title">
|
|
|
- <string>MultiviewProjector</string>
|
|
|
- </property>
|
|
|
- </widget>
|
|
|
<widget class="QMenu" name="menuTools">
|
|
|
<property name="title">
|
|
|
<string>Basic.MainMenu.Tools</string>
|
|
@@ -739,7 +739,7 @@
|
|
|
<widget class="OBSBasicStatusBar" name="statusbar"/>
|
|
|
<widget class="OBSDock" name="scenesDock">
|
|
|
<property name="features">
|
|
|
- <set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable</set>
|
|
|
+ <set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
|
|
|
</property>
|
|
|
<property name="windowTitle">
|
|
|
<string>Basic.Main.Scenes</string>
|
|
@@ -808,9 +808,6 @@
|
|
|
<verstretch>0</verstretch>
|
|
|
</sizepolicy>
|
|
|
</property>
|
|
|
- <property name="spacing">
|
|
|
- <number>0</number>
|
|
|
- </property>
|
|
|
<property name="contextMenuPolicy">
|
|
|
<enum>Qt::CustomContextMenu</enum>
|
|
|
</property>
|
|
@@ -832,6 +829,9 @@
|
|
|
<property name="defaultDropAction">
|
|
|
<enum>Qt::TargetMoveAction</enum>
|
|
|
</property>
|
|
|
+ <property name="spacing">
|
|
|
+ <number>0</number>
|
|
|
+ </property>
|
|
|
<addaction name="actionRemoveScene"/>
|
|
|
</widget>
|
|
|
</item>
|
|
@@ -879,7 +879,7 @@
|
|
|
</widget>
|
|
|
<widget class="OBSDock" name="sourcesDock">
|
|
|
<property name="features">
|
|
|
- <set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable</set>
|
|
|
+ <set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
|
|
|
</property>
|
|
|
<property name="windowTitle">
|
|
|
<string>Basic.Main.Sources</string>
|
|
@@ -948,9 +948,6 @@
|
|
|
<verstretch>0</verstretch>
|
|
|
</sizepolicy>
|
|
|
</property>
|
|
|
- <property name="spacing">
|
|
|
- <number>0</number>
|
|
|
- </property>
|
|
|
<property name="contextMenuPolicy">
|
|
|
<enum>Qt::CustomContextMenu</enum>
|
|
|
</property>
|
|
@@ -972,6 +969,9 @@
|
|
|
<property name="selectionMode">
|
|
|
<enum>QAbstractItemView::ExtendedSelection</enum>
|
|
|
</property>
|
|
|
+ <property name="spacing">
|
|
|
+ <number>0</number>
|
|
|
+ </property>
|
|
|
<addaction name="actionRemoveSource"/>
|
|
|
</widget>
|
|
|
</item>
|
|
@@ -1019,7 +1019,7 @@
|
|
|
</widget>
|
|
|
<widget class="OBSDock" name="mixerDock">
|
|
|
<property name="features">
|
|
|
- <set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable</set>
|
|
|
+ <set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
|
|
|
</property>
|
|
|
<property name="windowTitle">
|
|
|
<string>Mixer</string>
|
|
@@ -1094,7 +1094,7 @@
|
|
|
<rect>
|
|
|
<x>0</x>
|
|
|
<y>0</y>
|
|
|
- <width>74</width>
|
|
|
+ <width>217</width>
|
|
|
<height>16</height>
|
|
|
</rect>
|
|
|
</property>
|
|
@@ -1202,7 +1202,7 @@
|
|
|
</widget>
|
|
|
<widget class="OBSDock" name="transitionsDock">
|
|
|
<property name="features">
|
|
|
- <set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable</set>
|
|
|
+ <set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
|
|
|
</property>
|
|
|
<property name="windowTitle">
|
|
|
<string>Basic.SceneTransitions</string>
|
|
@@ -1348,7 +1348,7 @@
|
|
|
<string notr="true"/>
|
|
|
</property>
|
|
|
<property name="icon">
|
|
|
- <iconset>
|
|
|
+ <iconset resource="obs.qrc">
|
|
|
<normaloff>:/res/images/plus.svg</normaloff>:/res/images/plus.svg</iconset>
|
|
|
</property>
|
|
|
<property name="flat">
|
|
@@ -1380,7 +1380,7 @@
|
|
|
<string notr="true"/>
|
|
|
</property>
|
|
|
<property name="icon">
|
|
|
- <iconset>
|
|
|
+ <iconset resource="obs.qrc">
|
|
|
<normaloff>:/res/images/minus.svg</normaloff>:/res/images/minus.svg</iconset>
|
|
|
</property>
|
|
|
<property name="flat">
|
|
@@ -1412,7 +1412,7 @@
|
|
|
<string notr="true"/>
|
|
|
</property>
|
|
|
<property name="icon">
|
|
|
- <iconset>
|
|
|
+ <iconset resource="obs.qrc">
|
|
|
<normaloff>:/settings/images/settings/general.svg</normaloff>:/settings/images/settings/general.svg</iconset>
|
|
|
</property>
|
|
|
<property name="flat">
|
|
@@ -1449,7 +1449,7 @@
|
|
|
</widget>
|
|
|
<widget class="OBSDock" name="controlsDock">
|
|
|
<property name="features">
|
|
|
- <set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable</set>
|
|
|
+ <set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
|
|
|
</property>
|
|
|
<property name="windowTitle">
|
|
|
<string>Basic.Main.Controls</string>
|
|
@@ -1650,7 +1650,7 @@
|
|
|
</widget>
|
|
|
<action name="actionAddScene">
|
|
|
<property name="icon">
|
|
|
- <iconset>
|
|
|
+ <iconset resource="obs.qrc">
|
|
|
<normaloff>:/res/images/plus.svg</normaloff>:/res/images/plus.svg</iconset>
|
|
|
</property>
|
|
|
<property name="text">
|
|
@@ -1665,7 +1665,7 @@
|
|
|
</action>
|
|
|
<action name="actionAddSource">
|
|
|
<property name="icon">
|
|
|
- <iconset>
|
|
|
+ <iconset resource="obs.qrc">
|
|
|
<normaloff>:/res/images/plus.svg</normaloff>:/res/images/plus.svg</iconset>
|
|
|
</property>
|
|
|
<property name="text">
|
|
@@ -1680,7 +1680,7 @@
|
|
|
</action>
|
|
|
<action name="actionRemoveScene">
|
|
|
<property name="icon">
|
|
|
- <iconset>
|
|
|
+ <iconset resource="obs.qrc">
|
|
|
<normaloff>:/res/images/minus.svg</normaloff>:/res/images/minus.svg</iconset>
|
|
|
</property>
|
|
|
<property name="text">
|
|
@@ -1704,7 +1704,7 @@
|
|
|
</action>
|
|
|
<action name="actionRemoveSource">
|
|
|
<property name="icon">
|
|
|
- <iconset>
|
|
|
+ <iconset resource="obs.qrc">
|
|
|
<normaloff>:/res/images/minus.svg</normaloff>:/res/images/minus.svg</iconset>
|
|
|
</property>
|
|
|
<property name="text">
|
|
@@ -1731,7 +1731,7 @@
|
|
|
<bool>true</bool>
|
|
|
</property>
|
|
|
<property name="icon">
|
|
|
- <iconset>
|
|
|
+ <iconset resource="obs.qrc">
|
|
|
<normaloff>:/settings/images/settings/general.svg</normaloff>:/settings/images/settings/general.svg</iconset>
|
|
|
</property>
|
|
|
<property name="text">
|
|
@@ -1746,7 +1746,7 @@
|
|
|
</action>
|
|
|
<action name="actionSceneUp">
|
|
|
<property name="icon">
|
|
|
- <iconset>
|
|
|
+ <iconset resource="obs.qrc">
|
|
|
<normaloff>:/res/images/up.svg</normaloff>:/res/images/up.svg</iconset>
|
|
|
</property>
|
|
|
<property name="text">
|
|
@@ -1764,7 +1764,7 @@
|
|
|
<bool>true</bool>
|
|
|
</property>
|
|
|
<property name="icon">
|
|
|
- <iconset>
|
|
|
+ <iconset resource="obs.qrc">
|
|
|
<normaloff>:/res/images/up.svg</normaloff>:/res/images/up.svg</iconset>
|
|
|
</property>
|
|
|
<property name="text">
|
|
@@ -1779,7 +1779,7 @@
|
|
|
</action>
|
|
|
<action name="actionSceneDown">
|
|
|
<property name="icon">
|
|
|
- <iconset>
|
|
|
+ <iconset resource="obs.qrc">
|
|
|
<normaloff>:/res/images/down.svg</normaloff>:/res/images/down.svg</iconset>
|
|
|
</property>
|
|
|
<property name="text">
|
|
@@ -1797,7 +1797,7 @@
|
|
|
<bool>true</bool>
|
|
|
</property>
|
|
|
<property name="icon">
|
|
|
- <iconset>
|
|
|
+ <iconset resource="obs.qrc">
|
|
|
<normaloff>:/res/images/down.svg</normaloff>:/res/images/down.svg</iconset>
|
|
|
</property>
|
|
|
<property name="text">
|
|
@@ -2013,12 +2013,12 @@
|
|
|
</property>
|
|
|
</action>
|
|
|
<action name="actionReleaseNotes">
|
|
|
- <property name="visible">
|
|
|
- <bool>false</bool>
|
|
|
- </property>
|
|
|
<property name="text">
|
|
|
<string>Basic.MainMenu.Help.ReleaseNotes</string>
|
|
|
</property>
|
|
|
+ <property name="visible">
|
|
|
+ <bool>false</bool>
|
|
|
+ </property>
|
|
|
</action>
|
|
|
<action name="actionInteract">
|
|
|
<property name="text">
|