Skip to content

Commit 5c65dad

Browse files
csetecsete
committed
Use system font in graphical views
Closes #174.
1 parent 31696b7 commit 5c65dad

10 files changed

Lines changed: 77 additions & 44 deletions

‎src/gtk-azel-plot.c‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,9 @@ static GooCanvasItemModel *create_canvas_model(GtkAzelPlot * azel)
423423

424424
root = goo_canvas_group_model_new(NULL, NULL);
425425

426+
/* default font */
427+
g_object_get_property(G_OBJECT(gtk_settings_get_default()), "gtk-font-name", &azel->font);
428+
426429
/* graph dimensions */
427430
azel->width = AZEL_DEFAULT_SIZE;
428431
azel->height = AZEL_DEFAULT_SIZE;
@@ -497,7 +500,7 @@ static GooCanvasItemModel *create_canvas_model(GtkAzelPlot * azel)
497500
(gfloat) (azel->y0 + 5),
498501
-1,
499502
GOO_CANVAS_ANCHOR_N,
500-
"font", "Sans 8",
503+
"font", g_value_get_string(&azel->font),
501504
"fill-color-rgba", 0x000000FF, NULL);
502505

503506
/* left y tick marks */
@@ -529,7 +532,8 @@ static GooCanvasItemModel *create_canvas_model(GtkAzelPlot * azel)
529532
azel->azlab[i] =
530533
MKTEXT(root, txt, (gfloat) (azel->x0 - 5),
531534
(gfloat) (azel->y0 - (i + 1) * ystep), -1,
532-
GOO_CANVAS_ANCHOR_E, "font", "Sans 8",
535+
GOO_CANVAS_ANCHOR_E,
536+
"font", g_value_get_string(&azel->font),
533537
"fill-color-rgba", 0x0000BFFF, NULL);
534538
g_free(txt);
535539

@@ -541,7 +545,8 @@ static GooCanvasItemModel *create_canvas_model(GtkAzelPlot * azel)
541545
MKTEXT(root, txt, (gfloat) (azel->xmax + 5),
542546
(gfloat) (azel->y0 - (i + 1) * ystep), -1,
543547
GOO_CANVAS_ANCHOR_W,
544-
"font", "Sans 8", "fill-color-rgba", 0xBF0000FF, NULL);
548+
"font", g_value_get_string(&azel->font),
549+
"fill-color-rgba", 0xBF0000FF, NULL);
545550
g_free(txt);
546551
}
547552

@@ -553,7 +558,7 @@ static GooCanvasItemModel *create_canvas_model(GtkAzelPlot * azel)
553558
(gfloat) (azel->height - 5),
554559
-1,
555560
GOO_CANVAS_ANCHOR_S,
556-
"font", "Sans 9",
561+
"font", g_value_get_string(&azel->font),
557562
"fill-color-rgba", 0x000000FF, NULL);
558563
}
559564
else
@@ -563,7 +568,7 @@ static GooCanvasItemModel *create_canvas_model(GtkAzelPlot * azel)
563568
(gfloat) (azel->height - 5),
564569
-1,
565570
GOO_CANVAS_ANCHOR_S,
566-
"font", "Sans 9",
571+
"font", g_value_get_string(&azel->font),
567572
"fill-color-rgba", 0x000000FF, NULL);
568573
}
569574

@@ -573,15 +578,16 @@ static GooCanvasItemModel *create_canvas_model(GtkAzelPlot * azel)
573578
5.0,
574579
-1,
575580
GOO_CANVAS_ANCHOR_N,
576-
"font", "Sans 8", "fill-color-rgba", 0x000000FF, NULL);
581+
"font", g_value_get_string(&azel->font),
582+
"fill-color-rgba", 0x000000FF, NULL);
577583

578584
/* Az legend */
579585
azel->azleg = MKTEXT(root, _("Az"),
580586
(gfloat) (azel->x0 - 7),
581587
(gfloat) azel->ymax,
582588
-1,
583589
GOO_CANVAS_ANCHOR_NE,
584-
"font", "Sans 9",
590+
"font", g_value_get_string(&azel->font),
585591
"fill-color-rgba", 0x0000BFFF, NULL);
586592

587593
/* El legend */
@@ -590,7 +596,7 @@ static GooCanvasItemModel *create_canvas_model(GtkAzelPlot * azel)
590596
(gfloat) azel->ymax,
591597
-1,
592598
GOO_CANVAS_ANCHOR_NW,
593-
"font", "Sans 9",
599+
"font", g_value_get_string(&azel->font),
594600
"fill-color-rgba", 0xBF0000FF, NULL);
595601

596602
/* Az graph */

‎src/gtk-azel-plot.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ struct _GtkAzelPlot {
8989
gboolean qthinfo; /*!< Show the QTH info. */
9090
gboolean cursinfo; /*!< Track the mouse cursor. */
9191
gboolean extratick; /*!< Show extra ticks */
92+
93+
GValue font; /*!< Default font */
9294
};
9395

