Re: multimedia capplet
- From: Bastien Nocera <hadess hadess net>
- To: Jonathan Blandford <jrb redhat com>
- Cc: Gnome Multimedia Hackers <gnome-multimedia gnome org>, Jody Goldberg <jody gnome org>
- Subject: Re: multimedia capplet
- Date: Mon, 12 Jan 2004 00:31:48 +0000
On Sun, 2004-01-11 at 07:24, Jonathan Blandford wrote:
> Bastien Nocera <hadess hadess net> writes:
>
> > Heya,
> >
> > I was cleaning up (at least trying to) the preferences in Totem and
> > thought that quite a few settings should be system-wide (or at least
> > desktop-wide) settings.
> >
> > So, I'd have wanted to move from the Totem prefs:
> > - Soundcard output type: Stereo, 4.0, 5.0, 5.1 or even AC3 passthrough
> > (an int, from an enum)
> > - Network speed: 56k, ISDN, Cable, bleh (see Totem's prefs for the
> > complete list) (int from an enum as well), that would be used for
> > Streaming protocols that support such a thing (only mms and rtsp that I
> > know of)
> > - Contrast/Brightness for the video (in percents)
>
> A couple thoughts:
>
> * How does these fit in with the Sound, Network, and Display dialogs?
> I don't know what I'd expect in a 'Multimedia' capplet, but I don't
> know that that is it.
>
> * The sound settings in particular seems like they belongs in the sound
> capplet.
OK.
> * Network speed can be quite variable. Can this be autodetected by the
> target application? It seems especially meaningless with laptops.
> It also affects a very small number of network apps. We'd have to
> phrase it in such a way that people aren't playing with it trying to
> make their web browser faster.
I really don't know how I could spell it right. In MacOS X, this appears
as "Connection Speed", but it's the Quicktime control panel.
The connection speed can also be set much lower than the actual network
connection speed. When I'm in the office, I set it to 56k to avoid
triggering the sysadmin alarm :)
> * Perhaps d-d-l should be CC'ed here?
Maybe not ;)
I had 2 days to make up my mind. If I copied d-d-l, we'd never have had
time :)
> > It's about an hour's worth of work, just setting some GConf keys, which
> > both xine-lib and GStreamer-based apps could use in the desktop.
> > The main problem is where we should put this code. I'd like to see it
> > added to the control-center myself as there aren't any additional deps.
>
> If the keys are needed, we can add them to libgnome and let individual
> apps configure them. That may be a better solution.
The whole point of this was to have a central place to configure these
details desktop-wide. Otherwise I'm better off just keeping it to my
application.
> > Any comments?
>
> I'm not sold on a generic 'multimedia' capplet, but think the keys sound
> fine. I can be convinced on the dialog though, if you make a good
> case. Jody, do you have an opinion?
I modified the sound and the network capplets for the changes above.
> > I'd like to know if there are any more configuration options related to
> > multimedia that could be added as desktop-wide?
>
> Yeah. Additionally, I've been hoping we can clean up the sound capplet
> sometime. It can and should be so much more than it currently is.
Like what? :)
---
Bastien Nocera <hadess hadess net>
The politician was gone but unnoticed, like the full stop after the Dr.
on a Dr Pepper can.
Index: capplets/network/gnome-network-preferences.c
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/network/gnome-network-preferences.c,v
retrieving revision 1.13
diff -u -r1.13 gnome-network-preferences.c
--- capplets/network/gnome-network-preferences.c 27 Aug 2003 18:50:43 -0000 1.13
+++ capplets/network/gnome-network-preferences.c 11 Jan 2004 23:51:08 -0000
@@ -47,6 +47,34 @@
{ 0, NULL, NULL }
};
+enum ConnectionSpeed
+{
+ SPEED_144_KBPS_MODEM,
+ SPEED_336_KBPS_MODEM,
+ SPEED_56_KBPS_MODEM_ISDN,
+ SPEED_128_KBPS_DUAL_ISDN,
+ SPEED_256_KBPS_DSL_CABLE,
+ SPEED_384_KBPS_DSL_CABLE,
+ SPEED_512_KBPS_DSL_CABLE,
+ SPEED_1_MBPS_DSL_CABLE_LAN,
+ SPEED_15_MBPS_T1_LAN,
+ SPEED_INTRANET_LAN
+};
+
+static GEnumValue connection_speed_values[] = {
+ {SPEED_144_KBPS_MODEM, "SPEED_144_KBPS_MODEM", "144-modem"},
+ {SPEED_336_KBPS_MODEM, "SPEED_336_KBPS_MODEM", "336-modem"},
+ {SPEED_56_KBPS_MODEM_ISDN, "SPEED_56_KBPS_MODEM_ISDN", "56-modem"},
+ {SPEED_128_KBPS_DUAL_ISDN, "SPEED_128_KBPS_DUAL_ISDN", "128-isdn"},
+ {SPEED_256_KBPS_DSL_CABLE, "SPEED_256_KBPS_DSL_CABLE", "256-cable"},
+ {SPEED_384_KBPS_DSL_CABLE, "SPEED_384_KBPS_DSL_CABLE", "382-cable"},
+ {SPEED_512_KBPS_DSL_CABLE, "SPEED_512_KBPS_DSL_CABLE", "512-cable"},
+ {SPEED_1_MBPS_DSL_CABLE_LAN, "SPEED_1_MBPS_DSL_CABLE_LAN", "1-cable"},
+ {SPEED_15_MBPS_T1_LAN, "SPEED_15_MBPS_T1_LAN", "15-t1"},
+ {SPEED_INTRANET_LAN, "SPEED_INTRANET_LAN", "lan"}
+};
+
+#define CONNECTION_SPEED_KEY "/desktop/gnome/network/connection_speed"
#define USE_PROXY_KEY "/system/http_proxy/use_http_proxy"
#define HTTP_PROXY_HOST_KEY "/system/http_proxy/host"
#define HTTP_PROXY_PORT_KEY "/system/http_proxy/port"
@@ -207,12 +235,21 @@
{
GConfPropertyEditor *peditor;
GSList *mode_group;
- GType mode_type = 0;
+ GType mode_type, connection_speed_type;
GConfClient *client;
gint port_value;
mode_type = g_enum_register_static ("NetworkPreferencesProxyType",
proxytype_values);
+ connection_speed_type = g_enum_register_static ("ConnectionSpeed",
+ connection_speed_values);
+ /* Connection Speed */
+ gconf_peditor_new_select_menu_with_enum (NULL,
+ CONNECTION_SPEED_KEY,
+ WID ("connection_speed_menu"),
+ connection_speed_type,
+ TRUE,
+ NULL);
/* There's a bug in peditors that cause them to not initialize the entry
* correctly. */
Index: capplets/network/gnome-network-preferences.desktop.in
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/network/gnome-network-preferences.desktop.in,v
retrieving revision 1.9
diff -u -r1.9 gnome-network-preferences.desktop.in
--- capplets/network/gnome-network-preferences.desktop.in 16 Dec 2003 21:38:49 -0000 1.9
+++ capplets/network/gnome-network-preferences.desktop.in 11 Jan 2004 23:51:08 -0000
@@ -1,7 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
-_Name=Network Proxy
-_Comment=Network proxy preferences
+_Name=Network
+_Comment=Network preferences
Exec=gnome-network-preferences
Icon=gnome-globe
Terminal=false
Index: capplets/network/gnome-network-preferences.glade
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/network/gnome-network-preferences.glade,v
retrieving revision 1.9
diff -u -r1.9 gnome-network-preferences.glade
--- capplets/network/gnome-network-preferences.glade 27 Aug 2003 18:50:43 -0000 1.9
+++ capplets/network/gnome-network-preferences.glade 11 Jan 2004 23:51:13 -0000
@@ -59,53 +59,38 @@
</child>
<child>
- <widget class="GtkVBox" id="vbox1">
- <property name="border_width">5</property>
+ <widget class="GtkVBox" id="vbox4">
+ <property name="border_width">8</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">18</property>
+ <property name="spacing">16</property>
<child>
- <widget class="GtkRadioButton" id="none_radiobutton">
+ <widget class="GtkFrame" id="frame1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes"><b>_Direct internet connection</b></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>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="no_direct_vbox">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">18</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.5</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
- <widget class="GtkVBox" id="manual_vbox">
+ <widget class="GtkHBox" id="hbox4">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">6</property>
+ <property name="spacing">15</property>
<child>
- <widget class="GtkRadioButton" id="manual_radiobutton">
+ <widget class="GtkLabel" id="label22">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes"><b>_Manual proxy configuration</b></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>
- <property name="group">none_radiobutton</property>
+ <property name="label" translatable="yes">Connection speed:</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="padding">0</property>
@@ -115,462 +100,165 @@
</child>
<child>
- <widget class="GtkHBox" id="manual_box">
+ <widget class="GtkOptionMenu" id="connection_speed_menu">
<property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="label" translatable="yes"> </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="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="history">0</property>
<child>
- <widget class="GtkTable" id="manual_table">
- <property name="visible">True</property>
- <property name="n_rows">4</property>
- <property name="n_columns">5</property>
- <property name="homogeneous">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
+ <widget class="GtkMenu" id="menu1">
<child>
- <widget class="GtkLabel" id="label6">
+ <widget class="GtkMenuItem" id="144_kbps_modem1">
<property name="visible">True</property>
- <property name="label" translatable="yes">H_TTP proxy:</property>
+ <property name="label" translatable="yes">14.4 Kbps Modem</property>
<property name="use_underline">True</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</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="mnemonic_widget">http_host_entry</property>
+ <signal name="activate" handler="on_144_kbps_modem1_activate" last_modification_time="Sun, 11 Jan 2004 01:49:04 GMT"/>
</widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
</child>
<child>
- <widget class="GtkLabel" id="label7">
+ <widget class="GtkMenuItem" id="336_kbps_modem1">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Secure HTTP proxy:</property>
+ <property name="label" translatable="yes">33.6 Kbps Modem</property>
<property name="use_underline">True</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</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="mnemonic_widget">secure_host_entry</property>
+ <signal name="activate" handler="on_336_kbps_modem1_activate" last_modification_time="Sun, 11 Jan 2004 01:49:04 GMT"/>
</widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
</child>
<child>
- <widget class="GtkLabel" id="label8">
+ <widget class="GtkMenuItem" id="56_kbps_modem_isdn1">
<property name="visible">True</property>
- <property name="label" translatable="yes">_FTP proxy:</property>
+ <property name="label" translatable="yes">56 Kbps Modem/ISDN</property>
<property name="use_underline">True</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</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="mnemonic_widget">ftp_host_entry</property>
+ <signal name="activate" handler="on_56_kbps_modem_isdn1_activate" last_modification_time="Sun, 11 Jan 2004 01:49:04 GMT"/>
</widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
</child>
<child>
- <widget class="GtkLabel" id="label9">
+ <widget class="GtkMenuItem" id="128_kbps_dual-isdn/cable1">
<property name="visible">True</property>
- <property name="label" translatable="yes">S_ocks host:</property>
+ <property name="label" translatable="yes">128 Kbps Dual-ISDN/Cable</property>
<property name="use_underline">True</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</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="mnemonic_widget">socks_host_entry</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="http_host_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
- <property name="activates_default">False</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="secure_host_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
- <property name="activates_default">False</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="ftp_host_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
- <property name="activates_default">False</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="socks_host_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
- <property name="activates_default">False</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label10">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Port:</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</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
+ <signal name="activate" handler="on_128_kbps_dual-isdn/cable1_activate" last_modification_time="Sun, 11 Jan 2004 22:56:03 GMT"/>
</widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
</child>
<child>
- <widget class="GtkLabel" id="label11">
+ <widget class="GtkMenuItem" id="256_kbps_dsl_cable1">
<property name="visible">True</property>
- <property name="label" translatable="yes">Port:</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</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label12">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Port:</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</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label13">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Port:</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</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
+ <property name="label" translatable="yes">256 Kbps DSL/Cable</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_256_kbps_dsl_cable1_activate" last_modification_time="Sun, 11 Jan 2004 01:49:04 GMT"/>
</widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
</child>
<child>
- <widget class="GtkSpinButton" id="http_port_spinbutton">
+ <widget class="GtkMenuItem" id="384_kbps_dsl_cable1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="climb_rate">1</property>
- <property name="digits">0</property>
- <property name="numeric">False</property>
- <property name="update_policy">GTK_UPDATE_ALWAYS</property>
- <property name="snap_to_ticks">False</property>
- <property name="wrap">False</property>
- <property name="adjustment">0 0 65535 1 10 10</property>
+ <property name="label" translatable="yes">384 Kbps DSL/Cable</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_384_kbps_dsl_cable1_activate" last_modification_time="Sun, 11 Jan 2004 01:49:04 GMT"/>
</widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="y_options"></property>
- </packing>
</child>
<child>
- <widget class="GtkSpinButton" id="secure_port_spinbutton">
+ <widget class="GtkMenuItem" id="512_kbps_dsl_cable1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="climb_rate">1</property>
- <property name="digits">0</property>
- <property name="numeric">False</property>
- <property name="update_policy">GTK_UPDATE_ALWAYS</property>
- <property name="snap_to_ticks">False</property>
- <property name="wrap">False</property>
- <property name="adjustment">0 0 65535 1 10 10</property>
+ <property name="label" translatable="yes">512 Kbps DSL/Cable</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_512_kbps_dsl_cable1_activate" last_modification_time="Sun, 11 Jan 2004 01:49:04 GMT"/>
</widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
- </packing>
</child>
<child>
- <widget class="GtkSpinButton" id="ftp_port_spinbutton">
+ <widget class="GtkMenuItem" id="1_mbps_dsl/cable/lan1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="climb_rate">1</property>
- <property name="digits">0</property>
- <property name="numeric">False</property>
- <property name="update_policy">GTK_UPDATE_ALWAYS</property>
- <property name="snap_to_ticks">False</property>
- <property name="wrap">False</property>
- <property name="adjustment">0 0 65535 1 10 10</property>
+ <property name="label" translatable="yes">1 Mbps DSL/Cable/LAN</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_1_mbps_dsl/cable/lan1_activate" last_modification_time="Sun, 11 Jan 2004 22:54:32 GMT"/>
</widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
- </packing>
</child>
<child>
- <widget class="GtkSpinButton" id="socks_port_spinbutton">
+ <widget class="GtkMenuItem" id="15_mbps_t1_intranet_lan1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="climb_rate">1</property>
- <property name="digits">0</property>
- <property name="numeric">False</property>
- <property name="update_policy">GTK_UPDATE_ALWAYS</property>
- <property name="snap_to_ticks">False</property>
- <property name="wrap">False</property>
- <property name="adjustment">0 0 65535 1 10 10</property>
+ <property name="label" translatable="yes">1.5 Mbps T1/Intranet/LAN</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_15_mbps_t1_intranet_lan1_activate" last_modification_time="Sun, 11 Jan 2004 01:49:04 GMT"/>
</widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options"></property>
- </packing>
</child>
<child>
- <widget class="GtkButton" id="details_button">
+ <widget class="GtkMenuItem" id="intranet_lan1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_Details</property>
+ <property name="label" translatable="yes">Intranet/LAN</property>
<property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
+ <signal name="activate" handler="on_intranet_lan1_activate" last_modification_time="Sun, 11 Jan 2004 01:49:04 GMT"/>
</widget>
- <packing>
- <property name="left_attach">4</property>
- <property name="right_attach">5</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
</child>
</widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
</child>
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
</packing>
</child>
</widget>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label20">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Connection Speed</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</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="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="type">label_item</property>
</packing>
</child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkFrame" id="frame2">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.5</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
- <widget class="GtkVBox" id="vbox2">
+ <widget class="GtkVBox" id="vbox1">
+ <property name="border_width">5</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">6</property>
+ <property name="spacing">18</property>
<child>
- <widget class="GtkRadioButton" id="auto_radiobutton">
+ <widget class="GtkRadioButton" id="none_radiobutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes"><b>_Automatic proxy configuration</b></property>
+ <property name="label" translatable="yes"><b>_Direct internet connection</b></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>
- <property name="group">none_radiobutton</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -580,53 +268,493 @@
</child>
<child>
- <widget class="GtkHBox" id="hbox1">
+ <widget class="GtkVBox" id="no_direct_vbox">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="spacing">18</property>
<child>
- <widget class="GtkLabel" id="label17">
+ <widget class="GtkVBox" id="manual_vbox">
<property name="visible">True</property>
- <property name="label" translatable="yes"> </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>
+ <property name="homogeneous">False</property>
+ <property name="spacing">6</property>
+
+ <child>
+ <widget class="GtkRadioButton" id="manual_radiobutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes"><b>_Manual proxy configuration</b></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>
+ <property name="group">none_radiobutton</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="manual_box">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"> </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="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkTable" id="manual_table">
+ <property name="visible">True</property>
+ <property name="n_rows">4</property>
+ <property name="n_columns">5</property>
+ <property name="homogeneous">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+
+ <child>
+ <widget class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">H_TTP proxy:</property>
+ <property name="use_underline">True</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</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="mnemonic_widget">http_host_entry</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Secure HTTP proxy:</property>
+ <property name="use_underline">True</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</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="mnemonic_widget">secure_host_entry</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_FTP proxy:</property>
+ <property name="use_underline">True</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</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="mnemonic_widget">ftp_host_entry</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label9">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">S_ocks host:</property>
+ <property name="use_underline">True</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</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="mnemonic_widget">socks_host_entry</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkEntry" id="http_host_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char" translatable="yes">*</property>
+ <property name="activates_default">False</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkEntry" id="secure_host_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char" translatable="yes">*</property>
+ <property name="activates_default">False</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkEntry" id="ftp_host_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char" translatable="yes">*</property>
+ <property name="activates_default">False</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkEntry" id="socks_host_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char" translatable="yes">*</property>
+ <property name="activates_default">False</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label10">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Port:</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</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label11">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Port:</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</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label12">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Port:</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</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label13">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Port:</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</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkSpinButton" id="http_port_spinbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">0</property>
+ <property name="numeric">False</property>
+ <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ <property name="snap_to_ticks">False</property>
+ <property name="wrap">False</property>
+ <property name="adjustment">0 0 65535 1 10 10</property>
+ </widget>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkSpinButton" id="secure_port_spinbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">0</property>
+ <property name="numeric">False</property>
+ <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ <property name="snap_to_ticks">False</property>
+ <property name="wrap">False</property>
+ <property name="adjustment">0 0 65535 1 10 10</property>
+ </widget>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkSpinButton" id="ftp_port_spinbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">0</property>
+ <property name="numeric">False</property>
+ <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ <property name="snap_to_ticks">False</property>
+ <property name="wrap">False</property>
+ <property name="adjustment">0 0 65535 1 10 10</property>
+ </widget>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkSpinButton" id="socks_port_spinbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">0</property>
+ <property name="numeric">False</property>
+ <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ <property name="snap_to_ticks">False</property>
+ <property name="wrap">False</property>
+ <property name="adjustment">0 0 65535 1 10 10</property>
+ </widget>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="details_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">_Details</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ </widget>
+ <packing>
+ <property name="left_attach">4</property>
+ <property name="right_attach">5</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </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>
<child>
- <widget class="GtkHBox" id="auto_box">
+ <widget class="GtkVBox" id="vbox2">
<property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="homogeneous">False</property>
- <property name="spacing">12</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label18">
+ <widget class="GtkRadioButton" id="auto_radiobutton">
<property name="visible">True</property>
- <property name="label" translatable="yes">Autoconfiguration _URL:</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes"><b>_Automatic proxy configuration</b></property>
<property name="use_underline">True</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>
- <property name="mnemonic_widget">autoconfig_entry</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">none_radiobutton</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -636,16 +764,86 @@
</child>
<child>
- <widget class="GtkEntry" id="autoconfig_entry">
+ <widget class="GtkHBox" id="hbox1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
- <property name="activates_default">False</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="label17">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"> </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="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="auto_box">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">12</property>
+
+ <child>
+ <widget class="GtkLabel" id="label18">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Autoconfiguration _URL:</property>
+ <property name="use_underline">True</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>
+ <property name="mnemonic_widget">autoconfig_entry</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkEntry" id="autoconfig_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char" translatable="yes">*</property>
+ <property name="activates_default">False</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -656,8 +854,8 @@
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
</packing>
</child>
</widget>
@@ -668,10 +866,24 @@
</packing>
</child>
</widget>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label21">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Proxy</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</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="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="type">label_item</property>
</packing>
</child>
</widget>
Index: capplets/sound/sound-properties-capplet.c
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/sound/sound-properties-capplet.c,v
retrieving revision 1.40
diff -u -r1.40 sound-properties-capplet.c
--- capplets/sound/sound-properties-capplet.c 4 Aug 2003 05:51:52 -0000 1.40
+++ capplets/sound/sound-properties-capplet.c 11 Jan 2004 23:51:14 -0000
@@ -41,6 +41,24 @@
#include "activate-settings-daemon.h"
+enum AudioOutType {
+ AUDIO_SOUND_STEREO,
+ AUDIO_SOUND_4CHANNEL,
+ AUDIO_SOUND_5CHANNEL,
+ AUDIO_SOUND_51CHANNEL,
+ AUDIO_SOUND_AC3PASSTHRU,
+};
+
+static const GEnumValue audio_out_values[] = {
+ {AUDIO_SOUND_STEREO, "AUDIO_SOUND_STEREO", "stereo"},
+ {AUDIO_SOUND_4CHANNEL, "AUDIO_SOUND_4CHANNEL", "4-channel"},
+ {AUDIO_SOUND_5CHANNEL, "AUDIO_SOUND_5CHANNEL", "5-channel"},
+ {AUDIO_SOUND_51CHANNEL, "AUDIO_SOUND_51CHANNEL", "51-channel"},
+ {AUDIO_SOUND_AC3PASSTHRU, "AUDIO_SOUND_AC3PASSTHRU", "ac3passthru"},
+ {0, NULL, NULL}
+};
+
+#define AUDIO_OUTPUT_TYPE_KEY "/desktop/gnome/sound/audio_output"
#define ENABLE_ESD_KEY "/desktop/gnome/sound/enable_esd"
#define EVENT_SOUNDS_KEY "/desktop/gnome/sound/event_sounds"
#define VISUAL_BELL_KEY "/apps/metacity/general/visual_bell"
@@ -137,10 +155,20 @@
*/
static void
-setup_dialog (GladeXML *dialog, GConfChangeSet *changeset)
+setup_dialog (GladeXML *dialog)
{
+ GType audio_out_type;
GObject *peditor;
+ audio_out_type = g_enum_register_static ("AudioOutTypeEnum",
+ audio_out_values);
+ gconf_peditor_new_select_menu_with_enum (NULL,
+ AUDIO_OUTPUT_TYPE_KEY,
+ WID ("audio_output_type_menu"),
+ audio_out_type,
+ TRUE,
+ NULL);
+
peditor = gconf_peditor_new_boolean (NULL, ENABLE_ESD_KEY, WID ("enable_toggle"), NULL);
gconf_peditor_widget_set_guard (GCONF_PROPERTY_EDITOR (peditor), WID ("events_toggle"));
gconf_peditor_widget_set_guard (GCONF_PROPERTY_EDITOR (peditor), WID ("events_vbox"));
@@ -197,7 +225,6 @@
main (int argc, char **argv)
{
GConfClient *client;
- GConfChangeSet *changeset;
GladeXML *dialog = NULL;
GtkWidget *dialog_win;
@@ -231,9 +258,8 @@
if (get_legacy) {
get_legacy_settings ();
} else {
- changeset = gconf_change_set_new ();
dialog = create_dialog ();
- setup_dialog (dialog, changeset);
+ setup_dialog (dialog);
dialog_win = gtk_dialog_new_with_buttons
(_("Sound preferences"), NULL, GTK_DIALOG_NO_SEPARATOR,
@@ -244,15 +270,14 @@
gtk_container_set_border_width (GTK_CONTAINER (dialog_win), 5);
gtk_box_set_spacing (GTK_BOX (GTK_DIALOG(dialog_win)->vbox), 2);
gtk_dialog_set_default_response (GTK_DIALOG (dialog_win), GTK_RESPONSE_CLOSE);
- g_signal_connect (G_OBJECT (dialog_win), "response", (GCallback) dialog_button_clicked_cb, changeset);
+ g_signal_connect (G_OBJECT (dialog_win), "response", (GCallback) dialog_button_clicked_cb, NULL);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog_win)->vbox), WID ("prefs_widget"), TRUE, TRUE, 0);
capplet_set_icon (dialog_win, "sound-capplet.png");
gtk_widget_show_all (dialog_win);
gtk_main ();
- gconf_change_set_unref (changeset);
}
-
+
g_object_unref (dialog);
return 0;
}
Index: capplets/sound/sound-properties.glade
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/sound/sound-properties.glade,v
retrieving revision 1.13
diff -u -r1.13 sound-properties.glade
--- capplets/sound/sound-properties.glade 12 Jul 2003 08:10:06 -0000 1.13
+++ capplets/sound/sound-properties.glade 11 Jan 2004 23:51:16 -0000
@@ -26,34 +26,134 @@
<child>
<widget class="GtkVBox" id="vbox5">
- <property name="border_width">12</property>
+ <property name="border_width">4</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="spacing">8</property>
<child>
- <widget class="GtkHBox" id="hbox4">
+ <widget class="GtkFrame" id="frame3">
+ <property name="border_width">8</property>
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.5</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
- <widget class="GtkVBox" id="vbox1">
+ <widget class="GtkHBox" id="hbox4">
+ <property name="border_width">8</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">6</property>
+ <property name="spacing">0</property>
<child>
- <widget class="GtkCheckButton" id="enable_toggle">
+ <widget class="GtkVBox" id="vbox1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">E_nable sound server startup</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>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Feature Selection</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</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">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkFrame" id="frame4">
+ <property name="border_width">8</property>
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.5</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox5">
+ <property name="border_width">8</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">15</property>
+
+ <child>
+ <widget class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Audio output type:</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"/>
+ <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>
+ <property name="mnemonic_widget">audio_output_type_menu</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -63,16 +163,60 @@
</child>
<child>
- <widget class="GtkCheckButton" id="events_toggle">
+ <widget class="GtkOptionMenu" id="audio_output_type_menu">
<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"/>
+ <property name="history">0</property>
+
+ <child>
+ <widget class="GtkMenu" id="menu1">
+
+ <child>
+ <widget class="GtkMenuItem" id="stereo1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Stereo</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_stereo1_activate" last_modification_time="Sun, 11 Jan 2004 01:51:24 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="4-channel1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">4-channel</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_4-channel1_activate" last_modification_time="Sun, 11 Jan 2004 01:51:24 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="50-channel1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">5.0-channel</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_50-channel1_activate" last_modification_time="Sun, 11 Jan 2004 01:51:24 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="51-channel1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">5.1-channel</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_51-channel1_activate" last_modification_time="Sun, 11 Jan 2004 01:51:24 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="ac3_passthrough1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">AC3 Passthrough</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_ac3_passthrough1_activate" last_modification_time="Sun, 11 Jan 2004 01:51:24 GMT"/>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -81,17 +225,31 @@
</packing>
</child>
</widget>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Audio Output</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</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="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="type">label_item</property>
</packing>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
</packing>
</child>
</widget>
Index: schemas/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-control-center/schemas/Makefile.am,v
retrieving revision 1.13
diff -u -r1.13 Makefile.am
--- schemas/Makefile.am 30 Nov 2003 01:48:04 -0000 1.13
+++ schemas/Makefile.am 11 Jan 2004 23:51:19 -0000
@@ -3,7 +3,9 @@
apps_gnome_settings_daemon_screensaver.schemas.in \
apps_gnome_settings_daemon_default_editor.schemas.in \
desktop_gnome_font_rendering.schemas \
- desktop_gnome_peripherals_keyboard_xkb.schemas.in
+ desktop_gnome_peripherals_keyboard_xkb.schemas.in \
+ desktop_gnome_sound_audio_output.schemas.in \
+ desktop_gnome_network_connection_speed.schemas.in
schema_DATA = $(schema_in_files:.schemas.in=.schemas)
Index: schemas/desktop_gnome_network_connection_speed.schemas.in
===================================================================
RCS file: schemas/desktop_gnome_network_connection_speed.schemas.in
diff -N schemas/desktop_gnome_network_connection_speed.schemas.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ schemas/desktop_gnome_network_connection_speed.schemas.in 11 Jan 2004 23:51:19 -0000
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<gconfschemafile>
+ <schemalist>
+ <schema>
+ <key>/schemas/desktop/network/connection_speed</key>
+ <applyto>/desktop/gnome/network/connection_speed</applyto>
+ <type>string</type>
+ <default>56-modem</default>
+ <locale name="C">
+ <short>Speed of the network connection</short>
+ <long>
+ Speed of the network connection:\n
+ 144-modem for a 14.4 kbps modem,\n
+ 336-modem for a 33.6 kbps modem,\n
+ 56-modem for a 56 kbps modem, or an ISDN line,\n
+ 128-isdn for a 128 kbps cable or a dual-ISDN line,\n
+ 256-cable for a 256 kbps cable or DSL,\n
+ 382-cable for a 382 kbps cable or DSL,\n
+ 512-cable for a 512 kbps cable or DSL,\n
+ 1-cable for a 1 Mbps cable or DSL,\n
+ 15-t1 for a T1, or a 1.5 Mbps cable or DSL,\n
+ lan for a LAN or Intranet connection.
+ </long>
+ </locale>
+ </schema>
+ </schemalist>
+</gconfschemafile>
Index: schemas/desktop_gnome_sound_audio_output.schemas.in
===================================================================
RCS file: schemas/desktop_gnome_sound_audio_output.schemas.in
diff -N schemas/desktop_gnome_sound_audio_output.schemas.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ schemas/desktop_gnome_sound_audio_output.schemas.in 11 Jan 2004 23:51:19 -0000
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<gconfschemafile>
+ <schemalist>
+ <schema>
+ <key>/schemas/desktop/gnome/sound/audio_output</key>
+ <applyto>/desktop/gnome/sound/audio_output</applyto>
+ <type>string</type>
+ <default>stereo</default>
+ <locale name="C">
+ <short>Type of audio output to use</short>
+ <long>
+ Type of audio output to use:\n
+ stereo for stereo,\n
+ 4-channel for 4-channel output,\n
+ 5-channel for 5.0 channel output,\n
+ 51-channel for 5.1 channel output,\n
+ ac3passthru for AC3 Passthrough.
+ </long>
+ </locale>
+ </schema>
+ </schemalist>
+</gconfschemafile>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
