Skip to content

Commit 7b0f344

Browse files
rncbcrncbc
committed
- MIDI Tool Resize / Legato: 'Mono', 'Poly' modes option added. (EXPERIMENTAL)
1 parent 89c7a53 commit 7b0f344

11 files changed

+553
-390
lines changed

‎src/qtractorMidiToolsForm.cpp‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,9 @@ qtractorMidiToolsForm::qtractorMidiToolsForm ( QWidget *pParent )
399399
QObject::connect(m_ui.ResizeLegatoSpinBox,
400400
SIGNAL(valueChanged(double)),
401401
SLOT(changed()));
402+
QObject::connect(m_ui.ResizeLegatoComboBox,
403+
SIGNAL(activated(int)),
404+
SLOT(changed()));
402405

403406
QObject::connect(m_ui.RescaleCheckBox,
404407
SIGNAL(toggled(bool)),
@@ -606,9 +609,10 @@ void qtractorMidiToolsForm::loadPreset ( const QString& sPreset )
606609
m_ui.ResizeValue2SpinBox->setValue(vlist[6].toInt());
607610
}
608611
// Resize legato mode tool...
609-
if (vlist.count() > 8) {
612+
if (vlist.count() > 9) {
610613
m_ui.ResizeLegatoCheckBox->setChecked(vlist[7].toBool());
611614
m_ui.ResizeLegatoSpinBox->setValue(vlist[8].toDouble());
615+
m_ui.ResizeLegatoComboBox->setCurrentIndex(vlist[9].toInt());
612616
}
613617
// Rescale tool...
614618
vlist = settings.value("/Rescale").toList();
@@ -715,6 +719,7 @@ void qtractorMidiToolsForm::savePreset ( const QString& sPreset )
715719
vlist.append(m_ui.ResizeValue2SpinBox->value());
716720
vlist.append(m_ui.ResizeLegatoCheckBox->isChecked());
717721
vlist.append(m_ui.ResizeLegatoSpinBox->value());
722+
vlist.append(m_ui.ResizeLegatoComboBox->currentIndex());
718723
settings.setValue("/Resize", vlist);
719724
// Rescale tool...
720725
vlist.clear();
@@ -1173,7 +1178,11 @@ qtractorMidiEditCommand *qtractorMidiToolsForm::midiEditCommand (
11731178
= 0.01f * float(m_ui.ResizeLegatoSpinBox->value());
11741179
const long d2
11751180
= long(p * float(pLastEvent->time() - pEvent->time()));
1176-
if (iDuration < d2 && d2 > 0)
1181+
if (m_ui.ResizeLegatoComboBox->currentIndex() > 0) {
1182+
if (iDuration < d2 && d2 > 0)
1183+
iDuration = d2;
1184+
}
1185+
else if (d2 > 0)
11771186
iDuration = d2;
11781187
}
11791188
pLastEvent = pEvent;
@@ -1477,6 +1486,7 @@ void qtractorMidiToolsForm::stabilizeForm (void)
14771486
if (bEnabled2)
14781487
++iEnabled;
14791488
m_ui.ResizeLegatoSpinBox->setEnabled(bEnabled2);
1489+
m_ui.ResizeLegatoComboBox->setEnabled(bEnabled2);
14801490

14811491
m_ui.ResizeValueCheckBox->setEnabled(bEnabled);
14821492
bEnabled2 = bEnabled && m_ui.ResizeValueCheckBox->isChecked();

‎src/qtractorMidiToolsForm.ui‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1067,7 +1067,24 @@
10671067
</property>
10681068
</widget>
10691069
</item>
1070-
<item row="3" column="3" colspan="4">
1070+
<item row="3" column="3">
1071+
<widget class="QComboBox" name="ResizeLegatoComboBox">
1072+
<property name="toolTip">
1073+
<string>Legato mode</string>
1074+
</property>
1075+
<item>
1076+
<property name="text">
1077+
<string>Mono</string>
1078+
</property>
1079+
</item>
1080+
<item>
1081+
<property name="text">
1082+
<string>Poly</string>
1083+
</property>
1084+
</item>
1085+
</widget>
1086+
</item>
1087+
<item row="3" column="3" colspan="3">
10711088
<spacer>
10721089
<property name="orientation">
10731090
<enum>Qt::Horizontal</enum>
@@ -1646,6 +1663,7 @@ Edit head/tail (blue) markers define the shift range.</string>
16461663
<tabstop>ResizeValue2SpinBox</tabstop>
16471664
<tabstop>ResizeLegatoCheckBox</tabstop>
16481665
<tabstop>ResizeLegatoSpinBox</tabstop>
1666+
<tabstop>ResizeLegatoComboBox</tabstop>
16491667
<tabstop>RescaleCheckBox</tabstop>
16501668
<tabstop>RescaleTimeCheckBox</tabstop>
16511669
<tabstop>RescaleTimeSpinBox</tabstop>

‎src/translations/qtractor_cs.ts‎

Lines changed: 58 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -11037,12 +11037,12 @@ Promiňte.</translation>
1103711037
<translation>(výchozí)</translation>
1103811038
</message>
1103911039
<message>
11040-
<location filename="../qtractorMidiToolsForm.cpp" line="827"/>
11040+
<location filename="../qtractorMidiToolsForm.cpp" line="832"/>
1104111041
<source>Warning</source>
1104211042
<translation>Upozornění</translation>
1104311043
</message>
1104411044
<message>
11045-
<location filename="../qtractorMidiToolsForm.cpp" line="828"/>
11045+
<location filename="../qtractorMidiToolsForm.cpp" line="833"/>
1104611046
<source>About to delete preset:
1104711047

1104811048
&quot;%1&quot;
@@ -11055,47 +11055,47 @@ Are you sure?</source>
1105511055
Jste si jistý?</translation>
1105611056
</message>
1105711057
<message>
11058-
<location filename="../qtractorMidiToolsForm.cpp" line="857"/>
11058+
<location filename="../qtractorMidiToolsForm.cpp" line="862"/>
1105911059
<source>none</source>
1106011060
<translation>Žádný</translation>
1106111061
</message>
1106211062
<message>
11063-
<location filename="../qtractorMidiToolsForm.cpp" line="862"/>
11063+
<location filename="../qtractorMidiToolsForm.cpp" line="867"/>
1106411064
<source>quantize</source>
1106511065
<translation>Kvantizovat</translation>
1106611066
</message>
1106711067
<message>
11068-
<location filename="../qtractorMidiToolsForm.cpp" line="864"/>
11068+
<location filename="../qtractorMidiToolsForm.cpp" line="869"/>
1106911069
<source>transpose</source>
1107011070
<translation>Převést</translation>
1107111071
</message>
1107211072
<message>
11073-
<location filename="../qtractorMidiToolsForm.cpp" line="866"/>
11073+
<location filename="../qtractorMidiToolsForm.cpp" line="871"/>
1107411074
<source>normalize</source>
1107511075
<translation>Normalizovat</translation>
1107611076
</message>
1107711077
<message>
11078-
<location filename="../qtractorMidiToolsForm.cpp" line="868"/>
11078+
<location filename="../qtractorMidiToolsForm.cpp" line="873"/>
1107911079
<source>randomize</source>
1108011080
<translation>Náhodně vybrat</translation>
1108111081
</message>
1108211082
<message>
11083-
<location filename="../qtractorMidiToolsForm.cpp" line="870"/>
11083+
<location filename="../qtractorMidiToolsForm.cpp" line="875"/>
1108411084
<source>resize</source>
1108511085
<translation>Změnit velikost</translation>
1108611086
</message>
1108711087
<message>
11088-
<location filename="../qtractorMidiToolsForm.cpp" line="872"/>
11088+
<location filename="../qtractorMidiToolsForm.cpp" line="877"/>
1108911089
<source>rescale</source>
1109011090
<translation>Změnit měřítko</translation>
1109111091
</message>
1109211092
<message>
11093-
<location filename="../qtractorMidiToolsForm.cpp" line="874"/>
11093+
<location filename="../qtractorMidiToolsForm.cpp" line="879"/>
1109411094
<source>timeshift</source>
1109511095
<translation>Časový posun</translation>
1109611096
</message>
1109711097
<message>
11098-
<location filename="../qtractorMidiToolsForm.cpp" line="876"/>
11098+
<location filename="../qtractorMidiToolsForm.cpp" line="881"/>
1109911099
<source>temporamp</source>
1110011100
<translation>tempovýnájezd</translation>
1110111101
</message>
@@ -11134,7 +11134,7 @@ Jste si jistý?</translation>
1113411134
<location filename="../qtractorMidiToolsForm.ui" line="162"/>
1113511135
<location filename="../qtractorMidiToolsForm.ui" line="466"/>
1113611136
<location filename="../qtractorMidiToolsForm.ui" line="751"/>
11137-
<location filename="../qtractorMidiToolsForm.ui" line="1138"/>
11137+
<location filename="../qtractorMidiToolsForm.ui" line="1155"/>
1113811138
<source>&amp;Time:</source>
1113911139
<translation>Č&amp;as:</translation>
1114011140
</message>
@@ -11152,7 +11152,7 @@ Jste si jistý?</translation>
1115211152
<location filename="../qtractorMidiToolsForm.ui" line="223"/>
1115311153
<location filename="../qtractorMidiToolsForm.ui" line="786"/>
1115411154
<location filename="../qtractorMidiToolsForm.ui" line="908"/>
11155-
<location filename="../qtractorMidiToolsForm.ui" line="1192"/>
11155+
<location filename="../qtractorMidiToolsForm.ui" line="1209"/>
1115611156
<source>&amp;Duration:</source>
1115711157
<translation>&amp;Doba trvání:</translation>
1115811158
</message>
@@ -11324,73 +11324,88 @@ Jste si jistý?</translation>
1132411324
<translation type="unfinished"></translation>
1132511325
</message>
1132611326
<message>
11327-
<location filename="../qtractorMidiToolsForm.ui" line="1100"/>
11328-
<location filename="../qtractorMidiToolsForm.ui" line="1115"/>
11327+
<location filename="../qtractorMidiToolsForm.ui" line="1073"/>
11328+
<source>Legato mode</source>
11329+
<translation type="unfinished"></translation>
11330+
</message>
11331+
<message>
11332+
<location filename="../qtractorMidiToolsForm.ui" line="1077"/>
11333+
<source>Mono</source>
11334+
<translation type="unfinished"></translation>
11335+
</message>
11336+
<message>
11337+
<location filename="../qtractorMidiToolsForm.ui" line="1082"/>
11338+
<source>Poly</source>
11339+
<translation type="unfinished"></translation>
11340+
</message>
11341+
<message>
11342+
<location filename="../qtractorMidiToolsForm.ui" line="1117"/>
11343+
<location filename="../qtractorMidiToolsForm.ui" line="1132"/>
1132911344
<source>Re&amp;scale</source>
1133011345
<translation>Změnit &amp;měřítko</translation>
1133111346
</message>
1133211347
<message>
11333-
<location filename="../qtractorMidiToolsForm.ui" line="1112"/>
11348+
<location filename="../qtractorMidiToolsForm.ui" line="1129"/>
1133411349
<source>Rescale selected events</source>
1133511350
<translation>Změnit měřítko vybraných událostí</translation>
1133611351
</message>
1133711352
<message>
11338-
<location filename="../qtractorMidiToolsForm.ui" line="1151"/>
11353+
<location filename="../qtractorMidiToolsForm.ui" line="1168"/>
1133911354
<source>Rescale time</source>
1134011355
<translation>Změnit měřítko času</translation>
1134111356
</message>
1134211357
<message>
11343-
<location filename="../qtractorMidiToolsForm.ui" line="1205"/>
11358+
<location filename="../qtractorMidiToolsForm.ui" line="1222"/>
1134411359
<source>Rescale duration</source>
1134511360
<translation>Změnit měřítko doby trvání</translation>
1134611361
</message>
1134711362
<message>
11348-
<location filename="../qtractorMidiToolsForm.ui" line="1246"/>
11363+
<location filename="../qtractorMidiToolsForm.ui" line="1263"/>
1134911364
<source>Rescale value</source>
1135011365
<translation>Změnit měřítko hodnoty</translation>
1135111366
</message>
1135211367
<message>
11353-
<location filename="../qtractorMidiToolsForm.ui" line="1274"/>
11368+
<location filename="../qtractorMidiToolsForm.ui" line="1291"/>
1135411369
<source>&amp;Invert</source>
1135511370
<translation>&amp;Obrátit</translation>
1135611371
</message>
1135711372
<message>
11358-
<location filename="../qtractorMidiToolsForm.ui" line="1295"/>
11373+
<location filename="../qtractorMidiToolsForm.ui" line="1312"/>
1135911374
<source>T&amp;imeshift</source>
1136011375
<translation>Ča&amp;sový posun</translation>
1136111376
</message>
1136211377
<message>
11363-
<location filename="../qtractorMidiToolsForm.ui" line="1307"/>
11378+
<location filename="../qtractorMidiToolsForm.ui" line="1324"/>
1136411379
<source>Timeshift selected events</source>
1136511380
<translation>Časově posunout vybrané události</translation>
1136611381
</message>
1136711382
<message>
11368-
<location filename="../qtractorMidiToolsForm.ui" line="1310"/>
11383+
<location filename="../qtractorMidiToolsForm.ui" line="1327"/>
1136911384
<source>Timeshift</source>
1137011385
<translation>Časově posunout</translation>
1137111386
</message>
1137211387
<message>
11373-
<location filename="../qtractorMidiToolsForm.ui" line="1333"/>
11388+
<location filename="../qtractorMidiToolsForm.ui" line="1350"/>
1137411389
<source>P:</source>
1137511390
<translation>P:</translation>
1137611391
</message>
1137711392
<message>
11378-
<location filename="../qtractorMidiToolsForm.ui" line="1346"/>
11393+
<location filename="../qtractorMidiToolsForm.ui" line="1363"/>
1137911394
<source>Timeshift parameter</source>
1138011395
<translation>Parametr pro časový posun</translation>
1138111396
</message>
1138211397
<message>
11383-
<location filename="../qtractorMidiToolsForm.ui" line="1374"/>
11398+
<location filename="../qtractorMidiToolsForm.ui" line="1391"/>
1138411399
<source>Timeshift parameter (log)</source>
1138511400
<translation>Parametr pro časový posun (log)</translation>
1138611401
</message>
1138711402
<message>
11388-
<location filename="../qtractorMidiToolsForm.ui" line="1411"/>
11403+
<location filename="../qtractorMidiToolsForm.ui" line="1428"/>
1138911404
<source>Timeshift curve</source>
1139011405
<translation>Křivka časového posunu</translation>
1139111406
</message>
1139211407
<message>
11393-
<location filename="../qtractorMidiToolsForm.ui" line="1424"/>
11408+
<location filename="../qtractorMidiToolsForm.ui" line="1441"/>
1139411409
<source>P = 0 : no change.
1139511410
P &gt; 0 : accelerating shift.
1139611411
P &lt; 0 : slowing down shift.
@@ -11401,52 +11416,52 @@ P &lt; 0 : zpomalení posunu.
1140111416
(Modré) značky pro úpravy začátku/konce vymezují rozsah posunu.</translation>
1140211417
</message>
1140311418
<message>
11404-
<location filename="../qtractorMidiToolsForm.ui" line="1434"/>
11419+
<location filename="../qtractorMidiToolsForm.ui" line="1451"/>
1140511420
<source>Timeshift duration</source>
1140611421
<translation>Doba trvání posunu</translation>
1140711422
</message>
1140811423
<message>
11409-
<location filename="../qtractorMidiToolsForm.ui" line="1455"/>
11424+
<location filename="../qtractorMidiToolsForm.ui" line="1472"/>
1141011425
<source>T&amp;empo ramp</source>
1141111426
<translation>T&amp;empový nájezd</translation>
1141211427
</message>
1141311428
<message>
11414-
<location filename="../qtractorMidiToolsForm.ui" line="1467"/>
11429+
<location filename="../qtractorMidiToolsForm.ui" line="1484"/>
1141511430
<source>Tempo ramp selected events</source>
1141611431
<translation>Vybrané události tempového nájezdu</translation>
1141711432
</message>
1141811433
<message>
11419-
<location filename="../qtractorMidiToolsForm.ui" line="1470"/>
11434+
<location filename="../qtractorMidiToolsForm.ui" line="1487"/>
1142011435
<source>Tempo ramp</source>
1142111436
<translation>Tempový nájezd</translation>
1142211437
</message>
1142311438
<message>
11424-
<location filename="../qtractorMidiToolsForm.ui" line="1493"/>
11439+
<location filename="../qtractorMidiToolsForm.ui" line="1510"/>
1142511440
<source>From</source>
1142611441
<translation>Od</translation>
1142711442
</message>
1142811443
<message>
11429-
<location filename="../qtractorMidiToolsForm.ui" line="1506"/>
11444+
<location filename="../qtractorMidiToolsForm.ui" line="1523"/>
1143011445
<source>Tempo ramp start</source>
1143111446
<translation>Začátek tempového nájezdu</translation>
1143211447
</message>
1143311448
<message>
11434-
<location filename="../qtractorMidiToolsForm.ui" line="1513"/>
11449+
<location filename="../qtractorMidiToolsForm.ui" line="1530"/>
1143511450
<source>to</source>
1143611451
<translation>do</translation>
1143711452
</message>
1143811453
<message>
11439-
<location filename="../qtractorMidiToolsForm.ui" line="1526"/>
11454+
<location filename="../qtractorMidiToolsForm.ui" line="1543"/>
1144011455
<source>Temporamp end</source>
1144111456
<translation>Konec tempového nájezdu</translation>
1144211457
</message>
1144311458
<message>
11444-
<location filename="../qtractorMidiToolsForm.ui" line="1546"/>
11459+
<location filename="../qtractorMidiToolsForm.ui" line="1563"/>
1144511460
<source>Edit head/tail (blue) markers define the ramp range.</source>
1144611461
<translation>Značky úpravy začátku/konce (modré) vymezují rozsah tempa.</translation>
1144711462
</message>
1144811463
<message>
11449-
<location filename="../qtractorMidiToolsForm.ui" line="1553"/>
11464+
<location filename="../qtractorMidiToolsForm.ui" line="1570"/>
1145011465
<source>Tempo ramp duration</source>
1145111466
<translation>Doba trvání tempa</translation>
1145211467
</message>
@@ -11460,10 +11475,10 @@ P &lt; 0 : zpomalení posunu.
1146011475
<location filename="../qtractorMidiToolsForm.ui" line="802"/>
1146111476
<location filename="../qtractorMidiToolsForm.ui" line="837"/>
1146211477
<location filename="../qtractorMidiToolsForm.ui" line="1048"/>
11463-
<location filename="../qtractorMidiToolsForm.ui" line="1154"/>
11464-
<location filename="../qtractorMidiToolsForm.ui" line="1208"/>
11465-
<location filename="../qtractorMidiToolsForm.ui" line="1249"/>
11466-
<location filename="../qtractorMidiToolsForm.ui" line="1367"/>
11478+
<location filename="../qtractorMidiToolsForm.ui" line="1171"/>
11479+
<location filename="../qtractorMidiToolsForm.ui" line="1225"/>
11480+
<location filename="../qtractorMidiToolsForm.ui" line="1266"/>
11481+
<location filename="../qtractorMidiToolsForm.ui" line="1384"/>
1146711482
<source> %</source>
1146811483
<translation> %</translation>
1146911484
</message>
@@ -11476,7 +11491,7 @@ P &lt; 0 : zpomalení posunu.
1147611491
<location filename="../qtractorMidiToolsForm.ui" line="628"/>
1147711492
<location filename="../qtractorMidiToolsForm.ui" line="821"/>
1147811493
<location filename="../qtractorMidiToolsForm.ui" line="963"/>
11479-
<location filename="../qtractorMidiToolsForm.ui" line="1233"/>
11494+
<location filename="../qtractorMidiToolsForm.ui" line="1250"/>
1148011495
<source>&amp;Value:</source>
1148111496
<translation>&amp;Délka trvání:</translation>
1148211497
</message>

0 commit comments

Comments
 (0)