diff options
author | Scott Reeves <SReeves@novell.com> | 2006-01-11 10:17:56 +0000 |
---|---|---|
committer | Rodrigo Moya <rodrigo@src.gnome.org> | 2006-01-11 10:17:56 +0000 |
commit | 6226f5c1270e27038b288d33855aac26bbabee70 (patch) | |
tree | 39a871e79a20d13c216654075cad319a64cdbad0 | |
parent | d9d55d1dd67faa26281f985319670b4e227ab8a1 (diff) | |
download | gnome-control-center-6226f5c1270e27038b288d33855aac26bbabee70.tar.gz |
new GUI.
2006-01-11 Scott Reeves <SReeves@novell.com>
* sound-properties.glade: new GUI.
* sound-properties-capplet.c (create_dialog): make dialog bigger.
-rw-r--r-- | capplets/sound/ChangeLog | 6 | ||||
-rw-r--r-- | capplets/sound/sound-properties-capplet.c | 2 | ||||
-rw-r--r-- | capplets/sound/sound-properties.glade | 173 |
3 files changed, 85 insertions, 96 deletions
diff --git a/capplets/sound/ChangeLog b/capplets/sound/ChangeLog index 91933d9e3..dbe537c93 100644 --- a/capplets/sound/ChangeLog +++ b/capplets/sound/ChangeLog @@ -1,3 +1,9 @@ +2006-01-11 Scott Reeves <SReeves@novell.com> + + * sound-properties.glade: new GUI. + + * sound-properties-capplet.c (create_dialog): make dialog bigger. + 2005-05-22 Sebastien Bacher <seb128@debian.org> * sound-properties-capplet.c: (main): diff --git a/capplets/sound/sound-properties-capplet.c b/capplets/sound/sound-properties-capplet.c index 879079077..425d67884 100644 --- a/capplets/sound/sound-properties-capplet.c +++ b/capplets/sound/sound-properties-capplet.c @@ -150,7 +150,7 @@ create_dialog (void) gtk_image_set_from_file (GTK_IMAGE (WID ("bell_image")), GNOMECC_DATA_DIR "/pixmaps/visual-bell.png"); - gtk_widget_set_size_request (widget, -1, 250); /* Can this be right? Seems broken for large fonts. */ + gtk_widget_set_size_request (widget, 425, 500); if (!CheckXKB()) { GtkWidget *audible_bell_option = WID ("bell_audible_toggle"); diff --git a/capplets/sound/sound-properties.glade b/capplets/sound/sound-properties.glade index a414420eb..4d47e7904 100644 --- a/capplets/sound/sound-properties.glade +++ b/capplets/sound/sound-properties.glade @@ -12,6 +12,12 @@ <property name="modal">False</property> <property name="resizable">True</property> <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">False</property> + <property name="skip_pager_hint">False</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> + <property name="focus_on_map">True</property> <child> <widget class="GtkNotebook" id="prefs_widget"> @@ -25,73 +31,66 @@ <property name="enable_popup">False</property> <child> - <widget class="GtkVBox" id="vbox5"> + <widget class="GtkVBox" id="vbox1"> <property name="border_width">12</property> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">0</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkCheckButton" id="enable_toggle"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">E_nable software sound mixing (ESD)</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="enable_toggled_cb"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="events_toggle"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">_Play system sounds</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="events_toggled_cb"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> <child> - <widget class="GtkHBox" id="hbox4"> + <widget class="GtkVBox" id="events_vbox"> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">0</property> <child> - <widget class="GtkVBox" id="vbox1"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkCheckButton" id="enable_toggle"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">E_nable sound server startup</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="enable_toggled_cb"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="events_toggle"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Sounds for events</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="events_toggled_cb"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> + <placeholder/> </child> </widget> <packing> <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> </packing> </child> </widget> @@ -104,7 +103,7 @@ <child> <widget class="GtkLabel" id="label1"> <property name="visible">True</property> - <property name="label" translatable="yes">General</property> + <property name="label" translatable="yes">Sounds</property> <property name="use_underline">True</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_CENTER</property> @@ -114,6 +113,10 @@ <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="type">tab</property> @@ -121,46 +124,14 @@ </child> <child> - <widget class="GtkVBox" id="events_vbox"> - <property name="border_width">12</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - </widget> - <packing> - <property name="tab_expand">False</property> - <property name="tab_fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="label" translatable="yes">Sound Events</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</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="type">tab</property> - </packing> - </child> - - <child> - <widget class="GtkVBox" id="bell_vbox"> - <property name="border_width">12</property> + <widget class="GtkVBox" id="sound_events_vbox"> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">0</property> <child> <widget class="GtkHBox" id="hbox2"> + <property name="border_width">12</property> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">12</property> @@ -181,7 +152,7 @@ </child> <child> - <widget class="GtkVBox" id="vbox4"> + <widget class="GtkVBox" id="vbox12"> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">6</property> @@ -190,9 +161,10 @@ <widget class="GtkCheckButton" id="bell_audible_toggle"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Sound an audible bell</property> + <property name="label" translatable="yes">_Enable system beep</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">True</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -208,9 +180,10 @@ <widget class="GtkCheckButton" id="bell_visual_toggle"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">_Visual feedback:</property> + <property name="label" translatable="yes">_Visual system beep</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -235,6 +208,10 @@ <property name="yalign">0.5</property> <property name="xscale">0</property> <property name="yscale">1</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> <child> <widget class="GtkFrame" id="frame2"> @@ -270,6 +247,7 @@ <property name="label" translatable="yes">Flash _window titlebar</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -288,6 +266,7 @@ <property name="label" translatable="yes">Flash _entire screen</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">False</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -335,18 +314,22 @@ </child> <child> - <widget class="GtkLabel" id="label3"> + <widget class="GtkLabel" id="label4"> <property name="visible">True</property> - <property name="label" translatable="yes">System Bell</property> - <property name="use_underline">True</property> + <property name="label" translatable="yes">System Beep</property> + <property name="use_underline">False</property> <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_CENTER</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> <property name="selectable">False</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> <property name="type">tab</property> |