morse2txt-checkins Mailing List for Morse code decoder (Page 3)
Morse code decoder.
Brought to you by:
kprox
Menu
▾
▴
morse2txt-checkins — CVS checkin list.
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(22) |
Sep
(4) |
Oct
(32) |
Nov
(2) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(4) |
Feb
|
Mar
(9) |
Apr
(6) |
May
(10) |
Jun
(8) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(9) |
Aug
|
Sep
|
Oct
(3) |
Nov
|
Dec
(1) |
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(22) |
Oct
(4) |
Nov
(6) |
Dec
(12) |
| 2009 |
Jan
(1) |
Feb
|
Mar
(4) |
Apr
(5) |
May
(15) |
Jun
(13) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Ken P. <kp...@us...> - 2008-11-26 04:12:08
|
Update of /cvsroot/morse2txt/morse2txt/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv2834/src Modified Files: audio.h Log Message: fix mixed types Index: audio.h =================================================================== RCS file: /cvsroot/morse2txt/morse2txt/src/audio.h,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** audio.h 25 Nov 2008 23:16:27 -0000 1.26 --- audio.h 26 Nov 2008 04:11:54 -0000 1.27 *************** *** 88,92 **** /** Number of DSP channels. */ te_audio_channels dsp_channels; ! size_t samples; /** Callback for GUI handler to display error messages. */ audio_error_message_handler error_msg_handler; --- 88,92 ---- /** Number of DSP channels. */ te_audio_channels dsp_channels; ! int32_t samples; /** Callback for GUI handler to display error messages. */ audio_error_message_handler error_msg_handler; |
|
From: Ken P. <kp...@us...> - 2008-11-26 04:00:40
|
Update of /cvsroot/morse2txt/morse2txt/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv2411/src Modified Files: audio_oss.h Log Message: add missing null for play Index: audio_oss.h =================================================================== RCS file: /cvsroot/morse2txt/morse2txt/src/audio_oss.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** audio_oss.h 18 Mar 2006 16:59:33 -0000 1.5 --- audio_oss.h 26 Nov 2008 04:00:34 -0000 1.6 *************** *** 40,43 **** --- 40,44 ---- #define audio_close_oss NULL #define audio_record_oss NULL + #define audio_play_oss NULL #endif /* HAVE_SYS_SOUNDCARD_H */ |
|
From: Ken P. <kp...@us...> - 2008-11-26 00:12:40
|
Update of /cvsroot/morse2txt/morse2txt/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27604/src Modified Files: audio_oss.c Log Message: Fixes problem on x64 system. audio buffer size was wrong type. Index: audio_oss.c =================================================================== RCS file: /cvsroot/morse2txt/morse2txt/src/audio_oss.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** audio_oss.c 24 Nov 2008 03:15:04 -0000 1.9 --- audio_oss.c 26 Nov 2008 00:12:34 -0000 1.10 *************** *** 143,149 **** return(-1); } - /* TODO: Returns a HUGE number on a 64-bit system, hda audio device. */ ioctl (device->handle, SNDCTL_DSP_GETBLKSIZE, &device->audio_buffer_size); ! if(device->audio_buffer_size < 1) { perror ("GETBLKSIZE"); return(-1); --- 143,148 ---- return(-1); } ioctl (device->handle, SNDCTL_DSP_GETBLKSIZE, &device->audio_buffer_size); ! if(device->audio_buffer_size < 0) { perror ("GETBLKSIZE"); return(-1); |
|
From: Ken P. <kp...@us...> - 2008-11-25 23:16:40
|
Update of /cvsroot/morse2txt/morse2txt/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23053/src Modified Files: audio.h Log Message: fixed wrong type for audio buffer size. OSS api returns int. Index: audio.h =================================================================== RCS file: /cvsroot/morse2txt/morse2txt/src/audio.h,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** audio.h 14 Sep 2008 13:57:02 -0000 1.25 --- audio.h 25 Nov 2008 23:16:27 -0000 1.26 *************** *** 82,86 **** te_audio_segments buffer_segments; /** Number of bytes in the audio buffer (twice samples per segment). */ ! size_t audio_buffer_size; int32_t fragsize; /** The raw audio buffer. */ --- 82,86 ---- te_audio_segments buffer_segments; /** Number of bytes in the audio buffer (twice samples per segment). */ ! int32_t audio_buffer_size; int32_t fragsize; /** The raw audio buffer. */ |
|
From: Ken P. <kp...@us...> - 2008-11-24 03:15:11
|
Update of /cvsroot/morse2txt/morse2txt/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4056/src Modified Files: audio_oss.c Log Message: Mark line that is broke on an x64 bit HDA Intel audio system with a todo. Index: audio_oss.c =================================================================== RCS file: /cvsroot/morse2txt/morse2txt/src/audio_oss.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** audio_oss.c 22 Oct 2005 22:45:09 -0000 1.8 --- audio_oss.c 24 Nov 2008 03:15:04 -0000 1.9 *************** *** 143,147 **** return(-1); } ! ioctl (device->handle, SNDCTL_DSP_GETBLKSIZE, &device->audio_buffer_size); if(device->audio_buffer_size < 1) { --- 143,147 ---- return(-1); } ! /* TODO: Returns a HUGE number on a 64-bit system, hda audio device. */ ioctl (device->handle, SNDCTL_DSP_GETBLKSIZE, &device->audio_buffer_size); if(device->audio_buffer_size < 1) { *************** *** 155,159 **** if ((device->audio_buffer_raw = malloc ((size_t)(device->audio_buffer_size * device->buffer_segments))) == NULL) { ! fprintf (stderr, "Unable to allocate input/output buffer\n"); device->error_msg_handler("Unable to allocate input/output buffer."); return(-1); --- 155,159 ---- if ((device->audio_buffer_raw = malloc ((size_t)(device->audio_buffer_size * device->buffer_segments))) == NULL) { ! fprintf (stderr, "Unable to allocate input/output buffer\n"); device->error_msg_handler("Unable to allocate input/output buffer."); return(-1); |
|
From: Ken P. <kp...@us...> - 2008-11-17 23:50:40
|
Update of /cvsroot/morse2txt/morse2txt/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4804/src Modified Files: fir_win.c Log Message: add missing include for stdint Index: fir_win.c =================================================================== RCS file: /cvsroot/morse2txt/morse2txt/src/fir_win.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** fir_win.c 31 Jul 2006 14:18:56 -0000 1.12 --- fir_win.c 17 Nov 2008 23:50:33 -0000 1.13 *************** *** 56,59 **** --- 56,60 ---- #include <string.h> #include <math.h> + #include <stdint.h> #include "fir_win.h" |
|
From: Ken P. <kp...@us...> - 2008-10-04 02:06:27
|
Update of /cvsroot/morse2txt/morse2txt/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv19304/src Modified Files: prop_interface.c Log Message: don't show the device api type selection until the Alsa interface is completed. Index: prop_interface.c =================================================================== RCS file: /cvsroot/morse2txt/morse2txt/src/prop_interface.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** prop_interface.c 28 Sep 2008 00:57:50 -0000 1.8 --- prop_interface.c 4 Oct 2008 02:06:20 -0000 1.9 *************** *** 170,178 **** gtk_container_set_border_width (GTK_CONTAINER (vbox1), 10); label13 = gtk_label_new (_("Device Type")); ! gtk_widget_show (label13); gtk_box_pack_start (GTK_BOX (vbox1), label13, FALSE, FALSE, 0); comboboxentryDeviceType = gtk_combo_box_entry_new_text (); ! gtk_widget_show (comboboxentryDeviceType); gtk_box_pack_start (GTK_BOX (vbox1), comboboxentryDeviceType, FALSE, FALSE, 0); --- 170,178 ---- gtk_container_set_border_width (GTK_CONTAINER (vbox1), 10); label13 = gtk_label_new (_("Device Type")); ! /*gtk_widget_show (label13);*/ gtk_box_pack_start (GTK_BOX (vbox1), label13, FALSE, FALSE, 0); comboboxentryDeviceType = gtk_combo_box_entry_new_text (); ! /*gtk_widget_show (comboboxentryDeviceType);*/ gtk_box_pack_start (GTK_BOX (vbox1), comboboxentryDeviceType, FALSE, FALSE, 0); |
|
From: Ken P. <kp...@us...> - 2008-10-02 23:59:56
|
Update of /cvsroot/morse2txt/morse2txt/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23944/src Modified Files: prop_callbacks.c Log Message: remove debug line Index: prop_callbacks.c =================================================================== RCS file: /cvsroot/morse2txt/morse2txt/src/prop_callbacks.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** prop_callbacks.c 2 Oct 2008 23:58:41 -0000 1.13 --- prop_callbacks.c 2 Oct 2008 23:59:45 -0000 1.14 *************** *** 99,105 **** i++; } ! i = morse_audio_device_type_id_get(); ! gtk_combo_box_set_active(GTK_COMBO_BOX(tmp), i); ! //(gint)morse_audio_device_type_id_get()); gnome_property_box_set_modified(GNOME_PROPERTY_BOX(main_gui.properties_v), FALSE); --- 99,103 ---- i++; } ! gtk_combo_box_set_active(GTK_COMBO_BOX(tmp), (gint)morse_audio_device_type_id_get()); gnome_property_box_set_modified(GNOME_PROPERTY_BOX(main_gui.properties_v), FALSE); |
|
From: Ken P. <kp...@us...> - 2008-10-02 23:58:53
|
Update of /cvsroot/morse2txt/morse2txt/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23924/src Modified Files: prop_callbacks.c Log Message: Audio type api selector now working. Index: prop_callbacks.c =================================================================== RCS file: /cvsroot/morse2txt/morse2txt/src/prop_callbacks.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** prop_callbacks.c 2 Oct 2008 01:17:44 -0000 1.12 --- prop_callbacks.c 2 Oct 2008 23:58:41 -0000 1.13 *************** *** 4,7 **** --- 4,8 ---- #include <gnome.h> + #include <stdint.h> #include "prop_callbacks.h" *************** *** 30,33 **** --- 31,37 ---- audio_device_name_set(morse_audio_rec_dev_get(), ctmp); + tmp = lookup_widget(main_gui.properties_v, "comboboxentryDeviceType"); + morse_audio_device_type_id_set((int32_t)gtk_combo_box_get_active(GTK_COMBO_BOX(tmp))); + tmp = lookup_widget(main_gui.properties_v, "comboboxentrySampleFrequency"); morse_audio_sample_rate_set(atoi(gtk_combo_box_get_active_text(GTK_COMBO_BOX(tmp)))); *************** *** 45,53 **** GTK_ADJUSTMENT(main_gui.adjustment_frequency_v)->lower = 0.0; GTK_ADJUSTMENT(main_gui.adjustment_frequency_v)->upper = (morse_get_fft_data_size() - 1); - #if 0 - - tmp = lookup_widget(main_gui.properties_v, "comboboxentryDeviceType"); - - #endif } --- 49,52 ---- *************** *** 62,65 **** --- 61,65 ---- static char c_tmp[ENTRY_LENGTH]; char *tmp_char; + int32_t i; sample_freq = morse_audio_sample_rate_get(); *************** *** 93,96 **** --- 93,106 ---- gtk_entry_set_text(GTK_ENTRY(GTK_BIN(tmp)->child), c_tmp); + tmp = lookup_widget(main_gui.properties_v, "comboboxentryDeviceType"); + i = 0; + while(NULL != (tmp_char = audio_device_type_name_get(i))) { + gtk_combo_box_append_text(GTK_COMBO_BOX(tmp), tmp_char); + i++; + } + i = morse_audio_device_type_id_get(); + gtk_combo_box_set_active(GTK_COMBO_BOX(tmp), i); + //(gint)morse_audio_device_type_id_get()); + gnome_property_box_set_modified(GNOME_PROPERTY_BOX(main_gui.properties_v), FALSE); } *************** *** 108,116 **** gnome_property_box_changed (GNOME_PROPERTY_BOX (main_gui.properties_v)); - #if 0 - - tmp = lookup_widget(main_gui.properties_v, "comboboxentryDeviceType"); - - #endif tmp = lookup_widget(main_gui.properties_v, "comboboxentrySampleFrequency"); --- 118,121 ---- |
|
From: Ken P. <kp...@us...> - 2008-10-02 01:17:52
|
Update of /cvsroot/morse2txt/morse2txt/src In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3221/src Modified Files: prop_callbacks.c Log Message: update property box changed callback Index: prop_callbacks.c =================================================================== RCS file: /cvsroot/morse2txt/morse2txt/src/prop_callbacks.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** prop_callbacks.c 30 Sep 2008 01:39:50 -0000 1.11 --- prop_callbacks.c 2 Oct 2008 01:17:44 -0000 1.12 *************** *** 108,119 **** gnome_property_box_changed (GNOME_PROPERTY_BOX (main_gui.properties_v)); ! ! #if 0 ! tmp = lookup_widget(main_gui.properties_v, "sample_frequency_entry"); ! sample_freq = atoi(gtk_entry_get_text(GTK_ENTRY(tmp))); ! ! tmp = lookup_widget(main_gui.properties_v, "fft_packet_length_entry"); ! packet_length = atoi(gtk_entry_get_text(GTK_ENTRY(tmp))); freq_resolution = (double)sample_freq / (double)packet_length; --- 108,122 ---- gnome_property_box_changed (GNOME_PROPERTY_BOX (main_gui.properties_v)); + #if 0 ! tmp = lookup_widget(main_gui.properties_v, "comboboxentryDeviceType"); ! ! #endif ! ! tmp = lookup_widget(main_gui.properties_v, "comboboxentrySampleFrequency"); ! sample_freq = atoi(gtk_entry_get_text(GTK_ENTRY(GTK_BIN(tmp)->child))); ! ! tmp = lookup_widget(main_gui.properties_v, "comboboxentryFFTPacketLength"); ! packet_length = atoi(gtk_entry_get_text(GTK_ENTRY(GTK_BIN(tmp)->child))); freq_resolution = (double)sample_freq / (double)packet_length; *************** *** 127,130 **** tmp = lookup_widget(main_gui.properties_v, "maximum_wpm_entry"); gtk_entry_set_text(GTK_ENTRY(tmp), c_tmp); - #endif } --- 130,132 ---- |
|
From: Ken P. <kp...@us...> - 2008-09-30 01:39:56
|
Update of /cvsroot/morse2txt/morse2txt/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2469/src Modified Files: prop_callbacks.c Log Message: fix remainder of depreciated combo box handlers in property box changed callback Index: prop_callbacks.c =================================================================== RCS file: /cvsroot/morse2txt/morse2txt/src/prop_callbacks.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** prop_callbacks.c 28 Sep 2008 00:58:19 -0000 1.10 --- prop_callbacks.c 30 Sep 2008 01:39:50 -0000 1.11 *************** *** 24,54 **** GtkWidget *tmp; static char ctmp[AUDIO_DEVICE_NAME_LENGTH]; - - #if 0 - ! ! /** TODO - This needs to be fixed */ ! tmp = lookup_widget(main_gui.properties_v, "audio_device_combo_entry"); ! s = gtk_entry_get_text(GTK_ENTRY(tmp)); g_snprintf(ctmp, AUDIO_DEVICE_NAME_LENGTH, "%s", s); audio_device_name_set(morse_audio_rec_dev_get(), ctmp); - - tmp = lookup_widget(main_gui.properties_v, "comboboxentryDeviceType"); - tmp = lookup_widget(main_gui.properties_v, "comboboxentryDevicePath"); - - ! ! ! tmp = lookup_widget(main_gui.properties_v, "sample_frequency_entry"); ! morse_audio_sample_rate_set(atoi(gtk_entry_get_text(GTK_ENTRY(tmp)))); ! ! tmp = lookup_widget(main_gui.properties_v, "fft_packet_length_entry"); ! morse_set_tone_packet_size(atoi(gtk_entry_get_text(GTK_ENTRY(tmp)))); ! tmp = lookup_widget(main_gui.properties_v, "filter_taps_entry"); ! morse_set_filter_taps(atoi(gtk_entry_get_text(GTK_ENTRY(tmp)))); morse_set_fft_data_size(morse_get_tone_packet_size() / FFT_DATA_SIZE_DIVISOR); --- 24,41 ---- GtkWidget *tmp; static char ctmp[AUDIO_DEVICE_NAME_LENGTH]; ! tmp = lookup_widget(main_gui.properties_v, "comboboxentryDevicePath"); ! s = gtk_combo_box_get_active_text(GTK_COMBO_BOX(tmp)); g_snprintf(ctmp, AUDIO_DEVICE_NAME_LENGTH, "%s", s); audio_device_name_set(morse_audio_rec_dev_get(), ctmp); + tmp = lookup_widget(main_gui.properties_v, "comboboxentrySampleFrequency"); + morse_audio_sample_rate_set(atoi(gtk_combo_box_get_active_text(GTK_COMBO_BOX(tmp)))); ! tmp = lookup_widget(main_gui.properties_v, "comboboxentryFFTPacketLength"); ! morse_set_tone_packet_size(atoi(gtk_combo_box_get_active_text(GTK_COMBO_BOX(tmp)))); ! tmp = lookup_widget(main_gui.properties_v, "comboboxentryFilterTaps"); ! morse_set_filter_taps(atoi(gtk_combo_box_get_active_text(GTK_COMBO_BOX(tmp)))); morse_set_fft_data_size(morse_get_tone_packet_size() / FFT_DATA_SIZE_DIVISOR); *************** *** 58,62 **** GTK_ADJUSTMENT(main_gui.adjustment_frequency_v)->lower = 0.0; GTK_ADJUSTMENT(main_gui.adjustment_frequency_v)->upper = (morse_get_fft_data_size() - 1); ! #endif } --- 45,53 ---- GTK_ADJUSTMENT(main_gui.adjustment_frequency_v)->lower = 0.0; GTK_ADJUSTMENT(main_gui.adjustment_frequency_v)->upper = (morse_get_fft_data_size() - 1); ! #if 0 ! ! tmp = lookup_widget(main_gui.properties_v, "comboboxentryDeviceType"); ! ! #endif } |
|
From: Ken P. <kp...@us...> - 2008-09-28 00:58:32
|
Update of /cvsroot/morse2txt/morse2txt/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10069/src Modified Files: prop_callbacks.c Log Message: Callback for property box show now completed. Index: prop_callbacks.c =================================================================== RCS file: /cvsroot/morse2txt/morse2txt/src/prop_callbacks.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** prop_callbacks.c 27 Sep 2008 23:04:38 -0000 1.9 --- prop_callbacks.c 28 Sep 2008 00:58:19 -0000 1.10 *************** *** 89,118 **** tmp = lookup_widget(main_gui.properties_v, "maximum_wpm_entry"); gtk_entry_set_text(GTK_ENTRY(tmp), c_tmp); - #if 0 - g_snprintf(c_tmp, ENTRY_LENGTH, "%d", sample_freq); - tmp = lookup_widget(main_gui.properties_v, "sample_frequency_entry"); - gtk_entry_set_text(GTK_ENTRY(tmp), c_tmp); - - - - /** TODO - This needs to be fixed. */ - tmp = lookup_widget(main_gui.properties_v, "audio_device_combo_entry"); - audio_device_name_get(morse_audio_rec_dev_get(), &tmp_char); - gtk_entry_set_text(GTK_ENTRY(tmp), _(tmp_char)); - - tmp = lookup_widget(main_gui.properties_v, "comboboxentryDeviceType"); tmp = lookup_widget(main_gui.properties_v, "comboboxentryDevicePath"); ! ! ! ! ! ! tmp = lookup_widget(main_gui.properties_v, "filter_taps_entry"); g_snprintf(c_tmp, ENTRY_LENGTH, "%d", morse_get_filter_taps()); ! gtk_entry_set_text(GTK_ENTRY(tmp), c_tmp); ! #endif gnome_property_box_set_modified(GNOME_PROPERTY_BOX(main_gui.properties_v), FALSE); } --- 89,105 ---- tmp = lookup_widget(main_gui.properties_v, "maximum_wpm_entry"); gtk_entry_set_text(GTK_ENTRY(tmp), c_tmp); + g_snprintf(c_tmp, ENTRY_LENGTH, "%d", sample_freq); + tmp = lookup_widget(main_gui.properties_v, "comboboxentrySampleFrequency"); + gtk_entry_set_text(GTK_ENTRY(GTK_BIN(tmp)->child), c_tmp); tmp = lookup_widget(main_gui.properties_v, "comboboxentryDevicePath"); + audio_device_name_get(morse_audio_rec_dev_get(), &tmp_char); + gtk_entry_set_text(GTK_ENTRY(GTK_BIN(tmp)->child), tmp_char); ! tmp = lookup_widget(main_gui.properties_v, "comboboxentryFilterTaps"); g_snprintf(c_tmp, ENTRY_LENGTH, "%d", morse_get_filter_taps()); ! gtk_entry_set_text(GTK_ENTRY(GTK_BIN(tmp)->child), c_tmp); ! gnome_property_box_set_modified(GNOME_PROPERTY_BOX(main_gui.properties_v), FALSE); } |
|
From: Ken P. <kp...@us...> - 2008-09-28 00:58:07
|
Update of /cvsroot/morse2txt/morse2txt/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9262/src Modified Files: prop_interface.c Log Message: Make all combo edit entry boxes read only Index: prop_interface.c =================================================================== RCS file: /cvsroot/morse2txt/morse2txt/src/prop_interface.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** prop_interface.c 27 Sep 2008 23:04:19 -0000 1.7 --- prop_interface.c 28 Sep 2008 00:57:50 -0000 1.8 *************** *** 296,299 **** --- 296,300 ---- gtk_entry_set_editable(GTK_ENTRY(GTK_BIN(comboboxentryDeviceType)->child), FALSE); gtk_entry_set_editable(GTK_ENTRY(GTK_BIN(comboboxentryDevicePath)->child), FALSE); + gtk_entry_set_editable(GTK_ENTRY(GTK_BIN(comboboxentryFilterTaps)->child), FALSE); return morse2txt_properties; |
|
From: Ken P. <kp...@us...> - 2008-09-27 23:04:44
|
Update of /cvsroot/morse2txt/morse2txt/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1846/src Modified Files: prop_callbacks.c Log Message: commit to fix broken build Index: prop_callbacks.c =================================================================== RCS file: /cvsroot/morse2txt/morse2txt/src/prop_callbacks.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** prop_callbacks.c 17 Sep 2008 00:56:13 -0000 1.8 --- prop_callbacks.c 27 Sep 2008 23:04:38 -0000 1.9 *************** *** 79,88 **** g_snprintf(c_tmp, ENTRY_LENGTH, "%d", morse_get_tone_packet_size()); ! tmp = lookup_widget(main_gui.properties_v, "comboboxFFTPacketLength"); ! gtk_combo_box_set_text(GTK_COMBO_BOX(tmp), c_tmp); ! #if 0 ! ! gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (combo)->entry), "My String."); ! g_snprintf(c_tmp, ENTRY_LENGTH, "%2.1f", freq_resolution); tmp = lookup_widget(main_gui.properties_v, "frequency_resolution_entry"); --- 79,85 ---- g_snprintf(c_tmp, ENTRY_LENGTH, "%d", morse_get_tone_packet_size()); ! tmp = lookup_widget(main_gui.properties_v, "comboboxentryFFTPacketLength"); ! gtk_entry_set_text(GTK_ENTRY(GTK_BIN(tmp)->child), c_tmp); ! g_snprintf(c_tmp, ENTRY_LENGTH, "%2.1f", freq_resolution); tmp = lookup_widget(main_gui.properties_v, "frequency_resolution_entry"); *************** *** 92,96 **** tmp = lookup_widget(main_gui.properties_v, "maximum_wpm_entry"); gtk_entry_set_text(GTK_ENTRY(tmp), c_tmp); ! g_snprintf(c_tmp, ENTRY_LENGTH, "%d", sample_freq); tmp = lookup_widget(main_gui.properties_v, "sample_frequency_entry"); --- 89,93 ---- tmp = lookup_widget(main_gui.properties_v, "maximum_wpm_entry"); gtk_entry_set_text(GTK_ENTRY(tmp), c_tmp); ! #if 0 g_snprintf(c_tmp, ENTRY_LENGTH, "%d", sample_freq); tmp = lookup_widget(main_gui.properties_v, "sample_frequency_entry"); |
|
From: Ken P. <kp...@us...> - 2008-09-27 23:04:27
|
Update of /cvsroot/morse2txt/morse2txt/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1611/src Modified Files: prop_interface.c Log Message: turn off editing capability for some combo box's Index: prop_interface.c =================================================================== RCS file: /cvsroot/morse2txt/morse2txt/src/prop_interface.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** prop_interface.c 17 Sep 2008 00:56:13 -0000 1.6 --- prop_interface.c 27 Sep 2008 23:04:19 -0000 1.7 *************** *** 288,291 **** --- 288,300 ---- GLADE_HOOKUP_OBJECT (morse2txt_properties, label10, "label10"); + + /** Instead of using the ComboBox, use ComboBoxEntry, we can then change the edit property + * without changing the widget. + */ + gtk_entry_set_editable(GTK_ENTRY(GTK_BIN(comboboxentryFFTPacketLength)->child), FALSE); + gtk_entry_set_editable(GTK_ENTRY(GTK_BIN(comboboxentrySampleFrequency)->child), FALSE); + gtk_entry_set_editable(GTK_ENTRY(GTK_BIN(comboboxentryDeviceType)->child), FALSE); + gtk_entry_set_editable(GTK_ENTRY(GTK_BIN(comboboxentryDevicePath)->child), FALSE); + return morse2txt_properties; } |
|
From: Ken P. <kp...@us...> - 2008-09-16 17:56:18
|
Update of /cvsroot/morse2txt/morse2txt/gui In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21191/gui Modified Files: properites_gui-gtk-2.x.glade Log Message: Since the combobox sets the text per index vs. text, this would change the format of the preferences file, in order to avoid this, the comboboxes were changed to comboboxentry widgets. Index: properites_gui-gtk-2.x.glade =================================================================== RCS file: /cvsroot/morse2txt/morse2txt/gui/properites_gui-gtk-2.x.glade,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** properites_gui-gtk-2.x.glade 16 Sep 2008 00:16:31 -0000 1.7 --- properites_gui-gtk-2.x.glade 17 Sep 2008 00:56:13 -0000 1.8 *************** *** 206,223 **** <child> ! <widget class="GtkComboBox" id="comboboxFFTPacketLength"> <property name="visible">True</property> ! <property name="items" translatable="yes">16 ! 32 ! 64 ! 128 ! 256</property> <property name="add_tearoffs">False</property> <property name="focus_on_click">True</property> ! <signal name="changed" handler="widget_in_property_box_changed" last_modification_time="Tue, 16 Sep 2008 00:11:14 GMT"/> </widget> <packing> ! <property name="left_attach">0</property> ! <property name="right_attach">1</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> --- 206,224 ---- <child> ! <widget class="GtkComboBoxEntry" id="comboboxentrySampleFrequency"> <property name="visible">True</property> ! <property name="items" translatable="yes">4000 ! 8000 ! 11025 ! 16000 ! 22050</property> <property name="add_tearoffs">False</property> + <property name="has_frame">True</property> <property name="focus_on_click">True</property> ! <signal name="changed" handler="widget_in_property_box_changed" last_modification_time="Wed, 17 Sep 2008 00:38:31 GMT"/> </widget> <packing> ! <property name="left_attach">1</property> ! <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> *************** *** 228,245 **** <child> ! <widget class="GtkComboBox" id="comboboxSampleFrequency"> <property name="visible">True</property> ! <property name="items" translatable="yes">4000 ! 8000 ! 11025 ! 16000 ! 22050</property> <property name="add_tearoffs">False</property> <property name="focus_on_click">True</property> ! <signal name="changed" handler="widget_in_property_box_changed" last_modification_time="Tue, 16 Sep 2008 00:11:26 GMT"/> </widget> <packing> ! <property name="left_attach">1</property> ! <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> --- 229,247 ---- <child> ! <widget class="GtkComboBoxEntry" id="comboboxentryFFTPacketLength"> <property name="visible">True</property> ! <property name="items" translatable="yes">16 ! 32 ! 64 ! 128 ! 256</property> <property name="add_tearoffs">False</property> + <property name="has_frame">True</property> <property name="focus_on_click">True</property> ! <signal name="changed" handler="widget_in_property_box_changed" last_modification_time="Wed, 17 Sep 2008 00:40:11 GMT"/> </widget> <packing> ! <property name="left_attach">0</property> ! <property name="right_attach">1</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> *************** *** 344,352 **** <child> ! <widget class="GtkComboBox" id="comboboxDeviceType"> <property name="visible">True</property> <property name="add_tearoffs">False</property> <property name="focus_on_click">True</property> ! <signal name="changed" handler="widget_in_property_box_changed" last_modification_time="Tue, 16 Sep 2008 00:11:35 GMT"/> </widget> <packing> --- 346,355 ---- <child> ! <widget class="GtkComboBoxEntry" id="comboboxentryDeviceType"> <property name="visible">True</property> <property name="add_tearoffs">False</property> + <property name="has_frame">True</property> <property name="focus_on_click">True</property> ! <signal name="changed" handler="widget_in_property_box_changed" last_modification_time="Wed, 17 Sep 2008 00:41:40 GMT"/> </widget> <packing> *************** *** 383,393 **** <child> ! <widget class="GtkComboBox" id="comboboxDevicePath"> <property name="visible">True</property> <property name="items" translatable="yes">/dev/dsp /dev/audio</property> <property name="add_tearoffs">False</property> <property name="focus_on_click">True</property> ! <signal name="changed" handler="widget_in_property_box_changed" last_modification_time="Tue, 16 Sep 2008 00:11:43 GMT"/> </widget> <packing> --- 386,397 ---- <child> ! <widget class="GtkComboBoxEntry" id="comboboxentryDevicePath"> <property name="visible">True</property> <property name="items" translatable="yes">/dev/dsp /dev/audio</property> <property name="add_tearoffs">False</property> + <property name="has_frame">True</property> <property name="focus_on_click">True</property> ! <signal name="changed" handler="widget_in_property_box_changed" last_modification_time="Wed, 17 Sep 2008 00:42:10 GMT"/> </widget> <packing> *************** *** 505,509 **** <child> ! <widget class="GtkComboBox" id="comboboxTaps"> <property name="visible">True</property> <property name="items" translatable="yes">8 --- 509,513 ---- <child> ! <widget class="GtkComboBoxEntry" id="comboboxentryFilterTaps"> <property name="visible">True</property> <property name="items" translatable="yes">8 *************** *** 513,518 **** 128</property> <property name="add_tearoffs">False</property> <property name="focus_on_click">True</property> ! <signal name="changed" handler="widget_in_property_box_changed" last_modification_time="Tue, 16 Sep 2008 00:11:58 GMT"/> </widget> <packing> --- 517,523 ---- 128</property> <property name="add_tearoffs">False</property> + <property name="has_frame">True</property> <property name="focus_on_click">True</property> ! <signal name="changed" handler="widget_in_property_box_changed" last_modification_time="Wed, 17 Sep 2008 00:36:08 GMT"/> </widget> <packing> |
|
From: Ken P. <kp...@us...> - 2008-09-16 17:56:18
|
Update of /cvsroot/morse2txt/morse2txt/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21191/src Modified Files: prop_interface.c prop_callbacks.h prop_callbacks.c Log Message: Since the combobox sets the text per index vs. text, this would change the format of the preferences file, in order to avoid this, the comboboxes were changed to comboboxentry widgets. Index: prop_callbacks.h =================================================================== RCS file: /cvsroot/morse2txt/morse2txt/src/prop_callbacks.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** prop_callbacks.h 14 Sep 2008 23:55:47 -0000 1.3 --- prop_callbacks.h 17 Sep 2008 00:56:13 -0000 1.4 *************** *** 12,15 **** void ! widget_in_property_box_changed (GtkEditable *editable, gpointer user_data); --- 12,15 ---- void ! widget_in_property_box_changed (GtkComboBox *combobox, gpointer user_data); Index: prop_interface.c =================================================================== RCS file: /cvsroot/morse2txt/morse2txt/src/prop_interface.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** prop_interface.c 16 Sep 2008 01:32:20 -0000 1.5 --- prop_interface.c 17 Sep 2008 00:56:13 -0000 1.6 *************** *** 41,46 **** GtkWidget *label5; GtkWidget *maximum_wpm_entry; ! GtkWidget *comboboxFFTPacketLength; ! GtkWidget *comboboxSampleFrequency; GtkWidget *label3; GtkWidget *label1; --- 41,46 ---- GtkWidget *label5; GtkWidget *maximum_wpm_entry; ! GtkWidget *comboboxentrySampleFrequency; ! GtkWidget *comboboxentryFFTPacketLength; GtkWidget *label3; GtkWidget *label1; *************** *** 48,54 **** GtkWidget *vbox1; GtkWidget *label13; ! GtkWidget *comboboxDeviceType; GtkWidget *label9; ! GtkWidget *comboboxDevicePath; GtkWidget *label8; GtkWidget *label2; --- 48,54 ---- GtkWidget *vbox1; GtkWidget *label13; ! GtkWidget *comboboxentryDeviceType; GtkWidget *label9; ! GtkWidget *comboboxentryDevicePath; GtkWidget *label8; GtkWidget *label2; *************** *** 57,61 **** GtkWidget *vbox2; GtkWidget *label12; ! GtkWidget *comboboxTaps; GtkWidget *label11; GtkWidget *label10; --- 57,61 ---- GtkWidget *vbox2; GtkWidget *label12; ! GtkWidget *comboboxentryFilterTaps; GtkWidget *label11; GtkWidget *label10; *************** *** 129,153 **** gtk_entry_set_text (GTK_ENTRY (maximum_wpm_entry), _("20")); ! comboboxFFTPacketLength = gtk_combo_box_new_text (); ! gtk_widget_show (comboboxFFTPacketLength); ! gtk_table_attach (GTK_TABLE (table1), comboboxFFTPacketLength, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxFFTPacketLength), _("16")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxFFTPacketLength), _("32")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxFFTPacketLength), _("64")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxFFTPacketLength), _("128")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxFFTPacketLength), _("256")); ! comboboxSampleFrequency = gtk_combo_box_new_text (); ! gtk_widget_show (comboboxSampleFrequency); ! gtk_table_attach (GTK_TABLE (table1), comboboxSampleFrequency, 1, 2, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxSampleFrequency), _("4000")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxSampleFrequency), _("8000")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxSampleFrequency), _("11025")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxSampleFrequency), _("16000")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxSampleFrequency), _("22050")); label3 = gtk_label_new (_("Morse Settings")); --- 129,153 ---- gtk_entry_set_text (GTK_ENTRY (maximum_wpm_entry), _("20")); ! comboboxentrySampleFrequency = gtk_combo_box_entry_new_text (); ! gtk_widget_show (comboboxentrySampleFrequency); ! gtk_table_attach (GTK_TABLE (table1), comboboxentrySampleFrequency, 1, 2, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentrySampleFrequency), _("4000")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentrySampleFrequency), _("8000")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentrySampleFrequency), _("11025")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentrySampleFrequency), _("16000")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentrySampleFrequency), _("22050")); ! comboboxentryFFTPacketLength = gtk_combo_box_entry_new_text (); ! gtk_widget_show (comboboxentryFFTPacketLength); ! gtk_table_attach (GTK_TABLE (table1), comboboxentryFFTPacketLength, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentryFFTPacketLength), _("16")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentryFFTPacketLength), _("32")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentryFFTPacketLength), _("64")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentryFFTPacketLength), _("128")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentryFFTPacketLength), _("256")); label3 = gtk_label_new (_("Morse Settings")); *************** *** 173,179 **** gtk_box_pack_start (GTK_BOX (vbox1), label13, FALSE, FALSE, 0); ! comboboxDeviceType = gtk_combo_box_new_text (); ! gtk_widget_show (comboboxDeviceType); ! gtk_box_pack_start (GTK_BOX (vbox1), comboboxDeviceType, FALSE, FALSE, 0); label9 = gtk_label_new (_("Device Path")); --- 173,179 ---- gtk_box_pack_start (GTK_BOX (vbox1), label13, FALSE, FALSE, 0); ! comboboxentryDeviceType = gtk_combo_box_entry_new_text (); ! gtk_widget_show (comboboxentryDeviceType); ! gtk_box_pack_start (GTK_BOX (vbox1), comboboxentryDeviceType, FALSE, FALSE, 0); label9 = gtk_label_new (_("Device Path")); *************** *** 182,190 **** gtk_label_set_justify (GTK_LABEL (label9), GTK_JUSTIFY_CENTER); ! comboboxDevicePath = gtk_combo_box_new_text (); ! gtk_widget_show (comboboxDevicePath); ! gtk_box_pack_start (GTK_BOX (vbox1), comboboxDevicePath, FALSE, FALSE, 0); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxDevicePath), _("/dev/dsp")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxDevicePath), _("/dev/audio")); label8 = gtk_label_new (_("Audio Device Settings")); --- 182,190 ---- gtk_label_set_justify (GTK_LABEL (label9), GTK_JUSTIFY_CENTER); ! comboboxentryDevicePath = gtk_combo_box_entry_new_text (); ! gtk_widget_show (comboboxentryDevicePath); ! gtk_box_pack_start (GTK_BOX (vbox1), comboboxentryDevicePath, FALSE, FALSE, 0); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentryDevicePath), _("/dev/dsp")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentryDevicePath), _("/dev/audio")); label8 = gtk_label_new (_("Audio Device Settings")); *************** *** 217,228 **** gtk_label_set_justify (GTK_LABEL (label12), GTK_JUSTIFY_CENTER); ! comboboxTaps = gtk_combo_box_new_text (); ! gtk_widget_show (comboboxTaps); ! gtk_box_pack_start (GTK_BOX (vbox2), comboboxTaps, FALSE, FALSE, 0); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxTaps), _("8")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxTaps), _("16")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxTaps), _("32")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxTaps), _("64")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxTaps), _("128")); label11 = gtk_label_new (_("Filter Settings")); --- 217,228 ---- gtk_label_set_justify (GTK_LABEL (label12), GTK_JUSTIFY_CENTER); ! comboboxentryFilterTaps = gtk_combo_box_entry_new_text (); ! gtk_widget_show (comboboxentryFilterTaps); ! gtk_box_pack_start (GTK_BOX (vbox2), comboboxentryFilterTaps, FALSE, FALSE, 0); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentryFilterTaps), _("8")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentryFilterTaps), _("16")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentryFilterTaps), _("32")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentryFilterTaps), _("64")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentryFilterTaps), _("128")); label11 = gtk_label_new (_("Filter Settings")); *************** *** 241,257 **** G_CALLBACK (on_morse2txt_properties_show), NULL); ! g_signal_connect ((gpointer) comboboxFFTPacketLength, "changed", G_CALLBACK (widget_in_property_box_changed), NULL); ! g_signal_connect ((gpointer) comboboxSampleFrequency, "changed", G_CALLBACK (widget_in_property_box_changed), NULL); ! g_signal_connect ((gpointer) comboboxDeviceType, "changed", G_CALLBACK (widget_in_property_box_changed), NULL); ! g_signal_connect ((gpointer) comboboxDevicePath, "changed", G_CALLBACK (widget_in_property_box_changed), NULL); ! g_signal_connect ((gpointer) comboboxTaps, "changed", G_CALLBACK (widget_in_property_box_changed), NULL); --- 241,257 ---- G_CALLBACK (on_morse2txt_properties_show), NULL); ! g_signal_connect ((gpointer) comboboxentrySampleFrequency, "changed", G_CALLBACK (widget_in_property_box_changed), NULL); ! g_signal_connect ((gpointer) comboboxentryFFTPacketLength, "changed", G_CALLBACK (widget_in_property_box_changed), NULL); ! g_signal_connect ((gpointer) comboboxentryDeviceType, "changed", G_CALLBACK (widget_in_property_box_changed), NULL); ! g_signal_connect ((gpointer) comboboxentryDevicePath, "changed", G_CALLBACK (widget_in_property_box_changed), NULL); ! g_signal_connect ((gpointer) comboboxentryFilterTaps, "changed", G_CALLBACK (widget_in_property_box_changed), NULL); *************** *** 268,273 **** GLADE_HOOKUP_OBJECT (morse2txt_properties, label5, "label5"); GLADE_HOOKUP_OBJECT (morse2txt_properties, maximum_wpm_entry, "maximum_wpm_entry"); ! GLADE_HOOKUP_OBJECT (morse2txt_properties, comboboxFFTPacketLength, "comboboxFFTPacketLength"); ! GLADE_HOOKUP_OBJECT (morse2txt_properties, comboboxSampleFrequency, "comboboxSampleFrequency"); GLADE_HOOKUP_OBJECT (morse2txt_properties, label3, "label3"); GLADE_HOOKUP_OBJECT (morse2txt_properties, label1, "label1"); --- 268,273 ---- GLADE_HOOKUP_OBJECT (morse2txt_properties, label5, "label5"); GLADE_HOOKUP_OBJECT (morse2txt_properties, maximum_wpm_entry, "maximum_wpm_entry"); ! GLADE_HOOKUP_OBJECT (morse2txt_properties, comboboxentrySampleFrequency, "comboboxentrySampleFrequency"); ! GLADE_HOOKUP_OBJECT (morse2txt_properties, comboboxentryFFTPacketLength, "comboboxentryFFTPacketLength"); GLADE_HOOKUP_OBJECT (morse2txt_properties, label3, "label3"); GLADE_HOOKUP_OBJECT (morse2txt_properties, label1, "label1"); *************** *** 275,281 **** GLADE_HOOKUP_OBJECT (morse2txt_properties, vbox1, "vbox1"); GLADE_HOOKUP_OBJECT (morse2txt_properties, label13, "label13"); ! GLADE_HOOKUP_OBJECT (morse2txt_properties, comboboxDeviceType, "comboboxDeviceType"); GLADE_HOOKUP_OBJECT (morse2txt_properties, label9, "label9"); ! GLADE_HOOKUP_OBJECT (morse2txt_properties, comboboxDevicePath, "comboboxDevicePath"); GLADE_HOOKUP_OBJECT (morse2txt_properties, label8, "label8"); GLADE_HOOKUP_OBJECT (morse2txt_properties, label2, "label2"); --- 275,281 ---- GLADE_HOOKUP_OBJECT (morse2txt_properties, vbox1, "vbox1"); GLADE_HOOKUP_OBJECT (morse2txt_properties, label13, "label13"); ! GLADE_HOOKUP_OBJECT (morse2txt_properties, comboboxentryDeviceType, "comboboxentryDeviceType"); GLADE_HOOKUP_OBJECT (morse2txt_properties, label9, "label9"); ! GLADE_HOOKUP_OBJECT (morse2txt_properties, comboboxentryDevicePath, "comboboxentryDevicePath"); GLADE_HOOKUP_OBJECT (morse2txt_properties, label8, "label8"); GLADE_HOOKUP_OBJECT (morse2txt_properties, label2, "label2"); *************** *** 284,288 **** GLADE_HOOKUP_OBJECT (morse2txt_properties, vbox2, "vbox2"); GLADE_HOOKUP_OBJECT (morse2txt_properties, label12, "label12"); ! GLADE_HOOKUP_OBJECT (morse2txt_properties, comboboxTaps, "comboboxTaps"); GLADE_HOOKUP_OBJECT (morse2txt_properties, label11, "label11"); GLADE_HOOKUP_OBJECT (morse2txt_properties, label10, "label10"); --- 284,288 ---- GLADE_HOOKUP_OBJECT (morse2txt_properties, vbox2, "vbox2"); GLADE_HOOKUP_OBJECT (morse2txt_properties, label12, "label12"); ! GLADE_HOOKUP_OBJECT (morse2txt_properties, comboboxentryFilterTaps, "comboboxentryFilterTaps"); GLADE_HOOKUP_OBJECT (morse2txt_properties, label11, "label11"); GLADE_HOOKUP_OBJECT (morse2txt_properties, label10, "label10"); Index: prop_callbacks.c =================================================================== RCS file: /cvsroot/morse2txt/morse2txt/src/prop_callbacks.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** prop_callbacks.c 14 Sep 2008 23:55:47 -0000 1.7 --- prop_callbacks.c 17 Sep 2008 00:56:13 -0000 1.8 *************** *** 25,29 **** static char ctmp[AUDIO_DEVICE_NAME_LENGTH]; ! --- 25,29 ---- static char ctmp[AUDIO_DEVICE_NAME_LENGTH]; ! #if 0 *************** *** 58,61 **** --- 58,62 ---- GTK_ADJUSTMENT(main_gui.adjustment_frequency_v)->lower = 0.0; GTK_ADJUSTMENT(main_gui.adjustment_frequency_v)->upper = (morse_get_fft_data_size() - 1); + #endif } *************** *** 78,84 **** g_snprintf(c_tmp, ENTRY_LENGTH, "%d", morse_get_tone_packet_size()); ! ! tmp = lookup_widget(main_gui.properties_v, "fft_packet_length_entry"); ! gtk_entry_set_text(GTK_ENTRY(tmp), c_tmp); g_snprintf(c_tmp, ENTRY_LENGTH, "%2.1f", freq_resolution); --- 79,87 ---- g_snprintf(c_tmp, ENTRY_LENGTH, "%d", morse_get_tone_packet_size()); ! tmp = lookup_widget(main_gui.properties_v, "comboboxFFTPacketLength"); ! gtk_combo_box_set_text(GTK_COMBO_BOX(tmp), c_tmp); ! #if 0 ! ! gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (combo)->entry), "My String."); g_snprintf(c_tmp, ENTRY_LENGTH, "%2.1f", freq_resolution); *************** *** 114,118 **** g_snprintf(c_tmp, ENTRY_LENGTH, "%d", morse_get_filter_taps()); gtk_entry_set_text(GTK_ENTRY(tmp), c_tmp); ! gnome_property_box_set_modified(GNOME_PROPERTY_BOX(main_gui.properties_v), FALSE); } --- 117,121 ---- g_snprintf(c_tmp, ENTRY_LENGTH, "%d", morse_get_filter_taps()); gtk_entry_set_text(GTK_ENTRY(tmp), c_tmp); ! #endif gnome_property_box_set_modified(GNOME_PROPERTY_BOX(main_gui.properties_v), FALSE); } *************** *** 120,124 **** void ! widget_in_property_box_changed (GtkEditable *editable, gpointer user_data) { --- 123,127 ---- void ! widget_in_property_box_changed (GtkComboBox *combobox, gpointer user_data) { *************** *** 131,134 **** --- 134,139 ---- gnome_property_box_changed (GNOME_PROPERTY_BOX (main_gui.properties_v)); + + #if 0 tmp = lookup_widget(main_gui.properties_v, "sample_frequency_entry"); sample_freq = atoi(gtk_entry_get_text(GTK_ENTRY(tmp))); *************** *** 147,149 **** --- 152,155 ---- tmp = lookup_widget(main_gui.properties_v, "maximum_wpm_entry"); gtk_entry_set_text(GTK_ENTRY(tmp), c_tmp); + #endif } |
|
From: Ken P. <kp...@us...> - 2008-09-15 18:32:23
|
Update of /cvsroot/morse2txt/morse2txt/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16016/src Modified Files: prop_interface.c Log Message: Add missing callback functions. Index: prop_interface.c =================================================================== RCS file: /cvsroot/morse2txt/morse2txt/src/prop_interface.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** prop_interface.c 14 Sep 2008 23:55:47 -0000 1.4 --- prop_interface.c 16 Sep 2008 01:32:20 -0000 1.5 *************** *** 241,244 **** --- 241,259 ---- G_CALLBACK (on_morse2txt_properties_show), NULL); + g_signal_connect ((gpointer) comboboxFFTPacketLength, "changed", + G_CALLBACK (widget_in_property_box_changed), + NULL); + g_signal_connect ((gpointer) comboboxSampleFrequency, "changed", + G_CALLBACK (widget_in_property_box_changed), + NULL); + g_signal_connect ((gpointer) comboboxDeviceType, "changed", + G_CALLBACK (widget_in_property_box_changed), + NULL); + g_signal_connect ((gpointer) comboboxDevicePath, "changed", + G_CALLBACK (widget_in_property_box_changed), + NULL); + g_signal_connect ((gpointer) comboboxTaps, "changed", + G_CALLBACK (widget_in_property_box_changed), + NULL); /* Store pointers to all widgets, for use by lookup_widget(). */ |
|
From: Ken P. <kp...@us...> - 2008-09-15 17:16:36
|
Update of /cvsroot/morse2txt/morse2txt/gui In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15311/gui Modified Files: properites_gui-gtk-2.x.glade Log Message: Fix missing callbacks. Index: properites_gui-gtk-2.x.glade =================================================================== RCS file: /cvsroot/morse2txt/morse2txt/gui/properites_gui-gtk-2.x.glade,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** properites_gui-gtk-2.x.glade 14 Sep 2008 23:53:21 -0000 1.6 --- properites_gui-gtk-2.x.glade 16 Sep 2008 00:16:31 -0000 1.7 *************** *** 215,218 **** --- 215,219 ---- <property name="add_tearoffs">False</property> <property name="focus_on_click">True</property> + <signal name="changed" handler="widget_in_property_box_changed" last_modification_time="Tue, 16 Sep 2008 00:11:14 GMT"/> </widget> <packing> *************** *** 236,239 **** --- 237,241 ---- <property name="add_tearoffs">False</property> <property name="focus_on_click">True</property> + <signal name="changed" handler="widget_in_property_box_changed" last_modification_time="Tue, 16 Sep 2008 00:11:26 GMT"/> </widget> <packing> *************** *** 346,349 **** --- 348,352 ---- <property name="add_tearoffs">False</property> <property name="focus_on_click">True</property> + <signal name="changed" handler="widget_in_property_box_changed" last_modification_time="Tue, 16 Sep 2008 00:11:35 GMT"/> </widget> <packing> *************** *** 386,389 **** --- 389,393 ---- <property name="add_tearoffs">False</property> <property name="focus_on_click">True</property> + <signal name="changed" handler="widget_in_property_box_changed" last_modification_time="Tue, 16 Sep 2008 00:11:43 GMT"/> </widget> <packing> *************** *** 510,513 **** --- 514,518 ---- <property name="add_tearoffs">False</property> <property name="focus_on_click">True</property> + <signal name="changed" handler="widget_in_property_box_changed" last_modification_time="Tue, 16 Sep 2008 00:11:58 GMT"/> </widget> <packing> |
|
From: Ken P. <kp...@us...> - 2008-09-14 23:56:16
|
Update of /cvsroot/morse2txt/morse2txt/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22623/src Modified Files: prop_interface.c prop_callbacks.h prop_callbacks.c Log Message: Newly Generated, removed depreciated GTK controls, Some lookups not working here in the property page. Index: prop_callbacks.h =================================================================== RCS file: /cvsroot/morse2txt/morse2txt/src/prop_callbacks.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** prop_callbacks.h 23 Apr 2005 15:53:16 -0000 1.2 --- prop_callbacks.h 14 Sep 2008 23:55:47 -0000 1.3 *************** *** 12,15 **** void ! widget_in_property_box_changed (GtkComboBox *combobox, gpointer user_data); --- 12,15 ---- void ! widget_in_property_box_changed (GtkEditable *editable, gpointer user_data); Index: prop_interface.c =================================================================== RCS file: /cvsroot/morse2txt/morse2txt/src/prop_interface.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** prop_interface.c 23 Apr 2005 15:54:22 -0000 1.3 --- prop_interface.c 14 Sep 2008 23:55:47 -0000 1.4 *************** *** 41,58 **** GtkWidget *label5; GtkWidget *maximum_wpm_entry; ! GtkWidget *combo3; ! GList *combo3_items = NULL; ! GtkWidget *fft_packet_length_entry; ! GtkWidget *combo4; ! GList *combo4_items = NULL; ! GtkWidget *sample_frequency_entry; GtkWidget *label3; GtkWidget *label1; GtkWidget *frame1; GtkWidget *vbox1; GtkWidget *label9; ! GtkWidget *combo1; ! GList *combo1_items = NULL; ! GtkWidget *audio_device_combo_entry; GtkWidget *label8; GtkWidget *label2; --- 41,54 ---- GtkWidget *label5; GtkWidget *maximum_wpm_entry; ! GtkWidget *comboboxFFTPacketLength; ! GtkWidget *comboboxSampleFrequency; GtkWidget *label3; GtkWidget *label1; GtkWidget *frame1; GtkWidget *vbox1; + GtkWidget *label13; + GtkWidget *comboboxDeviceType; GtkWidget *label9; ! GtkWidget *comboboxDevicePath; GtkWidget *label8; GtkWidget *label2; *************** *** 61,67 **** GtkWidget *vbox2; GtkWidget *label12; ! GtkWidget *combo2; ! GList *combo2_items = NULL; ! GtkWidget *filter_taps_entry; GtkWidget *label11; GtkWidget *label10; --- 57,61 ---- GtkWidget *vbox2; GtkWidget *label12; ! GtkWidget *comboboxTaps; GtkWidget *label11; GtkWidget *label10; *************** *** 135,176 **** gtk_entry_set_text (GTK_ENTRY (maximum_wpm_entry), _("20")); ! combo3 = gtk_combo_new (); ! g_object_set_data (G_OBJECT (GTK_COMBO (combo3)->popwin), ! "GladeParentKey", combo3); ! gtk_widget_show (combo3); ! gtk_table_attach (GTK_TABLE (table1), combo3, 0, 1, 1, 2, ! (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), ! (GtkAttachOptions) (0), 0, 0); ! combo3_items = g_list_append (combo3_items, (gpointer) _("16")); ! combo3_items = g_list_append (combo3_items, (gpointer) _("32")); ! combo3_items = g_list_append (combo3_items, (gpointer) _("64")); ! combo3_items = g_list_append (combo3_items, (gpointer) _("128")); ! combo3_items = g_list_append (combo3_items, (gpointer) _("256")); ! gtk_combo_set_popdown_strings (GTK_COMBO (combo3), combo3_items); ! g_list_free (combo3_items); ! ! fft_packet_length_entry = GTK_COMBO (combo3)->entry; ! gtk_widget_show (fft_packet_length_entry); ! gtk_editable_set_editable (GTK_EDITABLE (fft_packet_length_entry), FALSE); ! gtk_entry_set_text (GTK_ENTRY (fft_packet_length_entry), _("16")); ! ! combo4 = gtk_combo_new (); ! g_object_set_data (G_OBJECT (GTK_COMBO (combo4)->popwin), ! "GladeParentKey", combo4); ! gtk_widget_show (combo4); ! gtk_table_attach (GTK_TABLE (table1), combo4, 1, 2, 1, 2, ! (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), ! (GtkAttachOptions) (0), 0, 0); ! combo4_items = g_list_append (combo4_items, (gpointer) _("4000")); ! combo4_items = g_list_append (combo4_items, (gpointer) _("8000")); ! combo4_items = g_list_append (combo4_items, (gpointer) _("11025")); ! combo4_items = g_list_append (combo4_items, (gpointer) _("16000")); ! combo4_items = g_list_append (combo4_items, (gpointer) _("22050")); ! gtk_combo_set_popdown_strings (GTK_COMBO (combo4), combo4_items); ! g_list_free (combo4_items); ! sample_frequency_entry = GTK_COMBO (combo4)->entry; ! gtk_widget_show (sample_frequency_entry); ! gtk_editable_set_editable (GTK_EDITABLE (sample_frequency_entry), FALSE); label3 = gtk_label_new (_("Morse Settings")); --- 129,153 ---- gtk_entry_set_text (GTK_ENTRY (maximum_wpm_entry), _("20")); ! comboboxFFTPacketLength = gtk_combo_box_new_text (); ! gtk_widget_show (comboboxFFTPacketLength); ! gtk_table_attach (GTK_TABLE (table1), comboboxFFTPacketLength, 0, 1, 1, 2, ! (GtkAttachOptions) (GTK_FILL), ! (GtkAttachOptions) (GTK_FILL), 0, 0); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxFFTPacketLength), _("16")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxFFTPacketLength), _("32")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxFFTPacketLength), _("64")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxFFTPacketLength), _("128")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxFFTPacketLength), _("256")); ! comboboxSampleFrequency = gtk_combo_box_new_text (); ! gtk_widget_show (comboboxSampleFrequency); ! gtk_table_attach (GTK_TABLE (table1), comboboxSampleFrequency, 1, 2, 1, 2, ! (GtkAttachOptions) (GTK_FILL), ! (GtkAttachOptions) (GTK_FILL), 0, 0); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxSampleFrequency), _("4000")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxSampleFrequency), _("8000")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxSampleFrequency), _("11025")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxSampleFrequency), _("16000")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxSampleFrequency), _("22050")); label3 = gtk_label_new (_("Morse Settings")); *************** *** 192,195 **** --- 169,179 ---- gtk_container_add (GTK_CONTAINER (frame1), vbox1); gtk_container_set_border_width (GTK_CONTAINER (vbox1), 10); + label13 = gtk_label_new (_("Device Type")); + gtk_widget_show (label13); + gtk_box_pack_start (GTK_BOX (vbox1), label13, FALSE, FALSE, 0); + + comboboxDeviceType = gtk_combo_box_new_text (); + gtk_widget_show (comboboxDeviceType); + gtk_box_pack_start (GTK_BOX (vbox1), comboboxDeviceType, FALSE, FALSE, 0); label9 = gtk_label_new (_("Device Path")); *************** *** 198,215 **** gtk_label_set_justify (GTK_LABEL (label9), GTK_JUSTIFY_CENTER); ! combo1 = gtk_combo_new (); ! g_object_set_data (G_OBJECT (GTK_COMBO (combo1)->popwin), ! "GladeParentKey", combo1); ! gtk_widget_show (combo1); ! gtk_box_pack_start (GTK_BOX (vbox1), combo1, FALSE, FALSE, 0); ! combo1_items = g_list_append (combo1_items, (gpointer) _("/dev/dsp")); ! combo1_items = g_list_append (combo1_items, (gpointer) _("/dev/audio")); ! gtk_combo_set_popdown_strings (GTK_COMBO (combo1), combo1_items); ! g_list_free (combo1_items); ! ! audio_device_combo_entry = GTK_COMBO (combo1)->entry; ! gtk_widget_show (audio_device_combo_entry); ! label8 = gtk_label_new (_("OSS Device")); gtk_widget_show (label8); gtk_frame_set_label_widget (GTK_FRAME (frame1), label8); --- 182,192 ---- gtk_label_set_justify (GTK_LABEL (label9), GTK_JUSTIFY_CENTER); ! comboboxDevicePath = gtk_combo_box_new_text (); ! gtk_widget_show (comboboxDevicePath); ! gtk_box_pack_start (GTK_BOX (vbox1), comboboxDevicePath, FALSE, FALSE, 0); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxDevicePath), _("/dev/dsp")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxDevicePath), _("/dev/audio")); ! label8 = gtk_label_new (_("Audio Device Settings")); gtk_widget_show (label8); gtk_frame_set_label_widget (GTK_FRAME (frame1), label8); *************** *** 240,259 **** gtk_label_set_justify (GTK_LABEL (label12), GTK_JUSTIFY_CENTER); ! combo2 = gtk_combo_new (); ! g_object_set_data (G_OBJECT (GTK_COMBO (combo2)->popwin), ! "GladeParentKey", combo2); ! gtk_widget_show (combo2); ! gtk_box_pack_start (GTK_BOX (vbox2), combo2, FALSE, FALSE, 0); ! combo2_items = g_list_append (combo2_items, (gpointer) _("8")); ! combo2_items = g_list_append (combo2_items, (gpointer) _("16")); ! combo2_items = g_list_append (combo2_items, (gpointer) _("32")); ! combo2_items = g_list_append (combo2_items, (gpointer) _("64")); ! combo2_items = g_list_append (combo2_items, (gpointer) _("128")); ! gtk_combo_set_popdown_strings (GTK_COMBO (combo2), combo2_items); ! g_list_free (combo2_items); ! ! filter_taps_entry = GTK_COMBO (combo2)->entry; ! gtk_widget_show (filter_taps_entry); ! gtk_editable_set_editable (GTK_EDITABLE (filter_taps_entry), FALSE); label11 = gtk_label_new (_("Filter Settings")); --- 217,228 ---- gtk_label_set_justify (GTK_LABEL (label12), GTK_JUSTIFY_CENTER); ! comboboxTaps = gtk_combo_box_new_text (); ! gtk_widget_show (comboboxTaps); ! gtk_box_pack_start (GTK_BOX (vbox2), comboboxTaps, FALSE, FALSE, 0); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxTaps), _("8")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxTaps), _("16")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxTaps), _("32")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxTaps), _("64")); ! gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxTaps), _("128")); label11 = gtk_label_new (_("Filter Settings")); *************** *** 272,287 **** G_CALLBACK (on_morse2txt_properties_show), NULL); - g_signal_connect ((gpointer) fft_packet_length_entry, "changed", - G_CALLBACK (widget_in_property_box_changed), - NULL); - g_signal_connect ((gpointer) sample_frequency_entry, "changed", - G_CALLBACK (widget_in_property_box_changed), - NULL); - g_signal_connect ((gpointer) audio_device_combo_entry, "changed", - G_CALLBACK (widget_in_property_box_changed), - NULL); - g_signal_connect ((gpointer) filter_taps_entry, "changed", - G_CALLBACK (widget_in_property_box_changed), - NULL); /* Store pointers to all widgets, for use by lookup_widget(). */ --- 241,244 ---- *************** *** 296,310 **** GLADE_HOOKUP_OBJECT (morse2txt_properties, label5, "label5"); GLADE_HOOKUP_OBJECT (morse2txt_properties, maximum_wpm_entry, "maximum_wpm_entry"); ! GLADE_HOOKUP_OBJECT (morse2txt_properties, combo3, "combo3"); ! GLADE_HOOKUP_OBJECT (morse2txt_properties, fft_packet_length_entry, "fft_packet_length_entry"); ! GLADE_HOOKUP_OBJECT (morse2txt_properties, combo4, "combo4"); ! GLADE_HOOKUP_OBJECT (morse2txt_properties, sample_frequency_entry, "sample_frequency_entry"); GLADE_HOOKUP_OBJECT (morse2txt_properties, label3, "label3"); GLADE_HOOKUP_OBJECT (morse2txt_properties, label1, "label1"); GLADE_HOOKUP_OBJECT (morse2txt_properties, frame1, "frame1"); GLADE_HOOKUP_OBJECT (morse2txt_properties, vbox1, "vbox1"); GLADE_HOOKUP_OBJECT (morse2txt_properties, label9, "label9"); ! GLADE_HOOKUP_OBJECT (morse2txt_properties, combo1, "combo1"); ! GLADE_HOOKUP_OBJECT (morse2txt_properties, audio_device_combo_entry, "audio_device_combo_entry"); GLADE_HOOKUP_OBJECT (morse2txt_properties, label8, "label8"); GLADE_HOOKUP_OBJECT (morse2txt_properties, label2, "label2"); --- 253,266 ---- GLADE_HOOKUP_OBJECT (morse2txt_properties, label5, "label5"); GLADE_HOOKUP_OBJECT (morse2txt_properties, maximum_wpm_entry, "maximum_wpm_entry"); ! GLADE_HOOKUP_OBJECT (morse2txt_properties, comboboxFFTPacketLength, "comboboxFFTPacketLength"); ! GLADE_HOOKUP_OBJECT (morse2txt_properties, comboboxSampleFrequency, "comboboxSampleFrequency"); GLADE_HOOKUP_OBJECT (morse2txt_properties, label3, "label3"); GLADE_HOOKUP_OBJECT (morse2txt_properties, label1, "label1"); GLADE_HOOKUP_OBJECT (morse2txt_properties, frame1, "frame1"); GLADE_HOOKUP_OBJECT (morse2txt_properties, vbox1, "vbox1"); + GLADE_HOOKUP_OBJECT (morse2txt_properties, label13, "label13"); + GLADE_HOOKUP_OBJECT (morse2txt_properties, comboboxDeviceType, "comboboxDeviceType"); GLADE_HOOKUP_OBJECT (morse2txt_properties, label9, "label9"); ! GLADE_HOOKUP_OBJECT (morse2txt_properties, comboboxDevicePath, "comboboxDevicePath"); GLADE_HOOKUP_OBJECT (morse2txt_properties, label8, "label8"); GLADE_HOOKUP_OBJECT (morse2txt_properties, label2, "label2"); *************** *** 313,318 **** GLADE_HOOKUP_OBJECT (morse2txt_properties, vbox2, "vbox2"); GLADE_HOOKUP_OBJECT (morse2txt_properties, label12, "label12"); ! GLADE_HOOKUP_OBJECT (morse2txt_properties, combo2, "combo2"); ! GLADE_HOOKUP_OBJECT (morse2txt_properties, filter_taps_entry, "filter_taps_entry"); GLADE_HOOKUP_OBJECT (morse2txt_properties, label11, "label11"); GLADE_HOOKUP_OBJECT (morse2txt_properties, label10, "label10"); --- 269,273 ---- GLADE_HOOKUP_OBJECT (morse2txt_properties, vbox2, "vbox2"); GLADE_HOOKUP_OBJECT (morse2txt_properties, label12, "label12"); ! GLADE_HOOKUP_OBJECT (morse2txt_properties, comboboxTaps, "comboboxTaps"); GLADE_HOOKUP_OBJECT (morse2txt_properties, label11, "label11"); GLADE_HOOKUP_OBJECT (morse2txt_properties, label10, "label10"); Index: prop_callbacks.c =================================================================== RCS file: /cvsroot/morse2txt/morse2txt/src/prop_callbacks.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** prop_callbacks.c 18 Mar 2006 15:43:49 -0000 1.6 --- prop_callbacks.c 14 Sep 2008 23:55:47 -0000 1.7 *************** *** 25,32 **** --- 25,45 ---- static char ctmp[AUDIO_DEVICE_NAME_LENGTH]; + + + + + /** TODO - This needs to be fixed */ tmp = lookup_widget(main_gui.properties_v, "audio_device_combo_entry"); s = gtk_entry_get_text(GTK_ENTRY(tmp)); g_snprintf(ctmp, AUDIO_DEVICE_NAME_LENGTH, "%s", s); audio_device_name_set(morse_audio_rec_dev_get(), ctmp); + + tmp = lookup_widget(main_gui.properties_v, "comboboxentryDeviceType"); + tmp = lookup_widget(main_gui.properties_v, "comboboxentryDevicePath"); + + + + + tmp = lookup_widget(main_gui.properties_v, "sample_frequency_entry"); *************** *** 81,87 **** --- 94,113 ---- gtk_entry_set_text(GTK_ENTRY(tmp), c_tmp); + + + + + /** TODO - This needs to be fixed. */ tmp = lookup_widget(main_gui.properties_v, "audio_device_combo_entry"); audio_device_name_get(morse_audio_rec_dev_get(), &tmp_char); gtk_entry_set_text(GTK_ENTRY(tmp), _(tmp_char)); + + tmp = lookup_widget(main_gui.properties_v, "comboboxentryDeviceType"); + tmp = lookup_widget(main_gui.properties_v, "comboboxentryDevicePath"); + + + + + tmp = lookup_widget(main_gui.properties_v, "filter_taps_entry"); *************** *** 94,98 **** void ! widget_in_property_box_changed (GtkComboBox *combobox, gpointer user_data) { --- 120,124 ---- void ! widget_in_property_box_changed (GtkEditable *editable, gpointer user_data) { *************** *** 122,129 **** gtk_entry_set_text(GTK_ENTRY(tmp), c_tmp); } - - - - - - --- 148,149 ---- |
|
From: Ken P. <kp...@us...> - 2008-09-14 23:53:36
|
Update of /cvsroot/morse2txt/morse2txt/gui In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19928/gui Modified Files: properites_gui-gtk-2.x.glade Log Message: Change the edit combo boxes to plain combo boxes. Index: properites_gui-gtk-2.x.glade =================================================================== RCS file: /cvsroot/morse2txt/morse2txt/gui/properites_gui-gtk-2.x.glade,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** properites_gui-gtk-2.x.glade 14 Sep 2008 23:37:24 -0000 1.5 --- properites_gui-gtk-2.x.glade 14 Sep 2008 23:53:21 -0000 1.6 *************** *** 206,210 **** <child> ! <widget class="GtkComboBoxEntry" id="comboboxentryFFTPacketLength"> <property name="visible">True</property> <property name="items" translatable="yes">16 --- 206,210 ---- <child> ! <widget class="GtkComboBox" id="comboboxFFTPacketLength"> <property name="visible">True</property> <property name="items" translatable="yes">16 *************** *** 214,218 **** 256</property> <property name="add_tearoffs">False</property> - <property name="has_frame">True</property> <property name="focus_on_click">True</property> </widget> --- 214,217 ---- *************** *** 228,232 **** <child> ! <widget class="GtkComboBoxEntry" id="comboboxentrySampleFrequency"> <property name="visible">True</property> <property name="items" translatable="yes">4000 --- 227,231 ---- <child> ! <widget class="GtkComboBox" id="comboboxSampleFrequency"> <property name="visible">True</property> <property name="items" translatable="yes">4000 *************** *** 236,240 **** 22050</property> <property name="add_tearoffs">False</property> - <property name="has_frame">True</property> <property name="focus_on_click">True</property> </widget> --- 235,238 ---- *************** *** 344,351 **** <child> ! <widget class="GtkComboBoxEntry" id="comboboxentryDeviceType"> <property name="visible">True</property> <property name="add_tearoffs">False</property> - <property name="has_frame">True</property> <property name="focus_on_click">True</property> </widget> --- 342,348 ---- <child> ! <widget class="GtkComboBox" id="comboboxDeviceType"> <property name="visible">True</property> <property name="add_tearoffs">False</property> <property name="focus_on_click">True</property> </widget> *************** *** 383,392 **** <child> ! <widget class="GtkComboBoxEntry" id="comboboxentryDevicePath"> <property name="visible">True</property> <property name="items" translatable="yes">/dev/dsp /dev/audio</property> <property name="add_tearoffs">False</property> - <property name="has_frame">True</property> <property name="focus_on_click">True</property> </widget> --- 380,388 ---- <child> ! <widget class="GtkComboBox" id="comboboxDevicePath"> <property name="visible">True</property> <property name="items" translatable="yes">/dev/dsp /dev/audio</property> <property name="add_tearoffs">False</property> <property name="focus_on_click">True</property> </widget> *************** *** 505,509 **** <child> ! <widget class="GtkComboBoxEntry" id="comboboxentryTaps"> <property name="visible">True</property> <property name="items" translatable="yes">8 --- 501,505 ---- <child> ! <widget class="GtkComboBox" id="comboboxTaps"> <property name="visible">True</property> <property name="items" translatable="yes">8 *************** *** 513,517 **** 128</property> <property name="add_tearoffs">False</property> - <property name="has_frame">True</property> <property name="focus_on_click">True</property> </widget> --- 509,512 ---- |
|
From: Ken P. <kp...@us...> - 2008-09-14 23:37:42
|
Update of /cvsroot/morse2txt/morse2txt/gui In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2807/gui Modified Files: properites_gui-gtk-2.x.glade Log Message: Remove depreciated combobox controls. Index: properites_gui-gtk-2.x.glade =================================================================== RCS file: /cvsroot/morse2txt/morse2txt/gui/properites_gui-gtk-2.x.glade,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** properites_gui-gtk-2.x.glade 14 Sep 2008 01:01:46 -0000 1.4 --- properites_gui-gtk-2.x.glade 14 Sep 2008 23:37:24 -0000 1.5 *************** *** 64,68 **** <property name="xpad">0</property> <property name="ypad">0</property> - <property name="mnemonic_widget">sample_frequency_entry</property> <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> <property name="width_chars">-1</property> --- 64,67 ---- *************** *** 207,279 **** <child> ! <widget class="GtkCombo" id="combo3"> <property name="visible">True</property> ! <property name="value_in_list">False</property> ! <property name="allow_empty">True</property> ! <property name="case_sensitive">False</property> ! <property name="enable_arrow_keys">True</property> ! <property name="enable_arrows_always">False</property> ! ! <child internal-child="entry"> ! <widget class="GtkEntry" id="fft_packet_length_entry"> ! <property name="visible">True</property> ! <property name="can_focus">True</property> ! <property name="editable">False</property> ! <property name="visibility">True</property> ! <property name="max_length">0</property> ! <property name="text" translatable="yes"></property> ! <property name="has_frame">True</property> ! <property name="invisible_char">*</property> ! <property name="activates_default">False</property> ! <signal name="changed" handler="widget_in_property_box_changed" last_modification_time="Sat, 23 Apr 2005 04:13:17 GMT"/> ! </widget> ! </child> ! ! <child internal-child="list"> ! <widget class="GtkList" id="combo-list3"> ! <property name="visible">True</property> ! <property name="selection_mode">GTK_SELECTION_BROWSE</property> ! ! <child> ! <widget class="GtkListItem" id="listitem153"> ! <property name="visible">True</property> ! <property name="can_focus">True</property> ! <property name="label" translatable="yes">16</property> ! </widget> ! </child> ! ! <child> ! <widget class="GtkListItem" id="listitem154"> ! <property name="visible">True</property> ! <property name="can_focus">True</property> ! <property name="label" translatable="yes">32</property> ! </widget> ! </child> ! ! <child> ! <widget class="GtkListItem" id="listitem155"> ! <property name="visible">True</property> ! <property name="can_focus">True</property> ! <property name="label" translatable="yes">64</property> ! </widget> ! </child> ! ! <child> ! <widget class="GtkListItem" id="listitem156"> ! <property name="visible">True</property> ! <property name="can_focus">True</property> ! <property name="label" translatable="yes">128</property> ! </widget> ! </child> ! ! <child> ! <widget class="GtkListItem" id="listitem157"> ! <property name="visible">True</property> ! <property name="can_focus">True</property> ! <property name="label" translatable="yes">256</property> ! </widget> ! </child> ! </widget> ! </child> </widget> <packing> --- 206,219 ---- <child> ! <widget class="GtkComboBoxEntry" id="comboboxentryFFTPacketLength"> <property name="visible">True</property> ! <property name="items" translatable="yes">16 ! 32 ! 64 ! 128 ! 256</property> ! <property name="add_tearoffs">False</property> ! <property name="has_frame">True</property> ! <property name="focus_on_click">True</property> </widget> <packing> *************** *** 282,359 **** <property name="top_attach">1</property> <property name="bottom_attach">2</property> ! <property name="y_options"></property> </packing> </child> <child> ! <widget class="GtkCombo" id="combo4"> <property name="visible">True</property> ! <property name="value_in_list">False</property> ! <property name="allow_empty">True</property> ! <property name="case_sensitive">False</property> ! <property name="enable_arrow_keys">True</property> ! <property name="enable_arrows_always">False</property> ! ! <child internal-child="entry"> ! <widget class="GtkEntry" id="sample_frequency_entry"> ! <property name="visible">True</property> ! <property name="can_focus">True</property> ! <property name="editable">False</property> ! <property name="visibility">True</property> ! <property name="max_length">0</property> ! <property name="text" translatable="yes"></property> ! <property name="has_frame">True</property> ! <property name="invisible_char">*</property> ! <property name="activates_default">False</property> ! <signal name="changed" handler="widget_in_property_box_changed" last_modification_time="Sat, 23 Apr 2005 04:18:12 GMT"/> ! </widget> ! </child> ! ! <child internal-child="list"> ! <widget class="GtkList" id="combo-list4"> ! <property name="visible">True</property> ! <property name="selection_mode">GTK_SELECTION_BROWSE</property> ! ! <child> ! <widget class="GtkListItem" id="listitem94"> ! <property name="visible">True</property> ! <property name="can_focus">True</property> ! <property name="label" translatable="yes">4000</property> ! </widget> ! </child> ! ! <child> ! <widget class="GtkListItem" id="listitem95"> ! <property name="visible">True</property> ! <property name="can_focus">True</property> ! <property name="label" translatable="yes">8000</property> ! </widget> ! </child> ! ! <child> ! <widget class="GtkListItem" id="listitem96"> ! <property name="visible">True</property> ! <property name="can_focus">True</property> ! <property name="label" translatable="yes">11025</property> ! </widget> ! </child> ! ! <child> ! <widget class="GtkListItem" id="listitem97"> ! <property name="visible">True</property> ! <property name="can_focus">True</property> ! <property name="label" translatable="yes">16000</property> ! </widget> ! </child> ! ! <child> ! <widget class="GtkListItem" id="listitem98"> ! <property name="visible">True</property> ! <property name="can_focus">True</property> ! <property name="label" translatable="yes">22050</property> ! </widget> ! </child> ! </widget> ! </child> </widget> <packing> --- 222,241 ---- <property name="top_attach">1</property> <property name="bottom_attach">2</property> ! <property name="x_options">fill</property> ! <property name="y_options">fill</property> </packing> </child> <child> ! <widget class="GtkComboBoxEntry" id="comboboxentrySampleFrequency"> <property name="visible">True</property> ! <property name="items" translatable="yes">4000 ! 8000 ! 11025 ! 16000 ! 22050</property> ! <property name="add_tearoffs">False</property> ! <property name="has_frame">True</property> ! <property name="focus_on_click">True</property> </widget> <packing> *************** *** 362,366 **** <property name="top_attach">1</property> <property name="bottom_attach">2</property> ! <property name="y_options"></property> </packing> </child> --- 244,249 ---- <property name="top_attach">1</property> <property name="bottom_attach">2</property> ! <property name="x_options">fill</property> ! <property name="y_options">fill</property> </packing> </child> *************** *** 622,694 **** <child> ! <widget class="GtkCombo" id="combo2"> <property name="visible">True</property> ! <property name="value_in_list">False</property> ! <property name="allow_empty">True</property> ! <property name="case_sensitive">False</property> ! <property name="enable_arrow_keys">True</property> ! <property name="enable_arrows_always">False</property> ! ! <child internal-child="entry"> ! <widget class="GtkEntry" id="filter_taps_entry"> ! <property name="visible">True</property> ! <property name="can_focus">True</property> ! <property name="editable">False</property> ! <property name="visibility">True</property> ! <property name="max_length">0</property> ! <property name="text" translatable="yes"></property> ! <property name="has_frame">True</property> ! <property name="invisible_char">*</property> ! <property name="activates_default">False</property> ! <signal name="changed" handler="widget_in_property_box_changed" last_modification_time="Sat, 23 Apr 2005 04:12:26 GMT"/> ! </widget> ! </child> ! ! <child internal-child="list"> ! <widget class="GtkList" id="combo-list2"> ! <property name="visible">True</property> ! <property name="selection_mode">GTK_SELECTION_BROWSE</property> ! ! <child> ! <widget class="GtkListItem" id="listitem38"> ! <property name="visible">True</property> ! <property name="can_focus">True</property> ! <property name="label" translatable="yes">8</property> ! </widget> ! </child> ! ! <child> ! <widget class="GtkListItem" id="listitem39"> ! <property name="visible">True</property> ! <property name="can_focus">True</property> ! <property name="label" translatable="yes">16</property> ! </widget> ! </child> ! ! <child> ! <widget class="GtkListItem" id="listitem40"> ! <property name="visible">True</property> ! <property name="can_focus">True</property> ! <property name="label" translatable="yes">32</property> ! </widget> ! </child> ! ! <child> ! <widget class="GtkListItem" id="listitem41"> ! <property name="visible">True</property> ! <property name="can_focus">True</property> ! <property name="label" translatable="yes">64</property> ! </widget> ! </child> ! ! <child> ! <widget class="GtkListItem" id="listitem42"> ! <property name="visible">True</property> ! <property name="can_focus">True</property> ! <property name="label" translatable="yes">128</property> ! </widget> ! </child> ! </widget> ! </child> </widget> <packing> --- 505,518 ---- <child> ! <widget class="GtkComboBoxEntry" id="comboboxentryTaps"> <property name="visible">True</property> ! <property name="items" translatable="yes">8 ! 16 ! 32 ! 64 ! 128</property> ! <property name="add_tearoffs">False</property> ! <property name="has_frame">True</property> ! <property name="focus_on_click">True</property> </widget> <packing> |
|
From: Ken P. <kp...@us...> - 2008-09-14 13:58:16
|
Update of /cvsroot/morse2txt/morse2txt/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22395/src Modified Files: audio.c Log Message: tabs Index: audio.c =================================================================== RCS file: /cvsroot/morse2txt/morse2txt/src/audio.c,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** audio.c 14 Sep 2008 13:57:01 -0000 1.37 --- audio.c 14 Sep 2008 13:58:00 -0000 1.38 *************** *** 244,253 **** int32_t audio_supported_device_types_get(void) { ! return AUDIO_NUMBER_OF_DEVICE_TYPES; } char* audio_device_type_name_get(int32_t audio_device_type_id) { ! return AUDIO_DEVICE_TABLE[audio_device_type_id].audio_device_type_name; } --- 244,253 ---- int32_t audio_supported_device_types_get(void) { ! return AUDIO_NUMBER_OF_DEVICE_TYPES; } char* audio_device_type_name_get(int32_t audio_device_type_id) { ! return AUDIO_DEVICE_TABLE[audio_device_type_id].audio_device_type_name; } |
|
From: Ken P. <kp...@us...> - 2008-09-14 13:57:10
|
Update of /cvsroot/morse2txt/morse2txt/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21636/src Modified Files: audio.c audio.h morse.c Log Message: tabs Index: audio.c =================================================================== RCS file: /cvsroot/morse2txt/morse2txt/src/audio.c,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** audio.c 13 Sep 2008 18:13:56 -0000 1.36 --- audio.c 14 Sep 2008 13:57:01 -0000 1.37 *************** *** 43,61 **** /** OSS API for morse2txt. */ { ! .audio_device_type_name = "OSS", ! .open = audio_open_oss, ! .init = audio_init_oss, ! .close = audio_close_oss, ! .play = audio_play_oss, ! .record = audio_record_oss }, /** Alsa API for morse2txt. */ { ! .audio_device_type_name = "Alsa", ! .open = audio_open_alsa, ! .init = audio_init_alsa, ! .close = audio_close_alsa, ! .play = audio_play_alsa, ! .record = audio_record_alsa }, /* Terminator */ --- 43,61 ---- /** OSS API for morse2txt. */ { ! .audio_device_type_name = "OSS", ! .open = audio_open_oss, ! .init = audio_init_oss, ! .close = audio_close_oss, ! .play = audio_play_oss, ! .record = audio_record_oss }, /** Alsa API for morse2txt. */ { ! .audio_device_type_name = "Alsa", ! .open = audio_open_alsa, ! .init = audio_init_alsa, ! .close = audio_close_alsa, ! .play = audio_play_alsa, ! .record = audio_record_alsa }, /* Terminator */ Index: audio.h =================================================================== RCS file: /cvsroot/morse2txt/morse2txt/src/audio.h,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** audio.h 13 Sep 2008 18:13:56 -0000 1.24 --- audio.h 14 Sep 2008 13:57:02 -0000 1.25 *************** *** 95,100 **** /** Audio API that morse2txt will use to control OSS or ALSA audio devices. */ typedef struct ts_audio_api { ! char* audio_device_type_name; ! int32_t (*open)(p_audio_pub device); int32_t (*init)(p_audio_pub device); int32_t (*close)(p_audio_pub device); --- 95,100 ---- /** Audio API that morse2txt will use to control OSS or ALSA audio devices. */ typedef struct ts_audio_api { ! char* audio_device_type_name; ! int32_t (*open)(p_audio_pub device); int32_t (*init)(p_audio_pub device); int32_t (*close)(p_audio_pub device); Index: morse.c =================================================================== RCS file: /cvsroot/morse2txt/morse2txt/src/morse.c,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** morse.c 13 Sep 2008 18:13:57 -0000 1.62 --- morse.c 14 Sep 2008 13:57:03 -0000 1.63 *************** *** 976,980 **** int32_t morse_audio_device_type_id_get(void) { ! return morse_settings.audio_type_id; } /** Set the current audio device type Id. --- 976,980 ---- int32_t morse_audio_device_type_id_get(void) { ! return morse_settings.audio_type_id; } /** Set the current audio device type Id. *************** *** 983,987 **** void morse_audio_device_type_id_set(int32_t audio_device_type_id) { ! morse_settings.audio_type_id = audio_device_type_id; } --- 983,987 ---- void morse_audio_device_type_id_set(int32_t audio_device_type_id) { ! morse_settings.audio_type_id = audio_device_type_id; } |
|
From: Ken P. <kp...@us...> - 2008-09-14 01:10:36
|
Update of /cvsroot/morse2txt/morse2txt In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20079 Modified Files: AUTHORS Log Message: update e-mail address Index: AUTHORS =================================================================== RCS file: /cvsroot/morse2txt/morse2txt/AUTHORS,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** AUTHORS 24 Feb 2005 02:19:30 -0000 1.1.1.1 --- AUTHORS 14 Sep 2008 01:10:32 -0000 1.2 *************** *** 1,3 **** Authors: ! Ken Prox, ka8cln <kp...@ww...> --- 1,3 ---- Authors: ! Ken Prox, ka8cln <kp...@us...> |