Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
1.6.0-bacon19
Create column Titles.
* Every view will have a column title (or header).
* Is possible to change the color of the header.
* Include the color changes as part of the mixer view.
Expose CONSOLE colour in config and update docs

1.6.0-bacon18
Expand Down
2 changes: 2 additions & 0 deletions docs/LittlePiggyTrackerConf.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ LittleGPTracker uses 6 colours to do all the drawing. If you want, you can redef
- `MAJORBEAT`: Color of rows 00,04,08,0c in phrase screen as well as clipping indicator ('red') in VU meter
- `CONSOLE`: Color of normal signal level ('green') in VU meter
- `ALTROWNUMBER`: How many rows for each `ROWCOLOR`
- `COL_TITLE`: Color of the column title

All colors are defined by a set of hexadecimal triplet for RGB. Here's an example:

Expand All @@ -146,6 +147,7 @@ All colors are defined by a set of hexadecimal triplet for RGB. Here's an exampl
<ROWCOLOR1 value = "BA28F9" /> <!-- Row count color 1 -->
<ROWCOLOR2 value = "FF00FF" /> <!-- Row count color 2 -->
<ALTROWNUMBER value = "4" /> <!-- How many rows of each ROWCOLOR -->
<COL_TITLE value = "853B6F" /> <!-- Color of the column title -->
</CONFIG>
```

Expand Down
2 changes: 2 additions & 0 deletions docs/wiki/config_xml.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ LittleGPTracker uses 6 colours to do all the drawing. If you want, you can redef
- `ROWCOLOR2`: row count color 2
- `ALTROWNUMBER`: How many rows for each rowcolor
- `MAJORBEAT`: color of "--" at row 00,04,08,0c in phrase screen
- `COL_TITLE`: Color of the column title

All colors are defined by a set of hexadecimal triplet for RGB. Here's an example:

Expand All @@ -89,6 +90,7 @@ All colors are defined by a set of hexadecimal triplet for RGB. Here's an exampl
<ROWCOLOR1 value = "BA28F9" /> <!--Row count color 1 -->
<ROWCOLOR2 value = "FF00FF" /> <!--Row count color 2-->
<ALTROWNUMBER value = "4"/> <!--How many rows of each ROWCOLOR-->
<COL_TITLE value = "853B6F" /> <!-- Color of the column title -->
</CONFIG>
```

Expand Down
1 change: 1 addition & 0 deletions projects/resources/CHIP/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,5 @@
<ROWCOLOR2 value = "FF00FF" /> <!--Row count color 2-->
<ALTROWNUMBER value = "4"/> <!--How many rows of each ROWCOLOR-->
<FONTTYPE value = '0' /> <!-- '0':original '1':digital '2':monster 'CUSTOM': load custom_font.xml-->
<COL_TITLE value = "853B6F" /> <!-- Color of the column title -->
</CONFIG>
1 change: 1 addition & 0 deletions projects/resources/DEB/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@
<ROWCOLOR2 value = "FF00FF" /> <!--Row count color 2-->
<ALTROWNUMBER value = "4"/> <!--How many rows of each ROWCOLOR-->
<FONTTYPE value = '0' /> <!-- '0':original '1':digital '2':monster 'CUSTOM': load custom_font.xml-->
<COL_TITLE value = "853B6F" /> <!-- Color of the column title -->

</CONFIG>
1 change: 1 addition & 0 deletions projects/resources/MACOS/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@
<ROWCOLOR2 value = "FF00FF" /> <!--Row count color 2-->
<ALTROWNUMBER value = "4"/> <!--How many rows of each ROWCOLOR-->
<FONTTYPE value = '0' /> <!-- '0':original '1':digital '2':monster 'CUSTOM': load custom_font.xml-->
<COL_TITLE value = "853B6F" /> <!-- Color of the column title -->

</CONFIG>
1 change: 1 addition & 0 deletions projects/resources/MIYOO/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@ root of your sd card.
<ROWCOLOR2 value = "FF00FF" /> <!--Row count color 2-->
<ALTROWNUMBER value = "4"/> <!--How many rows of each ROWCOLOR-->
<FONTTYPE value = '0' /> <!-- '0':original '1':digital '2':monster 'CUSTOM': load custom_font.xml-->
<COL_TITLE value = "853B6F" /> <!-- Color of the column title -->

