[Goodies-commits] r6933 - xfce4-radio-plugin/trunk/panel-plugin

Stefan Ott cockroach at xfce.org
Wed Mar 18 02:18:31 CET 2009


Author: cockroach
Date: 2009-03-18 01:18:30 +0000 (Wed, 18 Mar 2009)
New Revision: 6933

Modified:
   xfce4-radio-plugin/trunk/panel-plugin/xfce4-radio.c
Log:
Disabled the signal strength graphics


Modified: xfce4-radio-plugin/trunk/panel-plugin/xfce4-radio.c
===================================================================
--- xfce4-radio-plugin/trunk/panel-plugin/xfce4-radio.c	2009-03-17 18:55:03 UTC (rev 6932)
+++ xfce4-radio-plugin/trunk/panel-plugin/xfce4-radio.c	2009-03-18 01:18:30 UTC (rev 6933)
@@ -89,7 +89,7 @@
 	gtk_widget_show (data->signal_bar);
 	gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR
 		(data->signal_bar), signal / data->max_signal_strength);
-	
+
 	if (signal == 1)
 		gdk_color_parse (COLOR_SIGNAL_LOW, &color);
 	else if (signal == data->max_signal_strength)
@@ -119,7 +119,7 @@
 	else
 	{
 		double signal = radio_get_signal ();
-	
+
 		if (data->signal_timeout_id == 0)
 		{
 			data->signal_timeout_id = g_timeout_add (500,
@@ -332,7 +332,7 @@
 xfce4_radio_stop (radio_gui* data)
 {
 	DBG("Stopping, auto_update_display=%d", data->auto_update_display);
-	
+
 	if (data->auto_update_display)
 		radio_mute ();
 	else
@@ -610,7 +610,7 @@
 
 	gtk_container_set_border_width (GTK_CONTAINER (gui->box), BORDER / 2);
 
-	gtk_widget_show (gui->box);	
+	gtk_widget_show (gui->box);
 	gtk_widget_show (gui->outer_box);
 
 	gtk_container_add (GTK_CONTAINER (gui->outer_box), gui->box);
@@ -710,9 +710,9 @@
 	strcpy(plugin_data->device, "/dev/radio0");
 
 	plugin_data->show_signal = TRUE;
-	plugin_data->show_signal_graphical = TRUE;
+	plugin_data->show_signal_graphical = FALSE;
 	plugin_data->show_label = TRUE;
-	plugin_data->show_label_when_off = FALSE;
+	plugin_data->show_label_when_off = TRUE;
 	plugin_data->auto_update_display = FALSE;
 	plugin_data->presets = NULL;
 	plugin_data->presets = NULL;
@@ -1143,7 +1143,7 @@
 	GtkWidget *properties = gtk_vbox_new (FALSE, 0);
 	gtk_widget_show (properties);
 	gtk_container_add (GTK_CONTAINER (align), properties);
-	
+
 	// Device
 	real_frame = gtk_frame_new (_("Device"));
 	frame = gtk_alignment_new (0, 0, 0.5, 0.5);
@@ -1249,6 +1249,7 @@
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (preset_button),
 		data->scroll == CHANGE_PRESET);
 
+	/*
 	// When off
 	real_frame = gtk_frame_new (_("When radio is off"));
 	frame = gtk_alignment_new (0, 0, 0.5, 0.5);
@@ -1277,12 +1278,13 @@
 			(label_when_off), data->show_label_when_off);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
 			(graphics_when_off), !data->show_label_when_off);
-	
+
 	gtk_widget_show (label_when_off);
 	gtk_widget_show (graphics_when_off);
 
 	gtk_container_add (GTK_CONTAINER (when_off), label_when_off);
 	gtk_container_add (GTK_CONTAINER (when_off), graphics_when_off);
+	*/
 
 	// When on
 	real_frame = gtk_frame_new (_("When radio is running"));
@@ -1308,6 +1310,7 @@
 	gtk_widget_show (show_signal);
 	gtk_container_add (GTK_CONTAINER (strength), show_signal);
 
+	/*
 	// Show the signal strength as
 	hbox = gtk_hbox_new (FALSE, 0);
 	gtk_widget_show (hbox);
@@ -1325,6 +1328,7 @@
 
 	gtk_container_add (GTK_CONTAINER (strength), signal_type_bar);
 	gtk_container_add (GTK_CONTAINER (strength), signal_type_xpm);
+	*/
 
 	// Show the label
 	show_label = gtk_check_button_new_with_label
@@ -1364,7 +1368,7 @@
 
 	gtk_container_add (GTK_CONTAINER (frame), table);
 	gtk_container_add (GTK_CONTAINER (real_frame), frame);
-	gtk_box_pack_start(GTK_BOX(properties), real_frame, FALSE, FALSE, 0);	
+	gtk_box_pack_start(GTK_BOX(properties), real_frame, FALSE, FALSE, 0);
 
 	// Post-startup command
 	label = gtk_label_new (_("Run after startup"));
@@ -1610,11 +1614,11 @@
 	data->show_label = xfce_rc_read_bool_entry
 					(rc, "show_label", TRUE);
 	data->show_label_when_off = xfce_rc_read_bool_entry
-					(rc, "show_label_when_off", FALSE);
+					(rc, "show_label_when_off", TRUE);
 	data->resolve_presets_in_label = xfce_rc_read_bool_entry
 					(rc, "resolve_presets_in_label", TRUE);
 	data->show_signal_graphical = xfce_rc_read_bool_entry
-					(rc, "graphical_signal", TRUE);
+					(rc, "graphical_signal", FALSE);
 
 	if ((value = xfce_rc_read_entry (rc, "dev", NULL)) && *value)
 		strncpy (data->device, value, MAX_DEVICE_NAME_LENGTH);




More information about the Goodies-commits mailing list