Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deere 2.1 #940

Merged
merged 158 commits into from
Jun 1, 2017
Merged

Deere 2.1 #940

merged 158 commits into from
Jun 1, 2017

Conversation

Be-ing
Copy link
Contributor

@Be-ing Be-ing commented May 3, 2016

Must have for merge:

  • Figure out what to do for spinny/waveform sizes
  • merge new loop and beatjump controls #1187
  • Change default sizes for all combinations of 2/4 decks, stacked/split waveforms, and quick effect knob/no quick effect loaded. Test with fresh config file and upgrading from Deere 2.0

Other tasks tasks to take care of:

  • Test that WEffectSelector and WBeatSpinBox look good on all operating systems with Qt4
  • Ellide text where necessary (quick effect knob labels at least)
  • Fix log spam
  • Disappearing level meter bug. Help figuring out how to reproduce this would be appreciated.
  • Fix overlapping labels and metaknobs in show parameters mode with effect focus showing.
  • Try to reduce vertical space used by effect units so 4 decks and 4 effect units can fit on a 1366 x 768 screen
  • Redesign spinny position indicator
  • Mini decks for maximized library view
  • Recording duration length

This PR rearranges the mixer in Deere to make stacked waveform mode more practical. It also adds options to show/hide EQs and an option to show only minimal deck controls. I have also added crossfader assignment buttons in 4 deck mode.

The new "Show Minimal Controls" option is helpful for users with controllers who can use their controller for the functionality hidden by this option. It is also helpful for vinyl users who don't use those features. This new option opens up more space for the overview waveforms.

The settings menu has also been reorganized a bit.

Before, the library was barely visible with stacked waveforms and a lot of vertical space was wasted:
before-2-decks-stacked
Current master, 2 decks split waveforms:
before-2-decks-split
Current master, 4 decks split waveforms:
before-4-decks-split
Current master, 4 decks stacked waveforms:
before-4-decks-stacked

@Be-ing
Copy link
Contributor Author

Be-ing commented May 3, 2016

There are many new combinations of options available, so I won't post screenshots of every single possibility.

This PR, 2 decks stacked without EQs:
after-2-decks-stacked

This PR, 2 decks split with EQs:
after-2-decks-split-eqs

This PR, 4 decks split:
after-4-decks-split

This PR, 4 decks split with EQs:
after-4-decks-split-with-eqs

This PR, 4 decks stacked with no EQs and minimal deck controls:
after-4-decks-stacked-minimal-controls

This PR, 4 decks stacked with EQs and minimal deck controls:
after-4-decks-stacked-with-eqs-minimal-controls

This PR, 4 decks stacked with no mixer and minimal deck controls:
after-4-decks-stacked-no-mixer-minimal-controls

Updated settings menu:
after-settings-menu

Example with a small window. This could be used by toggling between this view and the maximized library:
after-small-window

There are a few polishing details I need help with:

  • I don't know how to align the bottom & top of the volume fader with the channel level meters in 2 deck mode. Maybe a little spacer under the headphone button could make up the difference between the size of the gain knob and the headphone button. But I have no idea why the bottoms don't line up.
  • The headphone button is not horizontally centered with 4 decks stacked + EQs
  • Getting zoomed waveforms to shrink as necessary but still expand to take all the space they can. Notice how the bottoms of the waveforms are clipped off with 4 decks stacked, EQs, and minimal deck controls. I've tried playing around with the Size and SizePolicy tags in deck_visual_row.xml but couldn't figure out how to get this to work.
  • Putting a little space between the buttons in "Show Minimal Controls" mode.
  • Lighting the crossfader assignment buttons in 4 deck mode. They're grey when set to left (0) and blue for both center (1) and right (2). Do I need to make a separate SVG for each to show 3 different states?

@daschuer
Copy link
Member

daschuer commented May 3, 2016

Thank you for this PR. I had not the time to actually test it, but here are some comments form the screen shots:

  • The master VU meter between the channel VU meters clutters the mixing region and is not centered. I prefer the old solution.
  • The gain knob should not "jump" when switching the views. I would prefer it always on the top of the mixing region.
  • how about pair the pfl buttons withe the orientatoin buttons?

