Use display font and sized defined in radio.h

diff --git a/meter.c b/meter.c
index e4ae92ce551dc2a54f2beef049a6a6b2e676189e..13961933a424204a3ee9a199a5c866b34824f58e 100644 (file)
--- a/meter.c
+++ b/meter.c
@@ -187,7 +187,7 @@ if(analog_meter) {
   cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
   cairo_paint (cr);
 
-  cairo_set_font_size(cr, 12);
+  cairo_set_font_size(cr, DISPLAY_FONT_SIZE2);
 
   switch(meter_type) {
     case SMETER:
@@ -470,10 +470,10 @@ if(analog_meter) {
     cairo_rectangle(cr, offset, 0.0, peak, 5.0);
     cairo_fill(cr);
 
-    cairo_select_font_face(cr, "FreeMono",
+    cairo_select_font_face(cr, DISPLAY_FONT,
                 CAIRO_FONT_SLANT_NORMAL,
                 CAIRO_FONT_WEIGHT_BOLD);
-    cairo_set_font_size(cr, 10);
+    cairo_set_font_size(cr, DISPLAY_FONT_SIZE1);
     cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);
     cairo_move_to(cr, 0.0, 8.0);
     cairo_show_text(cr, "Mic Lvl");
@@ -505,10 +505,10 @@ if(analog_meter) {
   cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
   cairo_paint (cr);
 
-  cairo_select_font_face(cr, "FreeMono",
+  cairo_select_font_face(cr, DISPLAY_FONT,
                 CAIRO_FONT_SLANT_NORMAL,
                 CAIRO_FONT_WEIGHT_BOLD);
-  cairo_set_font_size(cr, 12);
+  cairo_set_font_size(cr, DISPLAY_FONT_SIZE2);
 
   cairo_set_line_width(cr, 1.0);
 
@@ -599,7 +599,7 @@ if(analog_meter) {
         }
         cairo_stroke(cr);
 
-        cairo_set_font_size(cr, 10);
+        cairo_set_font_size(cr, DISPLAY_FONT_SIZE1);
         cairo_move_to(cr, offset+(double)(18*db)-3.0, (double)meter_height-1);
         cairo_show_text(cr, "3");
         cairo_move_to(cr, offset+(double)(36*db)-3.0, (double)meter_height-1);
@@ -664,16 +664,16 @@ if(analog_meter) {
         text_location=offset+(db*114)+5;
       }
 
-      cairo_set_font_size(cr, 12);
+      cairo_set_font_size(cr, DISPLAY_FONT_SIZE2);
       sprintf(sf,"%d dBm",(int)level);
       cairo_move_to(cr, text_location, meter_height-12);
       cairo_show_text(cr, sf);
       break;
     case POWER:
-      cairo_select_font_face(cr, "FreeMono",
+      cairo_select_font_face(cr, DISPLAY_FONT,
             CAIRO_FONT_SLANT_NORMAL,
             CAIRO_FONT_WEIGHT_BOLD);
-      cairo_set_font_size(cr, 12);
+      cairo_set_font_size(cr, DISPLAY_FONT_SIZE2);
 
       if(level>max_level || max_count==10) {
           max_level=level;
@@ -691,10 +691,10 @@ if(analog_meter) {
       } else {
         swr=999.9;
       }
-      cairo_select_font_face(cr, "FreeMono",
+      cairo_select_font_face(cr, DISPLAY_FONT,
             CAIRO_FONT_SLANT_NORMAL,
             CAIRO_FONT_WEIGHT_BOLD);
-      cairo_set_font_size(cr, 12);
+      cairo_set_font_size(cr, DISPLAY_FONT_SIZE2);
       sprintf(sf,"SWR: %1.1f:1",swr);
       cairo_move_to(cr, 10, 55);
       cairo_show_text(cr, sf);