Unify Skin controls #1848

ronso0 · 2018-10-17T15:26:43Z

This keeps common skin settings when changing skins.
Continuation of #1642, fixes Bug 1740513

Are the following COs okay for everyone?
[Skin],show_4decks

[Skin],show_4effectunits
[Skin],show_superknobs (previous [Master],... is used in only one official mapping)

[Skin],show_spinnies
[Skin],show_coverart
[Skin],show_big_spinny_coverart

[Skin],show_8_hotcues
[Skin],show_starrating]
[Skin],show_rate_controls
[Skin],show_eq_knobs
[Skin],show_eq_kill_buttons
[Skin],show_xfader
[Skin],show_loop_beatjump_controls

[Skin],sampler_rows = number of sampler rows
[Skin],sampler_row_N = trigger CO for sampler rows WidgetStack
[Skin],sampler_row_current/..next/..prev = COs to cycle throught sampler rows WidgetStack
[Skin],sampler_row_N_expanded

daschuer · 2018-10-18T20:55:49Z

This works for me. Thank you.

ronso0 · 2018-10-23T14:59:35Z

Woooo, grep and sed are my friends now.
Please test.

Be-ing · 2018-10-24T17:45:08Z

There is now a merge conflict in res/skins/LateNight/deck_row_5_transportLoopJump.xml.

ronso0 · 2018-10-25T12:49:51Z

(rebased)

Be-ing · 2018-10-25T19:18:38Z

res/skins/Deere (64 Samplers)/skin.xml

      <attribute config_key="[Master],num_decks">4</attribute>
-      <attribute config_key="[Master],num_samplers">64</attribute>
+      <attribute config_key="[Master],num_samplers">16</attribute>


Why did you change this?

copy/paste mistake apparently. thx!

res/skins/Deere (64 Samplers)/skin.xml

res/skins/Deere/skin.xml

res/skins/LateNight/skin.xml

res/skins/Tango (64 Samplers)/skin.xml

res/skins/Tango/library.xml

res/skins/Deere (64 Samplers)/skin.xml

Be-ing · 2018-10-25T19:33:04Z

res/skins/Tango (64 Samplers)/skin.xml

-      <attribute config_key="[Master],num_samplers">64</attribute>
-      <attribute persist="true" config_key="[Master],show_mixer">1</attribute>
-      <attribute persist="true" config_key="[Master],show_eqs">1</attribute>
+      <attribute config_key="[Master],num_samplers">16</attribute>


revert back to 64

ronso0 · 2018-10-26T14:30:37Z

not finished, yet. I'll also take care of SplitSizes.

daschuer · 2018-10-28T09:56:21Z

Is this really still a 2.2 PR?

ronso0 · 2018-10-28T14:45:24Z

Is this really still a 2.2 PR?

I'd say so.
I think it makes sense to have this in a major 2.2 update where users rather expect/accept to re-configure some skin settings than in a point release.
At which branch would you like to target it?

daschuer · 2018-10-28T16:23:39Z

2.2 vs 2.3 it is just because we are past beta.
I don't expect issues due to letting that slip into 2.2 though.

res/skins/Deere/skin.xml

Be-ing · 2018-10-28T17:41:53Z

8 hotcues setting does not work in LateNight.

I'm ambivalent about whether to merge this to 2.2 or master...

ronso0 · 2018-10-28T21:09:23Z

8 hotcues setting does not work in LateNight.

fixed.

ronso0 · 2018-10-28T21:12:30Z

I'm ambivalent about whether to merge this to 2.2 or master...

I'm convinced users will appreciate it when checking out different skins, instead of having to go to each skin's settings menu to restore options. So why wait for 2.3?

ronso0 · 2018-11-03T19:38:01Z

(rebased, conflicts fixed)

daschuer · 2018-11-03T19:50:57Z

I have just tested it without any issues, thank you.
However, I vote for merging this to master.
We do not know how many custom skins and mappings are effected out there and a normal beta period would be fair.
What do others think?

Be-ing · 2018-11-03T20:15:47Z

I'm also wary to rush this for 2.2 considering the potential for regressions. Although we have already identified and fixed some of those, I am concerned there may be more subtle regressions lurking here.

There is a new conflict since #1840 was merged.

ronso0 · 2018-11-03T20:16:14Z

... and a normal beta period would be fair.

You're right.

ronso0 · 2018-11-09T16:16:27Z

Some improvements for Deere:

use button templates in the skin settings menu
convert category labels (MiXER, EFFECTS, ...) to toggles like in LateNight (more compact menu)
add MIXER toggle to the tool bar
fixed sampler rows selection

check!

ronso0 · 2018-11-09T16:17:07Z

I'd say we should merge this now before more conflicts pop up.

delete BAK file

res/skins/Deere/skinsettings_button.xml

res/skins/Deere/skinsettings_category_button.xml

Be-ing · 2018-11-23T14:59:11Z

res/skins/Deere/style.qss

@@ -113,11 +113,17 @@

 #Spacer22 {
  background-color: #222222;