@Be-ing
Copy link
Contributor Author

Be-ing commented May 3, 2016

The master VU meter between the channel VU meters clutters the mixing region and is not centered. I prefer the old solution.

I definitely think the master level meters should be in the mixer next to the controls that affect them, not out of sight in the corner. I don't think it looks cluttered; I think it looks good there. It is off center with 4 decks and EQs turned off. I think this might have something to do with the width of the hidden EQ kill buttons, but I'm not sure. It is centered exactly in the middle of the crossfader. It's actually the channel columns that are shifted to the right. Any ideas on what might be going wrong there?

The gain knob should not "jump" when switching the views. I would prefer it always on the top of the mixing region.

I think it's going to have to jump sometimes relative to other controls, but it could be arranged to always be at the top of the mixer. I like it directly above the level meters, but I see that it is a bit weird to have it below the EQs with 4 decks.

how about pair the pfl buttons withe the orientatoin buttons?

Hm, interesting idea. Arranged vertically or horizontally? And positioned where?

@daschuer
Copy link
Member

daschuer commented May 3, 2016

IMHO the master VU meter is important during setup, but not that important during mixing and your gain staging is set. Many DJ controllers do not even have a master VU meter, so I would prefer that it remains next to its main control, the main gain knob in favor of a styled mixer region.

Hm, interesting idea. Arranged vertically or horizontally? And positioned where?

My first idea was to just stack them above the x-Fader. Stack them horizontal is also an interesting idea.

@Be-ing
Copy link
Contributor Author

Be-ing commented May 3, 2016

Many DJ controllers do not even have a master VU meter

That's why it's important to have it easily visible, to make sure one doesn't clip while mixing. Both LateNight and Shade are layed out with the master meters in the center of the mixer. I don't see a good reason not to do the same with Deere. Horizontal space isn't at a premium in the mixer; vertical space is.

@ferranpujolcamins
Copy link
Contributor

You added a big button for the channel crossfade orientation. Few weeks ago
Owen made clear he doesn't want orientation controls on the skin.

Since our skins are owned by they original creators, diverging opinions
usually lead to our skins being inconsistent. Some skins have features that
others don't have. Sometimes the original author blocks a skin modification
that a majority of developers actually wants. This doesn't make sense for
official Mixxx skins.

I think we need to have a set of skins owned by the team, and decide
modifications by voting. Either the authors give up their skins to the team
or we build new ones.
El dia 03/05/2016 4:18 p. m., "Be" notifications@github.com va escriure:

Many DJ controllers do not even have a master VU meter

That's why it's important to have it easily visible, to make sure one
doesn't clip while mixing. Both LateNight and Shade are layed out with the
master meters in the center of the mixer. I don't see a good reason not to
do the same with Deere. Horizontal space isn't at a premium in the mixer;
vertical space is.


You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub
#940 (comment)

@Be-ing
Copy link
Contributor Author

Be-ing commented May 3, 2016

You added a big button for the channel crossfade orientation. Few weeks ago Owen made clear he doesn't want orientation controls on the skin.

That was on a different skin and in a different context. I have added them in a different place on the skin, in the mixer, and only when 4 decks are showing; not always showing in the deck's controls. It is normal for 4 deck mixers to have crossfader assignment buttons.

I agree that not having every feature available in every skin is a problem. I'd be willing to add crossfader orientation buttons to the mixer of LateNight in 4 deck mode as well.

@ferranpujolcamins
Copy link
Contributor

I'd be willing to add crossfader orientation buttons to the mixer of LateNight in 4 deck mode as well.

But @ywwg doesn't want to. Which is legit because LateNight is his skin. The problem is that we don't have any team skin, only personal skins. From my point of view that's a problem we should discuss.

Sorry for being off topic though.

@Be-ing
Copy link
Contributor Author

Be-ing commented May 3, 2016

Okay, fixed the alignment of the columns:
centered-meter-4split
centered-meter-4stacked-noeq
centered-meter-condensed

