applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add a frame to the media popup (closes bug #451674)

Browse source 
2007-06-29  Jens Granseuer  <jensgr@gmx.net>

	* actions/acme.glade:
	* gsd-media-keys-window.c: (gsd_media_keys_window_init): add a frame to
	the media popup (closes bug #451674)

svn path=/trunk/; revision=7803
This commit is contained in:
Jens Granseuer 2007-06-29 16:16:24 +00:00 • committed by Jens Granseuer
parent ec555198de
commit 9c0c8e49ec
3 changed files with 49 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gnome-settings-daemon/ChangeLog
View file

@ -1,3 +1,9 @@
2007-06-29 Jens Granseuer <jensgr@gmx.net>
* actions/acme.glade:
* gsd-media-keys-window.c: (gsd_media_keys_window_init): add a frame to
the media popup (closes bug #451674)
2007-06-22 Rodrigo Moya <rodrigo@gnome-db.org>
* gnome-settings-daemon.c: incorporate fixes from Matthias Clasen in

68
gnome-settings-daemon/actions/acme.glade
View file

@ -19,42 +19,48 @@
<property name="urgency_hint">False</property>
<child>
<widget class="GtkVBox" id="acme_vbox">
<property name="border_width">12</property>
<widget class="GtkFrame" id="acme_frame">
<property name="shadow_type">GTK_SHADOW_OUT</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">6</property>
<child>
<widget class="GtkImage" id="acme_image">
<widget class="GtkVBox" id="acme_vbox">
<property name="border_width">12</property>
<property name="visible">True</property>
<property name="icon_size">6</property>
<property name="icon_name">stock_volume-max</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
<property name="homogeneous">False</property>
<property name="spacing">6</property>
<child>
<widget class="GtkProgressBar" id="acme_volume_progressbar">
<property name="visible">True</property>
<property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
<property name="fraction">0</property>
<property name="pulse_step">0.10000000149</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
<child>
<widget class="GtkImage" id="acme_image">
<property name="visible">True</property>
<property name="icon_size">6</property>
<property name="icon_name">stock_volume-max</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
<child>
<widget class="GtkProgressBar" id="acme_volume_progressbar">
<property name="visible">True</property>
<property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
<property name="fraction">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
</child>
</widget>
</child>

12
gnome-settings-daemon/gsd-media-keys-window.c
View file

@ -852,14 +852,14 @@ gsd_media_keys_window_init (GsdMediaKeysWindow *window)
gtk_window_set_default_size (GTK_WINDOW (window), 300, 300);
g_signal_connect (window, "expose-event", G_CALLBACK (on_expose_event), window);
} else {
GtkWidget *vbox;
GtkWidget *frame;
window->priv->xml = glade_xml_new (GNOMECC_GLADE_DIR "/acme.glade", "acme_vbox", NULL);
window->priv->xml = glade_xml_new (GNOMECC_GLADE_DIR "/acme.glade", "acme_frame", NULL);
vbox = glade_xml_get_widget (window->priv->xml, "acme_vbox");
if (vbox != NULL) {
gtk_container_add (GTK_CONTAINER (window), vbox);
gtk_widget_show_all (vbox);
frame = glade_xml_get_widget (window->priv->xml, "acme_frame");
if (frame != NULL) {
gtk_container_add (GTK_CONTAINER (window), frame);
gtk_widget_show_all (frame);
}
}
}