UI: Add pause support

Adds support for pausing recordings.  When settings are eligible for
recordings, a pause button will appear next to the recording button.  If
the settings are not eligible, it will warn the user in the output
settings that they cannot pause recordings if those settings are used.
This commit is contained in:
jp9000
2019-07-08 08:11:56 -07:00
parent 942ca6f709
commit eab10d48b2
22 changed files with 385 additions and 42 deletions
+57 -33
View File
@@ -116,7 +116,7 @@
<x>0</x>
<y>0</y>
<width>1079</width>
<height>22</height>
<height>21</height>
</rect>
</property>
<widget class="QMenu" name="menu_File">
@@ -656,7 +656,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>64</width>
<width>80</width>
<height>16</height>
</rect>
</property>
@@ -843,7 +843,7 @@
<string notr="true"/>
</property>
<property name="icon">
<iconset resource="obs.qrc">
<iconset>
<normaloff>:/res/images/add.png</normaloff>:/res/images/add.png</iconset>
</property>
<property name="flat">
@@ -878,7 +878,7 @@
<string notr="true"/>
</property>
<property name="icon">
<iconset resource="obs.qrc">
<iconset>
<normaloff>:/res/images/list_remove.png</normaloff>:/res/images/list_remove.png</iconset>
</property>
<property name="flat">
@@ -913,7 +913,7 @@
<string notr="true"/>
</property>
<property name="icon">
<iconset resource="obs.qrc">
<iconset>
<normaloff>:/res/images/configuration21_16.png</normaloff>:/res/images/configuration21_16.png</iconset>
</property>
<property name="flat">
@@ -1000,7 +1000,7 @@
<attribute name="dockWidgetArea">
<number>8</number>
</attribute>
<widget class="QWidget" name="dockWidgetContents_3">
<widget class="QWidget" name="controlsDockContents">
<layout class="QVBoxLayout" name="buttonsVLayout">
<property name="spacing">
<number>2</number>
@@ -1037,29 +1037,48 @@
</widget>
</item>
<item>
<widget class="QPushButton" name="recordButton">
<property name="enabled">
<bool>true</bool>
<layout class="QHBoxLayout" name="recordingLayout">
<property name="spacing">
<number>2</number>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
<property name="leftMargin">
<number>0</number>
</property>
<property name="minimumSize">
<size>
<width>130</width>
<height>0</height>
</size>
<property name="topMargin">
<number>0</number>
</property>
<property name="text">
<string>Basic.Main.StartRecording</string>
<property name="rightMargin">
<number>0</number>
</property>
<property name="checkable">
<bool>true</bool>
<property name="bottomMargin">
<number>0</number>
</property>
</widget>
<item>
<widget class="RecordButton" name="recordButton">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>130</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Basic.Main.StartRecording</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QPushButton" name="modeSwitch">
@@ -1115,7 +1134,7 @@
</widget>
<action name="actionAddScene">
<property name="icon">
<iconset resource="obs.qrc">
<iconset>
<normaloff>:/res/images/add.png</normaloff>:/res/images/add.png</iconset>
</property>
<property name="text">
@@ -1127,7 +1146,7 @@
</action>
<action name="actionAddSource">
<property name="icon">
<iconset resource="obs.qrc">
<iconset>
<normaloff>:/res/images/add.png</normaloff>:/res/images/add.png</iconset>
</property>
<property name="text">
@@ -1139,7 +1158,7 @@
</action>
<action name="actionRemoveScene">
<property name="icon">
<iconset resource="obs.qrc">
<iconset>
<normaloff>:/res/images/list_remove.png</normaloff>:/res/images/list_remove.png</iconset>
</property>
<property name="text">
@@ -1157,7 +1176,7 @@
</action>
<action name="actionRemoveSource">
<property name="icon">
<iconset resource="obs.qrc">
<iconset>
<normaloff>:/res/images/list_remove.png</normaloff>:/res/images/list_remove.png</iconset>
</property>
<property name="text">
@@ -1178,7 +1197,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="obs.qrc">
<iconset>
<normaloff>:/res/images/properties.png</normaloff>:/res/images/properties.png</iconset>
</property>
<property name="text">
@@ -1190,7 +1209,7 @@
</action>
<action name="actionSceneUp">
<property name="icon">
<iconset resource="obs.qrc">
<iconset>
<normaloff>:/res/images/up.png</normaloff>:/res/images/up.png</iconset>
</property>
<property name="text">
@@ -1205,7 +1224,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="obs.qrc">
<iconset>
<normaloff>:/res/images/up.png</normaloff>:/res/images/up.png</iconset>
</property>
<property name="text">
@@ -1217,7 +1236,7 @@
</action>
<action name="actionSceneDown">
<property name="icon">
<iconset resource="obs.qrc">
<iconset>
<normaloff>:/res/images/down.png</normaloff>:/res/images/down.png</iconset>
</property>
<property name="text">
@@ -1232,7 +1251,7 @@
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="obs.qrc">
<iconset>
<normaloff>:/res/images/down.png</normaloff>:/res/images/down.png</iconset>
</property>
<property name="text">
@@ -1733,6 +1752,11 @@
<header>window-dock.hpp</header>
<container>1</container>
</customwidget>
<customwidget>
<class>RecordButton</class>
<extends>QPushButton</extends>
<header>record-button.hpp</header>
</customwidget>
</customwidgets>
<resources>
<include location="obs.qrc"/>
+3
View File
@@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8" fill="#000000">
<path d="M0 0v6h2v-6h-2zm4 0v6h2v-6h-2z" transform="translate(1 1)" />
</svg>

After

Width:  |  Height:  |  Size: 154 B

+1
View File
@@ -1,5 +1,6 @@
<RCC>
<qresource prefix="/res">
<file>images/media-pause.svg</file>
<file>images/mute.svg</file>
<file>images/refresh.svg</file>
<file>images/no_sources.svg</file>