@daschuer
Copy link
Member

daschuer commented May 4, 2016

Ok, now it looks better, however i am still in fond of the original version. The original knob grid where really looking professional and polished in my eyes. But that is a matter or taste.

How about to align the master VU Meter with the channel VU meter?
I think you should also edit the right plf buttons for symmetry.

@Be-ing
Copy link
Contributor Author

Be-ing commented May 4, 2016

How about to align the master VU Meter with the channel VU meter?

Cool idea, but I'm not sure how to go about making that happen.

I think you should also edit the right plf buttons for symmetry.

I think the headphone icon should be centered in the buttons, but again I'm not sure how to make that happen.

@Be-ing
Copy link
Contributor Author

Be-ing commented Dec 12, 2016

I'm getting back to work on this. I think there is still room for improvement, but it's pretty good at this point.

After much frustrated fiddling with XML and QSS, I realized the issue with the alignment of the volume fader was because of whitespace in the slider SVG file.

A few quick screenshots of the current state:
2 decks stacked waveforms:
update0-2decks-stacked

4 decks split waveforms:
update0-4decks-split

Now the skin settings menu fits in the minimum height again.
This is useful for using an external mixer and still seeing the software
level meters and gain controls. It is also useful for controllers that
have faders and EQs but no level meters.
@Be-ing
Copy link
Contributor Author

Be-ing commented May 27, 2017

I think the level meter issue was due to a lack of a SizeHint. Hopefully it works better now.

I have moved the effects, sampler, and mic/aux toggle buttons up to the toolbar as suggested. I made the buttons only light their border when activated unlike other buttons in the skin so they are not too distracting. With some space opened in the skin settings menu, I added an option to hide the faders and PFL buttons from the mixer. Now the mixer can be shown with just the level meters and deck gain knobs. This is helpful for both the use cases of external mixers, for watching the software levels before the signal is sent to the sound card, and for using controllers that have EQs and volume faders but not level meters.

Putting more buttons in the top toolbar made it not quite fit in the minimum width. I'm working on getting the spacers to shrink for the minimum width so it fits again without cutting of any labels.

@Be-ing
Copy link
Contributor Author

Be-ing commented May 27, 2017

Minimum dimensions:
minimum-dimensions

Mixer with no faders, EQs, or crossfader:
no-faders

@daschuer
Copy link
Member

Here some findings and test results:

  • The master button in the effect decks is misleading. "The master button is there, but where are the deck buttons"?
  • The German effect button labels are cut off. I think we have still not a derision about: "What is long and what is short". By now I think the "lorem ipsum" length reference text works best.
  • the preview deck VU meter does not scale with the preview deck with for wide settings.
  • the gaps between the sampler decks are unequal.
  • the sampler gain knop is truncated on small screens
  • the master vu-meter is not alligned with deck VU meters.
  • on small screens the UV meter region is sqashed and overlapping.
  • sampler track title is overlapping and not elided.

@Be-ing
Copy link
Contributor Author

Be-ing commented May 28, 2017

There is room for improvement still, but please merge this ASAP. We have many users who are not familiar with managing different Git branches and are eagerly awaiting the new features. It will be hard to get updated controller mappings without this skin merged.

@Be-ing
Copy link
Contributor Author

Be-ing commented May 28, 2017

The master button in the effect decks is misleading. "The master button is there, but where are the deck buttons"?

It is odd, but I don't think there is a better place for them.

The German effect button labels are cut off. I think we have still not a derision about: "What is long and what is short". By now I think the "lorem ipsum" length reference text works best.

What do you mean by effect button labels? The effect names in the effect selectors?

the preview deck VU meter does not scale with the preview deck with for wide settings.

I cannot reproduce this. Please post a screenshot.

the gaps between the sampler decks are unequal.

Likewise, I cannot reproduce this. Please post a screenshot.

the sampler gain knop is truncated on small screens

I am aware. Do you have any ideas for redesigning the expanded sampler view to fit in small screens?

the master vu-meter is not alligned with deck VU meters.

In what configuration? Please post a screenshot.

on small screens the UV meter region is sqashed and overlapping.

