mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-03-16 05:02:13 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,237 Commits 9 Branches 61 Tags
5d258cedf261dcbc186e40d6feefde8d30ee97c1
Commit Graph

10 Commits

Author SHA1 Message Date
Lukas W
5d258cedf2 When removing a track, remove its solo state 
Fixes #1103
 2014-11-25 16:47:11 +01:00
Lukas W
8e8879f735 Merge stable-1.1 
Conflicts:
	include/ConfigManager.h
	include/MidiTime.h
	include/string_pair_drag.h
	src/gui/string_pair_drag.cpp
	src/gui/widgets/rubberband.cpp
 2014-11-10 19:26:59 +01:00
Umcaruje
6fb923cba2 Correct the program name and site in the descriptions. 2014-11-04 22:56:50 +01:00
Vesa V
128a3ec927 Merge pull request #1053 from diizy/banish-all-locks 
Banish all locks
 2014-08-16 09:58:52 +03:00
Tobias Doerffel
4cee046909 Added initial Qt5 support 
LMMS now properly builds and runs with Qt5. Various deprecated functions
had to be replaced like QString::toAscii()/fromAscii(). Also occurences
of FALSE/TRUE have been replaced with false/true.

LmmsStyle now derives from QProxyStyle and sets a style instance as base
style (Plastique for Qt4, Fusion for Qt5).

MOC files are not included anymore but added as regular source files.

What's missing is support for embedding VST plugins into a subwindow
inside LMMS on Linux/X11 due to missing QX11EmbedContainer class in Qt5.

Build instructions can be found in INSTALL.Qt5

Minimum version requirement for Qt4 has been raised to 4.6.0 for best
API compatibility between Qt4 and Qt5.
 2014-08-14 17:34:49 +02:00
Vesa
9e1cdd0441 Start work on replacing/removing global locks 2014-08-03 14:49:45 +03:00
Tobias Doerffel
75d8ab54be TrackContainerView: add journal checkpoints in view rather than model 2014-03-30 12:39:12 +02:00
Tobias Doerffel
7b8eaa6835 Merge remote-tracking branch 'origin/stable-0.4-undo-redo' 
Conflicts:
	include/AutomatableModel.h
	include/MidiPort.h
	include/TrackContainerView.h
	include/surround_area.h
	include/track.h
	src/core/AutomatableModel.cpp
	src/core/TrackContainer.cpp
	src/core/note.cpp
	src/core/track.cpp
	src/gui/PianoRoll.cpp
	src/gui/TrackContainerView.cpp
	src/gui/widgets/LcdSpinBox.cpp
 2014-03-24 19:37:26 +01:00
Vesa
e7b097d255 Define all pattern colours in CSS and make them stylable 
also coding style improvements (remove leading underscores from header guards)
 2014-02-25 21:30:39 +02:00
Tobias Doerffel
4e5507a30a TrackContainer, TrackContainerView: adopted coding style 
Renamed file and class names.
 2014-01-14 17:39:02 +01:00