summaryrefslogtreecommitdiff
path: root/RHMixxx1280x800
diff options
context:
space:
mode:
Diffstat (limited to 'RHMixxx1280x800')
-rwxr-xr-xRHMixxx1280x800/skin.xml10
1 files changed, 3 insertions, 7 deletions
diff --git a/RHMixxx1280x800/skin.xml b/RHMixxx1280x800/skin.xml
index e9cf5b2..2678747 100755
--- a/RHMixxx1280x800/skin.xml
+++ b/RHMixxx1280x800/skin.xml
@@ -184,7 +184,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
background-color: transparent; color: #FF0000; }
</Style>
<Channel>1</Channel>
- <Pos>315,38</Pos>
+ <Pos>270,38</Pos>
<Size>150,32</Size>
<NumberOfDigits>6</NumberOfDigits>
<Connection>
@@ -384,11 +384,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
<TooltipId>waveform_overview</TooltipId>
<Channel>1</Channel>
<Pos>10,60</Pos>
-<<<<<<< .mine
<Size>254,40</Size>
-=======
- <Size>259,42</Size>
->>>>>>> .r63
<BgColor>#061319</BgColor>
<BgPixmap></BgPixmap>
<SignalColor>#CC0000</SignalColor>
@@ -462,7 +458,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
<Pressed>btn_stop_red.png</Pressed>
<Unpressed>btn_stop.png</Unpressed>
</State>
- <Pos>264,60</Pos>
+ <Pos>274,60</Pos>
<Connection>
<ConfigKey>[Channel1],start_stop</ConfigKey>
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
@@ -812,7 +808,7 @@ WSearchLineEdit { background: #cfdee7; color: #000000; }
<Time>
<TooltipId>time</TooltipId>
<Style>QLabel { font: bold 53px/50px Arial; color: #00000; }</Style>
- <Pos>473,100</Pos>
+ <Pos>508,100</Pos>
<Size>150,50</Size>
<ShowSeconds>true</ShowSeconds>
<ClockFormat>24</ClockFormat>