and now reduce grid column counts

Murph9 · Oct 1, 2023 · 6eb2669 · 6eb2669
1 parent 329e420
commit 6eb2669
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/godot/scenes/SongDisplay.cs b/godot/scenes/SongDisplay.cs
@@ -36,7 +36,7 @@ private void LoadSong() {
 		GetNode<Label>("ArtistLabel").Text = "Artist: " + songInfo.Metadata.Artist;
 		GetNode<Label>("SongNameLabel").Text = "Name: " + songInfo.Metadata.Name;
 		GetNode<Label>("AlbumLabel").Text = "Album: " + songInfo.Metadata.Album;
-		GetNode<Label>("YearLabel").Text = "Year:" + songInfo.Metadata.Year.ToString();
+		GetNode<Label>("YearLabel").Text = "Year: " + songInfo.Metadata.Year.ToString();
 		GetNode<Label>("OtherLabel").Text = "Length: " + songInfo.Metadata.SongLength.ToMinSec();
 
 		var grid = GetNode<GridContainer>("InstrumentGridContainer");

diff --git a/godot/scenes/SongList.cs b/godot/scenes/SongList.cs
@@ -56,11 +56,7 @@ public Row(SongFile song, Action<SongFile> buttonAction) {
                 CreateLabel(song.Album.FixedWidthString(20)),
                 CreateLabel(song.Year.ToString()),
                 CreateLabel(song.Length.ToMinSec()),
-                CreateLabel(song.GetInstrumentChars()),
-                CreateLabel(mainI?.Name),
-                CreateLabel(Instrument.CalcTuningName(mainI?.Tuning)),
-                CreateLabel(mainI?.NoteCount.ToString()),
-                CreateLabel(mainI?.GetNoteDensity(song).ToFixedPlaces(2, false))
+                CreateLabel(song.GetInstrumentChars())
             };
 		}
 
@@ -87,11 +83,7 @@ private void RowSelectedForReal(InputEvent @event)
 		new Column("Album", (s) => s.Album),
 		new Column("Year", (s) => s.Year),
 		new Column("Length", (s) => s.Length),
-		new Column("Parts", (s) => s.GetInstrumentChars()),
-		new Column("Main", (s) => s.GetMainInstrument()?.Name),
-		new Column("Tuning", (s) => Instrument.CalcTuningName(s.GetMainInstrument()?.Tuning, s.GetMainInstrument()?.CapoFret)),
-		new Column("Notes", (s) => s.GetMainInstrument()?.GetNoteDensity(s)),
-		new Column("Density", (s) => s.GetMainInstrument()?.NoteCount),
+		new Column("Parts", (s) => s.GetInstrumentChars())
 	};
 
 	private readonly List<Row> _rows;