9496
struct _GtkAzelPlotClass {

‎src/gtk-polar-plot.c‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ static GooCanvasItemModel *create_time_tick(GtkPolarPlot * pv, gdouble time,
159159
item = goo_canvas_text_model_new(root, buff,
160160
(gdouble) x, (gdouble) y,
161161
-1, anchor,
162-
"font", "Sans 7",
162+
"font", g_value_get_string(&pv->font),
163163
"fill-color-rgba", col, NULL);
164164

165165
return item;
@@ -425,6 +425,9 @@ static GooCanvasItemModel *create_canvas_model(GtkPolarPlot * polv)
425425

426426
col = sat_cfg_get_int(SAT_CFG_INT_POLAR_AXIS_COL);
427427

428+
/* default font */
429+
g_object_get_property(G_OBJECT(gtk_settings_get_default()), "gtk-font-name", &polv->font);
430+
428431
/* Add elevation circles at 0, 30 and 60 deg */
429432
polv->C00 = goo_canvas_ellipse_model_new(root,
430433
polv->cx, polv->cy,
@@ -471,7 +474,7 @@ static GooCanvasItemModel *create_canvas_model(GtkPolarPlot * polv)
471474
y,
472475
-1,
473476
anch,
474-
"font", "Sans 8",
477+
"font", g_value_get_string(&polv->font),
475478
"fill-color-rgba", col, NULL);
476479

477480
azel_to_xy(polv, 180.0, 0.0, &x, &y);
@@ -481,7 +484,7 @@ static GooCanvasItemModel *create_canvas_model(GtkPolarPlot * polv)
481484
y,
482485
-1,
483486
anch,
484-
"font", "Sans 8",
487+
"font", g_value_get_string(&polv->font),
485488
"fill-color-rgba", col, NULL);
486489

487490
azel_to_xy(polv, 90.0, 0.0, &x, &y);
@@ -491,7 +494,7 @@ static GooCanvasItemModel *create_canvas_model(GtkPolarPlot * polv)
491494
y,
492495
-1,
493496
anch,
494-
"font", "Sans 8",
497+
"font", g_value_get_string(&polv->font),
495498
"fill-color-rgba", col, NULL);
496499

497500
azel_to_xy(polv, 270.0, 0.0, &x, &y);
@@ -501,7 +504,7 @@ static GooCanvasItemModel *create_canvas_model(GtkPolarPlot * polv)
501504
y,
502505
-1,
503506
anch,
504-
"font", "Sans 8",
507+
"font", g_value_get_string(&polv->font),
505508
"fill-color-rgba", col, NULL);
506509

507510
/* cursor text */
@@ -511,16 +514,17 @@ static GooCanvasItemModel *create_canvas_model(GtkPolarPlot * polv)
511514
2 * POLV_LINE_EXTRA,
512515
polv->cy + polv->r +
513516
POLV_LINE_EXTRA, -1, GOO_CANVAS_ANCHOR_W,
514-
"font", "Sans 8", "fill-color-rgba",
515-
col, NULL);
517+
"font", g_value_get_string(&polv->font),
518+
"fill-color-rgba", col, NULL);
516519

517520
/* location info */
518521
polv->locnam = goo_canvas_text_model_new(root, polv->qth->name,
519522
polv->cx - polv->r -
520523
2 * POLV_LINE_EXTRA,
521524
polv->cy - polv->r -
522525
POLV_LINE_EXTRA, -1,
523-
GOO_CANVAS_ANCHOR_SW, "font", "Sans 8",
526+
GOO_CANVAS_ANCHOR_SW,
527+
"font", g_value_get_string(&polv->font),
524528
"fill-color-rgba", col, NULL);
525529

526530
return root;

‎src/gtk-polar-plot.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ struct _GtkPolarPlot {
101101
gboolean qthinfo; /*!< Show the QTH info. */
102102
gboolean cursinfo; /*!< Track the mouse cursor. */
103103
gboolean extratick; /*!< Show extra ticks */
104+
105+
GValue font; /*!< Default font */
104106
};
105107

106108
struct _GtkPolarPlotClass {

‎src/gtk-polar-view.c‎

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -610,6 +610,9 @@ static GooCanvasItemModel *create_canvas_model(GtkPolarView * polv)
610610
polv->cx = POLV_DEFAULT_SIZE / 2;
611611
polv->cy = POLV_DEFAULT_SIZE / 2;
612612

613+
/* default font */
614+
g_object_get_property(G_OBJECT(gtk_settings_get_default()), "gtk-font-name", &polv->font);
615+
613616
col = mod_cfg_get_int(polv->cfgdata,
614617
MOD_CFG_POLAR_SECTION,
615618
MOD_CFG_POLAR_BGD_COL, SAT_CFG_INT_POLAR_BGD_COL);
@@ -673,7 +676,7 @@ static GooCanvasItemModel *create_canvas_model(GtkPolarView * polv)
673676
y,
674677
-1,
675678
anch,
676-
"font", "Sans 10",
679+
"font", g_value_get_string(&polv->font),
677680
"fill-color-rgba", col, NULL);
678681

