X-Git-Url: http://git.scottworley.com/batteryviewer/blobdiff_plain/a9a80e4ebe7952a0210ac835affa0f7e4450b089..1bd5b32741e9a733836a509b29d30dcd67016815:/batteryviewer.c diff --git a/batteryviewer.c b/batteryviewer.c index 6c4304c..bb0187a 100644 --- a/batteryviewer.c +++ b/batteryviewer.c @@ -1,39 +1,39 @@ +#include "chart.h" #include -static void print_hello(GtkWidget *widget __attribute__((unused)), - gpointer data __attribute__((unused))) { - g_print("Hello World\n"); -} - static void activate(GtkApplication *app, gpointer user_data __attribute__((unused))) { - GtkWidget *window; - GtkWidget *button; - GtkWidget *button_box; - window = gtk_application_window_new(app); + GtkWidget *window = gtk_application_window_new(app); gtk_window_set_title(GTK_WINDOW(window), "Window"); gtk_window_set_default_size(GTK_WINDOW(window), 200, 200); - button_box = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL); - gtk_container_add(GTK_CONTAINER(window), button_box); + GtkWidget *box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 1); + gtk_container_add(GTK_CONTAINER(window), box); + + GtkWidget *chart = bv_chart_new(); + bv_chart_add_point(BV_CHART(chart), 0.0, 0.0); + bv_chart_add_point(BV_CHART(chart), 1.0, 1.0); + bv_chart_add_point(BV_CHART(chart), 3.0, 2.0); + gboolean expand = TRUE; + gboolean fill = TRUE; + guint padding = 0; + gtk_box_pack_start(GTK_BOX(box), chart, expand, fill, padding); - button = gtk_button_new_with_label("Hello World"); - g_signal_connect(button, "clicked", G_CALLBACK(print_hello), NULL); - g_signal_connect_swapped(button, "clicked", G_CALLBACK(gtk_widget_destroy), - window); - gtk_container_add(GTK_CONTAINER(button_box), button); + GtkWidget *chart2 = bv_chart_new(); + bv_chart_add_point(BV_CHART(chart2), 0.0, 1.0); + bv_chart_add_point(BV_CHART(chart2), 1.0, 0.0); + gtk_box_pack_end(GTK_BOX(box), chart2, expand, fill, padding); gtk_widget_show_all(window); } int main(int argc, char **argv) { - GtkApplication *app; - int status; - app = gtk_application_new("org.gtk.example", G_APPLICATION_DEFAULT_FLAGS); + GtkApplication *app = + gtk_application_new("org.gtk.example", G_APPLICATION_DEFAULT_FLAGS); g_signal_connect(app, "activate", G_CALLBACK(activate), NULL); - status = g_application_run(G_APPLICATION(app), argc, argv); + int status = g_application_run(G_APPLICATION(app), argc, argv); g_object_unref(app); return status;