mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-04-01 21:04:18 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,355 Commits 9 Branches 61 Tags
f131fbd87792b64d3d576aa1f2e23729deb2bd45
Commit Graph

71 Commits

Author SHA1 Message Date
Lukas W
f131fbd877 Editors: Add to workspace in MainWindow class, not in themselves 2014-12-08 19:22:52 +01:00
Lukas W
5f4cdac802 Merge branch 'master' into rename 
Conflicts:
	src/core/Song.cpp
	src/gui/LfoControllerDialog.cpp
	src/tracks/InstrumentTrack.cpp
 2014-11-26 11:45:55 +01:00
Lukas W
95798da9d0 Rename a lot of classes 
* aboutDialog -> AboutDialog
* bbEditor -> BBEditor
* exportProjectDialog -> ExportProjectDialog
* setupDialog -> SetupDialog
* stringPairDrag -> StringPairDrag
 2014-11-26 10:39:02 +01:00
Lukas W
7d4f179b4b Rename a lot of files 
* about_dialog -> AboutDialog
* bb_editor -> BBEditor
* export_project_dialog -> ExportProjectDialog
* setup_dialog -> SetupDialog
* string_pair_drag -> StringPairDrag
 2014-11-26 10:27:25 +01:00
Lukas W
1bbf7455a4 Rename a lot… 2014-11-26 10:09:49 +01:00
Lukas W
968909c07c Rename engine to Engine 2014-11-26 00:49:55 +01:00
Lukas W
7d0e3945e5 Rename song to Song 2014-11-26 00:44:41 +01:00
Vesa V
435c64cc70 Merge pull request #1285 from grindhold/issue_55 
Issue 55
 2014-11-25 21:20:21 +02:00
Lukas W
f231465e05 Rename plugin_browser to PluginBrowser 2014-11-25 01:10:59 +01:00
Lukas W
02cbc89f0f Merge branch 'stable-1.1' of git@github.com:LMMS/lmms.git 
Conflicts:
	src/gui/MainWindow.cpp
	src/gui/plugin_browser.cpp
 2014-11-25 01:01:47 +01:00
Lukas W
e47c1242b8 Add scrollbar to instrument plugin browser 
Fixes #959
 2014-11-25 00:36:23 +01:00
grindhold
69bf4b4a24 implemented proper behaviour for VST plugins 2014-11-20 01:47:13 +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
grindhold
f746db27f0 unexpected codestyle fixes 2014-11-10 10:35:36 +01:00
grindhold
27a136fe03 added capability to collect multiple errormessages and display them at once 2014-11-10 10:35:07 +01:00
Umcaruje
6fb923cba2 Correct the program name and site in the descriptions. 2014-11-04 22:56:50 +01:00
Garrett
6c91679de4 Last configManager to ConfigManager rename 2014-11-03 08:21:30 -08:00
Vesa
fa9674521e Merge branch 'stable-1.1' 
Conflicts:
	src/core/main.cpp
	src/gui/MainWindow.cpp
 2014-11-02 07:46:32 +02:00
Lukas W
47831c99c5 Rename ConfigManager files (2) 2014-11-02 01:08:27 +01:00
Lukas W
100a67cd3c Rename configManager to ConfigManager 2014-11-02 01:02:33 +01:00
Lukas W
2e66c88edf Store recovery file path in configManager 2014-11-02 00:51:24 +01:00
Lukas W
c682567e4b Ask for saving changes before opening recent project 
Fixes #1065
 2014-10-31 13:35:54 +01:00
Vesa
bf6659fbb1 Merge branch 'stable-1.1' 
Conflicts:
	src/gui/FileBrowser.cpp
 2014-09-09 23:55:39 +03:00
Tres Finocchiaro
e17e84266d Fix bad #ifdef, make ANSI compliant 
`#elif  LMMS_BUILD_APPLE` is not correct, it should be `#elif defined(LMMS_BUILD_APPLE)`
 2014-09-08 11:24:39 -04:00