</CONFIG>
1 change: 1 addition & 0 deletions projects/resources/PSP/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@
<ROWCOLOR2 value = "FF00FF" /> <!--Row count color 2-->
<ALTROWNUMBER value = "4"/> <!--How many rows before alternating-->
<FONTTYPE value = '0' /> <!-- '0':original '1':digital '2':monster 'CUSTOM': load custom_font.xml-->
<COL_TITLE value = "853B6F" /> <!-- Color of the column title -->

</CONFIG>
1 change: 1 addition & 0 deletions projects/resources/X64/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,6 @@
<ALTROWNUMBER value = "4"/> <!--How many rows of each ROWCOLOR-->
<ALTROWNUMBER value = "4"/>
<FONTTYPE value = '0' /> <!-- '0':original '1':digital '2':monster 'CUSTOM': load custom_font.xml-->
<COL_TITLE value = "853B6F" /> <!-- Color of the column title -->

</CONFIG>
1 change: 1 addition & 0 deletions projects/resources/X86/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,6 @@
<ROWCOLOR1 value = "BA28F9"/> <!--Row count color 1 -->
<ROWCOLOR2 value = "FF00FF"/> <!--Row count color 2-->
<ALTROWNUMBER value = "4"/> <!--How many rows before alternating-->
<COL_TITLE value = "853B6F" /> <!-- Color of the column title -->

</CONFIG>
5 changes: 5 additions & 0 deletions sources/Application/AppWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ GUIColor AppWindow::muteColor_(0xF5, 0xEB, 0xFF);
GUIColor AppWindow::rownumberColor_(0xBA, 0x28, 0xF9);
GUIColor AppWindow::rownumber2Color_(0xFF, 0x00, 0xFF);
GUIColor AppWindow::majorbeatColor_(0xBA, 0x28, 0xF9);
GUIColor AppWindow::columnTitleColor_(0xA5, 0x5B, 0x8F);

