diff options
| -rwxr-xr-x | RHMixxx1280x800/skin.xml | 159 |
1 files changed, 84 insertions, 75 deletions
diff --git a/RHMixxx1280x800/skin.xml b/RHMixxx1280x800/skin.xml index 7a9e9c1..1a7ab87 100755 --- a/RHMixxx1280x800/skin.xml +++ b/RHMixxx1280x800/skin.xml @@ -380,7 +380,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; } </Connection> </PushButton> - <!--Button- Stop--> + <!--Channel 1: Button- Stop--> <PushButton> <TooltipId>cue_default_cue_gotoandstop</TooltipId> <Style></Style> @@ -403,7 +403,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; } </Connection> </PushButton> - <!--VU-Meter Players--> + <!--Channel 1: VU-Meter Players--> <VuMeter> <Tooltip>Channel volume meter Shows the left channel of player 1 volume </Tooltip> @@ -462,22 +462,24 @@ WSearchLineEdit { background: #cfdee7; color: #000000; } <!-- Channel 2: Waveform Display --> <Visual> <TooltipId>waveform_display</TooltipId> - <Style></Style> - <Channel>2</Channel> + <Style> + </Style> + <Channel>1</Channel> <Pos>0,1</Pos> - <Size>381,50</Size> - <BgColor>#ffffff</BgColor> - <HfcColor>#000000</HfcColor> - <SignalColor>#000000</SignalColor> - <SignalLowColor>#000000</SignalLowColor> - <SignalMidColor>#000000</SignalMidColor> + <Size>331,50</Size> + <BgColor>#ffffff</BgColor> + <HfcColor>#000000</HfcColor> + <SignalColor>#CC0000</SignalColor> + <SignalLowColor>#CC0000</SignalLowColor> + <SignalMidColor>#CC0000</SignalMidColor> <SignalHighColor>#ff8900</SignalHighColor> - <BeatColor>#e0ddd7</BeatColor> - <BeatHighlightColor>#00FF00</BeatHighlightColor> - <MarkerColor>#00FF00</MarkerColor> - <CueColor>#e19820</CueColor> - <PlayPosColor>#00FF00</PlayPosColor> - <Mark> + <BeatColor>#e0ddd7</BeatColor> + <BeatHighlightColor>#00FF00</BeatHighlightColor> + <MarkerColor>#00FF00</MarkerColor> + <CueColor>#e19820</CueColor> + <EndOfTrackColor>#ff8900</EndOfTrackColor> + <PlayPosColor>#00FF00</PlayPosColor> + <Mark> <Control>cue_point</Control> <Pixmap>marker_cue.png</Pixmap> <Text> CUE </Text> @@ -507,25 +509,27 @@ WSearchLineEdit { background: #cfdee7; color: #000000; } <Align>bottom</Align> <Color>#00FF00</Color> <TextColor>#FFFFFF</TextColor> - </Mark> - </Visual> + </Mark> + </Visual> <!-- Channel 2: Waveform Overview --> <Overview> <TooltipId>waveform_overview</TooltipId> - <Channel>2</Channel> + <Channel>1</Channel> <Pos>0,60</Pos> - <Size>320,40</Size> - <BgColor>#FFFFFF</BgColor> - <SignalColor>#000000</SignalColor> + <Size>260,40</Size> + <BgColor>#061319</BgColor> + <BgPixmap></BgPixmap> + <SignalColor>#CC0000</SignalColor> <PlayPosColor>#00FF00</PlayPosColor> + <EndOfTrackColor>#000000</EndOfTrackColor> <Connection> - <ConfigKey>[Channel2],playposition</ConfigKey> + <ConfigKey>[Channel1],playposition</ConfigKey> <EmitOnDownPress>false</EmitOnDownPress> </Connection> - </Overview> - - <!-- Channel 2: Button play --> + </Overview> + + <!-- Channel 1: Button play --> <PushButton> <Tooltip>Play/Pause Left-click: Toggles playing or pausing the track. Right-click: Places a Cue-point at the current point in the track. </Tooltip> <Style></Style> @@ -541,22 +545,43 @@ WSearchLineEdit { background: #cfdee7; color: #000000; } <Pressed>btn_play_over.png</Pressed> <Unpressed>btn_play_over.png</Unpressed> </State> - <Pos>388,0</Pos> + <Pos>338,0</Pos> <Connection> - <ConfigKey>[Channel2],play</ConfigKey> + <ConfigKey>[Channel1],play</ConfigKey> <EmitOnDownPress>true</EmitOnDownPress> <ButtonState>LeftButton</ButtonState> </Connection> <Connection> - <ConfigKey>[Channel2],cue_set</ConfigKey> + <ConfigKey>[Channel1],cue_set</ConfigKey> <EmitOnDownPress>true</EmitOnDownPress> <ButtonState>RightButton</ButtonState> <ConnectValueToWidget>false</ConnectValueToWidget> </Connection> - </PushButton> - - <!--Button STOP--> - + </PushButton> + + + <!--Channel 1: Button- Repeat (End of track mode)--> + <PushButton> + <TooltipId>repeat</TooltipId> + <Style></Style> + <NumberStates>2</NumberStates> + <State> + <Number>0</Number> + <Pressed>btn_repeat1.png</Pressed> + <Unpressed>btn_repeat1.png</Unpressed> + </State> + <State> + <Number>1</Number> + <Pressed>btn_repeat1_over.png</Pressed> + <Unpressed>btn_repeat1_over.png</Unpressed> + </State> + <Pos>210,60</Pos> + <Connection> + <ConfigKey>[Channel1],repeat</ConfigKey> + </Connection> + </PushButton> + + <!--Button- Stop--> <PushButton> <TooltipId>cue_default_cue_gotoandstop</TooltipId> <Style></Style> @@ -566,88 +591,72 @@ WSearchLineEdit { background: #cfdee7; color: #000000; } <Pressed>btn_stop_red.png</Pressed> <Unpressed>btn_stop.png</Unpressed> </State> - <Pos>335,60</Pos> + <Pos>295,60</Pos> <Connection> - <ConfigKey>[Channel2],start_stop</ConfigKey> + <ConfigKey>[Channel1],start_stop</ConfigKey> <EmitOnPressAndRelease>true</EmitOnPressAndRelease> <ButtonState>LeftButton</ButtonState> </Connection> <Connection> - <ConfigKey>[Channel2],start_stop</ConfigKey> + <ConfigKey>[Channel1],start_stop</ConfigKey> <EmitOnPressAndRelease>true</EmitOnPressAndRelease> <ButtonState>RightButton</ButtonState> </Connection> </PushButton> - </Children> - </WidgetGroup> - - <!-- - ********************************************** - Visual - Volume level display - ********************************************** - --> - - <WidgetGroup> - <Pos>520,114</Pos> - <Style>QGroupBox { border: 0px solid red; }</Style> - <Children> - <!-- CHANNEL 2 --> + + <!--VU-Meter Players--> + <VuMeter> - <Tooltip>Channel volume meter Shows the left channel (2) volume </Tooltip> + <Tooltip>Channel volume meter Shows the left channel of player 1 volume </Tooltip> <Style></Style> <PathVu>btn_volume_display_small_over.png</PathVu> <PathBack>btn_volume_display_small.png</PathBack> - <Pos>184,24</Pos> + <Pos>440,27</Pos> <Horizontal>false</Horizontal> <PeakHoldSize>5</PeakHoldSize> <PeakHoldTime>500</PeakHoldTime> <PeakFallTime>50</PeakFallTime> <PeakFallStep>1</PeakFallStep> <Connection> - <ConfigKey>[Channel2],VuMeterL</ConfigKey> + <ConfigKey>[Channel1],VuMeterL</ConfigKey> </Connection> </VuMeter> - + <StatusLight> - <Tooltip>Peak Indicator Indicates when the signal on the left channel is clipping, (too loud for the hardware and is being distorted). </Tooltip> + <Tooltip>Peak Indicator Indicates when the signal on the channel is clipping, (too loud for the hardware and is being distorted). </Tooltip> <Style></Style> - <PathStatusLight>btn_clipping_over.png</PathStatusLight> - <PathBack>btn_clipping.png</PathBack> - <Pos>184,24</Pos> + <PathStatusLight>btn_clipping_master_over.png</PathStatusLight> + <PathBack>btn_clipping_master.png</PathBack> + <Pos>440,10</Pos> <Connection> - <ConfigKey>[Channel2],PeakIndicatorL</ConfigKey> + <ConfigKey>[Channel1],PeakIndicator</ConfigKey> </Connection> </StatusLight> + <VuMeter> - <Tooltip>Channel volume meter Shows the right channel (2) volume </Tooltip> + <Tooltip>Channel volume meter Shows the right channel (1) volume </Tooltip> <Style></Style> <PathVu>btn_volume_display_small_over.png</PathVu> <PathBack>btn_volume_display_small.png</PathBack> - <Pos>220,24</Pos> + <Pos>454,27</Pos> <Horizontal>false</Horizontal> <PeakHoldSize>5</PeakHoldSize> <PeakHoldTime>500</PeakHoldTime> <PeakFallTime>50</PeakFallTime> <PeakFallStep>1</PeakFallStep> <Connection> - <ConfigKey>[Channel2],VuMeterR</ConfigKey> + <ConfigKey>[Channel1],VuMeterR</ConfigKey> </Connection> </VuMeter> + </Children> + </WidgetGroup> - <StatusLight> - <Tooltip>Peak Indicator Indicates when the signal on the channel is clipping, (too loud for the hardware and is being distorted). </Tooltip> - <Style></Style> - <PathStatusLight>btn_clipping_over.png</PathStatusLight> - <PathBack>btn_clipping.png</PathBack> - <Pos>220,24</Pos> - <Connection> - <ConfigKey>[Channel2],PeakIndicatorR</ConfigKey> - </Connection> - </StatusLight> - </Children> - </WidgetGroup> - + <!-- + ********************************************** + Visual - Volume level display + ********************************************** + --> <WidgetGroup> <Pos>1000,700</Pos> |