From 167a4dce37ee3935eb28d0af7b49196cb837d271 Mon Sep 17 00:00:00 2001 From: Clayton Groeneveld Date: Thu, 3 Sep 2020 17:58:18 -0500 Subject: [PATCH] UI: Refine context bar This adds spacing between the timer and duration labels in the media controls. The vertical alignment of the labels have been fixed as well. And the width of the source label has also been widened. --- UI/forms/OBSBasic.ui | 60 ++++++- .../source-toolbar/browser-source-toolbar.ui | 32 +++- .../source-toolbar/color-source-toolbar.ui | 46 +++++- .../source-toolbar/device-select-toolbar.ui | 58 ++++++- .../source-toolbar/game-capture-toolbar.ui | 72 +++++++- .../source-toolbar/image-source-toolbar.ui | 56 ++++++- UI/forms/source-toolbar/media-controls.ui | 156 +++++++++++++++--- .../source-toolbar/text-source-toolbar.ui | 59 ++++++- 8 files changed, 496 insertions(+), 43 deletions(-) diff --git a/UI/forms/OBSBasic.ui b/UI/forms/OBSBasic.ui index 6a6d87bdc..8cc205219 100644 --- a/UI/forms/OBSBasic.ui +++ b/UI/forms/OBSBasic.ui @@ -206,18 +206,18 @@ 0 - 32 + 30 16777215 - 32 + 30 - 4 + 6 QLayout::SetDefaultConstraint @@ -266,16 +266,22 @@ + + + 0 + 0 + + - 150 - 0 + 250 + 22 - 150 - 16 + 250 + 22 @@ -298,6 +304,18 @@ 0 + + + 0 + 22 + + + + + 16777215 + 22 + + Properties @@ -318,6 +336,18 @@ + + + 0 + 22 + + + + + 16777215 + 22 + + Filters @@ -349,11 +379,23 @@ - + 0 0 + + + 0 + 22 + + + + + 16777215 + 22 + + 0 @@ -929,7 +971,7 @@ 0 0 - 92 + 94 16 diff --git a/UI/forms/source-toolbar/browser-source-toolbar.ui b/UI/forms/source-toolbar/browser-source-toolbar.ui index 4190213b9..3230ba641 100644 --- a/UI/forms/source-toolbar/browser-source-toolbar.ui +++ b/UI/forms/source-toolbar/browser-source-toolbar.ui @@ -7,9 +7,27 @@ 0 0 628 - 38 + 22 + + + 0 + 0 + + + + + 0 + 22 + + + + + 16777215 + 22 + + Form @@ -28,6 +46,18 @@ + + + 0 + 22 + + + + + 16777215 + 22 + + RefreshBrowser diff --git a/UI/forms/source-toolbar/color-source-toolbar.ui b/UI/forms/source-toolbar/color-source-toolbar.ui index 31e679ef5..df0d1afad 100644 --- a/UI/forms/source-toolbar/color-source-toolbar.ui +++ b/UI/forms/source-toolbar/color-source-toolbar.ui @@ -7,9 +7,27 @@ 0 0 565 - 37 + 22 + + + 0 + 0 + + + + + 0 + 22 + + + + + 16777215 + 22 + + Form @@ -28,10 +46,22 @@ + + + 0 + 0 + + 80 - 0 + 22 + + + + + 16777215 + 22 @@ -44,6 +74,18 @@ + + + 0 + 22 + + + + + 16777215 + 22 + + Basic.PropertiesWindow.SelectColor diff --git a/UI/forms/source-toolbar/device-select-toolbar.ui b/UI/forms/source-toolbar/device-select-toolbar.ui index e7d58116f..fcc534cca 100644 --- a/UI/forms/source-toolbar/device-select-toolbar.ui +++ b/UI/forms/source-toolbar/device-select-toolbar.ui @@ -7,9 +7,27 @@ 0 0 665 - 43 + 22 + + + 0 + 0 + + + + + 0 + 22 + + + + + 16777215 + 22 + + Form @@ -32,11 +50,23 @@ - + 0 0 + + + 0 + 22 + + + + + 16777215 + 22 + + Device @@ -53,6 +83,18 @@ 0 + + + 0 + 22 + + + + + 16777215 + 22 + + @@ -63,6 +105,18 @@ + + + 0 + 22 + + + + + 16777215 + 22 + + Activate diff --git a/UI/forms/source-toolbar/game-capture-toolbar.ui b/UI/forms/source-toolbar/game-capture-toolbar.ui index 01f84cc0d..b22064289 100644 --- a/UI/forms/source-toolbar/game-capture-toolbar.ui +++ b/UI/forms/source-toolbar/game-capture-toolbar.ui @@ -7,9 +7,27 @@ 0 0 650 - 29 + 24 + + + 0 + 0 + + + + + 0 + 22 + + + + + 16777215 + 24 + + Form @@ -29,11 +47,23 @@ - + 0 0 + + + 0 + 22 + + + + + 16777215 + 22 + + Mode @@ -44,6 +74,18 @@ + + + 0 + 22 + + + + + 16777215 + 22 + + @@ -52,11 +94,23 @@ - + 0 0 + + + 0 + 22 + + + + + 16777215 + 22 + + Window @@ -73,6 +127,18 @@ 0 + + + 0 + 22 + + + + + 16777215 + 22 + + diff --git a/UI/forms/source-toolbar/image-source-toolbar.ui b/UI/forms/source-toolbar/image-source-toolbar.ui index ce2c45a32..f3bf1a097 100644 --- a/UI/forms/source-toolbar/image-source-toolbar.ui +++ b/UI/forms/source-toolbar/image-source-toolbar.ui @@ -7,9 +7,27 @@ 0 0 580 - 41 + 22 + + + 0 + 0 + + + + + 0 + 22 + + + + + 16777215 + 22 + + Form @@ -29,11 +47,23 @@ - + 0 0 + + + 0 + 22 + + + + + 16777215 + 22 + + Image File @@ -47,7 +77,13 @@ 100 - 0 + 22 + + + + + 16777215 + 22 @@ -61,11 +97,23 @@ - + 0 0 + + + 0 + 22 + + + + + 16777215 + 22 + + Browse diff --git a/UI/forms/source-toolbar/media-controls.ui b/UI/forms/source-toolbar/media-controls.ui index 9cb3b9912..1133476a1 100644 --- a/UI/forms/source-toolbar/media-controls.ui +++ b/UI/forms/source-toolbar/media-controls.ui @@ -7,7 +7,7 @@ 0 0 888 - 28 + 22 @@ -19,7 +19,13 @@ 0 - 0 + 22 + + + + + 16777215 + 22 @@ -43,16 +49,22 @@ + + + 0 + 0 + + - 24 - 24 + 22 + 22 - 24 - 24 + 22 + 22 @@ -97,16 +109,22 @@ + + + 0 + 0 + + - 24 - 24 + 22 + 22 - 24 - 24 + 22 + 22 @@ -136,21 +154,21 @@ - + 0 0 - 24 - 24 + 22 + 22 - 24 - 24 + 22 + 22 @@ -180,21 +198,21 @@ - + 0 0 - 24 - 24 + 22 + 22 - 24 - 24 + 22 + 22 @@ -223,6 +241,18 @@ + + + 0 + 22 + + + + + 16777215 + 22 + + ContextBar.MediaControls.BlindSeek @@ -255,20 +285,106 @@ + + + 0 + 0 + + + + + 0 + 22 + + + + + 16777215 + 22 + + --:--:-- + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 4 + 0 + + + + + + + 0 + 0 + + + + + 0 + 22 + + + + + 16777215 + 22 + + / + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 4 + 0 + + + + + + + 0 + 0 + + + + + 0 + 22 + + + + + 16777215 + 22 + + --:--:-- diff --git a/UI/forms/source-toolbar/text-source-toolbar.ui b/UI/forms/source-toolbar/text-source-toolbar.ui index 9db30e0ff..1b2ada18d 100644 --- a/UI/forms/source-toolbar/text-source-toolbar.ui +++ b/UI/forms/source-toolbar/text-source-toolbar.ui @@ -7,9 +7,27 @@ 0 0 726 - 49 + 22 + + + 0 + 0 + + + + + 0 + 22 + + + + + 16777215 + 22 + + Form @@ -28,6 +46,18 @@ + + + 0 + 22 + + + + + 16777215 + 22 + + Basic.PropertiesWindow.SelectFont @@ -35,6 +65,18 @@ + + + 0 + 22 + + + + + 16777215 + 22 + + Basic.PropertiesWindow.SelectColor @@ -51,7 +93,20 @@ - + + + + 0 + 22 + + + + + 16777215 + 22 + + +