int AppWindow::charWidth_ = 8;
int AppWindow::charHeight_ = 8;
Expand Down Expand Up @@ -114,6 +115,7 @@ AppWindow::AppWindow(I_GUIWindowImp &imp) : GUIWindow(imp) {
defineColor("ROWCOLOR1", rownumberColor_);
defineColor("ROWCOLOR2", rownumber2Color_);
defineColor("MAJORBEAT", majorbeatColor_);
defineColor("COL_TITLE", columnTitleColor_);
defineColor("CONSOLE", consoleColor_);

GUIWindow::Clear(backgroundColor_);
Expand Down Expand Up @@ -288,6 +290,9 @@ void AppWindow::Flush() {
case CD_MAJORBEAT:
gcolor = majorbeatColor_;
break;
case CD_COL_TITLE:
gcolor = columnTitleColor_;
break;
default:
NAssert(0);
break;
Expand Down
1 change: 1 addition & 0 deletions sources/Application/AppWindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ class AppWindow : public GUIWindow, I_Observer, Status {
static GUIColor rownumberColor_;
static GUIColor rownumber2Color_;
static GUIColor majorbeatColor_;
static GUIColor columnTitleColor_;
#define LAST_PROJECT_NAME "bin:last_project"

ColorDefinition colorIndex_;
Expand Down
3 changes: 2 additions & 1 deletion sources/Application/Views/BaseClasses/View.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ enum ColorDefinition {
CD_SONGVIEW00,
CD_ROW,
CD_ROW2,
CD_MAJORBEAT
CD_MAJORBEAT,
CD_COL_TITLE
};

enum ViewUpdateDirection { VUD_LEFT = 0, VUD_RIGHT, VUD_UP, VUD_DOWN };
Expand Down
7 changes: 7 additions & 0 deletions sources/Application/Views/ChainView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -700,6 +700,13 @@ void ChainView::DrawView() {
pos._y += 1;
}

// Draw column titles
pos = anchor;
pos._y -= 1;
SetColor(CD_COL_TITLE);
DrawString(pos._x, pos._y, "Ph", props);
DrawString(pos._x + 3, pos._y, "Ts", props);

SetColor(CD_NORMAL);

pos = anchor;
Expand Down
11 changes: 9 additions & 2 deletions sources/Application/Views/GrooveView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,18 @@ void GrooveView::DrawView() {
// Compute song grid location

GUIPoint anchor=GetAnchor() ;

// Draw column titles
pos = anchor;
pos._y -= 1;
SetColor(CD_COL_TITLE);
DrawString(pos._x, pos._y, "Tk", props);

// Display row numbers

char buffer[6] ;
pos=anchor ;
SetColor(CD_NORMAL);
char buffer[6];
pos=anchor ;
pos._x-=3 ;
for (int j=0;j<16;j++) {
((j/altRowNumber_)%2)?SetColor(CD_ROW):SetColor(CD_ROW2);
Expand Down
3 changes: 2 additions & 1 deletion sources/Application/Views/MixerView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,8 @@ void MixerView::DrawView() {

for (int i = 0; i < 8; i++) {
props.invert_ = (i == viewData_->mixerCol_ && mixerRow_ == 0);
SetColor((i == viewData_->mixerCol_ && mixerRow_ == 0) ? CD_HILITE2 : CD_NORMAL);
SetColor((i == viewData_->mixerCol_ && mixerRow_ == 0) ? CD_HILITE2
: CD_COL_TITLE);

if (playerInst->IsChannelMuted(i)) {
DrawString(pos._x, pos._y, "M ", props);
Expand Down
11 changes: 11 additions & 0 deletions sources/Application/Views/PhraseView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1279,6 +1279,17 @@ void PhraseView::DrawView() {
pos._y++;
}

// Draw column titles
pos = anchor;
pos._y -= 1;
SetColor(CD_COL_TITLE);
DrawString(pos._x, pos._y, "Nt", props);
DrawString(pos._x + 4, pos._y, "I", props);
DrawString(pos._x + 8, pos._y, "Cmd1", props);
DrawString(pos._x + 13, pos._y, "", props);
DrawString(pos._x + 18, pos._y, "Cmd2", props);
DrawString(pos._x + 23, pos._y, "", props);

SetColor(CD_NORMAL);

pos = anchor;
Expand Down
13 changes: 12 additions & 1 deletion sources/Application/Views/SongView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1020,12 +1020,23 @@ void SongView::DrawView() {
pos._y += 1;
}

// Draw column titles
pos = anchor;
pos._y -= 1;
SetColor(CD_COL_TITLE);
char chbuf[4];
short dx = 3;
for (int i = 0; i < SONG_CHANNEL_COUNT; i++) {
snprintf(chbuf, sizeof(chbuf), "%02d", i);
DrawString(pos._x + i * dx, pos._y, chbuf, props);
}

SetColor(CD_NORMAL);

pos = anchor;
unsigned char *data =
viewData_->song_->data_ + (SONG_CHANNEL_COUNT * viewData_->songOffset_);
short dx = 3;
dx = 3;
short dy = 1;
for (int j = 0; j < View::songRowCount_; j++) {

Expand Down
12 changes: 11 additions & 1 deletion sources/Application/Views/TableView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -833,8 +833,18 @@ void TableView::DrawView() {

GUIPoint anchor = GetAnchor();

// Display row numbers
// Draw column titles
pos = anchor;
pos._y -= 1;
SetColor(CD_COL_TITLE);
DrawString(pos._x, pos._y, "Cmd1", props);
DrawString(pos._x + 5, pos._y, "", props);
DrawString(pos._x + 10, pos._y, "Cmd2", props);
DrawString(pos._x + 15, pos._y, "", props);
DrawString(pos._x + 20, pos._y, "Cmd3", props);
DrawString(pos._x + 25, pos._y, "", props);

// Display row numbers
char buffer[6];
pos = anchor;
pos._x -= 3;
Expand Down
Loading