Skip to content

Hotcue conflicts in LateNight, fix for Shade mini decks#29

Merged
Be-ing merged 75 commits intoBe-ing:hotcue_labelsfrom
ronso0:hotcue-confilcts-LateNight-Shade-fix
Oct 22, 2019
Merged

Hotcue conflicts in LateNight, fix for Shade mini decks#29
Be-ing merged 75 commits intoBe-ing:hotcue_labelsfrom
ronso0:hotcue-confilcts-LateNight-Shade-fix

Conversation

@ronso0
Copy link
Copy Markdown

@ronso0 ronso0 commented Oct 21, 2019 •
edited
Loading

I made the overview a bit smaller and it works for me
Screenshot_2019-10-21_23-30-02

that's how Shade looks here now
Screenshot_2019-10-22_00-35-26

ronso0 added 30 commits September 26, 2019 13:43
@ronso0
LateNight: 1st 3D facelift test
04a5c88
@ronso0
...
bf6b071
@ronso0
...
5f65331
@ronso0
new crossfader switches
98e0ff5
@ronso0
fresh new sliders
f5b32bf
@ronso0
fresh VU meters
3925d7e
@ronso0
fix QuickEffect label when Kill buttons are hidden
a07d550
@ronso0
ease button contrast a bit
c64e083
@ronso0
fix sliders
7a1615a
@ronso0
...
e615d3b
@ronso0
move knobs and sliders to separate folder
a1bc61c
@ronso0
separate hotcues from Play/Cue/Rev
40f4220
@ronso0
Revert "separate hotcues from Play/Cue/Rev"
b05253a 
This reverts commit 40f4220.
@ronso0
Mic/Aux tweaks, VU meters
fc03992
@ronso0
mixer, faders, knobs
1fb4c4d
@ronso0
fix order of rate buttons (rate direction), make buttons optional
9a19cb0
@ronso0
beat spinbox, effect selector
21d6aff
@ronso0
keep Spinny indicator within circle mask
9a6f2b2
@ronso0
rename vu and clipping graphics
b9a5dbb
@ronso0
...* except Mic/Aux
f131b38
@ronso0
improve & mirror Mic/Aux units
23bcb0a
@ronso0
add fx_assign_button.xml, add common small VU meter template, overhau…
9824da7 
…l Mic/Aux units...
@ronso0
fixed some labels, tooltips & buttons
f2b7e5d
@ronso0
fix tooltips & icons, remove negative widget sizes etc.
7066d89
@ronso0
consistent Fx Objectnames, small fixes for buttons
8192ac4
@ronso0
style focused fx slot
422e1e8
@ronso0
clean up qss, add SplitCue & MicDuck buttons
4ceaa34
@ronso0
adapt remaining drop shadows
94140f5
@ronso0
paint active Duck button orange, like AutoDJ button
cdfc06b
@ronso0
fix text color of lib feature button, fx enable tooltip, ..
edf9844
ronso0 and others added 26 commits October 15, 2019 13:44
@ronso0
make Fx buttons fit into Mic/Aux decks at minimal window size
7d8543f
@Be-ing
Merge pull request mixxxdj#2298 from ronso0/latenight-facelift
14037e9 
LateNight :: 3D facelift
@daschuer
Merge pull request mixxxdj#2315 from uklotzde/2.2_flac_decoding_errors
47c4848 
Recover from FLAC decoding errors
@daschuer
Merge pull request mixxxdj#2319 from rrrapha/battery-hide
6bc55a5 
Hide the battery widget when the status is unknown
@uklotzde
Merge branch '2.2' of git@github.com:mixxxdj/mixxx.git
5b7c509
@goddisignz
reduce number of sent midi messages for wheel leds
10dce7f
@Be-ing
Merge pull request mixxxdj#2326 from goddisignz/ddj-sx-reduce-messages
70e7ce9 
reduce number of sent midi messages for wheel leds
@uklotzde
Merge branch '2.2' of git@github.com:mixxxdj/mixxx.git
ff02df6
@Holzhaus
engine/sidechain/enginenetworkstream: Remove some unused variables
426a383
@Holzhaus
waveform/waveform.h: Typecast std::vector::size_type to int explicitly
ddda3ac
@Holzhaus
Add more typecasts from std::vector::size_type to int
a1c2452
@Holzhaus
soundio/soundmanagerutil.cpp: Remove unnecessary switch statement
ea88b92
@Holzhaus
preferences/dialog/dlgprefsound: Fix -Wreorder warning
56c6b91
@Holzhaus
soundio/soundmanagerutil: Add Q_UNUSED to fix unused parameter warning
03bff6d
@Holzhaus
util/platform: Add support for the GCC/G++ fallthrough attribute
3fbf31b
@uklotzde
Backport AcoustidClient from master
67057ec
@uklotzde
Switch from HTTP to HTTPS
7e54420
@uklotzde
Switch from XML to JSON and fix response parsing
9e0e355
@daschuer
Merge pull request mixxxdj#2328 from uklotzde/2.2_acoustid_response
9e6f1c0 
lp1848887: Fix parsing of AcoustID response
@daschuer
Merge pull request mixxxdj#2327 from Holzhaus/msvc-warning-fixes
8083e17 
Fix some warnings
@Holzhaus
preferences/dialog/dlgprefsound: Fix duplicate declaration of m_config
f259ffe
@Be-ing
Merge pull request mixxxdj#2329 from Holzhaus/fix-dlgsoundsource-error
c6460e8 
preferences/dialog/dlgprefsound: Fix duplicate declaration of m_config
@uklotzde
Merge branch '2.2' of git@github.com:mixxxdj/mixxx.git
ffb4d34 
# Conflicts:
#	src/musicbrainz/acoustidclient.cpp
@daschuer
Add guard against GCC > 7
b83b62d
@ronso0
Merge remote-tracking branch 'mixxx/master' into hotcue-confilcts-Lat…
a254e62 
…eNight-Shade-fix
@ronso0
expand overview in Shade mini decks
602afd6
@ronso0
Copy link
Copy Markdown
Author

ronso0 commented Oct 21, 2019

I just hope it looks the same at your system..

@Be-ing Be-ing merged commit c1ba627 into Be-ing:hotcue_labels Oct 22, 2019
@Be-ing
Copy link
Copy Markdown
Owner

Be-ing commented Oct 22, 2019

Thanks for your help.

@ronso0 ronso0 deleted the hotcue-confilcts-LateNight-Shade-fix branch October 22, 2019 01:35
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.

7 participants

@ronso0 @Be-ing @uklotzde @rrrapha @daschuer @goddisignz @Holzhaus