There is no freshcolumnheading.

[ccbs] / bigscreen / top5chosenscreen.cpp

diff --git a/bigscreen/top5chosenscreen.cpp b/bigscreen/top5chosenscreen.cpp
index cbb445511b51cf49dd32fec87274472d7f6ff69f..ccfbea9f4051e6297bfee4b43b42417b3eb49dfe 100644 (file)
--- a/bigscreen/top5chosenscreen.cpp
+++ b/bigscreen/top5chosenscreen.cpp
@@ -1,8 +1,15 @@
 #include <cstdio>
 #include <algorithm>
 
+#include "resolution.h"
 #include "top5chosenscreen.h"
 #include "fonts.h"
+#include "theme.h"
+
+#define RANK_X 30
+#define SONG_X 70
+#define FREQUENCY_X (LOGICAL_SCREEN_WIDTH - 55)
+#define SONG_MAX_WIDTH (LOGICAL_SCREEN_WIDTH - 190)
 
 Top5ChosenScreen::Top5ChosenScreen(pqxx::connection &conn, unsigned tournament)
        : conn(conn), tournament(tournament), scores_changed(conn, "scores"), valid(false)
@@ -19,6 +26,7 @@ bool Top5ChosenScreen::check_invalidated()
                return true;
        if (!scores_changed.get_flag())
                return false;
+       scores_changed.reset_flag();
 
        // check that there are indeed changes, otherwise don't bother
        std::vector<TopChosen> scores;
@@ -26,6 +34,7 @@ bool Top5ChosenScreen::check_invalidated()
 
        for (std::vector<TopChosen>::const_iterator i = scores.begin(); i != scores.end(); ++i) {
                if (seen_topchosen.count(*i) == 0) {
+                       valid = false;
                        return true;
                }       
        }
@@ -33,47 +42,60 @@ bool Top5ChosenScreen::check_invalidated()
        return false;
 }
 
-void Top5ChosenScreen::draw(unsigned char *buf)
+void Top5ChosenScreen::draw(unsigned char *buf, unsigned width, unsigned height)
 {
        scores_changed.reset_flag();
-       memset(buf, 0, 800 * 600 * 4);
+       fill_background(buf, "top5chosenscreen", width, height);
+       set_screen_size(width, height);
 
        // fetch the top 5 chosen songs
        std::vector<TopChosen> scores;
        conn.perform(FetchTopChosenSongsForTournament(tournament, 5, &scores));
 
        {
-               unsigned width = my_draw_text("Today's top 5 chosen songs", NULL, 40.0);
-               my_draw_text("Today's top 5 chosen songs", buf, 40.0, 800/2 - width/2, 60);
+               unsigned width = my_draw_text("Today's top 5 chosen songs", NULL, 40.0, "mainheading");
+               my_draw_text("Today's top 5 chosen songs", buf, 40.0, "mainheading", LOGICAL_SCREEN_WIDTH/2 - width/2, 60);
        }
 
        // simple headings
-       my_draw_text("Song", buf, 12.0, 70, 100);
-       my_draw_text("Frequency", buf, 12.0, 710, 100);
+       my_draw_text("Song", buf, 12.0, "columnheading", SONG_X, 100);
+       width = my_draw_text("Frequency", NULL, 12.0, "columnheading");
+       my_draw_text("Frequency", buf, 12.0, "columnheading", FREQUENCY_X - width/2, 100);
        
        unsigned row = 1, y = 140;
        for (std::vector<TopChosen>::const_iterator i = scores.begin(); i != scores.end(); ++i) {
+               std::string suffix;
+               if (row % 2 == 1) {
+                       suffix = ".odd";
+               } else {
+                       suffix = ".even";
+               }
+
                char str[16];
-               unsigned r = 255, g = 255, b = 255;
+               std::string heading_theme_element = "top5chosensongs.rowheading" + suffix;
+               std::string songname_theme_element = "top5chosensongs.songname" + suffix;
+               std::string frequency_theme_element = "top5chosensongs.frequency" + suffix;
 
                // print new entries in red
                if (seen_topchosen.count(*i) == 0 && seen_topchosen.size() > 0) {
-                       g = b = 0;
+                       heading_theme_element = "top5chosensongs.freshrowheading" + suffix;
+                       songname_theme_element = "top5chosensongs.freshsongname" + suffix;
+                       frequency_theme_element = "top5chosensongs.freshfrequency" + suffix;
                }
 
                std::sprintf(str, "%u", row++);
-               unsigned width = my_draw_text(str, NULL, 24.0);
-               my_draw_text(str, buf, 24.0, 30 - width/2, y);
+               unsigned width = my_draw_text(str, NULL, 24.0, heading_theme_element);
+               my_draw_text(str, buf, 24.0, heading_theme_element, RANK_X - width/2, y);
 
-               if (my_draw_text(i->title, NULL, 24.0) > 610) {
-                       my_draw_text(i->shorttitle, buf, 24.0, 70, y, r, g, b);
+               if (my_draw_text(i->title, NULL, 24.0, songname_theme_element) > SONG_MAX_WIDTH) {
+                       my_draw_text(i->shorttitle, buf, 24.0, songname_theme_element, SONG_X, y);
                } else {
-                       my_draw_text(i->title, buf, 24.0, 70, y, r, g, b);
+                       my_draw_text(i->title, buf, 24.0, songname_theme_element, SONG_X, y);
                }
                
                std::sprintf(str, "%u", i->frequency);
-               width = my_draw_text(str, NULL, 24.0);
-               my_draw_text(str, buf, 24.0, 745 - width/2, y, r, g, b);
+               width = my_draw_text(str, NULL, 24.0, frequency_theme_element);
+               my_draw_text(str, buf, 24.0, frequency_theme_element, FREQUENCY_X - width/2, y);
 
                y += 40;
        }