hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'stable-1.2' into master (@liushuyu)

Browse Source
This commit is contained in:
Hyunin Song
2017-07-15 07:56:28 +09:00
parent aaf09bb4db 0abe0a51c3
commit cc3822141e
113 changed files with 1513 additions and 609 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/locale/CMakeLists.txt
View File

@@ -31,7 +31,7 @@ FOREACH(_ts_file ${lmms_LOCALES})
COMMAND "${QT_LUPDATE_EXECUTABLE}" -locations none -no-obsolete -I ${CMAKE_SOURCE_DIR}/include/ ${LMMS_SRCS} ${LMMS_INCLUDES} ${LMMS_UIS} `find "\"${CMAKE_SOURCE_DIR}/plugins/\"" -type f -name '*.cpp' -or -name '*.h'` -ts "\"${_ts_file}\""
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
ADD_CUSTOM_TARGET(${_qm_target}
COMMAND "${QT_LRELEASE_EXECUTABLE}" "\"${_ts_file}\"" -qm "\"${_qm_file}\""
COMMAND "${QT_LRELEASE_EXECUTABLE}" "${_ts_file}" -qm "${_qm_file}"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
LIST(APPEND ts_targets "${_ts_target}")
LIST(APPEND qm_targets "${_qm_target}")

112
data/locale/en.ts
View File

@@ -721,10 +721,6 @@ If you're interested in translating LMMS in another language or want to imp
<source>Input Gain:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>NOIS</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Input Noise:</source>
<translation type="unfinished"></translation>
@@ -741,10 +737,6 @@ If you&apos;re interested in translating LMMS in another language or want to imp
<source>Output Clip:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Rate</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Rate Enabled</source>
<translation type="unfinished"></translation>
@@ -753,10 +745,6 @@ If you&apos;re interested in translating LMMS in another language or want to imp
<source>Enable samplerate-crushing</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Depth</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Depth Enabled</source>
<translation type="unfinished"></translation>
@@ -769,20 +757,28 @@ If you&apos;re interested in translating LMMS in another language or want to imp
<source>Sample rate:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>STD</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Stereo difference:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Levels</source>
<source>Levels:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Levels:</source>
<source>NOISE</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>FREQ</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>STEREO</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>QUANT</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -2170,10 +2166,6 @@ Please make sure you have write permission to the file and the directory contain
<source>RATE</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Rate:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>AMNT</source>
<translation type="unfinished"></translation>
@@ -2194,6 +2186,10 @@ Please make sure you have write permission to the file and the directory contain
<source>Invert</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Period:</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FxLine</name>
@@ -3370,22 +3366,10 @@ You can remove and move FX channels in the context menu, which is accessed by ri
<source>FX channel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>ENV/LFO</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>FUNC</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>FX</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>MIDI</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Save preset</source>
<translation type="unfinished"></translation>
@@ -3394,10 +3378,6 @@ You can remove and move FX channels in the context menu, which is accessed by ri
<source>XML preset file (*.xpf)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>PLUGIN</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Pitch range (semitones)</source>
<translation type="unfinished"></translation>
@@ -3414,10 +3394,6 @@ You can remove and move FX channels in the context menu, which is accessed by ri
<source>Click here, if you want to save current instrument track settings in a preset file. Later you can load this preset by double-clicking it in the preset-browser.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>MISC</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Use these controls to view and edit the next/previous track in the song editor.</source>
<translation type="unfinished"></translation>
@@ -3426,6 +3402,30 @@ You can remove and move FX channels in the context menu, which is accessed by ri
<source>SAVE</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Envelope, filter &amp; LFO</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Chord stacking &amp; arpeggio</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Effects</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>MIDI settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Miscellaneous</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Plugin</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Knob</name>
@@ -3913,14 +3913,6 @@ Please visit http://lmms.sf.net/wiki for documentation on LMMS.</source>
<source>Recover the file. Please don&apos;t run multiple instances of LMMS when you do this.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ignore</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Launch LMMS as usual but with automatic backup disabled to prevent the present recover file from being overwritten.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Discard</source>
<translation type="unfinished"></translation>
@@ -3993,10 +3985,6 @@ Please visit http://lmms.sf.net/wiki for documentation on LMMS.</source>
<source>Recover session. Please save your work!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Automatic backup disabled. Remember to save your work!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Recovered project not saved</source>
<translation type="unfinished"></translation>
@@ -5706,14 +5694,6 @@ Reason: &quot;%2&quot;</source>
</context>
<context>
<name>ProjectNotes</name>
<message>
<source>Project notes</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Put down your project notes here.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Edit Actions</source>
<translation type="unfinished"></translation>
@@ -5822,6 +5802,14 @@ Reason: &quot;%2&quot;</source>
<source>&amp;Color...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Project Notes</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enter project notes here</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ProjectRenderer</name>

89
data/projects/templates/default.mpt Normal file
View File

@@ -0,0 +1,89 @@
<?xml version="1.0"?>
<!DOCTYPE lmms-project>
<lmms-project version="1.0" creator="LMMS" creatorversion="1.2.0" type="song">
<head timesig_numerator="4" mastervol="100" timesig_denominator="4" bpm="140" masterpitch="0"/>
<song>
<trackcontainer width="600" x="5" y="5" maximized="0" height="300" visible="1" type="song" minimized="0">
<track muted="0" type="0" name="TripleOscillator" solo="0">
<instrumenttrack pan="0" fxch="0" usemasterpitch="1" pitchrange="1" pitch="0" basenote="57" vol="100">
<instrument name="tripleoscillator">
<tripleoscillator phoffset2="0" userwavefile0="" finer0="0" userwavefile1="" finer1="0" userwavefile2="" finer2="0" coarse0="0" coarse1="-12" coarse2="-24" finel0="0" finel1="0" modalgo1="2" modalgo2="2" finel2="0" pan0="0" modalgo3="2" pan1="0" stphdetun0="0" pan2="0" stphdetun1="0" wavetype0="0" stphdetun2="0" wavetype1="0" wavetype2="0" vol0="33" vol1="33" phoffset0="0" phoffset1="0" vol2="33"/>
</instrument>
<eldata fres="0.5" ftype="0" fcut="14000" fwet="0">
<elvol lspd_denominator="4" sustain="0.5" pdel="0" userwavefile="" dec="0.5" lamt="0" latt="0" rel="0.1" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lspd_syncmode="0" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
<elcut lspd_denominator="4" sustain="0.5" pdel="0" userwavefile="" dec="0.5" lamt="0" latt="0" rel="0.1" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lspd_syncmode="0" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
<elres lspd_denominator="4" sustain="0.5" pdel="0" userwavefile="" dec="0.5" lamt="0" latt="0" rel="0.1" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lspd_syncmode="0" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
</eldata>
<chordcreator chord="0" chordrange="1" chord-enabled="0"/>
<arpeggiator arptime="100" arprange="1" arpskip="0" arptime_denominator="4" arptime_syncmode="0" arpmode="0" arpcycle="0" arp-enabled="0" arp="0" arptime_numerator="4" arpdir="0" arpmiss="0" arpgate="100"/>
<midiport inputcontroller="0" fixedoutputvelocity="-1" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" fixedinputvelocity="-1" fixedoutputnote="-1" outputprogram="1" basevelocity="63" readable="0"/>
<fxchain numofeffects="0" enabled="0"/>
</instrumenttrack>
</track>
<track muted="0" type="2" name="Sample track" solo="0">
<sampletrack pan="0" vol="100">
<fxchain numofeffects="0" enabled="0"/>
</sampletrack>
</track>
<track muted="0" type="1" name="Beat/Bassline 0" solo="0">
<bbtrack>
<trackcontainer width="640" x="610" y="5" maximized="0" height="400" visible="0" type="bbtrackcontainer" minimized="0">
<track muted="0" type="0" name="Kicker" solo="0">
<instrumenttrack pan="0" fxch="0" usemasterpitch="1" pitchrange="1" pitch="0" basenote="57" vol="100">
<instrument name="kicker">
<kicker decay_numerator="4" decay_denominator="4" distend="0.8" click="0.4" endnote="0" version="1" decay_syncmode="0" decay="440" noise="0" slope="0.06" dist="0.8" env="0.163" startnote="1" startfreq="150" endfreq="40" gain="1"/>
</instrument>
<eldata fres="0.5" ftype="0" fcut="14000" fwet="0">
<elvol lspd_denominator="4" sustain="0.5" pdel="0" userwavefile="" dec="0.5" lamt="0" latt="0" rel="0.1" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lspd_syncmode="0" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
<elcut lspd_denominator="4" sustain="0.5" pdel="0" userwavefile="" dec="0.5" lamt="0" latt="0" rel="0.1" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lspd_syncmode="0" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
<elres lspd_denominator="4" sustain="0.5" pdel="0" userwavefile="" dec="0.5" lamt="0" latt="0" rel="0.1" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lspd_syncmode="0" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
</eldata>
<chordcreator chord="0" chordrange="1" chord-enabled="0"/>
<arpeggiator arptime="100" arprange="1" arpskip="0" arptime_denominator="4" arptime_syncmode="0" arpmode="0" arpcycle="0" arp-enabled="0" arp="0" arptime_numerator="4" arpdir="0" arpmiss="0" arpgate="100"/>
<midiport inputcontroller="0" fixedoutputvelocity="-1" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" fixedinputvelocity="-1" fixedoutputnote="-1" outputprogram="1" basevelocity="63" readable="0"/>
<fxchain numofeffects="0" enabled="0"/>
</instrumenttrack>
<pattern steps="16" muted="0" type="0" name="Kicker" pos="0"/>
</track>
</trackcontainer>
</bbtrack>
</track>
<track muted="0" type="5" name="Automation track" solo="0">
<automationtrack/>
</track>
</trackcontainer>
<track muted="0" type="6" name="Automation track" solo="0">
<automationtrack/>
<automationpattern tens="1" mute="0" prog="0" name="Numerator" pos="0" len="192">
<object id="4975896"/>
</automationpattern>
<automationpattern tens="1" mute="0" prog="0" name="Denominator" pos="0" len="192">
<object id="6613237"/>
</automationpattern>
<automationpattern tens="1" mute="0" prog="0" name="Tempo" pos="0" len="192">
<object id="6054005"/>
</automationpattern>
<automationpattern tens="1" mute="0" prog="0" name="Master volume" pos="0" len="192">
<object id="1345820"/>
</automationpattern>
<automationpattern tens="1" mute="0" prog="0" name="Master pitch" pos="0" len="192">
<object id="5865711"/>
</automationpattern>
</track>
<fxmixer width="543" x="5" y="310" maximized="0" height="335" visible="1" minimized="0">
<fxchannel num="0" muted="0" volume="1" name="Master" soloed="0">
<fxchain numofeffects="0" enabled="0"/>
</fxchannel>
</fxmixer>
<ControllerRackView width="350" x="680" y="310" maximized="0" height="200" visible="1" minimized="0"/>
<pianoroll width="640" x="5" y="5" maximized="0" height="480" visible="0" minimized="0"/>
<automationeditor width="640" x="-36" y="0" maximized="0" height="400" visible="0" minimized="0"/>
<projectnotes width="640" x="700" y="10" maximized="0" height="400" visible="0" minimized="0"><![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'Noto Sans'; font-size:9pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#e0e0e0;">Enter project notes here</span></p></body></html>]]></projectnotes>
<timeline lp1pos="192" lp0pos="0" lpstate="0"/>
<controllers/>
</song>
</lmms-project>

BIN
data/samples/misc/metronome01.ogg
View File

Binary file not shown.

BIN
data/samples/misc/metronome02.ogg
View File

Binary file not shown.

25
data/themes/classic/style.css
View File

@@ -139,6 +139,19 @@ PianoRoll {
qproperty-textShadow: rgb( 240, 240, 240 );
}
TabWidget {
background-color: #5b6571;
qproperty-tabText: rgba(255, 255, 255, 180);
qproperty-tabTitleText: #fff;
qproperty-tabSelected: #61666b;
qproperty-tabBackground: #3c434b;
qproperty-tabBorder: #3c434b;
}
GroupBox {
background-color: #5b6571;
}
/* main toolbar oscilloscope - can have transparent bg now */
VisualizationWidget {
@@ -281,6 +294,11 @@ TrackContainerView QFrame{
background-color: #49515b;
}
/* background for track controls */
TrackView > QWidget {
background-color: #5b6571;
}
/* autoscroll, loop, stop behaviour toggle buttons */
/* track background colors */
@@ -523,6 +541,12 @@ PluginDescWidget:hover {
background-color: #e0e0e0;
}
/* piano widget */
PianoView {
background-color: #14171a;
}
/* font sizes for text buttons */
FxMixerView QPushButton, EffectRackView QPushButton, ControllerRackView QPushButton {
@@ -543,6 +567,7 @@ FxLine {
/* persistent peak markers for fx peak meters */
Fader {
qproperty-peakGreen: rgb( 74, 253, 133);
qproperty-peakYellow: rgb(224, 222, 18);
qproperty-peakRed: rgb( 255, 100, 100);
}

BIN
data/themes/classic/track_op_menu.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 841 B

BIN
data/themes/classic/track_op_menu_active.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 824 B

BIN
data/themes/default/env_lfo_tab.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 255 B

BIN
data/themes/default/func_tab.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 179 B

BIN
data/themes/default/fx_tab.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 292 B

BIN
data/themes/default/midi_tab.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 170 B

BIN
data/themes/default/misc_tab.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 188 B

BIN
data/themes/default/plugin_tab.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 210 B

13
data/themes/default/style.css
View File

@@ -136,6 +136,19 @@ PianoRoll {
qproperty-textShadow: #fff;
}
TabWidget {
background-color: #262b30;
qproperty-tabText: rgba(255, 255, 255, 180);
qproperty-tabTitleText: #fff;
qproperty-tabSelected: #323940;
qproperty-tabBackground: #181b1f;
qproperty-tabBorder: #181b1f;
}
GroupBox {
background-color: #262b30;
}
/* main toolbar oscilloscope - can have transparent bg now */
VisualizationWidget {

BIN
data/themes/default/track_op_menu.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 496 B

BIN
data/themes/default/track_op_menu_active.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 403 B