mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-05-18 11:45:04 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,200 Commits 10 Branches 61 Tags
7cc917cc06e44b09378d4e4e166f2dbf148a1e27
Commit Graph

5200 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colin Wallace
7cc917cc06 Added SubWindow class to compensate for incorrect behavior of normalGeometry() method on X11 2015-06-15 03:29:59 +00:00
Lukas W
8b9868e0e5 Merge branch 'cmake_dist' 
# Conflicts:
#	src/gui/FileBrowser.cpp
 2015-06-14 21:38:12 +02:00
Dave
979fa2fb93 Merge pull request #2048 from Wallacoloo/issue-2015-4 
Reorder Editor/Song destruction order to prevent bad memory accesses
 2015-06-13 11:37:22 +01:00
Dave
6c934d6aae Merge pull request #2096 from curlymorphic/i1660 
Remove MessageBox warning of incomplete stk installation from mallets
 2015-06-12 22:09:24 +01:00
Dave French
d6ff89af68 Remove MessageBox waring of incomplete stk instalation from mallets 
The merge of stable 1.1 into master introduced the messagebox into the incorrect
place in the code. It is alrady present in the correct place in master,
 so simply removed the extra instance.

This stops the segfault and fixes #1660
 2015-06-12 20:46:04 +01:00
Tres Finocchiaro
4142a55f5f Merge pull request #2095 from curlymorphic/i2094 
No longer try to validate sf2 and gig files
 2015-06-12 13:58:39 -04:00
Dave French
0c205ba504 Nolonger try to validate sf2 anf gig files 
Removed trying to validate non lmms files when clicked in the file browser.
This had been the cause of erronus dialog box, and caused a bug, not allowing
drag and drop of sf2 files.

fixes #2094
 2015-06-12 18:21:09 +01:00
Tres Finocchiaro
90dd8b2abb Merge pull request #2091 from softrabbit/issue1812 
Don't save templates in "recently opened" list
 2015-06-11 09:48:47 -04:00
Raine M. Ekman
d9193960fc Coding style fixup. 2015-06-11 10:27:09 +03:00
Raine M. Ekman
f896316de4 ConfigManager: Don't add templates to "recent files" list 
Fixes #1812.
 2015-06-11 10:19:48 +03:00
Tres Finocchiaro
ecbeaf788c Merge pull request #2065 from midi-pascal/master 
Add and correct some French translation
 2015-06-10 13:08:00 -04:00
midi-pascal
fa498caf5c Add and correct some French translation 
The translation of the instrument plugins description does not work in Instruments pluginBrowser

Translation of the effect plugins description not showing in effects selector

Replace tabs with spaces in the fix indentation (as Tres request)

More French translations added

Remove the call to tr() inside the macro makeknob (DualFilterControlDialog.cpp) and tr() the strings before calling makeknob
Fix DualFilter description (was labeled as "A native amplifier plugin") (DualFilter.cpp)
Add French translation for the Dual filter knobs.

Move tr() out of macro's so lupdate find them for translation (extract litterals in "ts" file).
Full French translation of Monstro :-)

