DeforaOS/Panel
DeforaOS/Panel
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Pierre Pronchery 2012-09-27 18:44:24 +00:00
parent e7d4425e3c
commit da778f9da7
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/applets/volume.c
View File

@ -13,6 +13,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. */ * along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* TODO: /* TODO:
* - update the image according to the volume in notification mode
* - add a pulseaudio version */ * - add a pulseaudio version */
@ -56,7 +57,7 @@ typedef struct _PanelApplet
guint source; guint source;
/* widgets */ /* widgets */
GtkWidget * widget; GtkWidget * button;
GtkWidget * progress; GtkWidget * progress;
} Volume; } Volume;
@ -109,33 +110,30 @@ static Volume * _volume_init(PanelAppletHelper * helper, GtkWidget ** widget)
if((volume = _volume_new(helper)) == NULL) if((volume = _volume_new(helper)) == NULL)
return NULL; return NULL;
volume->helper = helper; volume->helper = helper;
volume->widget = gtk_volume_button_new(); volume->button = NULL;
volume->progress = NULL; volume->progress = NULL;
g_object_set(G_OBJECT(volume->widget), "size", helper->icon_size, NULL);
if(helper->type == PANEL_APPLET_TYPE_NOTIFICATION) if(helper->type == PANEL_APPLET_TYPE_NOTIFICATION)
{ {
vbox = gtk_vbox_new(FALSE, 4); vbox = gtk_vbox_new(FALSE, 4);
gtk_box_pack_start(GTK_BOX(vbox), volume->widget, TRUE, TRUE, *widget = gtk_image_new_from_icon_name("stock_volume-med",
0); helper->icon_size);
gtk_box_pack_start(GTK_BOX(vbox), *widget, TRUE, TRUE, 0);
volume->progress = gtk_progress_bar_new(); volume->progress = gtk_progress_bar_new();
gtk_box_pack_start(GTK_BOX(vbox), volume->progress, TRUE, TRUE, gtk_box_pack_start(GTK_BOX(vbox), volume->progress, TRUE, TRUE,
0); 0);
*widget = vbox; *widget = vbox;
} }
else else
*widget = volume->widget;
if((value = _volume_get(volume)) >= 0.0)
{ {
gtk_scale_button_set_value(GTK_SCALE_BUTTON(volume->widget), volume->button = gtk_volume_button_new();
value); g_object_set(G_OBJECT(volume->button), "size",
if(volume->progress != NULL) helper->icon_size, NULL);
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR( g_signal_connect_swapped(volume->button, "value-changed",
volume->progress), value); G_CALLBACK(_on_value_changed), volume);
_volume_set(volume, value); *widget = volume->button;
} }
g_signal_connect_swapped(volume->widget, "value-changed", G_CALLBACK( _on_volume_timeout(volume);
_on_value_changed), volume); gtk_widget_show_all(*widget);
gtk_widget_show(volume->widget);
return volume; return volume;
#else #else
return NULL; return NULL;
@ -406,7 +404,7 @@ static void _on_value_changed(gpointer data)
Volume * volume = data; Volume * volume = data;
gdouble value; gdouble value;
value = gtk_scale_button_get_value(GTK_SCALE_BUTTON(volume->widget)); value = gtk_scale_button_get_value(GTK_SCALE_BUTTON(volume->button));
_volume_set(volume, value); _volume_set(volume, value);
} }
@ -422,8 +420,10 @@ static gboolean _on_volume_timeout(gpointer data)
volume->source = 0; volume->source = 0;
return FALSE; return FALSE;
} }
gtk_scale_button_set_value(GTK_SCALE_BUTTON(volume->widget), value); if(volume->button != NULL)
if(volume->progress) gtk_scale_button_set_value(GTK_SCALE_BUTTON(volume->button),
value);
if(volume->progress != NULL)
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR( gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(
volume->progress), value); volume->progress), value);
return TRUE; return TRUE;