tresf
a278505cda Fix win32 compilation 2014-09-07 17:41:53 -04:00
Lukas W
efacfdfae9 Rename file_browser.* to FileBrowser.* 2014-09-03 11:29:25 +02:00
Lukas W
5245f6181c Apply new coding conventions to file_browser.h 2014-09-03 11:19:45 +02:00
Lukas W
42cd21a943 Change sidebar root to /Volumes on OS X 2014-09-03 11:06:56 +02: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 V
07a0f46c82 Merge pull request #1030 from LMMS/stable-1.1 
sync
 2014-07-26 16:28:01 +03:00
Vesa
37fa46792a Change redo shortcut from ctrl-r to ctrl-y 
Ctrl-y is more standard and used in many applications, ctrl-r is used pretty much nowhere.
 2014-07-26 14:46:30 +03:00
Arnout Engelen
2cb458a958 Add 'Recently opened project' menu hotkey 2014-07-08 20:24:03 +02:00
Oskar Wallgren
348315845a Add new toolbutton, whatsthis, to MainWindow 2014-05-03 20:32:58 +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
Tobias Doerffel
41c154dc95 Control play/pause buttons in slot of MainWindow via signal in Song class 
The engine class as the component instance manager is the wrong place to
control the play/pause buttons. Instead emit a signal in the Song class
and update the buttons in a slot in MainWindow. This fixes problems with
GUI/pixmap operations happening outside the GUI thread when exporting a
project.

Closes #435.
 2014-03-18 20:39:52 +01:00
Tobias Doerffel
b45c0c5f02 MainWindow: coding style improvements 2014-03-18 20:39:01 +01:00
Tobias Doerffel
0674e1434c SongEditor: renamed class and file name to match current coding style 2014-03-09 23:25:38 +01:00
Tobias Doerffel
24a9ef01f9 PianoRoll: renamed class and file name to match current coding style 2014-03-09 23:19:46 +01:00
Vesa
b1e653060a Sidebar: rotate icons to normal orientation, fixes #183 2014-03-04 12:11:04 +02:00
Tobias Doerffel
46ca257c14 Merge pull request #396 from diizy/stable-0.4 
A bunch of bugfixes
 2014-03-03 09:44:16 +01:00
Vesa
1c5106ee3b When saving new version of a project, skip already existing version numbers 2014-03-03 10:26:08 +02:00
Lukas W
e4cd692e91 SaveDialog: Switch order of mmp and mmpz 
Fixes #386.
When selecting the filter in the file save dialog, the file name used to change to *.mmp. As this is not desired, this commit changes it to '.mmpz'.
 2014-02-28 18:06:32 +01:00
Tobias Doerffel
2e7733eaa1 DataFile: renamed from old multimediaProject class + coding style fixes 2014-02-03 21:21:36 +01:00
Vesa
f7d58114b2 Added object names for transport buttons (for theming purposes), fixed alignment issues on track labels 2014-01-28 22:17:44 +02:00
Tobias Doerffel
f519bec995 MainWindow: remove undo/redo actions from edit menu for the time being 
As undo/redo are not working properly at the moment, do not expose
according menu items to the user. This will be fixed in upcoming releases.

Closes #152.
 2014-01-26 12:34:12 +01:00
Lukas W
84a6d0bf02 Add "Save as new version" action to project menu 
Use Shortcut Ctrl+Alt+S. Part of issue #86
 2014-01-24 15:45:13 +01:00
Lukas W
5c186eba0e Add new class VersionedSaveDialog 
A file save dialog (inherits FileDialog) that provides buttons to
increment or decrement a version which is appended to the file name.
(e.g. "MyProject-01.mmpz")
 2014-01-24 15:37:41 +01:00
Lukas W
2e7bfe17e6 Update code to use FileInfo instead of QFileInfo 
Also removed all blocks similar to
```
#if QT_VERSION >= 0x040806
	filedialog.setOption( QFileDialog::DontUseCustomDirectoryIcons );
#endif
```
as this now takes place in the new subclass's constructor.
 2014-01-24 15:37:41 +01:00
Lukas W
0bbfd907ae MainWindow: Moved FileDialog to own subclass 2014-01-24 15:37:26 +01:00
Lukas W
f073c6d11b Added two standard paths to file open/save dialog 
In particular Desktop and Downloads have been added.
Also introduced a new function to create a file dialog
in order to prevent code duplication.
 2014-01-22 17:52:02 +01:00