Again, I do not know which configuration you're referring to. Please post a screenshot.

sampler track title is overlapping and not elided.

It is elided in the collapsed view, but I see now that I forgot to elide it for the expanded view. I'll fix that.

@Be-ing
Copy link
Contributor Author

Be-ing commented May 28, 2017

It is elided in the collapsed view, but I see now that I forgot to elide it for the expanded view. I'll fix that.

Actually the sample title does elide in both views already, but in the minimum width when the edge of the samplers is cut off in expanded view that is not visible.

@Be-ing
Copy link
Contributor Author

Be-ing commented May 28, 2017

Is there anything preventing merging this?

@Be-ing
Copy link
Contributor Author

Be-ing commented May 31, 2017

:/ The red colors do not work well for red-green colorblind users:
metaknob-link-colorblind
mixer-colorblind
I'll play with different colors. Any suggestions?

@daschuer
Copy link
Member

daschuer commented Jun 1, 2017

The master button in the effect decks is misleading. "The master button is there, but where are the deck buttons"?

It is odd, but I don't think there is a better place for them.

If we follow the same logic as for the decks, the master button should be accessible if the effects are collapsed, this the current place is wrong. A natural place would be near the master gain knob or on top of the master VU-Meter.

The German effect button labels are cut off. I think we have still not a derision about: "What is long and what is short". By now I think the "lorem ipsum" length reference text works best.

What do you mean by effect button labels? The effect names in the effect selectors?

I meant the single parameter button labels. Do we have a short or long text there? Did you consider a solution for defining the length in Transiflex? However a proper elide is required anyway if we consider LV2 effects. Does a middle elide work for you?

the preview deck VU meter does not scale with the preview deck with for wide settings.

I cannot reproduce this. Please post a screenshot.

I cannot catch that is a screenshot, but you can reproduce it by this.
Shrink the treeview to minimum width. Play a track in the preview player,
Raise the width slowly. The VU meter rises at the beginning, but stops rising at a certain with.

the gaps between the sampler decks are unequal.

Likewise, I cannot reproduce this. Please post a screenshot.

bildschirmfoto vom 2017-06-01 21 39 31

the sampler gain knop is truncated on small screens

I am aware. Do you have any ideas for redesigning the expanded sampler view to fit in small screens?

bildschirmfoto vom 2017-06-01 21 42 01

We have the size aware stack, you can just remove some samplers if the space is to small.

Since we have already Tango and Shade which look much better on small screens, you may also just rise the skin and optimize it for HD ready screens: 1366 * 768

the master vu-meter is not alligned with deck VU meters.

In what configuration? Please post a screenshot.

You see it in the scrrenshot above the master VU meter is taller than the deck VU meter.
I think I would prefer to have them aligned to be visual comparable.

on small screens the UV meter region is sqashed and overlapping.

Again, I do not know which configuration you're referring to. Please post a screenshot.

bildschirmfoto vom 2017-06-01 21 32 26

sampler track title is overlapping and not elided.

It is elided in the collapsed view, but I see now that I forgot to elide it for the expanded view. I'll fix that.

Thanks

@Be-ing
Copy link
Contributor Author

Be-ing commented Jun 1, 2017

I'll work on these issues, but again, none of this should hold up merging any longer.

@daschuer
Copy link
Member

daschuer commented Jun 1, 2017

Ok, no problem!

@daschuer daschuer merged commit 3161b46 into mixxxdj:master Jun 1, 2017
@Be-ing Be-ing mentioned this pull request Jun 6, 2017
11 tasks
@esbrandt esbrandt mentioned this pull request Jun 24, 2017
37 tasks
@Be-ing Be-ing deleted the deere_stacked_waveforms_rework branch September 16, 2017 20:45
@Be-ing Be-ing mentioned this pull request Sep 23, 2017
19 tasks
@Be-ing Be-ing mentioned this pull request Oct 31, 2017
8 tasks
Copy link

@hibiarata hibiarata left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is so sad for me. I loved this function.

@daschuer
Copy link
Member

Which function exactly do you miss?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants