From 0cb3a2e995b53b8b3227e2d3a22c90300f090f3c Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sun, 19 Feb 2012 20:42:47 +0100 Subject: [PATCH] Split up nextsonginfo again. --- bigscreen/groupscreen.cpp | 24 ++++++++++++------------ bigscreen/theme.config | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp index 1fee290..9f3b17c 100644 --- a/bigscreen/groupscreen.cpp +++ b/bigscreen/groupscreen.cpp @@ -420,12 +420,12 @@ void GroupScreen::draw_next_up_versus(unsigned char *buf, const Group &group, // OK, we have two players. Draw their nicks and the scores widestring text = widestring("Next players: ") + next_player->nick + widestring(" and ") + other_player->nick; - unsigned this_width = my_draw_text(text, NULL, 24.0, "nextsonginfo"); - my_draw_text(text, buf, 24.0, "nextsonginfo", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 420); + unsigned this_width = my_draw_text(text, NULL, 24.0, "nextsonginfo.player"); + my_draw_text(text, buf, 24.0, "nextsonginfo.player", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 420); if (next_song->song.id != -1) { - this_width = my_draw_text(next_song->song.title, NULL, 20.0, "nextsongtitle"); - my_draw_text(next_song->song.title, buf, 20.0, "nextsonginfo", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 457); + this_width = my_draw_text(next_song->song.title, NULL, 20.0, "nextsonginfo.title"); + my_draw_text(next_song->song.title, buf, 20.0, "nextsonginfo.title", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 457); Highscore hs; conn.perform(FetchHighscore(next_song->song.id, &hs)); @@ -433,8 +433,8 @@ void GroupScreen::draw_next_up_versus(unsigned char *buf, const Group &group, if (hs.score != -1) { text = widestring("High score: ") + widestring(pqxx::to_string(hs.score)) + widestring(", by ") + hs.nick + widestring(" in ") + hs.tournament_name; - this_width = my_draw_text(text, NULL, 16.0, "nextsonginfo"); - my_draw_text(text, buf, 16.0, "nextsonginfo", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 487); + this_width = my_draw_text(text, NULL, 16.0, "nextsonginfo.highscore"); + my_draw_text(text, buf, 16.0, "nextsonginfo.highscore", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 487); } } } @@ -444,12 +444,12 @@ void GroupScreen::draw_next_up_player(unsigned char *buf, const Group &group, co const std::vector &max_score, const std::vector &min_score) { widestring text = widestring("Next player: ") + player.nick; - unsigned this_width = my_draw_text(text, NULL, 24.0, "nextsonginfo"); - my_draw_text(text, buf, 24.0, "nextsonginfo", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 420); + unsigned this_width = my_draw_text(text, NULL, 24.0, "nextsonginfo.player"); + my_draw_text(text, buf, 24.0, "nextsonginfo.player", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 420); if (song.song.id != -1) { - this_width = my_draw_text(song.song.title, NULL, 20.0, "nextsonginfo"); - my_draw_text(song.song.title, buf, 20.0, "nextsonginfo", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 457); + this_width = my_draw_text(song.song.title, NULL, 20.0, "nextsonginfo.title"); + my_draw_text(song.song.title, buf, 20.0, "nextsonginfo.title", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 457); Highscore hs; conn.perform(FetchHighscore(song.song.id, &hs)); @@ -457,8 +457,8 @@ void GroupScreen::draw_next_up_player(unsigned char *buf, const Group &group, co if (hs.score != -1) { text = widestring("High score: ") + widestring(pqxx::to_string(hs.score)) + widestring(", by ") + hs.nick + widestring(" in ") + hs.tournament_name; - this_width = my_draw_text(text, NULL, 16.0, "nextsonginfo"); - my_draw_text(text, buf, 16.0, "nextsonginfo", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 487); + this_width = my_draw_text(text, NULL, 16.0, "nextsonginfo.highscore"); + my_draw_text(text, buf, 16.0, "nextsonginfo.highscore", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 487); } } diff --git a/bigscreen/theme.config b/bigscreen/theme.config index cc5d403..ab01ebb 100644 --- a/bigscreen/theme.config +++ b/bigscreen/theme.config @@ -46,7 +46,7 @@ divider.red=127 divider.green=127 divider.blue=127 -# available elements: background.groupscreen, background.top5chosenscreen, background.top10scorescreen, mainheading, (fresh)columnheading, randomsongname, nextsonginfo, need, divider +# available elements: background.groupscreen, background.top5chosenscreen, background.top10scorescreen, mainheading, (fresh)columnheading, randomsongname, nextsonginfo.player, nextsonginfo.title, nextsonginfo.highscore, need, divider # available elements that also have .odd and .even: rowheading, (fresh)score, (fresh)chosensongname, (fresh)totalscore, (fresh)rank ## How to draw rectangles in the background (up to ten, numbered 0-9): -- 2.39.2