-}
+} /*


delete commented out code

hmm I'll uncomment it then. It's often useful having such snippets ready for debugging and tests.

Be-ing · 2018-11-24T16:42:02Z

Thanks for your work and sorry to make you rebase so many times for this branch.

ronso0 · 2018-11-24T16:57:06Z

never mind, had to iron out some mistakes anyway..

nikmartin · 2018-12-24T23:13:19Z

Just FYI Tango skin loop controls are not visible on master branch, assuming it's this PR.

ronso0 force-pushed the unify-skin-controls branch from ae77b84 to f3bc8f0 Compare October 17, 2018 15:29

uklotzde added this to the 2.2.0 milestone Oct 22, 2018

ronso0 force-pushed the unify-skin-controls branch from 73cfc7e to b1e7103 Compare October 25, 2018 12:49

Be-ing suggested changes Oct 25, 2018

View reviewed changes

Be-ing reviewed Oct 25, 2018

View reviewed changes

Be-ing suggested changes Oct 28, 2018

View reviewed changes

res/skins/Deere/skin.xml Show resolved Hide resolved

res/skins/Deere/skin.xml Outdated Show resolved Hide resolved

ronso0 added 13 commits November 3, 2018 20:35

Deere: remove unused Spinny CO from decks

ab0bc26

[Skin],show_4decks

469b2a2

[Skin],show_4effectunits

dcdbff1

[Skin],show_superknobs

9adc15c

[Skin],show_spinnies

0260fe8

[Skin],show_coverart

2c54485

[Skin],show_coverart [Skin],show_big_spinny_coverart

e735b1a

[Skin],show_8_hotcues

35d86a9

[Skin],sampler_row_N_expanded

d8fc639

[Skin],sampler_rows [Skin],sampler_row_current/..next/..prev

91935de

[Skin,show_starrating] etc.

5683b64

[Skin],show_rate_controls

da4e483

[Skin],show_eq_kill_buttons

8ff0bcf

LateNight: fix [Skin],show_8_hotcues

37fbb09

ronso0 force-pushed the unify-skin-controls branch from 56b1f22 to 37fbb09 Compare November 3, 2018 19:37

Be-ing changed the base branch from 2.2 to master November 3, 2018 20:16

Be-ing modified the milestones: 2.2.0, 2.3.0 Nov 3, 2018

ronso0 added 3 commits November 9, 2018 17:01

Deere: simplify skinsettings, fix sampler row selection

8d63594

Deere: improve tool bar on small screens, add Mixer toggle

0879682

resolve conflicts after merging [LateNight, 8 samplers]

90a02b4

ronso0 force-pushed the unify-skin-controls branch from e8c9e21 to 90a02b4 Compare November 9, 2018 16:06

Merge branch 'master' into unify-skin-controls

e6dc512

Delete skin_settings___.xml

e509a0c

delete BAK file

ronso0 mentioned this pull request Nov 22, 2018

Deere :: compact FX units #1909

Merged

move Mic/Aux toggle to match actual order in skin

1955283

Be-ing suggested changes Nov 23, 2018

View reviewed changes

ronso0 added 3 commits November 24, 2018 16:18

fix description in skinsettings_button.xml

4f4daf3

fix description in skinsettings_category_button.xml

32e3cd9

uncomment debug styles in Deere/style.qss

b0f1dd9

Be-ing merged commit fea7960 into mixxxdj:master Nov 24, 2018

ronso0 deleted the unify-skin-controls branch November 29, 2018 18:31

mixxxbot mentioned this pull request Aug 23, 2022

unify skin settings ControlObject names #9031

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Unify Skin controls #1848

Unify Skin controls #1848

ronso0 commented Oct 17, 2018 •

edited

Loading

daschuer commented Oct 18, 2018

ronso0 commented Oct 23, 2018

Be-ing commented Oct 24, 2018

ronso0 commented Oct 25, 2018

Be-ing Oct 25, 2018

ronso0 Oct 25, 2018

Be-ing Oct 25, 2018

ronso0 Oct 25, 2018

ronso0 commented Oct 26, 2018

daschuer commented Oct 28, 2018

ronso0 commented Oct 28, 2018

daschuer commented Oct 28, 2018

Be-ing commented Oct 28, 2018

ronso0 commented Oct 28, 2018

ronso0 commented Oct 28, 2018

ronso0 commented Nov 3, 2018

daschuer commented Nov 3, 2018

Be-ing commented Nov 3, 2018

ronso0 commented Nov 3, 2018

ronso0 commented Nov 9, 2018

ronso0 commented Nov 9, 2018

Be-ing Nov 23, 2018

ronso0 Nov 24, 2018

Be-ing commented Nov 24, 2018

ronso0 commented Nov 24, 2018

nikmartin commented Dec 24, 2018

Unify Skin controls #1848

Unify Skin controls #1848

Conversation

ronso0 commented Oct 17, 2018 • edited Loading

daschuer commented Oct 18, 2018

ronso0 commented Oct 23, 2018

Be-ing commented Oct 24, 2018

ronso0 commented Oct 25, 2018

Be-ing Oct 25, 2018

Choose a reason for hiding this comment

ronso0 Oct 25, 2018

Choose a reason for hiding this comment

Be-ing Oct 25, 2018

Choose a reason for hiding this comment

ronso0 Oct 25, 2018

Choose a reason for hiding this comment

ronso0 commented Oct 26, 2018

daschuer commented Oct 28, 2018

ronso0 commented Oct 28, 2018

daschuer commented Oct 28, 2018

Be-ing commented Oct 28, 2018

ronso0 commented Oct 28, 2018

ronso0 commented Oct 28, 2018

ronso0 commented Nov 3, 2018

daschuer commented Nov 3, 2018

Be-ing commented Nov 3, 2018

ronso0 commented Nov 3, 2018

ronso0 commented Nov 9, 2018

ronso0 commented Nov 9, 2018

Be-ing Nov 23, 2018

Choose a reason for hiding this comment

ronso0 Nov 24, 2018

Choose a reason for hiding this comment

Be-ing commented Nov 24, 2018

ronso0 commented Nov 24, 2018

nikmartin commented Dec 24, 2018

ronso0 commented Oct 17, 2018 •

edited

Loading