Changeset 1771

Timestamp:

04/15/07 19:04:45 (6 years ago)

Author:

mickey

Message:

openmoko-gsmd-demo: relayout buttons

File:

• trunk/src/target/OM-2007/examples/openmoko-gsmd-demo/src/demo-main.c (modified) (5 diffs)

trunk/src/target/OM-2007/examples/openmoko-gsmd-demo/src/demo-main.c

@@ -27 +27 @@
 #include <gtk/gtkalignment.h>
 #include <gtk/gtkbutton.h>
-#include <gtk/gtkhbox.h>
+#include <gtk/gtktable.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtkmain.h>
@@ -43 +43 @@
 static GtkLabel* status;
 
-void cb_orange_button_clicked( GtkButton* button, MokoFingerWindow* window )
+void cb_poweron_clicked( GtkButton* button, MokoFingerWindow* window )
 {
-    g_debug( "openmoko-gsmd-demo: orange button clicked" );
+    moko_gsmd_connection_set_antenna_power( gsm, TRUE );
 }
 
-void cb_dialer_button_clicked( GtkButton* button, MokoFingerWindow* window )
+void cb_register_clicked( GtkButton* button, MokoFingerWindow* window )
 {
-    g_debug( "openmoko-gsmd-demo: dialer button clicked" );
+    moko_gsmd_connection_network_register( gsm );
 }
 
-void cb_black_button_clicked( GtkButton* button, MokoFingerWindow* window )
+void cb_poweroff_clicked( GtkButton* button, MokoFingerWindow* window )
 {
-    g_debug( "openmoko-gsmd-demo: black button clicked" );
+    moko_gsmd_connection_set_antenna_power( gsm, FALSE );
+}
+
+void cb_signal_strength_changed( MokoGsmdConnection* connection, int value, gpointer user_data )
+{
+    g_debug( "openmoko-gsmd-demo: signal strength changed" );
+    gtk_label_set_text( signal, g_strdup_printf( "Signal Strength: %d", value ) );
+}
+
+void cb_network_registration( MokoGsmdConnection* connection, int type, int lac, int cell )
+{
+    g_debug( "openmoko-gsmd-demo: network registration" );
+    if ( type == 0 )
+        gtk_label_set_text( status, "Not Searching..." );
+    else
+    if ( type == 2 )
+        gtk_label_set_text( status, "Searching..." );
+    else if ( type == 3 )
+        gtk_label_set_text( status, "Denied! :(" );
+    else if ( type == 1 )
+    {
+        gtk_label_set_text( status, "Registered (Home)" );
+        gtk_label_set_text( network, g_strdup_printf( "LocationAreaCode: 0x%04X\nCellID: 0x%04X", lac, cell ) );
+    }
+    else if ( type == 5 )
+    {
+        gtk_label_set_text( status, "Registered (Roaming)" );
+        gtk_label_set_text( network, g_strdup_printf( "LocationAreaCode: 0x%04X\nCellID: 0x%04X", lac, cell ) );
+    }
 }
 
@@ -81 +109 @@
     g_signal_connect( G_OBJECT(window), "delete_event", G_CALLBACK(gtk_main_quit), NULL );
 
+    GtkLabel* label0 = gtk_label_new( "<big>A Vanille Media Production</big>" );
+    gtk_label_set_use_markup( label0, TRUE );
+
     /* contents */
-    vbox = gtk_vbox_new( TRUE, 0 );
-    network = gtk_label_new( "<not yet registered>" );
+    vbox = gtk_vbox_new( FALSE, 10 );
+    network = gtk_label_new( "<unknown>" );
     signal = gtk_label_new( "<signal strength>" );
-    status = gtk_label_new( "<unnown>" );
-    GtkLabel* label2 = gtk_label_new( "Orange button powers on, \nDialer button registeres,\nBlack button powers off\n \n \n" );
-    GtkHBox* hbox = gtk_hbox_new( TRUE, 0 );
+    status = gtk_label_new( "Idle" );
+    GtkLabel* label2 = gtk_label_new( "Press buttons to experiment..." );
 
