diff --git a/docs/wiki/config_xml.md b/docs/wiki/config_xml.md index b46de206..a7d60a27 100644 --- a/docs/wiki/config_xml.md +++ b/docs/wiki/config_xml.md @@ -67,6 +67,7 @@ LittleGPTracker uses 6 colours to do all the drawing. If you want, you can redef - `MUTECOLOR`: mute indicator color - `SONGVIEW_FE`: color of the chain "FE" in song screen - `SONGVIEW_00`: color of the chain "00" in song screen +- `BLANKSPACE`: color of the blanks in song and phrase screens - `ROWCOLOR1`: row count color 1 - `ROWCOLOR2`: row count color 2 - `ALTROWNUMBER`: How many rows for each rowcolor @@ -83,6 +84,7 @@ All colors are defined by a set of hexadecimal triplet for RGB. Here's an exampl + @@ -154,7 +156,7 @@ Set the value of FONTTYPE in the config file to '0', '1', or '2' to apply the co ``` ### Custom Fonts: -To use a custom font, set the value of the FONTTYPE key to 'CUSTOM' +To use a custom font, set the value of the FONTTYPE key to 'CUSTOM' ``` @@ -163,12 +165,12 @@ To use a custom font, set the value of the FONTTYPE key to 'CUSTOM' ``` and place the custom_font.xml file in the same directory as the application. -The custom_font.xml file is generated by converting a BMP file containing font information using a +The custom_font.xml file is generated by converting a BMP file containing font information using a [dedicated web tool](https://koisignal.com/toolsforlittlegptracker.html "BMP to XML") . -The source BMP file can be obtained from the link within the web tool -or from +The source BMP file can be obtained from the link within the web tool +or from [here](https://raw.githubusercontent.com/djdiskmachine/LittleGPTracker/master/sources/Resources/original.bmp "original.bmp") . diff --git a/projects/resources/CHIP/config.xml b/projects/resources/CHIP/config.xml index 86ba3681..30cb0631 100644 --- a/projects/resources/CHIP/config.xml +++ b/projects/resources/CHIP/config.xml @@ -9,7 +9,7 @@ - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/projects/resources/DEB/config.xml b/projects/resources/DEB/config.xml index 201ced08..d0474520 100644 --- a/projects/resources/DEB/config.xml +++ b/projects/resources/DEB/config.xml @@ -15,19 +15,20 @@ --> - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/projects/resources/MACOS/config.xml b/projects/resources/MACOS/config.xml index c6f6d875..cea8abc4 100644 --- a/projects/resources/MACOS/config.xml +++ b/projects/resources/MACOS/config.xml @@ -15,19 +15,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/projects/resources/MIYOO/config.xml b/projects/resources/MIYOO/config.xml index 74d56805..fad58741 100644 --- a/projects/resources/MIYOO/config.xml +++ b/projects/resources/MIYOO/config.xml @@ -16,19 +16,20 @@ root of your sd card. --> - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/projects/resources/PSP/config.xml b/projects/resources/PSP/config.xml index 97c3986d..6e2136ad 100644 --- a/projects/resources/PSP/config.xml +++ b/projects/resources/PSP/config.xml @@ -3,19 +3,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/projects/resources/X64/config.xml b/projects/resources/X64/config.xml index c41b4706..bd697c93 100644 --- a/projects/resources/X64/config.xml +++ b/projects/resources/X64/config.xml @@ -6,30 +6,30 @@ - + - + --> - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/projects/resources/X86/config.xml b/projects/resources/X86/config.xml index 017ea7e7..d0474520 100644 --- a/projects/resources/X86/config.xml +++ b/projects/resources/X86/config.xml @@ -15,18 +15,20 @@ --> - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/sources/Application/AppWindow.cpp b/sources/Application/AppWindow.cpp index ec8df28b..9b2295fa 100644 --- a/sources/Application/AppWindow.cpp +++ b/sources/Application/AppWindow.cpp @@ -23,6 +23,7 @@ GUIColor AppWindow::normalColor_(0xF5, 0xEB, 0xFF); GUIColor AppWindow::borderColor_(0xFF, 0x00, 0x8C); GUIColor AppWindow::songviewfeColor_(0xA5, 0x5B, 0x8F); GUIColor AppWindow::songview00Color_(0x85, 0x3B, 0x6F); +GUIColor AppWindow::blankspaceColor_(0xF5, 0xEB, 0xFF); GUIColor AppWindow::highlightColor_(0xB7, 0x50, 0xD1); GUIColor AppWindow::highlight2Color_(0xDB, 0x33, 0xDB); GUIColor AppWindow::consoleColor_(0x00, 0xFF, 0x00); @@ -103,6 +104,7 @@ AppWindow::AppWindow(I_GUIWindowImp &imp) : GUIWindow(imp) { defineColor("BORDER", borderColor_); defineColor("SONGVIEW_FE", songviewfeColor_); defineColor("SONGVIEW_00", songview00Color_); + defineColor("BLANKSPACE", blankspaceColor_); defineColor("HICOLOR1", highlightColor_); defineColor("HICOLOR2", highlight2Color_); defineColor("CURSORCOLOR", cursorColor_); @@ -260,6 +262,9 @@ void AppWindow::Flush() { case CD_SONGVIEW00: gcolor = songview00Color_; break; + case CD_BLANKSPACE: + gcolor = blankspaceColor_; + break; case CD_ROW: gcolor = rownumberColor_; break; diff --git a/sources/Application/AppWindow.h b/sources/Application/AppWindow.h index 990ec3c2..4474e209 100644 --- a/sources/Application/AppWindow.h +++ b/sources/Application/AppWindow.h @@ -93,6 +93,7 @@ class AppWindow : public GUIWindow, I_Observer, Status { static GUIColor borderColor_; static GUIColor songviewfeColor_; static GUIColor songview00Color_; + static GUIColor blankspaceColor_; static GUIColor highlight2Color_; static GUIColor highlightColor_; static GUIColor consoleColor_; diff --git a/sources/Application/Views/BaseClasses/View.h b/sources/Application/Views/BaseClasses/View.h index b7fff153..b826f759 100644 --- a/sources/Application/Views/BaseClasses/View.h +++ b/sources/Application/Views/BaseClasses/View.h @@ -63,6 +63,7 @@ enum ColorDefinition { CD_PLAY, CD_MUTE, CD_SONGVIEWFE, + CD_BLANKSPACE, CD_SONGVIEW00, CD_ROW, CD_ROW2, diff --git a/sources/Application/Views/ChainView.cpp b/sources/Application/Views/ChainView.cpp index 3fee8d7b..145397cd 100644 --- a/sources/Application/Views/ChainView.cpp +++ b/sources/Application/Views/ChainView.cpp @@ -701,7 +701,9 @@ void ChainView::DrawView() { unsigned char d = *data++; setTextProps(props, 0, j, false); if (d == 0xFF) { + SetColor(CD_BLANKSPACE); DrawString(pos._x, pos._y, "--", props); + SetColor(CD_NORMAL); } else { hex2char(d, row); DrawString(pos._x, pos._y, row, props); @@ -811,8 +813,8 @@ void ChainView::OnPlayerUpdate(PlayerEventType eventType, unsigned int tick) { pos._x += 200; /* if (player->Clipped()) { - w_.DrawString("clip",pos,props); + w_.DrawString("clip",pos,props); } else { - w_.DrawString("----",pos,props); + w_.DrawString("----",pos,props); } */} ; diff --git a/sources/Application/Views/SongView.cpp b/sources/Application/Views/SongView.cpp index 673a6124..d186f1ce 100644 --- a/sources/Application/Views/SongView.cpp +++ b/sources/Application/Views/SongView.cpp @@ -972,6 +972,8 @@ void SongView::DrawView() { SetColor(CD_SONGVIEWFE); } else if (d == 0x00) { SetColor(CD_SONGVIEW00); + } else if (d == 0xFF) { + SetColor(CD_BLANKSPACE); } else { SetColor(CD_NORMAL); }