diff options
author | ronso0 <ronso0@mixxx.org> | 2020-11-03 11:05:02 +0100 |
---|---|---|
committer | ronso0 <ronso0@mixxx.org> | 2020-11-04 22:17:35 +0100 |
commit | 2b0f0fe5228f7db2397a7db73167dfef9ec034b3 (patch) | |
tree | 495661ad9117336bb64a58726c9f404384e9bf24 /res | |
parent | 35e9d0d2513364b2a14fb881f0c98e4a02746ff0 (diff) |
LateNight: spread skin settings
Diffstat (limited to 'res')
-rw-r--r-- | res/skins/LateNight/skin_settings.xml | 18 | ||||
-rw-r--r-- | res/skins/LateNight/style_classic.qss | 29 | ||||
-rw-r--r-- | res/skins/LateNight/style_palemoon.qss | 36 |
3 files changed, 48 insertions, 35 deletions
diff --git a/res/skins/LateNight/skin_settings.xml b/res/skins/LateNight/skin_settings.xml index 88db8bce7f..cb4bb53ace 100644 --- a/res/skins/LateNight/skin_settings.xml +++ b/res/skins/LateNight/skin_settings.xml @@ -219,6 +219,8 @@ Description: <SetVariable name="Setting">[Skin],timing_shift_buttons</SetVariable> </Template> + <WidgetGroup><Size>0me,6f</Size></WidgetGroup> + <!-- Rate Controls --> <Template src="skin:/helpers/skin_settings_button_2state.xml"> <SetVariable name="TooltipId">rate_toggle</SetVariable> @@ -264,6 +266,8 @@ Description: <SetVariable name="Setting">[VinylControl],show_vinylcontrol</SetVariable> </Template> + <WidgetGroup><Size>0me,6f</Size></WidgetGroup> + <!-- Spinny --> <Template src="skin:/helpers/skin_settings_button_2state.xml"> <SetVariable name="TooltipId">show_spinny</SetVariable> @@ -329,6 +333,8 @@ Description: <SetVariable name="Setting">[Skin],timing_shift_buttons</SetVariable> </Template> + <WidgetGroup><Size>0me,6f</Size></WidgetGroup> + <!-- Loop/Jump Controls in compact decks--> <Template src="skin:/helpers/skin_settings_button_2state.xml"> <SetVariable name="TooltipId"></SetVariable> @@ -381,6 +387,8 @@ Description: <SetVariable name="Setting">[VinylControl],show_vinylcontrol</SetVariable> </Template> + <WidgetGroup><Size>0me,6f</Size></WidgetGroup> + <!-- Level meters --> <Template src="skin:/helpers/skin_settings_button_2state.xml"> <SetVariable name="TooltipId">show_vinylcontrol</SetVariable> @@ -462,7 +470,7 @@ Description: <SetVariable name="Setting">[Skin],timing_shift_buttons</SetVariable> </Template> - <WidgetGroup><Size>0me,108f</Size></WidgetGroup> + <WidgetGroup><Size>0me,120f</Size></WidgetGroup> <!-- Spinny --> <Template src="skin:/helpers/skin_settings_button_2state.xml"> @@ -497,7 +505,7 @@ Description: <!-- Other skin options --> <WidgetGroup> <ObjectName>SkinSettingsSeparator</ObjectName> - <Size>1min,6f</Size> + <Size>1min,12f</Size> </WidgetGroup> <WidgetGroup><!-- Mixer --> @@ -594,7 +602,7 @@ Description: <WidgetGroup> <ObjectName>SkinSettingsSeparator</ObjectName> - <Size>1min,6f</Size> + <Size>1min,12f</Size> </WidgetGroup> <WidgetGroup><!-- Effects --> @@ -694,7 +702,7 @@ Description: <WidgetGroup> <ObjectName>SkinSettingsSeparator</ObjectName> - <Size>1min,6f</Size> + <Size>1min,12f</Size> </WidgetGroup> <WidgetGroup><!-- Samplers --> @@ -859,7 +867,7 @@ Description: <WidgetGroup> <ObjectName>SkinSettingsSeparator</ObjectName> - <Size>1min,6f</Size> + <Size>1min,12f</Size> </WidgetGroup> <Label> diff --git a/res/skins/LateNight/style_classic.qss b/res/skins/LateNight/style_classic.qss index 3781db111b..3858975777 100644 --- a/res/skins/LateNight/style_classic.qss +++ b/res/skins/LateNight/style_classic.qss @@ -186,23 +186,27 @@ WSearchLineEdit, #DeckRateSeparator, #DeckRateSeparatorCompact, -#MasterMixerSeparator { +#MasterMixerSeparator, +#SkinSettingsSeparator { /* needs a background color to paint the borders */ background-color: transparent; min-width: 0px; max-width: 0px; } -#FxSlotSeparatorV { - min-width: 1px; - max-width: 1px; - image: url(skin:/classic/style/fx_separator.svg) repeat center center; - margin: 2px 1px; -} -#FxSlotSeparatorH { - min-height: 2px; - max-height: 2px; -} + #FxSlotSeparatorV { + min-width: 1px; + max-width: 1px; + image: url(skin:/classic/style/fx_separator.svg) repeat center center; + margin: 2px 1px; + } + #FxSlotSeparatorH { + min-height: 2px; + max-height: 2px; + } + #SkinSettingsSeparator { + margin: 3px 4px 7px 4px; + } WBeatSpinBox, #spinBoxTransition { @@ -2495,9 +2499,6 @@ WEffectSelector, height: 0px; margin: 4px; } - #SkinSettingsSeparator { - margin: 0px 4px 4px 4px; - } WBeatSpinBox QMenu::item, #LibraryContainer QMenu::item, WCueMenuPopup QMenu::item, diff --git a/res/skins/LateNight/style_palemoon.qss b/res/skins/LateNight/style_palemoon.qss index e6729fa45d..46bb6f3dbd 100644 --- a/res/skins/LateNight/style_palemoon.qss +++ b/res/skins/LateNight/style_palemoon.qss @@ -275,15 +275,22 @@ WSearchLineEdit { #MasterHeadphoneSeparator, #FxSlotSeparatorV, #FxSlotSeparatorH, -#SeparatorToolbar { +#SeparatorToolbar, +#SkinSettingsSeparator { /* needs a background color to paint the borders */ background-color: transparent; } #DeckRateSeparator, #DeckRateSeparatorCompact, - #FxSlotSeparatorV { + #FxSlotSeparatorV, + #SkinSettingsSeparator { min-width: 0px; max-width: 0px; + } + #DeckRateSeparator, + #DeckRateSeparatorCompact, + #FxSlotSeparatorV, + #FxSlotSeparatorH { border-left: 1px solid #0c0c0c; border-right: 1px solid #333; } @@ -291,20 +298,20 @@ WSearchLineEdit { border-left: 1px solid #0c0c0c; border-right: 1px solid #222; } + #FxSlotSeparatorH { + border-top: 1px solid #0c0c0c; + border-bottom: 1px solid #333; + } + #FxSlotSeparatorV { margin: 0px 0px 0px 2px; } - -#FxSlotSeparatorH { - min-height: 0px; - max-height: 0px; - border-top: 1px solid #0c0c0c; - border-bottom: 1px solid #333; -} - -#ToolbarSeparator { - margin: 0px 5px; -} + #ToolbarSeparator { + margin: 0px 5px; + } + #SkinSettingsSeparator { + margin: 3px 4px 7px 4px; + } /* dynamic bottom border in #DeckRow1_ */ #ExpandingBottomBorder { @@ -2992,9 +2999,6 @@ WEffectSelector, height: 0px; margin: 4px; } - #SkinSettingsSeparator { - margin: 0px 4px 4px 4px; - } WBeatSpinBox QMenu::item, #LibraryContainer QMenu::item, WCueMenuPopup QMenu::item, |