Even more fixes

obsproject · Aug 14, 2020 · 77ab591 · 77ab591
1 parent 4a07e78
commit 77ab591
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/UI/CMakeLists.txt b/UI/CMakeLists.txt
@@ -65,6 +65,7 @@ if(NOT Qt5Widgets_FOUND)
 	endif()
 endif()
 
+
 include_directories(${FFMPEG_INCLUDE_DIRS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(SYSTEM "obs-frontend-api")
@@ -362,7 +363,6 @@ set(obs_UI
 	forms/OBSUpdate.ui
 	forms/OBSRemux.ui
 	forms/OBSImporter.ui
-	forms/OBSAbout.ui
 	forms/OBSAbout.ui)
 
 set(obs_QRC

diff --git a/UI/data/locale/en-US.ini b/UI/data/locale/en-US.ini
@@ -1039,7 +1039,6 @@ NeedsRestart="OBS Studio needs to be restarted. Do you want to restart now?"
 ContextBar.NoSelectedSource="No source selected"
 ContextBar.ResetTransform="Reset Transform"
 ContextBar.FitToCanvas="Fit to Canvas"
-ContextBar.CloseContextToolbar="Close Context Toolbar"
 
 # Context Bar Media Controls
 ContextBar.MediaControls.PlayMedia="Play Media"

diff --git a/UI/data/themes/Rachni.qss b/UI/data/themes/Rachni.qss
@@ -1257,7 +1257,6 @@ OBSQTDisplay {
 	qproperty-displayBackgroundColor: rgb(35, 38, 41);
 }
 
-
 /* Preview/Program labels */
 
 * [themeID="previewProgramLabels"] {

diff --git a/UI/forms/OBSBasic.ui b/UI/forms/OBSBasic.ui
@@ -607,7 +607,7 @@
   <widget class="OBSBasicStatusBar" name="statusbar"/>
   <widget class="OBSDock" name="scenesDock">
    <property name="features">
-    <set>QDockWidget::AllDockWidgetFeatures</set>
+    <set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable</set>
    </property>
    <property name="windowTitle">
     <string>Basic.Main.Scenes</string>
@@ -742,7 +742,7 @@
   </widget>
   <widget class="OBSDock" name="sourcesDock">
    <property name="features">
-    <set>QDockWidget::AllDockWidgetFeatures</set>
+    <set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable</set>
    </property>
    <property name="windowTitle">
     <string>Basic.Main.Sources</string>
@@ -878,7 +878,7 @@
   </widget>
   <widget class="OBSDock" name="mixerDock">
    <property name="features">
-    <set>QDockWidget::AllDockWidgetFeatures</set>
+    <set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable</set>
    </property>
    <property name="windowTitle">
     <string>Mixer</string>
@@ -1018,7 +1018,7 @@
   </widget>
   <widget class="OBSDock" name="transitionsDock">
    <property name="features">
-    <set>QDockWidget::AllDockWidgetFeatures</set>
+    <set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable</set>
    </property>
    <property name="windowTitle">
     <string>Basic.SceneTransitions</string>
@@ -1179,7 +1179,7 @@
   </widget>
   <widget class="OBSDock" name="controlsDock">
    <property name="features">
-    <set>QDockWidget::AllDockWidgetFeatures</set>
+    <set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable</set>
    </property>
    <property name="windowTitle">
     <string>Basic.Main.Controls</string>

diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp
@@ -2908,7 +2908,8 @@ void OBSBasic::UpdateContextBar()
 			   strcmp(id, "coreaudio_input_capture") == 0 ||
 			   strcmp(id, "coreaudio_output_capture") == 0 ||
 			   strcmp(id, "pulse_input_capture") == 0 ||
-			   strcmp(id, "pulse_output_capture") == 0) {
+			   strcmp(id, "pulse_output_capture") == 0 ||
+			   strcmp(id, "alsa_input_capture") == 0 ||
 			AudioCaptureToolbar *c =
 				new AudioCaptureToolbar(ui->emptySpace, source);
 			c->Init();