mixxxdj · daschuer · Nov 5, 2017 · Jul 31, 2017 · Jul 31, 2017 · Jul 31, 2017
diff --git a/res/skins/Tango/button_1state.xml b/res/skins/Tango/button_1state.xml
@@ -3,7 +3,7 @@ Description:
   A button that has click or display controls.
 Variables:
   ObjectName        : object name
-  TooolTipID        : standard Tooltip from mixxx db
+  ToolTipID         : standard Tooltip from mixxx db
     see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/tooltips.cpp
   Size              : button size
   state_X_text      : label text for state X

diff --git a/res/skins/Tango/button_1state_right.xml b/res/skins/Tango/button_1state_right.xml
@@ -3,15 +3,15 @@ Description:
   A button that has click or display controls.
 Variables:
   ObjectName        : object name
-  TooolTipID        : standard Tooltip from mixxx db
+  ToolTipID         : standard Tooltip from mixxx db
     see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/tooltips.cpp
   Size              : button size
   state_X_text      : label text for state X
   state_X_pressed   : background graphic for pressed state X
   state_X_unpressed : background graphic for unpressed state X
   Align             : alignment of text
   ConfigKey         : left-click control
-  ConfigKeyRight    : left-click control
+  ConfigKeyRight    : right-click control
 -->
 <Template>
   <PushButton>

diff --git a/res/skins/Tango/button_1state_right_display.xml b/res/skins/Tango/button_1state_right_display.xml
@@ -3,15 +3,15 @@ Description:
   A button that has click or display controls.
 Variables:
   ObjectName        : object name
-  TooolTipID        : standard Tooltip from mixxx db
+  ToolTipID         : standard Tooltip from mixxx db
     see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/tooltips.cpp
   Size              : button size
   state_X_text      : label text for state X
   state_X_pressed   : background graphic for pressed state X
   state_X_unpressed : background graphic for unpressed state X
   Align             : alignment of text
   ConfigKey         : left-click control
-  ConfigKeyRight    : left-click control
+  ConfigKeyRight    : right-click control
   ConfigKeyDisp     : display control
 -->
 <Template>

diff --git a/res/skins/Tango/button_1state_right_persist.xml b/res/skins/Tango/button_1state_right_persist.xml
@@ -3,15 +3,15 @@ Description:
   A button that has click or display controls.
 Variables:
   ObjectName        : object name
-  TooolTipID        : standard Tooltip from mixxx db
+  ToolTipID         : standard Tooltip from mixxx db
     see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/tooltips.cpp
   Size              : button size
   state_X_text      : label text for state X
   state_X_pressed   : background graphic for pressed state X
   state_X_unpressed : background graphic for unpressed state X
   Align             : alignment of text
   ConfigKey         : left-click control
-  ConfigKeyRight    : left-click control
+  ConfigKeyRight    : right-click control
 -->
 <Template>
   <PushButton>
@@ -28,11 +28,11 @@ Variables:
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <Connection>
-      <ConfigKey><Variable name="ConfigKey"/></ConfigKey>
+      <ConfigKey persist="true"><Variable name="ConfigKey"/></ConfigKey>
       <ButtonState>LeftButton</ButtonState>
     </Connection>
     <Connection>
-      <ConfigKey><Variable name="ConfigKeyRight"/></ConfigKey>
+      <ConfigKey persist="true"><Variable name="ConfigKeyRight"/></ConfigKey>
       <ButtonState>RightButton</ButtonState>
     </Connection>
   </PushButton>

diff --git a/res/skins/Tango/button_2state.xml b/res/skins/Tango/button_2state.xml
@@ -3,7 +3,7 @@ Description:
   A button that has click or display controls.
 Variables:
   ObjectName        : object name
-  TooolTipID        : standard Tooltip from mixxx db
+  ToolTipID         : standard Tooltip from mixxx db
     see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/tooltips.cpp
   Size              : button size
   state_X_text      : label text for state X

diff --git a/res/skins/Tango/button_2state_display.xml b/res/skins/Tango/button_2state_display.xml
@@ -3,7 +3,7 @@ Description:
   A button that has click or display controls.
 Variables:
   ObjectName        : object name
-  TooolTipID        : standard Tooltip from mixxx db
+  ToolTipID         : standard Tooltip from mixxx db
     see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/tooltips.cpp
   Size              : button size
   state_X_text      : label text for state X

diff --git a/res/skins/Tango/button_4state_persist.xml → res/skins/Tango/button_2state_highlight.xml b/res/skins/Tango/button_4state_persist.xml → res/skins/Tango/button_2state_highlight.xml
@@ -3,52 +3,43 @@ Description:
   A button that has click or display controls.
 Variables:
   ObjectName        : object name
