diff options
author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-04-15 11:10:41 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-15 11:10:41 +0200 |
commit | da2b6d5b1f9bdda1657d711b0d6d9566ab67a295 (patch) | |
tree | 0a775193dd9c6c824247497b52759d9c423f4b09 /res | |
parent | 1acfda2e1ab3f5fea51036b67a58e0928716b544 (diff) | |
parent | bd9859a271b5eedecb809ddee91dde80ba785fa2 (diff) |
Merge pull request #2632 from ronso0/searchbox-fixes
Searchbox fixes
Diffstat (limited to 'res')
-rw-r--r-- | res/skins/LateNight/style.qss | 2 | ||||
-rw-r--r-- | res/skins/Shade/preview_deck.xml | 507 | ||||
-rw-r--r-- | res/skins/Shade/skin.xml | 33 | ||||
-rw-r--r-- | res/skins/Shade/style.qss | 4 | ||||
-rw-r--r-- | res/skins/Tango/style.qss | 5 |
5 files changed, 272 insertions, 279 deletions
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss index 617f18e731..9f1c16da76 100644 --- a/res/skins/LateNight/style.qss +++ b/res/skins/LateNight/style.qss @@ -29,7 +29,6 @@ WOverview /* Hotcue labels in the overview */ { } /* regular font weight */ -WSearchLineEdit, QToolTip, #LibraryContainer QMenu, WCueMenuPopup, @@ -2484,7 +2483,6 @@ WEffectSelector, WEffectSelector::item, WBeatSpinBox, #spinBoxTransition, #SkinSettings, -WSearchLineEdit, WEffectSelector, WEffectSelector QAbstractScrollArea, #fadeModeCombobox, #fadeModeCombobox QAbstractScrollArea { font-size: 13px/13px; diff --git a/res/skins/Shade/preview_deck.xml b/res/skins/Shade/preview_deck.xml index 444c389737..3356f10f77 100644 --- a/res/skins/Shade/preview_deck.xml +++ b/res/skins/Shade/preview_deck.xml @@ -1,263 +1,274 @@ <Template> - <WidgetGroup> - <Size>e,</Size> - <Layout>vertical</Layout> - <Children> - <WidgetGroup> - <ObjectName>SamplerTopBorder</ObjectName> - <Size>0e,5f</Size> - <BackPath>style/style_bg_deck_border.png</BackPath> - </WidgetGroup> + <WidgetGroup> + <Size>e,</Size> + <Layout>vertical</Layout> + <Children> + <WidgetGroup> + <ObjectName>PreviewDeckContainer</ObjectName> + <Size>e,</Size> + <Layout>vertical</Layout> + <Children> + <WidgetGroup> + <ObjectName>SamplerTopBorder</ObjectName> + <Size>0e,5f</Size> + <BackPath>style/style_bg_deck_border.png</BackPath> + </WidgetGroup> - <!-- Middle part: left border, text/overview, VU, volume, right border --> - <WidgetGroup> - <Size>0e,54f</Size> - <Layout>horizontal</Layout> - <Style> - QWidget { margin: 0; padding: 0; } - </Style> - <Children> - <WidgetGroup> - <ObjectName>SamplerLeftBorder</ObjectName> - <Size>5f,0e</Size> - <BackPath>style/style_bg_deck_border.png</BackPath> - </WidgetGroup> + <!-- Middle part: left border, text/overview, VU, volume, right border --> + <WidgetGroup> + <Size>0e,54f</Size> + <Layout>horizontal</Layout> + <Style> + QWidget { margin: 0; padding: 0; } + </Style> + <Children> + <WidgetGroup> + <ObjectName>SamplerLeftBorder</ObjectName> + <Size>5f,0e</Size> + <BackPath>style/style_bg_deck_border.png</BackPath> + </WidgetGroup> - <WidgetGroup> - <BackPath>style/style_bg_sampler_mid.png</BackPath> - <Layout>vertical</Layout> - <Children> + <WidgetGroup> + <BackPath>style/style_bg_sampler_mid.png</BackPath> + <Layout>vertical</Layout> + <Children> - <WidgetGroup> - <Layout>horizontal</Layout> - <Children> - <WidgetGroup> - <Size>0e,18f</Size> - <Layout>horizontal</Layout> - <Children> - <Text> - <TooltipId>text</TooltipId> - <Style>QLabel { font: bold 12px/14px sans-serif; - font-family: "Open Sans"; - background-color: transparent; - color: #191F24; - text-align: left; - padding-left: 1px; - padding-top: 2px;} - </Style> - <Group>[PreviewDeck1]</Group> - <SizePolicy>me,min</SizePolicy> - <Elide>right</Elide> - </Text> - </Children> - </WidgetGroup> - <WidgetGroup> - <Size>35f,18f</Size> - <Children> - <Number> - <TooltipId>visual_bpm</TooltipId> - <Style>QLabel { font: bold 9px sans-serif; - font-family: "Open Sans"; - background-color: transparent; - color: #191F24; - padding-right: 0; - padding-top: 2px;} - </Style> - <Size>35f,18f</Size> - <Group>[PreviewDeck1]</Group> - <!--CSS alignments not respected see bug lp:605530 , lets call <Alignment> --> - <Alignment>right</Alignment> - <Connection> - <ConfigKey>[PreviewDeck1],visual_bpm</ConfigKey> - </Connection> - </Number> - </Children> - </WidgetGroup> + <WidgetGroup> + <Layout>horizontal</Layout> + <Children> + <WidgetGroup> + <Size>0e,18f</Size> + <Layout>horizontal</Layout> + <Children> + <Text> + <TooltipId>text</TooltipId> + <Style>QLabel { font: bold 12px/14px sans-serif; + font-family: "Open Sans"; + background-color: transparent; + color: #191F24; + text-align: left; + padding-left: 1px; + padding-top: 2px;} + </Style> + <Group>[PreviewDeck1]</Group> + <SizePolicy>me,min</SizePolicy> + <Elide>right</Elide> + </Text> + </Children> + </WidgetGroup> + <WidgetGroup> + <Size>35f,18f</Size> + <Children> + <Number> + <TooltipId>visual_bpm</TooltipId> + <Style>QLabel { font: bold 9px sans-serif; + font-family: "Open Sans"; + background-color: transparent; + color: #191F24; + padding-right: 0; + padding-top: 2px;} + </Style> + <Size>35f,18f</Size> + <Group>[PreviewDeck1]</Group> + <!--CSS alignments not respected see bug lp:605530 , lets call <Alignment> --> + <Alignment>right</Alignment> + <Connection> + <ConfigKey>[PreviewDeck1],visual_bpm</ConfigKey> + </Connection> + </Number> + </Children> + </WidgetGroup> - <WidgetGroup> - <ObjectName>SamplerRightBorder</ObjectName> - <Size>1f,0e</Size> - <BackPath>style/style_bg_deck_border.png</BackPath> - </WidgetGroup> + <WidgetGroup> + <ObjectName>SamplerRightBorder</ObjectName> + <Size>1f,0e</Size> + <BackPath>style/style_bg_deck_border.png</BackPath> + </WidgetGroup> - <WidgetGroup> - <Size>20f,18f</Size> - <Children> - <PushButton> - <TooltipId>eject</TooltipId> - <NumberStates>1</NumberStates> - <State> - <Number>0</Number> - <Pressed>skin:/btn/btn_eject_over.png</Pressed> - <Unpressed>skin:/btn/btn_eject.png</Unpressed> - </State> - <Connection> - <ConfigKey>[PreviewDeck1],eject</ConfigKey> - <EmitOnPressAndRelease>true</EmitOnPressAndRelease> - <ButtonState>LeftButton</ButtonState> - <ConnectValueToWidget>false</ConnectValueToWidget> - </Connection> - </PushButton> - </Children> - </WidgetGroup> - </Children> - </WidgetGroup> + <WidgetGroup> + <Size>20f,18f</Size> + <Children> + <PushButton> + <TooltipId>eject</TooltipId> + <NumberStates>1</NumberStates> + <State> + <Number>0</Number> + <Pressed>skin:/btn/btn_eject_over.png</Pressed> + <Unpressed>skin:/btn/btn_eject.png</Unpressed> + </State> + <Connection> + <ConfigKey>[PreviewDeck1],eject</ConfigKey> + <EmitOnPressAndRelease>true</EmitOnPressAndRelease> + <ButtonState>LeftButton</ButtonState> + <ConnectValueToWidget>false</ConnectValueToWidget> + </Connection> + </PushButton> + </Children> + </WidgetGroup> + </Children> + </WidgetGroup> - <WidgetGroup> - <Size>0e,1f</Size> - <BackPath>style/style_bg_deck_border.png</BackPath> - </WidgetGroup> + <WidgetGroup> + <Size>0e,1f</Size> + <BackPath>style/style_bg_deck_border.png</BackPath> + </WidgetGroup> - <WidgetGroup> - <ObjectName>SamplerMid</ObjectName> - <Size>0e,35f</Size> - <Layout>horizontal</Layout> - <Children> - <WidgetGroup> - <ObjectName>SamplerMid</ObjectName> - <Size>27f,35f</Size> - <BackPath>style/style_bg_sampler_mid.png</BackPath> - <Children> - <PushButton> - <TooltipId>play_start</TooltipId> - <NumberStates>2</NumberStates> - <State> - <Number>0</Number> - <Pressed>skin:/btn/btn_play_sampler_down.png</Pressed> - <Unpressed>skin:/btn/btn_play_sampler.png</Unpressed> - </State> - <State> - <Number>1</Number> - <Pressed>skin:/btn/btn_play_previewdeck_overdown.png</Pressed> - <Unpressed>skin:/btn/btn_play_previewdeck_over.png</Unpressed> - </State> - <Pos>3,7</Pos> - <Connection> - <ConfigKey>[PreviewDeck1],play</ConfigKey> - <EmitOnDownPress>true</EmitOnDownPress> - <ButtonState>LeftButton</ButtonState> - </Connection> - <Connection> - <ConfigKey>[PreviewDeck1],start</ConfigKey> - <EmitOnDownPress>true</EmitOnDownPress> - <ButtonState>RightButton</ButtonState> - <ConnectValueToWidget>false</ConnectValueToWidget> - </Connection> - </PushButton> - </Children> - </WidgetGroup> - <WidgetGroup> - <ObjectName>SamplerMid</ObjectName> - <Size>0e,35f</Size> - <BackPath>style/style_bg_sampler_mid.png</BackPath> - <Layout>horizontal</Layout> - <Children> - <Overview> - <TooltipId>waveform_overview</TooltipId> - <Group>[PreviewDeck1]</Group> - <Pos>0,0</Pos> - <Size>0e,35f</Size> - <BgColor>#8D98A3</BgColor> - <PlayedOverlayColor>#60000000</PlayedOverlayColor> - <SignalHighColor></SignalHighColor> - <SignalMidColor></SignalMidColor> - <SignalLowColor></SignalLowColor> - <SignalColor>#191F24</SignalColor> - <PlayPosColor>#00FF00</PlayPosColor> - <ShowCueTimes>false</ShowCueTimes> - <DefaultMark> - <Align>top</Align> - <Color>#FD0564</Color> - <TextColor>#FFFFFF</TextColor> - <Text> %1 </Text> - </DefaultMark> - <Connection> - <ConfigKey>[PreviewDeck1],playposition</ConfigKey> - <EmitOnDownPress>false</EmitOnDownPress> - </Connection> - </Overview> - </Children> - </WidgetGroup> - </Children> - </WidgetGroup> - </Children> - </WidgetGroup> + <WidgetGroup> + <ObjectName>SamplerMid</ObjectName> + <Size>0e,35f</Size> + <Layout>horizontal</Layout> + <Children> + <WidgetGroup> + <ObjectName>SamplerMid</ObjectName> + <Size>27f,35f</Size> + <BackPath>style/style_bg_sampler_mid.png</BackPath> + <Children> + <PushButton> + <TooltipId>play_start</TooltipId> + <NumberStates>2</NumberStates> + <State> + <Number>0</Number> + <Pressed>skin:/btn/btn_play_sampler_down.png</Pressed> + <Unpressed>skin:/btn/btn_play_sampler.png</Unpressed> + </State> + <State> + <Number>1</Number> + <Pressed>skin:/btn/btn_play_previewdeck_overdown.png</Pressed> + <Unpressed>skin:/btn/btn_play_previewdeck_over.png</Unpressed> + </State> + <Pos>3,7</Pos> + <Connection> + <ConfigKey>[PreviewDeck1],play</ConfigKey> + <EmitOnDownPress>true</EmitOnDownPress> + <ButtonState>LeftButton</ButtonState> + </Connection> + <Connection> + <ConfigKey>[PreviewDeck1],start</ConfigKey> + <EmitOnDownPress>true</EmitOnDownPress> + <ButtonState>RightButton</ButtonState> + <ConnectValueToWidget>false</ConnectValueToWidget> + </Connection> + </PushButton> + </Children> + </WidgetGroup> + <WidgetGroup> + <ObjectName>SamplerMid</ObjectName> + <Size>0e,35f</Size> + <BackPath>style/style_bg_sampler_mid.png</BackPath> + <Layout>horizontal</Layout> + <Children> + <Overview> + <TooltipId>waveform_overview</TooltipId> + <Group>[PreviewDeck1]</Group> + <Pos>0,0</Pos> + <Size>0e,35f</Size> + <BgColor>#8D98A3</BgColor> + <PlayedOverlayColor>#60000000</PlayedOverlayColor> + <SignalHighColor></SignalHighColor> + <SignalMidColor></SignalMidColor> + <SignalLowColor></SignalLowColor> + <SignalColor>#191F24</SignalColor> + <PlayPosColor>#00FF00</PlayPosColor> + <ShowCueTimes>false</ShowCueTimes> + <DefaultMark> + <Align>top</Align> + <Color>#FD0564</Color> + <TextColor>#FFFFFF</TextColor> + <Text> %1 </Text> + </DefaultMark> + <Connection> + <ConfigKey>[PreviewDeck1],playposition</ConfigKey> + <EmitOnDownPress>false</EmitOnDownPress> + </Connection> + </Overview> + </Children> + </WidgetGroup> + </Children> + </WidgetGroup> + </Children> + </WidgetGroup> - <WidgetGroup> - <ObjectName>SamplerRightBorder</ObjectName> - <Size>1f,0e</Size> - <BackPath>style/style_bg_deck_border.png</BackPath> - </WidgetGroup> + <WidgetGroup> + <ObjectName>SamplerRightBorder</ObjectName> + <Size>1f,0e</Size> + <BackPath>style/style_bg_deck_border.png</BackPath> + </WidgetGroup> - <WidgetGroup> - <ObjectName>SamplerVUMeter</ObjectName> - <BackPath>style/style_bg_deck_pane.png</BackPath> - <Size>9f,54f</Size> - <Style> - QWidget { margin: 0px; padding: 2px; } - </Style> - <Children> - <StatusLight> - <TooltipId>sampler_PeakIndicator</TooltipId> - <PathStatusLight>skin:/style/volume_clipping_previewdeck_over.png</PathStatusLight> - <PathBack>skin:/style/volume_clipping_previewdeck.png</PathBack> - <Pos>2,2</Pos> - <Size>5f,8f</Size> - <Connection> - <ConfigKey>[PreviewDeck1],PeakIndicator</ConfigKey> - </Connection> - </StatusLight> - <VuMeter> - <TooltipId>sampler_VuMeter</TooltipId> - <PathVu>skin:/style/volume_display_previewdeck_over.png</PathVu> - <PathBack>skin:/style/volume_display_previewdeck.png</PathBack> - <Pos>2,11</Pos> - <Size>5f,41f</Size> - <Horizontal>false</Horizontal> - <PeakHoldSize>5</PeakHoldSize> - <PeakHoldTime>500</PeakHoldTime> - <PeakFallTime>50</PeakFallTime> - <PeakFallStep>2</PeakFallStep> - <Connection> - <ConfigKey>[PreviewDeck1],VuMeter</ConfigKey> - </Connection> - </VuMeter> - </Children> - </WidgetGroup> + <WidgetGroup> + <ObjectName>SamplerVUMeter</ObjectName> + <BackPath>style/style_bg_deck_pane.png</BackPath> + <Size>9f,54f</Size> + <Style> + QWidget { margin: 0px; padding: 2px; } + </Style> + <Children> + <StatusLight> + <TooltipId>sampler_PeakIndicator</TooltipId> + <PathStatusLight>skin:/style/volume_clipping_previewdeck_over.png</PathStatusLight> + <PathBack>skin:/style/volume_clipping_previewdeck.png</PathBack> + <Pos>2,2</Pos> + <Size>5f,8f</Size> + <Connection> + <ConfigKey>[PreviewDeck1],PeakIndicator</ConfigKey> + </Connection> + </StatusLight> + <VuMeter> + <TooltipId>sampler_VuMeter</TooltipId> + <PathVu>skin:/style/volume_display_previewdeck_over.png</PathVu> + <PathBack>skin:/style/volume_display_previewdeck.png</PathBack> + <Pos>2,11</Pos> + <Size>5f,41f</Size> + <Horizontal>false</Horizontal> + <PeakHoldSize>5</PeakHoldSize> + <PeakHoldTime>500</PeakHoldTime> + <PeakFallTime>50</PeakFallTime> + <PeakFallStep>2</PeakFallStep> + <Connection> + <ConfigKey>[PreviewDeck1],VuMeter</ConfigKey> + </Connection> + </VuMeter> + </Children> + </WidgetGroup> - <WidgetGroup> - <BackPath>style/style_bg_deck_pane.png</BackPath> - <Size>10f,54f</Size> - <Children> - <SliderComposed> - <TooltipId>pregain</TooltipId> - <Pos>0,1</Pos> - <Size>8f,52f</Size> - <Handle>knob_volume_previewdeck.png</Handle> - <Horizontal>false</Horizontal> - <Connection> - <ConfigKey>[PreviewDeck1],pregain</ConfigKey> - <EmitOnDownPress>false</EmitOnDownPress> - </Connection> - </SliderComposed> - </Children> - </WidgetGroup> + <WidgetGroup> + <BackPath>style/style_bg_deck_pane.png</BackPath> + <Size>10f,54f</Size> + <Children> + <SliderComposed> + <TooltipId>pregain</TooltipId> + <Pos>0,1</Pos> + <Size>8f,52f</Size> + <Handle>knob_volume_previewdeck.png</Handle> + <Horizontal>false</Horizontal> + <Connection> + <ConfigKey>[PreviewDeck1],pregain</ConfigKey> + <EmitOnDownPress>false</EmitOnDownPress> + </Connection> + </SliderComposed> + </Children> + </WidgetGroup> - <WidgetGroup> - <ObjectName>SamplerRightBorder</ObjectName> - <Size>5f,0e</Size> - <BackPath>style/style_bg_deck_border.png</BackPath> - </WidgetGroup> - </Children> - </WidgetGroup> - <!-- /Middle part: left border, text/overview, VU, volume, right border --> + <WidgetGroup> + <ObjectName>SamplerRightBorder</ObjectName> + <Size>5f,0e</Size> + <BackPath>style/style_bg_deck_border.png</BackPath> + </WidgetGroup> + </Children> + </WidgetGroup> + <!-- /Middle part: left border, text/overview, VU, volume, right border --> - <WidgetGroup> - <ObjectName>SamplerBottomBorder</ObjectName> - <Size>0e,5f</Size> - <BackPath>style/style_bg_deck_border.png</BackPath> - </WidgetGroup> - </Children> - </WidgetGroup> + <WidgetGroup> + <ObjectName>SamplerBottomBorder</ObjectName> + <Size>0e,5f</Size> + <BackPath>style/style_bg_deck_border.png</BackPath> + </WidgetGroup> + </Children> + </WidgetGroup> + </Children> + <Connection> + <ConfigKey>[PreviewDeck],show_previewdeck</ConfigKey> + <BindProperty>visible</BindProperty> + </Connection> + </WidgetGroup> </Template> diff --git a/res/skins/Shade/skin.xml b/res/skins/Shade/skin.xml index 9a94e72d17..1335e04363 100644 --- a/res/skins/Shade/skin.xml +++ b/res/skins/Shade/skin.xml @@ -445,33 +445,13 @@ <WidgetGroup> <Layout>vertical</Layout> <Children> - <!-- Preview deck --> - <WidgetGroup> - <Style> - QGroupBox { - margin: 2px 0px 4px 3px; - } - </Style> - <Layout>horizontal</Layout> - <Children> - <Template src="skin:preview_deck.xml"/> - </Children> - <Connection> - <ConfigKey>[PreviewDeck],show_previewdeck</ConfigKey> - <BindProperty>visible</BindProperty> - </Connection> - </WidgetGroup><!-- Preview deck --> + <Template src="skin:preview_deck.xml"/> <!--Search Input Field--> - <WidgetGroup> - <Style> - QGroupBox {margin: 0px 0px 5px 0px;} - </Style> - <Layout>horizontal</Layout> - <Children> - <SearchBox></SearchBox> - </Children> - </WidgetGroup> + <SearchBox></SearchBox> + + <WidgetGroup><Size>,5f</Size></WidgetGroup> + <!--Library Tree View--> <Splitter> <Size>e,me</Size> @@ -490,11 +470,14 @@ </CoverArt> </Children> </Splitter> + </Children> </WidgetGroup><!-- Sidebar etc. --> + <SingletonContainer> <ObjectName>LibraryTable</ObjectName> </SingletonContainer> + </Children> </Splitter> </Children> diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss index eff839f55d..f2ebf8c924 100644 --- a/res/skins/Shade/style.qss +++ b/res/skins/Shade/style.qss @@ -467,6 +467,10 @@ WLibrary WColorPicker QPushButton { border: 1px solid rgba(151,151,151,128); } +#PreviewDeckContainer { + margin: 2px 0px 4px 3px; +} + /* library search text box */ WSearchLineEdit { margin-top: 2px; diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss index 0dd35b5418..7d940ffb34 100644 --- a/res/skins/Tango/style.qss +++ b/res/skins/Tango/style.qss @@ -23,9 +23,7 @@ WNumber, WTrackProperty, WBeatSpinBox, WEffectSelector, WEffectSelector QAbstractScrollArea, -WSearchLineEdit, WPushButton, -WSearchLineEdit, #LibraryContainer QPushButton, #LibraryContainer QLabel, #LibraryContainer QRadioButton, @@ -48,7 +46,6 @@ WPushButton { } WPushButton, -WSearchLineEdit, #LibraryContainer QPushButton, #LibraryContainer QLabel, #LibraryContainer QRadioButton, @@ -2881,7 +2878,7 @@ WSearchLineEdit { padding: 2px; border: 1px solid #656565; color: #cfcfcf; - background: #0f0f0f; + background-color: #0f0f0f; selection-color: #0f0f0f; selection-background-color: #d2d2d2; /* margin will increase the Qt widget size which is used to position the |