Skip to content

Deere 2.1#1167

Closed
Be-ing wants to merge 82 commits intomixxxdj:masterfrom
Be-ing:deere_2.1
Closed

Deere 2.1#1167
Be-ing wants to merge 82 commits intomixxxdj:masterfrom
Be-ing:deere_2.1

Conversation

@Be-ing
Copy link
Copy Markdown
Contributor

@Be-ing Be-ing commented Feb 3, 2017

Continuation of #940, with new effects UI from #1063 merged.

Be-ing added 30 commits February 2, 2017 20:24
@Be-ing
Deere: shrink waveforms a little and align center marker with center …
a0ecd08 
…of screen in split waveform view
@Be-ing
Deere: remove key knob from mixer
f45e51f 
Takes up too much vertical space
@Be-ing
Deere: rearrange mixer to save vertical space
ee1292c
@Be-ing
Deere: add option to hide EQs
573cf29 
and rearrange skin menu a bit
@Be-ing
Deere: add "Show Minimal Controls" for decks option
edf8d12
@Be-ing
Deere: move main level meters to center of mixer
ad8b5b1
@Be-ing
Deere: make sure EQs show by default
3925207
@Be-ing
Deere: add crossfader assignment button in 4 deck mode
e073616
@Be-ing
Deere: rework mixer to save vertical space
0dc999e 
Add new column template for 4 decks + EQs + stacked waveforms
@Be-ing
Deere: decrease minimum size
d558bbb 
minimum size really depends on which options are selected
@Be-ing
Deere: rearrange toolbar to make Skin Settings button more discoverable
68a36e4
@Be-ing
Deere: mirror EQ kill buttons and center main level meters in mixer
336cb92
@Be-ing
Deere: pad buttons for minimal deck controls
c9660eb
@Be-ing
initial commit of new effects racks for Deere with meta knobs
4080c81
@Be-ing
Deere effects UI refinement
43a43b3
@Be-ing
Deere: add superknob link inversion buttons for expanded effects units
88db855
@Be-ing
Deere: increase font size of effect group enable buttons
61c5317
@Be-ing
add tooltip for new meta/superknob link inversion button
4a097a5
@Be-ing
Deere: label meta knobs
3ec8936
@Be-ing
Deere: remove vertical padding from slider-vertical.svg
830a40f
@Be-ing
Deere: mixer layout tweaks
0575960
@Be-ing
Deere: add rate text beneath rate slider
829984f
@Be-ing
Deere: use crossfader orientation icons in 4 deck mixer
6d496f4
@Be-ing
Deere: make samplers hideable
61b34ab
@Be-ing
Deere: make effects hideable
e1906c6
@Be-ing
Deere: make skin settings persistent across restarts
47ea53c
@Be-ing
Deere: don't make headphone button so wide
4cc9026
@Be-ing
Deere: reorganize settings menu
742eec0
@Be-ing
Deere: layout refinement
8fdc75e
@Be-ing
Deere: move vinyl control toggle to Main Decks section of settings
fb47fea
Be-ing and others added 20 commits February 2, 2017 20:33
@Be-ing
Deere: increase text and button sizes
a837b0c
@Be-ing
Deere: increase cover art size
376eb45
@Be-ing
Deere: move sync button to other side in minimal controls mode
aad5b61
@Be-ing
Deere: simplify skin settings menu wording; increase toolbar spacing
310ab6e
@Be-ing
Deere: use different minimum mixer height in 2 deck mode if QuickEffe…
1901e89 
…ct is loaded
@Be-ing
Deere: horizontally center pitch fader
0f46d2b
@Be-ing
re-fix hotcues layout-spacing
8f0f692
@Be-ing
proposal for checked/unchecked skin options
a371cee
@Be-ing
another version for checked/unchecked
ce23cfa
@Be-ing
fix mixer cut-off & knob label cut-off
460e526
@Be-ing
Deere: rename KnobButton to CircleButton
2d290b6
@Be-ing
Deere: change color of effect highlight border to blue
3e1e745
@Be-ing
Deere: make effect focus button a circle
9d69603
@Be-ing
Deere: use WEffectSelector
6c5b12b
@Be-ing
Deere: style WEffectSelector
e5f41a3 
don't rely on Qt theme to provide appropriate colors
@Be-ing
Deere: WEffectSelector styling fixes
56404ed 
for cross platform compatibility
@Be-ing
Deere: fix effect unit spacing with show_focus = 1
0734e75
@Be-ing
Deere: fix WEffectSelector white lines on Mac OS X
d505cae
@Be-ing
Deere: fix down arrow shifting position on hover
9382cdb
@Be-ing
Deere: fix text getting cut off on Mac
26007a3
@rryan
Copy link
Copy Markdown
Member

rryan commented Feb 3, 2017

The commits from #1063 show up in the diff -- did you merge #1063 into this branch or did you merge with master? Could you merge with master or rebase onto master?

@Be-ing
Copy link
Copy Markdown
Contributor Author

Be-ing commented Feb 3, 2017 •
edited
Loading

I just rebased onto master.

@rryan
Copy link
Copy Markdown
Member

rryan commented Feb 3, 2017

I just rebased onto master.

Hm, but all the commits from #1063 show up in this PR as commits to be merged (which suggest you merged #1063 into this branch at some point).

@Be-ing
Copy link
Copy Markdown
Contributor Author

Be-ing commented Feb 3, 2017

I realized I forgot to fetch upstream before rebasing onto master. Working on rebasing it again now.

@rryan
Copy link
Copy Markdown
Member

rryan commented Feb 3, 2017

It seems you merged deere_new_effects into deere_2.1 on Jan 28 f5e35a8 but then subsequently rebased deere_new_effects which gave all of those commits new hashes

e.g. this commit is in master a3c1d80

but this one is in this branch 166b9eb

@Be-ing
Copy link
Copy Markdown
Contributor Author

Be-ing commented Feb 3, 2017

Turned out to be easier to just merge master into #940, so I'll reopen that.

@Be-ing Be-ing closed this Feb 3, 2017
@Be-ing Be-ing deleted the deere_2.1 branch April 24, 2019 23:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Be-ing @rryan