679682
azel_to_xy(polv, 180.0, 0.0, &x, &y);
@@ -683,7 +686,7 @@ static GooCanvasItemModel *create_canvas_model(GtkPolarView * polv)
683686
y,
684687
-1,
685688
anch,
686-
"font", "Sans 10",
689+
"font", g_value_get_string(&polv->font),
687690
"fill-color-rgba", col, NULL);
688691

689692
azel_to_xy(polv, 90.0, 0.0, &x, &y);
@@ -693,7 +696,7 @@ static GooCanvasItemModel *create_canvas_model(GtkPolarView * polv)
693696
y,
694697
-1,
695698
anch,
696-
"font", "Sans 10",
699+
"font", g_value_get_string(&polv->font),
697700
"fill-color-rgba", col, NULL);
698701

699702
azel_to_xy(polv, 270.0, 0.0, &x, &y);
@@ -703,7 +706,7 @@ static GooCanvasItemModel *create_canvas_model(GtkPolarView * polv)
703706
y,
704707
-1,
705708
anch,
706-
"font", "Sans 10",
709+
"font", g_value_get_string(&polv->font),
707710
"fill-color-rgba", col, NULL);
708711

709712
/* cursor text */
@@ -715,8 +718,9 @@ static GooCanvasItemModel *create_canvas_model(GtkPolarView * polv)
715718
2 * POLV_LINE_EXTRA,
716719
polv->cy + polv->r +
717720
POLV_LINE_EXTRA, -1,
718-
GOO_CANVAS_ANCHOR_W, "font",
719-
"Sans 8", "fill-color-rgba", col,
721+
GOO_CANVAS_ANCHOR_W,
722+
"font", g_value_get_string(&polv->font),
723+
"fill-color-rgba", col,
720724
NULL);
721725

722726
/* location info */
@@ -725,8 +729,9 @@ static GooCanvasItemModel *create_canvas_model(GtkPolarView * polv)
725729
2 * POLV_LINE_EXTRA,
726730
polv->cy - polv->r -
727731
POLV_LINE_EXTRA, -1,
728-
GOO_CANVAS_ANCHOR_SW, "font",
729-
"Sans 8", "fill-color-rgba", col,
732+
GOO_CANVAS_ANCHOR_SW,
733+
"font", g_value_get_string(&polv->font),
734+
"fill-color-rgba", col,
730735
NULL);
731736

732737
/* next event */
@@ -735,8 +740,9 @@ static GooCanvasItemModel *create_canvas_model(GtkPolarView * polv)
735740
2 * POLV_LINE_EXTRA,
736741
polv->cy - polv->r -
737742
POLV_LINE_EXTRA, -1,
738-
GOO_CANVAS_ANCHOR_E, "font",
739-
"Sans 8", "fill-color-rgba", col,
743+
GOO_CANVAS_ANCHOR_E,
744+
"font", g_value_get_string(&polv->font),
745+
"fill-color-rgba", col,
740746
"alignment", PANGO_ALIGN_RIGHT,
741747
NULL);
742748

@@ -745,8 +751,9 @@ static GooCanvasItemModel *create_canvas_model(GtkPolarView * polv)
745751
polv->cx + polv->r +
746752
2 * POLV_LINE_EXTRA,
747753
polv->cy + polv->r + POLV_LINE_EXTRA,
748-
-1, GOO_CANVAS_ANCHOR_E, "font",
749-
"Sans 8", "fill-color-rgba", col,
754+
-1, GOO_CANVAS_ANCHOR_E,
755+
"font", g_value_get_string(&polv->font),
756+
"fill-color-rgba", col,
750757
"alignment", PANGO_ALIGN_RIGHT,
751758
NULL);
752759

@@ -1317,7 +1324,7 @@ static void update_sat(gpointer key, gpointer value, gpointer data)
13171324
obj->label =
13181325
goo_canvas_text_model_new(root, sat->nickname, x, y + 2,
13191326
-1, GOO_CANVAS_ANCHOR_NORTH,
1320-
"font", "Sans 8",
1327+
"font", g_value_get_string(&polv->font),
13211328
"fill-color-rgba", colour,
13221329
"tooltip", tooltip, NULL);
13231330

@@ -1475,7 +1482,7 @@ static GooCanvasItemModel *create_time_tick(GtkPolarView * pv, gdouble time,
14751482
item = goo_canvas_text_model_new(root, buff,
14761483
(gdouble) x, (gdouble) y,
14771484
-1, anchor,
1478-
"font", "Sans 7",
1485+
"font", g_value_get_string(&pv->font),
14791486
"fill-color-rgba", col, NULL);
14801487

14811488
return item;

‎src/gtk-polar-view.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ struct _GtkPolarView {
108108
gboolean extratick; /*!< Show extra ticks */
109109
gboolean showtrack; /*!< Automatically show sky tracks. */
110110
gboolean resize; /*!< Flag indicating that the view has been resized. */
111+
112+
GValue font; /*!< Default font */
111113
};
112114

113115
struct _GtkPolarViewClass {

0 commit comments

Comments
 (0)