From 8a207456b1b00b12ed5852ff2e282918657631f0 Mon Sep 17 00:00:00 2001 From: wellu Date: Fri, 5 Sep 2008 13:51:27 +0000 Subject: [PATCH] Some cleanups. git-svn-id: file:///svnroot/speedometer/trunk@18 df364472-da61-43ef-8a67-511c89aa921b --- Makefile | 4 ++-- appdata.h | 3 +++ main.c | 32 ++++++++++++-------------------- 3 files changed, 17 insertions(+), 22 deletions(-) diff --git a/Makefile b/Makefile index c8c82dc..8055655 100644 --- a/Makefile +++ b/Makefile @@ -4,8 +4,8 @@ CFLAGS = -g -Wall -O0 INCPATH = `pkg-config --cflags gtk+-2.0 liblocation` LIBS = `pkg-config --libs gtk+-2.0 liblocation` -SOURCES = main.c callbacks.c -OBJECTS = main.o callbacks.o +SOURCES = main.c callbacks.c ui.c +OBJECTS = main.o callbacks.o ui.o TARGET = speedometer diff --git a/appdata.h b/appdata.h index 8667634..2b9979a 100644 --- a/appdata.h +++ b/appdata.h @@ -19,6 +19,9 @@ #ifndef APPDATA_H_ #define APPDATA_H_ +#include +#include + typedef struct _AppData AppData; struct _AppData { HildonProgram *program; diff --git a/main.c b/main.c index ad2454f..54c8d75 100644 --- a/main.c +++ b/main.c @@ -24,12 +24,12 @@ #include #include "callbacks.h" +#include "appdata.h" +#include "ui.h" int main(int argc, char** argv) { - - HildonProgram *program; - HildonWindow *window; + AppData *appdata = g_new0(AppData, 1); gtk_init(&argc, &argv); @@ -37,12 +37,11 @@ int main(int argc, char** argv) { GtkWidget *box; - program = HILDON_PROGRAM(hildon_program_get_instance()); - g_set_application_name("Speedometer"); - - window = HILDON_WINDOW(hildon_window_new()); - hildon_program_add_window(program, window); + appdata->program = HILDON_PROGRAM(hildon_program_get_instance()); + appdata->window = HILDON_WINDOW(hildon_window_new()); + hildon_program_add_window(appdata->program, appdata->window); + set_app_bg_black(appdata); int i = 0; while(i < 10) { @@ -61,19 +60,12 @@ int main(int argc, char** argv) { gtk_box_pack_start(box, table[5], FALSE, FALSE, 0); gtk_box_pack_start(box, table[8], FALSE, FALSE, 0); - gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(box)); - - // set the background color to black - GdkColor black; - black.red = 0x0000; - black.blue = 0x0000; - black.green = 0x0000; - gtk_widget_modify_bg(window, GTK_STATE_NORMAL, &black); + gtk_container_add(GTK_CONTAINER(appdata->window), GTK_WIDGET(box)); // set the window fullscreen - gtk_window_fullscreen(GTK_WINDOW(window)); + gtk_window_fullscreen(GTK_WINDOW(appdata->window)); - gtk_widget_show_all(GTK_WIDGET(window)); + gtk_widget_show_all(GTK_WIDGET(appdata->window)); @@ -88,7 +80,7 @@ int main(int argc, char** argv) { // connect some signal handlers g_signal_connect (device, "changed", G_CALLBACK (location_changed), NULL); - g_signal_connect(G_OBJECT(window), "key_press_event", G_CALLBACK(key_press_cb), window); + g_signal_connect(G_OBJECT(appdata->window), "key_press_event", G_CALLBACK(key_press_cb), appdata->window); LocationGPSDControl *control; @@ -97,7 +89,7 @@ int main(int argc, char** argv) { #endif // __arm__ /* Connect signal to X in the upper corner */ - g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(gtk_main_quit), NULL); + g_signal_connect(G_OBJECT(appdata->window), "delete_event", G_CALLBACK(gtk_main_quit), NULL); /* Start the main event loop. */ gtk_main(); -- 1.7.9.5