Make NES translatable (some tr() missing)
Remove tr() from macros (litterals not extracted by lupdate
Translate NES to French

Translate Watsyn Synth as others

Missing Q_OBJECT in DelayControlsDialog definition prevents its translation
Translate Delay plugin to French

Make EqControlsDialog translatable

Fix selected-note volume bug

Closes #2070

Fix a typo in French translation.

Add EqControlsDialog.h to the MOCFILES list in Eq CMakeLists.txt

Remove definition of slot updateVuMeters() in EqControlsDialog.h which is not implemented
 2015-06-10 09:07:55 -04:00
Lukas W
cc454b2b53 Fix pixmap discovery 2015-05-30 22:59:18 +02:00
Lukas W
422fbbc8d3 Merge branch 'master' into cmake_dist 
# Conflicts:
#	include/ConfigManager.h
#	include/Engine.h
#	plugins/CMakeLists.txt
#	plugins/vst_base/CMakeLists.txt
#	plugins/vst_base/Win64/CMakeLists.txt
#	src/core/Engine.cpp
 2015-05-30 22:59:06 +02:00
Tres Finocchiaro
f403299460 Fix selected-note volume bug 
Closes #2070
 2015-05-24 13:55:09 -04:00
Tres Finocchiaro
a644183a57 Merge pull request #2062 from midi-pascal/master 
Issue #2061Sf2Player: Chorus tooltip assigned to reverb
 2015-05-19 20:32:30 -04:00
pascal
46f72d97ce Issue #2061 
Sf2Player: Chorus tooltip assigned to reverb
 2015-05-19 19:26:58 -04:00
Colin Wallace
12f299bb9e Reorder Editor/Song destruction order to prevent bad memory accesses (issue #2015) 2015-05-12 18:56:58 +00:00
Tres Finocchiaro
2f969c1e1c Merge pull request #2033 from michaelgregorius/2028-slow_midi_import 
Solves issue #2028 (Slow MIDI import due to repeated message)
 2015-05-05 00:31:08 -04:00
Michael Gregorius
cbf4e59691 Yet another tab correction 
The wrong settings concerning tabs in QtCreator lead to bad display of
the code in other editors.
 2015-05-04 19:37:54 +02:00
Michael Gregorius
3e72793465 Fixes the wrong tab spacing for #2028 2015-05-03 22:19:42 +02:00
Michael Gregorius
53f5ef1980 Solves issue #2028 (Slow MIDI import due to repeated message) 
AutomationPattern::addObject now returns a boolean which indicates
whether the object was added or not. This change enables the removal of
the error message that is shown in the case that a model is already
connected from AutomationPattern::addObject. Instead all interactive
callers now check for the return value and show the message in case it
is needed.

This change set improves the import of MIDI files significantly. These
have been slowed down quite a lot due to the message being shown
repeatedly during the MIDI import.
 2015-05-03 19:22:47 +02:00
Tres Finocchiaro
9f95c041b6 Merge pull request #1987 from Wallacoloo/instrument-nav-btns 
Add instrument switcher buttons to InstrumentTrackWindow
 2015-05-02 00:29:56 -04:00
Colin Wallace
26fc16b78b Implementation of next & previous instrument buttons in InstrumentTrackWindow 2015-05-02 02:09:57 +00:00
Tres Finocchiaro
9888cb9069 Merge pull request #2024 from Wallacoloo/browser-ctrl-f 
Add ctrl+f shortcut to FileBrowser & default focus to filter widget when opened
 2015-04-29 00:01:12 -04:00
Colin Wallace
c8a0d51a43 revert changes that caused FileBrowsers to steal focus when opened 2015-04-29 02:06:44 +00:00
Colin Wallace
fe3ca6aa76 Use QKeySequence::Find in place of Ctrl+F 2015-04-29 01:53:34 +00:00
Colin Wallace
616de244cc add ctrl+f shortcut to FileBrowser & default focus to filter widget when opened 2015-04-28 07:08:35 +00:00
Tres Finocchiaro
c35cfd2672 Merge pull request #2022 from Wallacoloo/os-shortcuts 
Use OS-default shortcuts where applicable
 2015-04-28 04:50:07 +00:00
Colin Wallace
9b6aaf058e Use OS-default shortcuts where applicable, but ensure both ctrl+y and ctrl+shift+z activate redo 2015-04-28 04:11:00 +00:00
Tres Finocchiaro
c9c26b1c69 Merge pull request #1975 from curlymorphic/delaywhine 
Delay and Flanger, removed noise from delay when automating length
 2015-04-27 19:20:10 +00:00
Tres Finocchiaro
6428c7a9c8 Merge pull request #1915 from Wallacoloo/master 
Provide status messages on splash screen when loading (#1696)
 2015-04-27 18:40:36 +00:00
Tres Finocchiaro
df9a1537b3 Merge pull request #2009 from Wallacoloo/undo-redo-greyout 
Grey out edit->undo/redo actions if there's nothing left to undo/redo
 2015-04-27 18:17:42 +00:00
Tres Finocchiaro
6c615dbcd4 Merge pull request #2021 from tresf/master 
Minor formatting fixes in ConfigManager
 2015-04-27 17:35:49 +00:00
Tres Finocchiaro
3eafcd0a58 Merge pull request #2020 from tresf/master 
Remove Win32 GetSpecialFolderPath ; fix windows builds
 2015-04-27 16:45:13 +00:00
Tres Finocchiaro
bdf7cce0d6 Merge pull request #2018 from softrabbit/denormal_refactor 
Denormal protection refactoring
 2015-04-27 12:54:47 +00:00
Tres Finocchiaro
a618f59418 Merge pull request #2017 from Wallacoloo/rm-song-playtrack 
Remove unused code in Song.cpp
 2015-04-27 12:46:50 +00:00
Raine M. Ekman
cb89750915 ...and add the new denormals.h file too. 2015-04-27 13:04:26 +03:00
Raine M. Ekman
dc67449175 Move the denormal protection routine to one place instead of 3 2015-04-27 13:02:07 +03:00
Colin Wallace
57cdfe1b66 Remove unused Mode_PlayTrack and m_trackToPlay 2015-04-27 06:33:22 +00:00
Colin Wallace
d9c2be73fa Remove unused function Song::playTrack 2015-04-27 06:24:47 +00:00
Tres Finocchiaro
b6643f83d4 Merge pull request #2010 from Wallacoloo/issue-1905 
Fix behavior of shift+dragging note ends
 2015-04-27 00:26:03 +00:00
Vesa
61c29ada2a fix merge oops 2015-04-26 17:07:27 +03:00
Vesa
d4ab23efef Merge branch 'stable-1.1' 
Conflicts:
	.travis.yml
	CMakeLists.txt
	plugins/stk/mallets/mallets.cpp
	plugins/vst_base/CMakeLists.txt
 2015-04-26 16:59:01 +03:00
Tres Finocchiaro
bbbe27d874 Merge pull request #2008 from Wallacoloo/recently-opened-project-typo 
Fix plurality of 'recently opened project'
 2015-04-26 12:37:49 +00:00
Colin Wallace
fd8123488a fix behavior of shift+dragging note ends (issue #1905) 2015-04-26 03:58:12 +00:00
Colin Wallace
035f48fb1d Grey out edit->undo/redo actions if there's nothing left to undo/redo 2015-04-25 22:15:12 +00:00
Colin Wallace
960c05bb32 Fix plurality of 'recently opened project' 2015-04-25 03:18:38 +00:00
Tres Finocchiaro
478bbbd4d0 Merge pull request #1984 from michaelgregorius/1981-midicrash 
Might fix 1981 ("Midi Import crash in master branch")
 2015-04-24 18:49:26 +00:00
Tres Finocchiaro
c57ba1b22c Merge pull request #1998 from tresf/master 
Load file names with utf chars
 2015-04-24 12:56:24 +00:00