← Back to branch summary

~max-linke/mixxx/bpmdelegate

~max-linke/mixxx/bpmdelegate

Viewing all changes in revision 3533.

Committer: Max Linke
Date: 2013-01-12 13:11:31 UTC
mfrom: (3499.1.173 1.11)
Revision ID: kain88@640x4.kel.wh.lokal-20130112131131-rgr1sq2l8730eme6

merge with trunk, remove grabwidget in bpmdelegate and apply Daniels solution

files added:
mixxx/res/unused/skins

mixxx/src/widget/wwidgetgroup.cpp

mixxx/src/widget/wwidgetgroup.h

files renamed:
mixxx/res/keyboard/Old-pre1.10.0.kbd.cfg => mixxx/res/unused/keyboard/Old-pre1.10.0.kbd.cfg

mixxx/res/skins/README.xsl => mixxx/res/unused/skins/README.xsl

mixxx/res/skins/skin.xsl => mixxx/res/unused/skins/skin.xsl

files modified:
mixxx/build/depends.py

mixxx/res/skins/Outline1024x600-Netbook/skin.xml

mixxx/res/skins/Outline1024x768-XGA/skin.xml

mixxx/res/skins/Outline800x480-WVGA/skin.xml

mixxx/src/library/bpmdelegate.cpp

mixxx/src/library/library.cpp

mixxx/src/library/previewbuttondelegate.cpp

mixxx/src/mathstuff.h

mixxx/src/mixxx.cpp

mixxx/src/skin/legacyskinparser.cpp

mixxx/src/skin/propertybinder.cpp

mixxx/src/skin/propertybinder.h

mixxx/src/waveform/renderers/waveformrendererfilteredsignal.cpp

mixxx/src/waveform/widgets/glsimplewaveformwidget.cpp

mixxx/src/waveform/widgets/glslwaveformwidget.cpp

mixxx/src/waveform/widgets/glwaveformwidget.cpp

mixxx/src/waveform/widgets/hsvwaveformwidget.cpp

mixxx/src/waveform/widgets/qtsimplewaveformwidget.cpp

mixxx/src/waveform/widgets/qtwaveformwidget.cpp

mixxx/src/waveform/widgets/softwarewaveformwidget.cpp

mixxx/src/widget/woverview.cpp

mixxx/src/widget/wpushbutton.cpp

mixxx/src/widget/wslidercomposed.cpp

mixxx/src/widget/wvumeter.cpp

Show diffs side-by-side

added added

removed removed

mixxx/build/depends.py

mixxx/res/skins/Outline1024x600-Netbook/skin.xml

mixxx/res/skins/Outline1024x768-XGA/skin.xml

mixxx/res/skins/Outline800x480-WVGA/skin.xml

mixxx/res/unused/skins/

mixxx/src/library/bpmdelegate.cpp

mixxx/src/library/library.cpp

mixxx/src/library/previewbuttondelegate.cpp

mixxx/src/mathstuff.h

mixxx/src/mixxx.cpp

mixxx/src/skin/legacyskinparser.cpp

mixxx/src/skin/propertybinder.cpp

mixxx/src/skin/propertybinder.h

mixxx/src/waveform/renderers/waveformrendererfilteredsignal.cpp

mixxx/src/waveform/widgets/glsimplewaveformwidget.cpp

mixxx/src/waveform/widgets/glslwaveformwidget.cpp

mixxx/src/waveform/widgets/glwaveformwidget.cpp

mixxx/src/waveform/widgets/hsvwaveformwidget.cpp

mixxx/src/waveform/widgets/qtsimplewaveformwidget.cpp

mixxx/src/waveform/widgets/qtwaveformwidget.cpp

mixxx/src/waveform/widgets/softwarewaveformwidget.cpp

Older »