From 1604cbeb70e6114b7863f4d0e2180a999e5c85af Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Tue, 27 Aug 2019 18:02:30 -0700 Subject: [PATCH] Linux compile fixes --- Editor/SampleEditor.cpp | 2 + Editor/StatusBarWidget.cpp | 2 + Editor/resources/lang_de.ts | 766 ++++++++++++++++++------------------ 3 files changed, 387 insertions(+), 383 deletions(-) diff --git a/Editor/SampleEditor.cpp b/Editor/SampleEditor.cpp index 1e16b23..f743ffd 100644 --- a/Editor/SampleEditor.cpp +++ b/Editor/SampleEditor.cpp @@ -1,5 +1,7 @@ #include "SampleEditor.hpp" +#include + #include #include #include diff --git a/Editor/StatusBarWidget.cpp b/Editor/StatusBarWidget.cpp index 572fa70..cf872e0 100644 --- a/Editor/StatusBarWidget.cpp +++ b/Editor/StatusBarWidget.cpp @@ -1,5 +1,7 @@ #include "StatusBarWidget.hpp" +#include + FXButton::FXButton(QWidget* parent) : QPushButton(parent) { setIcon(QIcon(QStringLiteral(":/icons/IconFX.svg"))); setToolTip(tr("Access studio setup window for experimenting with audio effects")); diff --git a/Editor/resources/lang_de.ts b/Editor/resources/lang_de.ts index 98db270..b5c4af1 100644 --- a/Editor/resources/lang_de.ts +++ b/Editor/resources/lang_de.ts @@ -4,94 +4,94 @@ ADSRControls - + Change Attack - + Change Decay - + Change Sustain - + Change Attack/Decay - + Change Decay/Sustain - + Change Release - + Change DLS - + Change Vel To Attack - + Change Key To Decay - + Attack - - - + + + sec - + Decay - + Sustain - + % - + Release - + DLS - + Vel To Attack - + Key To Decay @@ -99,12 +99,12 @@ AddRemoveButtons - + Add Row - + Remove Row @@ -112,12 +112,12 @@ BaseObjectDelegate - + Open in Editor - + Find Usages @@ -125,7 +125,7 @@ CommandWidget - + Change %1 @@ -133,27 +133,27 @@ CurveControls - + Edit Curve - + Did not evaluate as a number - + Expression - + Apply - + Expression interpreter mapping x:[0,1] to y:[0,1] with the following constants and functions available: @@ -162,26 +162,26 @@ EffectCatalogue - - + + Reverb Standard - - + + Reverb High - - + + Delay - - + + Chorus @@ -189,7 +189,7 @@ FXButton - + Access studio setup window for experimenting with audio effects @@ -197,47 +197,47 @@ KeymapControls - + SoundMacro - + Transpose - + Offset resulting MIDI note - + Pan - + Set initial pan - + Surround - + Initially play through surround channels - + Prio Offset - + Offset resulting priority @@ -245,17 +245,17 @@ LayersEditor - + Add Layer - + Add new layer mapping - + Remove selected layer mappings @@ -263,57 +263,57 @@ LayersModel - + Change %1 - + SoundMacro - + Key Lo - + Key Hi - + Transpose - + Volume - + Prio Off - + Span - + Pan - + Move Layers - + Move Layer @@ -321,12 +321,12 @@ LayersTableView - + Delete Layers - + Delete Layer @@ -334,7 +334,7 @@ ListingDeleteButton - + Delete this SoundMacro @@ -342,71 +342,71 @@ MIDIFileDelegate - + Change MIDI Path - + Save As MIDI - + Save As SNG - - - - - - - + + + + + + + File Error - - + + Unable to open %1 for reading: %1 - - + + Invalid song data at %1 - - + + Unable to open %1 for writing: %1 - + Invalid MIDI data at %1 - + Export MIDI - + MIDI(*.mid) - + Export Song - + Song(*.sng) @@ -414,12 +414,12 @@ MIDIFileFieldWidget - + Browse - + Open Song File @@ -427,23 +427,23 @@ MIDIPlayerWidget - + Stop - + Bad Song Data - + Unable to load song data at %1 - - + + Play @@ -641,379 +641,379 @@ - + A directory at '%1/%2' could not be created. - + Unable to create directory - + Launching Windows Explorer Failed - + Could not find explorer.exe in path to launch Windows Explorer. - + Show in Explorer - + Show in Finder - + Show in Browser - + Go Back - + Go Forward - + Clear Recent Projects - + Amuse[*] - + %1/%2/%3[*] - Amuse - + %1[*] - Amuse - - + + The directory at '%1' must not be empty. - - + + Directory empty - + The directory at '%1' must exist for the Amuse editor. - + Directory does not exist - + __amuse_test__ - + The directory at '%1' must be writable for the Amuse editor: %2 - + Unable to write to directory - + No Audio Devices Found - + Virtual MIDI-In - + No MIDI Devices Found - + SUSTAIN - - + + Unsaved Changes - + Save Changes in %1? - + New Project - + The directory at '%1' does not exist. - + Bad Directory - + Opening - - - - - + + + + + Scanning Project - + Opening %1 - + Open Project - + Discard Changes in %1? - + Reloading Samples - + Scanning %1 - + Import Project - + The file at '%1' could not be interpreted as a MusyX container. - + Unsupported MusyX Container - + Sample Import Mode - + Amuse can import samples as WAV files for ease of editing, import original compressed data for lossless repacking, or both. Exporting the project will prefer whichever version was modified most recently. - + Import Compressed - + Import WAVs - + Import Both - + Raw Import Mode - + Would you like to scan for all MusyX group files in this directory? - + Project Name - + What should this project be named? - - + + Importing - - + + Importing %1 - + Import Songs - + Exporting - + Exporting %1 - - + + Import C Headers - + <p>Importing names from C headers depends on up-to-date, consistent names relative to the sound group data.</p><p>Headers are imported on a per-subproject basis from a single directory. Headers must be named with the form <code>&lt;subproject&gt;.h</code>.</p><p>Group, Song and SFX definitions are matched according to the following forms:<pre>#define GRP&lt;name&gt; &lt;id&gt; #define SNG&lt;name&gt; &lt;id&gt; #define SFX&lt;name> &lt;id&gt;</pre></p><p><strong>This operation cannot be undone! It is recommended to make a backup of the project directory before proceeding.</strong></p><p>Continue?</p> - + Export C Headers - + New Subproject - + What should this subproject be named? - + New SFX Group - + What should the new SFX group in %1 be named? - + New Song Group - + What should the new Song group in %1 be named? - + New ADSR - + What should the new ADSR in %1 be named? - + New Curve - + What should the new Curve in %1 be named? - + New Keymap - + What should the new Keymap in %1 be named? - + New Layers - + What should the new Layers in %1 be named? - + About Amuse - + Export Complete - + %1? @@ -1021,7 +1021,7 @@ ModulationSlider - + Modulation: %1 @@ -1137,38 +1137,38 @@ PageModel - + Program Conflict - + Program %1 is already defined in table - - + + Change %1 - + Program - + Object - + Priority - + Max Voices @@ -1176,7 +1176,7 @@ PageObjectDelegate - + Change %1 @@ -1202,12 +1202,12 @@ PageTableView - + Delete Page Entries - + Delete Page Entry @@ -1215,7 +1215,7 @@ PaintButton - + Activate brush to apply values to keys @@ -1223,7 +1223,7 @@ PitchSlider - + Pitch: %1 @@ -1231,341 +1231,341 @@ ProjectModel - - - - - - + + + + + + Export Error - - - + + + Unable to find group %1 - + Unable to export %1.proj - + Unable to export %1.pool - + Unable to export %1.sdir - + Unable to export %1.samp - + Import Error - + Export Header Error - + Unable to open %1 for reading - + File Exists - + %1 already exists. Overwrite? - + Sound Macros - + ADSRs - + Curves - + Keymaps - + Layers - + Samples - + Naming Conflict - + %1 already exists in this context - + Rename %1 - + Subproject Conflict - + The subproject %1 is already defined - - - + + + Add Subproject %1 - + Sound Group Conflict - - + + The group %1 is already defined - - - + + + Add Sound Group %1 - + Song Group Conflict - - - + + + Add Song Group %1 - + Sound Macro Conflict - + The macro %1 is already defined - - + + Add Sound Macro %1 - + ADSR Conflict - + The ADSR %1 is already defined - - - + + + Add ADSR %1 - + Curve Conflict - + The Curve %1 is already defined - - - + + + Add Curve %1 - + Keymap Conflict - + The Keymap %1 is already defined - - - + + + Add Keymap %1 - + Layers Conflict - + Layers %1 is already defined - - - + + + Add Layers %1 - - + + -copy - + Add SoundMacro %1 - + Cut SongGroup %1 - + Cut SFXGroup %1 - + Cut SoundMacro %1 - + Cut ADSR %1 - + Cut Curve %1 - + Cut Keymap %1 - + Cut Layers %1 - + Delete Subproject - + <p>The subproject %1 will be permanently deleted from the project. Sample files will be permanently removed from the file system.</p><p><strong>This action cannot be undone!</strong></p><p>Continue?</p> - + Delete SongGroup %1 - + Delete SFXGroup %1 - + Delete SoundMacro %1 - + Delete ADSR %1 - + Delete Curve %1 - + Delete Keymap %1 - + Delete Layers %1 - + Delete Sample - + <p>The sample %1 will be permanently deleted from the file system. <p><strong>This action cannot be undone!</strong></p><p>Continue?</p> @@ -1573,7 +1573,7 @@ QDialogButtonBox - + OK @@ -1581,12 +1581,12 @@ QMessageBox - + <h3>About Amuse</h3> - + <p>Amuse is an alternate editor and runtime library for MusyX sound groups.</p><p>MusyX originally served as a widely-deployed audio system for developing games on the Nintendo 64, GameCube, and GameBoy Advance.</p><p>Amuse is available under the MIT license.<br>Please see <a href="https://gitlab.axiodl.com/AxioDL/amuse/blob/master/LICENSE">https://gitlab.axiodl.com/AxioDL/amuse/blob/master/LICENSE</a> for futher information.</p><p>Copyright (C) 2015-2018 Antidote / Jackoalan.</p><p>MusyX is a trademark of Factor 5, LLC.</p><p>Nintendo 64, GameCube, and GameBoy Advance are trademarks of Nintendo Co., Ltd.</p> @@ -1594,57 +1594,57 @@ SFXModel - + SFX Conflict - + SFX %1 is already defined in project - + Change SFX Name - + Change %1 - + SFX - + Object - + Priority - + Max Voices - + Velocity - + Panning - + Key @@ -1652,7 +1652,7 @@ SFXObjectDelegate - + Change %1 @@ -1660,13 +1660,13 @@ SFXPlayerWidget - + Stop - - + + Play @@ -1674,12 +1674,12 @@ SFXTableView - + Delete SFX Entries - + Delete SFX Entry @@ -1687,70 +1687,70 @@ SampleControls - + Change %1 - - - + + + Loop - + Loop Start - + Loop End - + Change Base Pitch - + Make WAV Version - + Make Compressed Version - + Up To Date - - + + Nothing Loaded - + Zoom - + Start - + End - + Base Pitch @@ -1758,32 +1758,32 @@ SetupListModel - + Double-click to select file - + Song Conflict - + Song %1 is already defined in project - + Change Song Name - + Song - + MIDI File @@ -1791,32 +1791,32 @@ SetupModel - + Change %1 - + Program - + Volume - + Panning - + Reverb - + Chorus @@ -1824,12 +1824,12 @@ SetupTableView - + Delete Setup Entries - + Delete Setup Entry @@ -1837,37 +1837,37 @@ SongGroupEditor - + Add Page Entry - + Add Setup Entry - + Normal Pages - + Drum Pages - + MIDI Setups - + Add new page entry - + Remove selected page entries @@ -1875,17 +1875,17 @@ SoundGroupEditor - + Add SFX Entry - + Add new SFX entry - + Remove selected SFX entries @@ -1893,72 +1893,72 @@ SoundMacroCatalogue - + Control - + Pitch - + Sample - + Setup - + Special - + Structure - + Volume - + Commands to control the voice - + Commands to control the voice's pitch - + Commands to control the voice's sample playback - + Commands to setup the voice's mixing process - + Miscellaneous commands - + Commands to control macro branching - + Commands to control the voice's volume @@ -1966,7 +1966,7 @@ SoundMacroDelegate - + Change %1 @@ -1974,17 +1974,17 @@ SoundMacroListing - + Reorder %1 - + Insert %1 - + Delete %1 @@ -1992,22 +1992,22 @@ StatusBarWidget - + Immediately kill active voices - + Aux A send level for all voices - + Aux B send level for all voices - + Master volume level @@ -2015,17 +2015,17 @@ StudioSetupWidget - + Studio Setup - + Aux A - + Aux B @@ -2033,7 +2033,7 @@ TargetButton - + Set step with target click @@ -2041,52 +2041,52 @@ TreeDelegate - + Export GameCube Group - + Find Usages - + Cut - + Copy - + Paste - + Duplicate - + Delete - + Rename - + Exporting - + Exporting %1 @@ -2094,7 +2094,7 @@ Uint32X8Button - + Channels @@ -2102,42 +2102,42 @@ Uint32X8Popup - + Front Left - + Front Right - + Rear Left - + Rear Right - + Front Center - + LFE - + Side Left - + Side Right @@ -2145,7 +2145,7 @@ VelocitySlider - + Velocity: %1