jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1979 from cg2121/suffixes

Browse Source 
UI, obs-plugins: Add spinbox suffixes where necessary
This commit is contained in:
Jim
2019-07-21 21:45:30 -07:00
committed by GitHub
parent 807da6c7f6 3ea354b4e4
commit 168ae0af8e
19 changed files with 172 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
UI/data/locale/en-US.ini
View File

@@ -668,7 +668,7 @@ Basic.Settings.Output.Mode.Simple="Simple"
Basic.Settings.Output.Mode.Adv="Advanced"
Basic.Settings.Output.Mode.FFmpeg="FFmpeg Output"
Basic.Settings.Output.UseReplayBuffer="Enable Replay Buffer"
Basic.Settings.Output.ReplayBuffer.SecondsMax="Maximum Replay Time (Seconds)"
Basic.Settings.Output.ReplayBuffer.SecondsMax="Maximum Replay Time"
Basic.Settings.Output.ReplayBuffer.MegabytesMax="Maximum Memory (Megabytes)"
Basic.Settings.Output.ReplayBuffer.Estimate="Estimated memory usage: %1 MB"
Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Cannot estimate memory usage. Please set maximum memory limit."
@@ -696,7 +696,7 @@ Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Software (x264 low CPU usag
Basic.Settings.Output.VideoBitrate="Video Bitrate"
Basic.Settings.Output.AudioBitrate="Audio Bitrate"
Basic.Settings.Output.Reconnect="Automatically Reconnect"
Basic.Settings.Output.RetryDelay="Retry Delay (seconds)"
Basic.Settings.Output.RetryDelay="Retry Delay"
Basic.Settings.Output.MaxRetries="Maximum Retries"
Basic.Settings.Output.Advanced="Enable Advanced Encoder Settings"
Basic.Settings.Output.EncoderPreset="Encoder Preset"
@@ -824,7 +824,7 @@ Basic.Settings.Advanced.Audio.MonitoringDevice="Monitoring Device"
Basic.Settings.Advanced.Audio.MonitoringDevice.Default="Default"
Basic.Settings.Advanced.Audio.DisableAudioDucking="Disable Windows audio ducking"
Basic.Settings.Advanced.StreamDelay="Stream Delay"
Basic.Settings.Advanced.StreamDelay.Duration="Duration (seconds)"
Basic.Settings.Advanced.StreamDelay.Duration="Duration"
Basic.Settings.Advanced.StreamDelay.Preserve="Preserve cutoff point (increase delay) when reconnecting"
Basic.Settings.Advanced.StreamDelay.MemoryUsage="Estimated Memory Usage: %1 MB"
Basic.Settings.Advanced.Network="Network"
@@ -841,7 +841,7 @@ Basic.AdvAudio.Name="Name"
Basic.AdvAudio.Volume="Volume"
Basic.AdvAudio.Mono="Downmix to Mono"
Basic.AdvAudio.Balance="Balance"
Basic.AdvAudio.SyncOffset="Sync Offset (ms)"
Basic.AdvAudio.SyncOffset="Sync Offset"
Basic.AdvAudio.Monitoring="Audio Monitoring"
Basic.AdvAudio.Monitoring.None="Monitor Off"
Basic.AdvAudio.Monitoring.MonitorOnly="Monitor Only (mute output)"

10
UI/forms/OBSBasic.ui
View File

@@ -188,7 +188,7 @@
<x>0</x>
<y>0</y>
<width>1079</width>
<height>21</height>
<height>22</height>
</rect>
</property>
<widget class="QMenu" name="menu_File">
@@ -728,7 +728,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>80</width>
<width>64</width>
<height>16</height>
</rect>
</property>
@@ -781,8 +781,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>28</width>
<height>16</height>
<width>16</width>
<height>28</height>
</rect>
</property>
<property name="sizePolicy">
@@ -1025,7 +1025,7 @@
<string>Basic.TransitionDuration</string>
</property>
<property name="suffix">
<string>ms</string>
<string> ms</string>
</property>
<property name="minimum">
<number>2</number>

53
UI/forms/OBSBasicSettings.ui
View File

@@ -138,7 +138,7 @@
<item>
<widget class="QScrollArea" name="scrollArea_2">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
@@ -151,8 +151,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>808</width>
<height>989</height>
<width>806</width>
<height>1225</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_19">
@@ -1159,22 +1159,22 @@
</property>
<item>
<widget class="QScrollArea" name="scrollArea_3">
<property name="widgetResizable">
<bool>true</bool>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="scrollAreaWidgetContents_3">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>747</width>
<height>808</height>
<width>813</width>
<height>761</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_21">
@@ -3511,7 +3511,7 @@
<item row="0" column="1">
<widget class="QSpinBox" name="advRBSecMax">
<property name="suffix">
<string notr="true"> sec</string>
<string notr="true"> s</string>
</property>
<property name="minimum">
<number>5</number>
@@ -3608,21 +3608,7 @@
<item>
<widget class="QScrollArea" name="scrollArea_50">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="widgetResizable">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>594</width>
<height>807</height>
</rect>
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
@@ -3635,8 +3621,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>594</width>
<height>807</height>
<width>767</width>
<height>582</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_50">
@@ -4064,7 +4050,7 @@
</widget>
</widget>
</item>
<item row="11" column="1">
<item>
<widget class="QLabel" name="audioMsg">
<property name="text">
<string notr="true"/>
@@ -4077,7 +4063,7 @@
</property>
</widget>
</item>
<item row="12" column="1">
<item>
<widget class="QLabel" name="audioMsg_2">
<property name="text">
<string notr="true"/>
@@ -4451,8 +4437,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>765</width>
<height>993</height>
<width>806</width>
<height>933</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_23">
@@ -4895,7 +4881,7 @@
</size>
</property>
<property name="suffix">
<string notr="true">s</string>
<string notr="true"> s</string>
</property>
<property name="minimum">
<number>1</number>
@@ -4989,6 +4975,9 @@
</property>
<item>
<widget class="QSpinBox" name="reconnectRetryDelay">
<property name="suffix">
<string> s</string>
</property>
<property name="maximum">
<number>30</number>
</property>

3
UI/properties-view.cpp
View File

@@ -334,6 +334,7 @@ void OBSPropertiesView::AddInt(obs_property_t *prop, QFormLayout *layout,
spin->setValue(val);
spin->setToolTip(QT_UTF8(obs_property_long_description(prop)));
spin->setSuffix(QT_UTF8(suffix));
spin->setFixedWidth(100);
WidgetInfo *info = new WidgetInfo(this, prop, spin);
children.emplace_back(info);
@@ -385,6 +386,8 @@ void OBSPropertiesView::AddFloat(obs_property_t *prop, QFormLayout *layout,
spin->setValue(val);
spin->setToolTip(QT_UTF8(obs_property_long_description(prop)));
spin->setSuffix(QT_UTF8(suffix));
spin->setDecimals(1);
spin->setFixedWidth(100);
WidgetInfo *info = new WidgetInfo(this, prop, spin);
children.emplace_back(info);