-  TooolTipID        : standard Tooltip from mixxx db
+  ToolTipID         : standard Tooltip from mixxx db
     see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/tooltips.cpp
   Size              : button size
   state_X_text      : label text for state X
   state_X_pressed   : background graphic for pressed state X
   state_X_unpressed : background graphic for unpressed state X
   Align             : alignment of text
-  ConfigKeyPerm     : persistent left-click control
+  ConfigKey         : left-click control
+  ConfigKeyDisp     : display control
 -->
 <Template>
   <PushButton>
     <TooltipId><Variable name="TooltipId"/></TooltipId>
     <ObjectName><Variable name="ObjectName"/></ObjectName>
     <Size><Variable name="Size"/></Size>
-    <NumberStates>4</NumberStates>
+    <NumberStates>2</NumberStates>
     <State>
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
+      <Alignment><Variable name="Align"/></Alignment>
       <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_pressed"/></Pressed>
       <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
-      <Alignment><Variable name="Align"/></Alignment>
     </State>
     <State>
       <Number>1</Number>
       <Text><Variable name="state_1_text"/></Text>
+      <Alignment><Variable name="Align"/></Alignment>
       <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_pressed"/></Pressed>
       <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_unpressed"/></Unpressed>
-      <Alignment><Variable name="Align"/></Alignment>
-    </State>
-    <State>
-      <Number>2</Number>
-      <Text><Variable name="state_2_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2_unpressed"/></Unpressed>
-      <Alignment><Variable name="Align"/></Alignment>
-    </State>
-    <State>
-      <Number>3</Number>
-      <Text><Variable name="state_3_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_3_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_3_unpressed"/></Unpressed>
-      <Alignment><Variable name="Align"/></Alignment>
     </State>
     <Connection>
-      <ConfigKey persist="true"><Variable name="ConfigKeyPerm"/></ConfigKey>
+      <ConfigKey><Variable name="ConfigKey"/></ConfigKey>
       <ButtonState>LeftButton</ButtonState>
     </Connection>
+    <Connection>
+      <ConfigKey><Variable name="HighlightKey"/></ConfigKey>
+      <BindProperty>highlight</BindProperty>
+    </Connection>
   </PushButton>
 </Template>
diff --git a/res/skins/Tango/button_2state_persist.xml b/res/skins/Tango/button_2state_persist.xml
@@ -3,14 +3,14 @@ Description:
   A button that has click or display controls.
 Variables:
   ObjectName        : object name
-  TooolTipID        : standard Tooltip from mixxx db
+  ToolTipID         : standard Tooltip from mixxx db
     see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/tooltips.cpp
   Size              : button size
   state_X_text      : label text for state X
   state_X_pressed   : background graphic for pressed state X
   state_X_unpressed : background graphic for unpressed state X
   Align             : alignment of text
-  ConfigKeyPerm     : persistent left-click control
+  ConfigKey         : persistent left-click control
 -->
 <Template>
   <PushButton>
@@ -33,7 +33,7 @@ Variables:
       <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_unpressed"/></Unpressed>
     </State>
     <Connection>
-      <ConfigKey persist="true"><Variable name="ConfigKeyPerm"/></ConfigKey>
+      <ConfigKey persist="true"><Variable name="ConfigKey"/></ConfigKey>
       <ButtonState>LeftButton</ButtonState>
     </Connection>
   </PushButton>

diff --git a/res/skins/Tango/button_2state_right.xml b/res/skins/Tango/button_2state_right.xml
@@ -3,15 +3,15 @@ Description:
   A button that has click or display controls.
 Variables:
   ObjectName        : object name
-  TooolTipID        : standard Tooltip from mixxx db
+  ToolTipID         : standard Tooltip from mixxx db
     see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/tooltips.cpp
   Size              : button size
   state_X_text      : label text for state X
   state_X_pressed   : background graphic for pressed state X
   state_X_unpressed : background graphic for unpressed state X
   Align             : alignment of text
   ConfigKey         : left-click control
-  ConfigKeyRight    : left-click control
+  ConfigKeyRight    : right-click control
 -->
 <Template>
   <PushButton>

diff --git a/res/skins/Tango/button_2state_right_display.xml b/res/skins/Tango/button_2state_right_display.xml
@@ -3,15 +3,15 @@ Description:
   A button that has click or display controls.
 Variables:
   ObjectName        : object name
