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

Merge pull request #1454 from Andersama/dockable-stats

Browse Source 
UI: Make stats dockable
This commit is contained in:
Jim
2018-09-05 21:04:19 -07:00
committed by GitHub
parent 22c8dba718 4df790a471
commit e299946b41
4 changed files with 48 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
UI/forms/OBSBasic.ui
View File

@@ -293,6 +293,7 @@
<addaction name="toggleMixer"/>
<addaction name="toggleTransitions"/>
<addaction name="toggleControls"/>
<addaction name="toggleStats"/>
</widget>
<action name="actionFullscreenInterface">
<property name="text">
@@ -1098,6 +1099,21 @@
</layout>
</widget>
</widget>
<widget class="QDockWidget" name="statsDock">
<property name="minimumSize">
<size>
<width>168</width>
<height>103</height>
</size>
</property>
<property name="windowTitle">
<string>Basic.Stats</string>
</property>
<attribute name="dockWidgetArea">
<number>2</number>
</attribute>
<widget class="QWidget" name="dockWidgetContents"/>
</widget>
<action name="actionAddScene">
<property name="icon">
<iconset resource="obs.qrc">
@@ -1656,6 +1672,17 @@
<string>Basic.MainMenu.Help.Discord</string>
</property>
</action>
<action name="toggleStats">
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="text">
<string>Basic.Stats</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>