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

Rework the properties dialog some more

Browse Source
This commit is contained in:
Pierre Pronchery 2015-05-10 18:34:05 +02:00
parent 1d14b66811
commit 499b0b1339
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/mixer.c
View File

@ -97,6 +97,7 @@ struct _Mixer
GtkWidget * notebook; GtkWidget * notebook;
GtkWidget * properties; GtkWidget * properties;
GtkWidget * about; GtkWidget * about;
PangoFontDescription * bold;
/* internals */ /* internals */
char * device; char * device;
@ -276,6 +277,7 @@ Mixer * mixer_new(char const * device, MixerLayout layout, gboolean embedded)
mixer->window = NULL; mixer->window = NULL;
mixer->properties = NULL; mixer->properties = NULL;
mixer->about = NULL; mixer->about = NULL;
mixer->bold = NULL;
#ifdef AUDIO_MIXER_DEVINFO #ifdef AUDIO_MIXER_DEVINFO
mixer->mc = NULL; mixer->mc = NULL;
mixer->mc_cnt = 0; mixer->mc_cnt = 0;
@ -290,6 +292,8 @@ Mixer * mixer_new(char const * device, MixerLayout layout, gboolean embedded)
} }
/* widgets */ /* widgets */
accel = gtk_accel_group_new(); accel = gtk_accel_group_new();
mixer->bold = pango_font_description_new();
pango_font_description_set_weight(mixer->bold, PANGO_WEIGHT_BOLD);
if(embedded) if(embedded)
{ {
mixer->window = gtk_plug_new(0); mixer->window = gtk_plug_new(0);
@ -853,6 +857,8 @@ void mixer_delete(Mixer * mixer)
close(mixer->fd); close(mixer->fd);
if(mixer->device != NULL) if(mixer->device != NULL)
free(mixer->device); free(mixer->device);
if(mixer->bold != NULL)
pango_font_description_free(mixer->bold);
if(mixer->window != NULL) if(mixer->window != NULL)
gtk_widget_destroy(mixer->window); gtk_widget_destroy(mixer->window);
free(mixer); free(mixer);
@ -1021,15 +1027,14 @@ static gboolean _about_on_closex(GtkWidget * widget)
/* mixer_properties */ /* mixer_properties */
static GtkWidget * _properties_label(GtkSizeGroup * left, char const * label, static GtkWidget * _properties_label(Mixer * mixer, GtkSizeGroup * group,
GtkSizeGroup * right, char const * value); char const * label, char const * value);
/* callbacks */ /* callbacks */
static gboolean _properties_on_closex(GtkWidget * widget); static gboolean _properties_on_closex(GtkWidget * widget);
void mixer_properties(Mixer * mixer) void mixer_properties(Mixer * mixer)
{ {
GtkSizeGroup * left; GtkSizeGroup * group;
GtkSizeGroup * right;
GtkWidget * vbox; GtkWidget * vbox;
GtkWidget * hbox; GtkWidget * hbox;
MixerProperties mp; MixerProperties mp;
@ -1044,11 +1049,12 @@ void mixer_properties(Mixer * mixer)
mixer->properties = gtk_message_dialog_new(GTK_WINDOW(mixer->window), mixer->properties = gtk_message_dialog_new(GTK_WINDOW(mixer->window),
GTK_DIALOG_DESTROY_WITH_PARENT, GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE,
"%s", _("Properties"));
#if GTK_CHECK_VERSION(2, 6, 0) #if GTK_CHECK_VERSION(2, 6, 0)
"%s", _("Properties"));
gtk_message_dialog_format_secondary_text( gtk_message_dialog_format_secondary_text(
GTK_MESSAGE_DIALOG(mixer->properties), ""); GTK_MESSAGE_DIALOG(mixer->properties),
#endif #endif
"");
#if GTK_CHECK_VERSION(2, 10, 0) #if GTK_CHECK_VERSION(2, 10, 0)
gtk_message_dialog_set_image(GTK_MESSAGE_DIALOG(mixer->properties), gtk_message_dialog_set_image(GTK_MESSAGE_DIALOG(mixer->properties),
gtk_image_new_from_stock(GTK_STOCK_PROPERTIES, gtk_image_new_from_stock(GTK_STOCK_PROPERTIES,
@ -1064,20 +1070,19 @@ void mixer_properties(Mixer * mixer)
#else #else
vbox = GTK_DIALOG(mixer->properties)->vbox; vbox = GTK_DIALOG(mixer->properties)->vbox;
#endif #endif
left = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
right = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); hbox = _properties_label(mixer, group, _("Name: "), mp.name);
hbox = _properties_label(left, _("Name: "), right, mp.name);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 2); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 2);
hbox = _properties_label(left, _("Version: "), right, mp.version); hbox = _properties_label(mixer, group, _("Version: "), mp.version);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
hbox = _properties_label(left, _("Device: "), right, mp.device); hbox = _properties_label(mixer, group, _("Device: "), mp.device);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 2); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 2);
gtk_widget_show_all(vbox); gtk_widget_show_all(vbox);
gtk_widget_show(mixer->properties); gtk_widget_show(mixer->properties);
} }
static GtkWidget * _properties_label(GtkSizeGroup * left, char const * label, static GtkWidget * _properties_label(Mixer * mixer, GtkSizeGroup * group,
GtkSizeGroup * right, char const * value) char const * label, char const * value)
{ {
GtkWidget * hbox; GtkWidget * hbox;
GtkWidget * widget; GtkWidget * widget;
@ -1088,13 +1093,13 @@ static GtkWidget * _properties_label(GtkSizeGroup * left, char const * label,
hbox = gtk_hbox_new(FALSE, 4); hbox = gtk_hbox_new(FALSE, 4);
#endif #endif
widget = gtk_label_new(label); widget = gtk_label_new(label);
gtk_widget_modify_font(widget, mixer->bold);
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
gtk_size_group_add_widget(left, widget); gtk_size_group_add_widget(group, widget);
gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0);
widget = gtk_label_new(value); widget = gtk_label_new(value);
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
gtk_size_group_add_widget(right, widget); gtk_box_pack_start(GTK_BOX(hbox), widget, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0);
return hbox; return hbox;
} }