Skip to content

Commit

Permalink
Microtuner UI update (LMMS#6206)
Browse files Browse the repository at this point in the history
* Replace deprecated sprintf() function

* Update microtuner-related UI (add more clues explaining how to use it)

* Simpler wording in the tooltips for "apply" buttons

* Post-merge fix of a forward declaration

* Rename Misc tab to Tuning and transposition; move Microtuner config dialog to Edit menu and make it also available from instrument tab

* Enable word wrap on "MIDI unsupported" label

* Remove forgotten new unnecessary includes

* Rename InstrumentMiscView to InstrumentTuningView in locales
  • Loading branch information
he29-net authored Aug 31, 2023
1 parent 8a94fb3 commit e1d3ecb
Show file tree
Hide file tree
Showing 46 changed files with 122 additions and 92 deletions.
2 changes: 1 addition & 1 deletion data/locale/ar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6361,7 +6361,7 @@ Please make sure you have write permission to the file and the directory contain
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="../../src/gui/instrument/InstrumentMidiIOView.cpp" line="221"/>
<source>MASTER PITCH</source>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/bs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3677,7 +3677,7 @@ You can remove and move mixer channels in the context menu, which is accessed by
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="src/gui/instrument/InstrumentMidiIOView.cpp" line="213"/>
<source>MASTER PITCH</source>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/ca.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6360,7 +6360,7 @@ Please make sure you have write permission to the file and the directory contain
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="../../src/gui/instrument/InstrumentMidiIOView.cpp" line="221"/>
<source>MASTER PITCH</source>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/cs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6361,7 +6361,7 @@ Ověřte si prosím, zda máte povolen zápis do souboru a do složky, ve které
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="../../src/gui/instrument/InstrumentMidiIOView.cpp" line="221"/>
<source>MASTER PITCH</source>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6361,7 +6361,7 @@ Please make sure you have write permission to the file and the directory contain
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="../../src/gui/instrument/InstrumentMidiIOView.cpp" line="221"/>
<source>MASTER PITCH</source>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/el.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6360,7 +6360,7 @@ Please make sure you have write permission to the file and the directory contain
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="../../src/gui/instrument/InstrumentMidiIOView.cpp" line="221"/>
<source>MASTER PITCH</source>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6362,7 +6362,7 @@ Please make sure you have write permission to the file and the directory contain
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="../../src/gui/instrument/InstrumentMidiIOView.cpp" line="221"/>
<source>MASTER PITCH</source>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/eo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6360,7 +6360,7 @@ Please make sure you have write permission to the file and the directory contain
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="../../src/gui/instrument/InstrumentMidiIOView.cpp" line="221"/>
<source>MASTER PITCH</source>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6361,7 +6361,7 @@ Asegúrate de tener permisos de escritura tanto del archivo como del directorio
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="../../src/gui/instrument/InstrumentMidiIOView.cpp" line="221"/>
<source>MASTER PITCH</source>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/eu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6641,7 +6641,7 @@ Please make sure you have write permission to the file and the directory contain
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="../../src/gui/instrument/InstrumentMidiIOView.cpp" line="221"/>
<source>MASTER PITCH</source>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/fa.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6360,7 +6360,7 @@ Please make sure you have write permission to the file and the directory contain
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="../../src/gui/instrument/InstrumentMidiIOView.cpp" line="221"/>
<source>MASTER PITCH</source>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6645,7 +6645,7 @@ Veuillez vous assurez que vous avez les droits d&apos;écriture sur le fichier e
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="../../src/gui/instrument/InstrumentMidiIOView.cpp" line="221"/>
<source>MASTER PITCH</source>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/gl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6360,7 +6360,7 @@ Please make sure you have write permission to the file and the directory contain
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="../../src/gui/instrument/InstrumentMidiIOView.cpp" line="221"/>
<source>MASTER PITCH</source>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/he.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6361,7 +6361,7 @@ Please make sure you have write permission to the file and the directory contain
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="../../src/gui/instrument/InstrumentMidiIOView.cpp" line="221"/>
<source>MASTER PITCH</source>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/hi_IN.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6362,7 +6362,7 @@ Please make sure you have write permission to the file and the directory contain
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="../../src/gui/instrument/InstrumentMidiIOView.cpp" line="221"/>
<source>MASTER PITCH</source>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/hu_HU.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6366,7 +6366,7 @@ Ellenőrizd, hogy rendelkezel-e a szükséges engedélyekkel és próbáld újra
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="../../src/gui/instrument/InstrumentMidiIOView.cpp" line="221"/>
<source>MASTER PITCH</source>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/id.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6362,7 +6362,7 @@ Pastikan Anda memiliki izin menulis ke file dan direktori yang berisi berkas ter
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="../../src/gui/instrument/InstrumentMidiIOView.cpp" line="221"/>
<source>MASTER PITCH</source>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/it.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6366,7 +6366,7 @@ Si prega di controllare i permessi di scrittura sul file e la cartella che lo co
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="../../src/gui/instrument/InstrumentMidiIOView.cpp" line="221"/>
<source>MASTER PITCH</source>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/ja.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6362,7 +6362,7 @@ Please make sure you have write permission to the file and the directory contain
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="../../src/gui/instrument/InstrumentMidiIOView.cpp" line="221"/>
<source>MASTER PITCH</source>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/ka.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6360,7 +6360,7 @@ Please make sure you have write permission to the file and the directory contain
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="../../src/gui/instrument/InstrumentMidiIOView.cpp" line="221"/>
<source>MASTER PITCH</source>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/ko.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6364,7 +6364,7 @@ Please make sure you have write permission to the file and the directory contain
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="../../src/gui/instrument/InstrumentMidiIOView.cpp" line="221"/>
<source>MASTER PITCH</source>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/ms_MY.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6360,7 +6360,7 @@ Please make sure you have write permission to the file and the directory contain
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="../../src/gui/instrument/InstrumentMidiIOView.cpp" line="221"/>
<source>MASTER PITCH</source>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/nb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6360,7 +6360,7 @@ Please make sure you have write permission to the file and the directory contain
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="../../src/gui/instrument/InstrumentMidiIOView.cpp" line="221"/>
<source>MASTER PITCH</source>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/nl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6362,7 +6362,7 @@ Zorg ervoor dat u schrijfbevoegdheid heeft voor het bestand en voor de map die h
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="../../src/gui/instrument/InstrumentMidiIOView.cpp" line="221"/>
<source>MASTER PITCH</source>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/oc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6360,7 +6360,7 @@ Please make sure you have write permission to the file and the directory contain
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="../../src/gui/instrument/InstrumentMidiIOView.cpp" line="221"/>
<source>MASTER PITCH</source>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/pl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6646,7 +6646,7 @@ Upewnij się, że masz uprawnienia do zapisu do pliku i katalogu zawierającego
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="../../src/gui/instrument/InstrumentMidiIOView.cpp" line="221"/>
<source>MASTER PITCH</source>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/pt.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6363,7 +6363,7 @@ Please make sure you have write permission to the file and the directory contain
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="../../src/gui/instrument/InstrumentMidiIOView.cpp" line="221"/>
<source>MASTER PITCH</source>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/ro.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6361,7 +6361,7 @@ Please make sure you have write permission to the file and the directory contain
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="../../src/gui/instrument/InstrumentMidiIOView.cpp" line="221"/>
<source>MASTER PITCH</source>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/ru.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6375,7 +6375,7 @@ Please make sure you have write permission to the file and the directory contain
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="../../src/gui/instrument/InstrumentMidiIOView.cpp" line="221"/>
<source>MASTER PITCH</source>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/sl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6360,7 +6360,7 @@ Please make sure you have write permission to the file and the directory contain
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="../../src/gui/instrument/InstrumentMidiIOView.cpp" line="221"/>
<source>MASTER PITCH</source>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/sr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2956,7 +2956,7 @@ You can remove and move mixer channels in the context menu, which is accessed by
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<source>MASTER PITCH</source>
<translation type="unfinished"/>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/sv.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6644,7 +6644,7 @@ Se till att du har skrivbehörighet till filen och mappen som innehåller filen
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="../../src/gui/instrument/InstrumentMidiIOView.cpp" line="221"/>
<source>MASTER PITCH</source>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/tr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6646,7 +6646,7 @@ Lütfen dosyaya ve dosyayı içeren dizine yazma izniniz olduğundan emin olun v
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="../../src/gui/instrument/InstrumentMidiIOView.cpp" line="221"/>
<source>MASTER PITCH</source>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/uk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6361,7 +6361,7 @@ Please make sure you have write permission to the file and the directory contain
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="../../src/gui/instrument/InstrumentMidiIOView.cpp" line="221"/>
<source>MASTER PITCH</source>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/zh_CN.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6370,7 +6370,7 @@ Please make sure you have write permission to the file and the directory contain
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="../../src/gui/instrument/InstrumentMidiIOView.cpp" line="221"/>
<source>MASTER PITCH</source>
Expand Down
2 changes: 1 addition & 1 deletion data/locale/zh_TW.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6361,7 +6361,7 @@ Please make sure you have write permission to the file and the directory contain
</message>
</context>
<context>
<name>InstrumentMiscView</name>
<name>InstrumentTuningView</name>
<message>
<location filename="../../src/gui/instrument/InstrumentMidiIOView.cpp" line="221"/>
<source>MASTER PITCH</source>
Expand Down
Binary file added data/themes/default/edit_draw_small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/themes/default/tuning_tab.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions include/InstrumentTrack.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ namespace gui

class InstrumentTrackView;
class InstrumentTrackWindow;
class InstrumentMiscView;
class InstrumentTuningView;
class MidiCCRackView;

} // namespace gui
Expand Down Expand Up @@ -315,7 +315,7 @@ protected slots:
friend class gui::InstrumentTrackView;
friend class gui::InstrumentTrackWindow;
friend class NotePlayHandle;
friend class gui::InstrumentMiscView;
friend class gui::InstrumentTuningView;
friend class gui::MidiCCRackView;

} ;
Expand Down
4 changes: 2 additions & 2 deletions include/InstrumentTrackWindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class MixerLineLcdSpinBox;
class InstrumentFunctionArpeggioView;
class InstrumentFunctionNoteStackingView;
class InstrumentMidiIOView;
class InstrumentMiscView;
class InstrumentTuningView;
class InstrumentSoundShapingView;
class InstrumentTrackShapingView;
class InstrumentTrackView;
Expand Down Expand Up @@ -154,7 +154,7 @@ protected slots:
InstrumentFunctionArpeggioView* m_arpeggioView;
InstrumentMidiIOView * m_midiView;
EffectRackView * m_effectView;
InstrumentMiscView *m_miscView;
InstrumentTuningView *m_tuningView;


// test-piano at the bottom of every instrument-settings-window
Expand Down
Loading

0 comments on commit e1d3ecb

Please sign in to comment.