-  TooolTipID        : standard Tooltip from mixxx db
+  ToolTipID         : standard Tooltip from mixxx db
     see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/tooltips.cpp
   Size              : button size
   state_X_text      : label text for state X
   state_X_pressed   : background graphic for pressed state X
   state_X_unpressed : background graphic for unpressed state X
   Align             : alignment of text
   ConfigKey         : left-click control
-  ConfigKeyRight    : persistent left-click control
+  ConfigKeyRight    : right-click control
   ConfigKeyDisp     : display control
 -->
 <Template>

diff --git a/res/skins/Tango/button_3state.xml b/res/skins/Tango/button_3state.xml
@@ -3,7 +3,7 @@ Description:
   A button that has click or display controls.
 Variables:
   ObjectName        : object name
-  TooolTipID        : standard Tooltip from mixxx db
+  ToolTipID         : standard Tooltip from mixxx db
     see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/tooltips.cpp
   Size              : button size
   state_X_text      : label text for state X

diff --git a/res/skins/Tango/button_3state_display.xml b/res/skins/Tango/button_3state_display.xml
@@ -3,7 +3,7 @@ Description:
   A button that has click or display controls.
 Variables:
   ObjectName        : object name
-  TooolTipID        : standard Tooltip from mixxx db
+  ToolTipID         : standard Tooltip from mixxx db
     see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/tooltips.cpp
   Size              : button size
   state_X_text      : label text for state X
@@ -46,7 +46,7 @@ Variables:
       <ButtonState>LeftButton</ButtonState>
     </Connection>
     <Connection>
-      <ConfigKey persist="true"><Variable name="ConfigKeyDisp"/></ConfigKey>
+      <ConfigKey><Variable name="ConfigKeyDisp"/></ConfigKey>
       <ConnectValueFromWidget>false</ConnectValueFromWidget>
     </Connection>
   </PushButton>

diff --git a/res/skins/Tango/button_3state_persist.xml b/res/skins/Tango/button_3state_persist.xml
@@ -3,14 +3,14 @@ Description:
   A button that has click or display controls.
 Variables:
   ObjectName        : object name
-  TooolTipID        : standard Tooltip from mixxx db
+  ToolTipID         : standard Tooltip from mixxx db
     see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/tooltips.cpp
   Size              : button size
   state_X_text      : label text for state X
   state_X_pressed   : background graphic for pressed state X
   state_X_unpressed : background graphic for unpressed state X
   Align             : alignment of text
-  ConfigKeyPerm     : persistent left-click control
+  ConfigKey         : persistent left-click control
 -->
 <Template>
   <PushButton>
@@ -40,7 +40,7 @@ Variables:
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <Connection>
-      <ConfigKey persist="true"><Variable name="ConfigKeyPerm"/></ConfigKey>
+      <ConfigKey persist="true"><Variable name="ConfigKey"/></ConfigKey>
       <ButtonState>LeftButton</ButtonState>
     </Connection>
   </PushButton>

diff --git a/res/skins/Tango/button_4state_display.xml b/res/skins/Tango/button_4state_display.xml
@@ -3,7 +3,7 @@ Description:
   A button that has click or display controls.
 Variables:
   ObjectName        : object name
-  TooolTipID        : standard Tooltip from mixxx db
+  ToolTipID         : standard Tooltip from mixxx db
     see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/tooltips.cpp
   Size              : button size
   state_X_text      : label text for state X

diff --git a/res/skins/Tango/button_5state.xml b/res/skins/Tango/button_5state.xml
@@ -3,7 +3,7 @@ Description:
   A button that has click or display controls.
 Variables:
   ObjectName        : object name
-  TooolTipID        : standard Tooltip from mixxx db
+  ToolTipID         : standard Tooltip from mixxx db
     see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/tooltips.cpp
   Size              : button size
   state_X_text      : label text for state X

diff --git a/res/skins/Tango/button_beatjump.xml b/res/skins/Tango/button_beatjump.xml
diff --git a/res/skins/Tango/button_hotcue_deck.xml b/res/skins/Tango/button_hotcue_deck.xml
@@ -1,7 +1,8 @@
 <!--
 Description:
   A HotCue button for regular decks only.
-  Left-click activates/recalls HotCue, right-click deletes it
+  Left-click activates/recalls HotCue, right-click deletes it.
+  Can be squeezed to make room for more deck controls, or star rating widget.
 Variables:
   group : [ChannelN]
   HotCue: hotcue number

diff --git a/res/skins/Tango/button_loop.xml b/res/skins/Tango/button_loop.xml