-    GtkButton* button1 = gtk_button_new();
-    g_signal_connect( G_OBJECT(button1), "clicked", G_CALLBACK(cb_orange_button_clicked), window );
-    gtk_widget_set_name( GTK_WIDGET(button1), "mokofingerbutton-orange" );
-    gtk_box_pack_start( GTK_BOX(hbox), GTK_WIDGET(button1), TRUE, TRUE, 5 );
+    GtkTable* table = gtk_table_new( 4, 3, TRUE );
 
-    GtkButton* button2 = gtk_button_new();
-    //FIXME toggle buttons look odd... needs working on styling
-    //gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (button2), TRUE);
-    g_signal_connect( G_OBJECT(button2), "clicked", G_CALLBACK(cb_dialer_button_clicked), window );
-    gtk_widget_set_name( GTK_WIDGET(button2), "mokofingerbutton-dialer" );
-    gtk_box_pack_start( GTK_BOX(hbox), GTK_WIDGET(button2), TRUE, TRUE, 5 );
+    GtkButton* button1 = gtk_button_new_with_label( "Power-On" );
+    g_signal_connect( G_OBJECT(button1), "clicked", G_CALLBACK(cb_poweron_clicked), window );
+    gtk_table_attach_defaults( GTK_BOX(table), GTK_WIDGET(button1), 0, 1, 0, 1 );
 
-    GtkButton* button3 = gtk_button_new();
-    g_signal_connect( G_OBJECT(button3), "clicked", G_CALLBACK(cb_black_button_clicked), window );
-    gtk_widget_set_name( GTK_WIDGET(button3), "mokofingerbutton-black" );
-    gtk_box_pack_start( GTK_BOX(hbox), GTK_WIDGET(button3), TRUE, TRUE, 5 );
+    GtkButton* button2 = gtk_button_new_with_label( "Register" );
+    g_signal_connect( G_OBJECT(button2), "clicked", G_CALLBACK(cb_register_clicked), window );
+    gtk_table_attach_defaults( GTK_BOX(table), GTK_WIDGET(button2), 1, 2, 0, 1 );
 
+    GtkButton* button3 = gtk_button_new_with_label( "Power-Off" );
+    g_signal_connect( G_OBJECT(button3), "clicked", G_CALLBACK(cb_poweroff_clicked), window );
+    gtk_table_attach_defaults( GTK_BOX(table), GTK_WIDGET(button3), 2, 3, 0, 1 );
+
+    gtk_box_pack_start( vbox, GTK_WIDGET(label0), FALSE, FALSE, 0 );
     gtk_box_pack_start( vbox, GTK_WIDGET(network), FALSE, FALSE, 0 );
     gtk_box_pack_start( vbox, GTK_WIDGET(signal), FALSE, FALSE, 0 );
     gtk_box_pack_start( vbox, GTK_WIDGET(status), FALSE, FALSE, 0 );
-    gtk_box_pack_start( vbox, GTK_WIDGET(hbox), TRUE, TRUE, 0 );
+    gtk_box_pack_start( vbox, GTK_WIDGET(table), TRUE, TRUE, 0 );
     gtk_box_pack_start( vbox, GTK_WIDGET(label2), FALSE, FALSE, 0 );
 
@@ -115 +143 @@
 
     gsm = moko_gsmd_connection_new();
+
+    g_signal_connect( G_OBJECT(gsm), "signal-strength-changed", G_CALLBACK(cb_signal_strength_changed), NULL );
+    g_signal_connect( G_OBJECT(gsm), "network-registration", G_CALLBACK(cb_network_registration), NULL );
 
     /* show everything and run main loop */
@@ -122 +153 @@
     g_debug( "openmoko-gsmd-demo left main loop" );
 
+    g_object_unref( G_OBJECT(gsm) );
+
     return 0;
 }