41 Commits c25cf72308 ... f600dd381e

Autore SHA1 Messaggio Data
  UltrasonicMadness f600dd381e Preparing 0.4.0 Adaptable Edition release 1 anno fa
  UltrasonicMadness e83d8394ad Fixed XML indentation 1 anno fa
  UltrasonicMadness 7467ee3a05 Documented conversion utility 1 anno fa
  UltrasonicMadness f613a5cc56 General code cleanup, removed excess comments 1 anno fa
  UltrasonicMadness 6ffd3d735a Better organised preferences loading and saving 1 anno fa
  UltrasonicMadness 9eb502bb71 Removed excess whitespace from history converter script 1 anno fa
  UltrasonicMadness ab89626199 Removed unused history icon 1 anno fa
  UltrasonicMadness a46645c28c Documenting song name generation feature 1 anno fa
  UltrasonicMadness 9f6915c5d8 Removed filename options from history file conversion script 1 anno fa
  UltrasonicMadness 6873e117ed Loading preferences is now functional 1 anno fa
  UltrasonicMadness d62c2b17ad Removed trailing spaces 1 anno fa
  UltrasonicMadness 3ff1bf5c46 Replaced scattered tab indentation with spaces 1 anno fa
  UltrasonicMadness eb2d060b85 Added code to save preferences file 1 anno fa
  UltrasonicMadness 8ce227b0cc Removed close buttons from dialogs 1 anno fa
  UltrasonicMadness 4cf648c2f3 Preferences dialog is now resizable 1 anno fa
  UltrasonicMadness 04785b7b36 Added option to randomly pick the style 1 anno fa
  UltrasonicMadness 844c76c949 Re-added stop button 1 anno fa
  UltrasonicMadness 6982e8c2e5 Added cueing support to SoundHelixThread 1 anno fa
  UltrasonicMadness ac5b753db9 Moved history table to main window 1 anno fa
  UltrasonicMadness 267c50777b Rearranged interface again 1 anno fa
  UltrasonicMadness 6c579d0934 Set minimum size for main MadHelix window 1 anno fa
  UltrasonicMadness 1de63f043b Removed excess newlines from about box 1 anno fa
  UltrasonicMadness 47f9b854a2 Implemented skipping back and forward 1 anno fa
  UltrasonicMadness 139661abc9 Moved buttons and replaced icons 1 anno fa
  UltrasonicMadness 56cde69179 Moved top-level panels 1 anno fa
  UltrasonicMadness 30bcae9c7d Adapting SongLogEntry for playlists 1 anno fa
  UltrasonicMadness 23e780e61d Removed stack trace when history.xml is absent and successfully created 1 anno fa
  UltrasonicMadness 831221c8bf Started work on rearranging interface 1 anno fa
  UltrasonicMadness 1ba9df8de8 More adaptable about box 1 anno fa
  UltrasonicMadness 32daeadda1 Added utility to convert old history files to the new XML format 1 anno fa
  UltrasonicMadness 672f79b1fc Replaced json-simple with Java's internal XML libraries 1 anno fa
  UltrasonicMadness f91b13cad6 Fixed bug where the music keeps playing on closing the main window 1 anno fa
  UltrasonicMadness 68af150299 Updated copyright years 1 anno fa
  UltrasonicMadness 9491b40095 Removed unused imports and the now unused version of HelixStatus (now SoundHelixThread.Status) 5 anni fa
  UltrasonicMadness 9cc9167d3b Changed brace style for consistency with other Java programs. 5 anni fa
  UltrasonicMadness 8556b6c9c3 Changed license notices to refer to 2019 5 anni fa
  UltrasonicMadness deab4fd8ed Preferences are now functional again. 5 anni fa
  UltrasonicMadness 6f14800fd5 Split the main MadHelix class and improved thread safety 5 anni fa
  UltrasonicMadness cc1f009bb6 Replaced timer thread with Swing timer 5 anni fa
  UltrasonicMadness b2699576b9 The play button now takes back focus once the song has loaded. 6 anni fa
  UltrasonicMadness 3110eeb6de Added --help and --version command-line options. 6 anni fa

+ 2 - 1
.gitignore

@@ -1,4 +1,5 @@
 bin
 midi
-history.json
+history.xml
+preferences.xml
 MadHelix.jar

+ 7 - 5
README.md

@@ -5,15 +5,17 @@ MadHelix is a Java Swing-based graphical frontend for [SoundHelix](https://www.s
 Run the ant command in the main folder and then run the generated MadHelix.jar file.
 
 ## How to Use
-1. Once the MadHelix interface shows, it should say 'Ready' at the top. If it says anything else, regardless of whether the rest of the program works, please report it on the Issues page.
-2. Enter any text in the 'Song name' field and choose a style.
-3. Click the play button to listen to the result. SoundHelix will then load and the generated song will begin playing. If SoundHelix does not load after 30 seconds, please report it.
+1. If upgrading from 0.3.0 or older, run `./utils/history_converter.py` to preserve song history. This step can be ignored if using MadHelix for the first time.
+2. Once the MadHelix interface shows, it should say 'Ready' at the top. If it says anything else, regardless of whether the rest of the program works, please report it on the Issues page.
+3. Enter any text in the 'Song name' field and choose a style. Alternatively, if the song name is empty, SoundHelix will generate a song title.
+4. Click the play button to listen to the result. SoundHelix will then load and the generated song will begin playing. If SoundHelix does not load after 30 seconds, please report it.
 
 ## Credits
 * MadHelix is developed by UltrasonicMadness
 * SoundHelix is developed by Thomas Schürger
-* The JSON library, json-simple, is developed by Yidong Fang, Chris Nokleberg and Dave Hughes
-* The icons are made by the [GNOME Project](http://www.gnome.org/) as part of version 3.28.0 of the [Adwaita Icon Theme](https://gitlab.gnome.org/GNOME/adwaita-icon-theme).
+* The icons are made by the [GNOME Project](http://www.gnome.org/) as part of version 44 of the [Adwaita Icon Theme](https://gitlab.gnome.org/GNOME/adwaita-icon-theme).
 
 ## License
 MadHelix is available under the GNU General Public License, version 3 only.
+
+Copyright © 2017-2019, 2023 UltrasonicMadness.

+ 2 - 2
build.xml

@@ -11,7 +11,7 @@
     
     <target name="compile">
         <mkdir dir="${targetdir}" />
-        <javac srcdir="${srcdir}" destdir="${targetdir}" classpath="lib/SoundHelix.jar:lib/json-simple.jar" />
+        <javac srcdir="${srcdir}" destdir="${targetdir}" classpath="lib/SoundHelix.jar:lib/gnu-getopt.jar" />
         <copy todir="${targetdir}">
             <fileset dir="res" />
         </copy>
@@ -23,7 +23,7 @@
                 <attribute name="Main-Class"
                     value="org.ultrasonicmadness.madhelix.MadHelix" />
                 <attribute name="Class-Path"
-                    value=". lib/json-simple.jar lib/SoundHelix.jar lib/gnu-getopt.jar lib/log4j.jar" />
+                    value=". lib/SoundHelix.jar lib/gnu-getopt.jar lib/log4j.jar" />
             </manifest>
         </jar>
     </target>

BIN
lib/json-simple.jar


BIN
res/icons/document-open-recent.png


BIN
res/icons/help-about-symbolic.png


BIN
res/icons/help-about.png


BIN
res/icons/media-playback-start-symbolic.png


BIN
res/icons/media-playback-start.png


+ 0 - 0
res/icons/media-playback-stop-symbolic.png


Some files were not shown because too many files changed in this diff