From: Alexandru C. <cs...@us...> - 2003-06-06 10:47:50
|
Update of /cvsroot/groundstation/grig/src In directory sc8-pr-cvs1:/tmp/cvs-serv14586 Modified Files: ChangeLog grig-druid-rig.c Log Message: Added serial speed option. Index: ChangeLog =================================================================== RCS file: /cvsroot/groundstation/grig/src/ChangeLog,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** ChangeLog 6 Jun 2003 08:55:01 -0000 1.48 --- ChangeLog 6 Jun 2003 10:47:46 -0000 1.49 *************** *** 2,5 **** --- 2,6 ---- * grig-config-rot.c: Added possibility to configure rotator type (AZ, EL or AZ/EL). + * grig-druid-rig.c: Added serial speed option. 2003-06-05; Alexandru Csete <cs...@us...> Index: grig-druid-rig.c =================================================================== RCS file: /cvsroot/groundstation/grig/src/grig-druid-rig.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** grig-druid-rig.c 5 Jun 2003 13:24:26 -0000 1.13 --- grig-druid-rig.c 6 Jun 2003 10:47:46 -0000 1.14 *************** *** 40,43 **** --- 40,44 ---- #include "riglist-util.h" #include "grig-druid-rig.h" + #include "grig-utils.h" #if defined (HAVE_LIBHAMLIB) && defined (HAVE_HAMLIB_RIG_H) *************** *** 49,53 **** static guint rigid; static GtkWidget *page,*swin,*rigclist; ! static GtkWidget *frame,*table,*hbox; static GtkWidget *idlabel,*mfglabel,*mlabel,*drlabel; static GtkWidget *port; --- 50,54 ---- static guint rigid; static GtkWidget *page,*swin,*rigclist; ! static GtkWidget *frame,*table,*hbox,*speedw; static GtkWidget *idlabel,*mfglabel,*mlabel,*drlabel; static GtkWidget *port; *************** *** 81,85 **** NULL); /* don't need it anymore */ ! // g_slist_free (riglist); /* pack the clist into a scrolled window */ --- 82,86 ---- NULL); /* don't need it anymore */ ! /* g_slist_free (riglist); */ /* pack the clist into a scrolled window */ *************** *** 99,105 **** /* Status stuff */ ! table = gtk_table_new (8, 2, TRUE); gtk_table_set_col_spacings (GTK_TABLE (table), 10); ! gtk_table_set_row_spacings (GTK_TABLE (table), 5); /* table contents */ label = gtk_label_new (_("Hamlib ID:")); --- 100,107 ---- /* Status stuff */ ! table = gtk_table_new (8, 2, FALSE); gtk_table_set_col_spacings (GTK_TABLE (table), 10); ! gtk_table_set_row_spacings (GTK_TABLE (table), 0); ! /* table contents */ label = gtk_label_new (_("Hamlib ID:")); *************** *** 121,125 **** gtk_misc_set_alignment (GTK_MISC (mlabel), 0.0, 0.5); gtk_table_attach_defaults (GTK_TABLE (table), mlabel, 1, 2, 2, 3); ! label = gtk_label_new (_("Driver status:")); gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4); --- 123,127 ---- gtk_misc_set_alignment (GTK_MISC (mlabel), 0.0, 0.5); gtk_table_attach_defaults (GTK_TABLE (table), mlabel, 1, 2, 2, 3); ! label = gtk_label_new (_("Driver Status:")); gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4); *************** *** 127,130 **** --- 129,133 ---- gtk_misc_set_alignment (GTK_MISC (drlabel), 0.0, 0.5); gtk_table_attach_defaults (GTK_TABLE (table), drlabel, 1, 2, 3, 4); + /* update labels... */ grig_druid_rig_select_row_cb (rigclist, 0, 0, NULL, NULL); *************** *** 140,147 **** gtk_table_attach_defaults (GTK_TABLE (table), port, 1, 2, 4, 5); /* port info label */ label = gtk_label_new (rportinfo); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); ! gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 2, 5, 8); /* frame */ --- 143,159 ---- gtk_table_attach_defaults (GTK_TABLE (table), port, 1, 2, 4, 5); + /* speed selector */ + label = gtk_label_new (_("Serial Speed:")); + gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 5, 6); + speedw = gtk_option_menu_new (); + gtk_option_menu_set_menu (GTK_OPTION_MENU (speedw), grig_utils_create_serial_rate_menu ()); + gtk_option_menu_set_history (GTK_OPTION_MENU (speedw), 0); + gtk_table_attach_defaults (GTK_TABLE (table), speedw, 1, 2, 5, 6); + /* port info label */ label = gtk_label_new (rportinfo); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); ! gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 2, 6, 8); /* frame */ *************** *** 204,207 **** --- 216,221 ---- */ gboolean ok = TRUE; + GtkWidget *activemenu; + guint speed; /* default radio is in /apps/grig/locations/0/ */ *************** *** 237,240 **** --- 251,261 ---- gtk_entry_get_text (GTK_ENTRY (port)), NULL); + + /* serial speed */ + activemenu = gtk_menu_get_active (GTK_MENU (gtk_option_menu_get_menu (GTK_OPTION_MENU (speedw)))); + speed = GPOINTER_TO_UINT (gtk_object_get_data (GTK_OBJECT (activemenu), "speed")); + ok = ok && gconf_client_set_int (confclient, + GRIG_CONFIG_RIG_DIR "/0/speed", + speed, NULL); return (gint) !ok; /* shoot me again, please! */ |