diff --git a/ChangeLog b/ChangeLog index ea328b8eef..10777d69bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-05-28 Christian Persch + + * gnome/vpn-properties/nm-vpn-properties.glade: + * vpn-daemons/openvpn/properties/nm-openvpn-dialog.glade: + * vpn-daemons/pptp/properties/nm-pptp-dialog.glade: + * vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade: + - Make the VPN properties pages prettier and more HIG + compliant. Gnome Bug #336913. + 2006-05-28 Dan Williams Patch from Christian Persch diff --git a/vpn-daemons/openvpn/properties/nm-openvpn-dialog.glade b/vpn-daemons/openvpn/properties/nm-openvpn-dialog.glade index 1165d6d399..79eed43ae0 100644 --- a/vpn-daemons/openvpn/properties/nm-openvpn-dialog.glade +++ b/vpn-daemons/openvpn/properties/nm-openvpn-dialog.glade @@ -9,7 +9,7 @@ GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False - True + False False True False @@ -21,7 +21,6 @@ - 8 True False 6 @@ -83,35 +82,16 @@ - + True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 12 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 @@ -163,11 +143,6 @@ - - 0 - True - True - @@ -179,7 +154,7 @@ 0 - True + False True @@ -188,7 +163,7 @@ True False - 0 + 6 @@ -216,20 +191,25 @@ - - 6 + True - False - 6 + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 True - 2 + 3 2 False 6 - 0 + 12 @@ -328,48 +308,439 @@ X.509 with Password Authentication fill - - - 0 - True - True - - - - - 0 - True - True - - - - - - 12 - True - True - True - True - GTK_POS_TOP - False - False - - - - True - False - 6 - + True - False - 0 + True + True + True + GTK_POS_TOP + False + False - + True - + False + 6 + + + + 6 + True + 3 + 3 + False + 6 + 12 + + + + True + True + False + True + 0 + + True + * + False + + + 1 + 2 + 0 + 1 + + + + + + True + CA file: + True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + openvpn-ca + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + True + Certificate: + False + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + True + False + True + 0 + + True + * + False + + + 1 + 2 + 1 + 2 + + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-open + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + + + + 2 + 3 + 0 + 1 + fill + + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-open + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + + + + 2 + 3 + 1 + 2 + fill + + + + + + + True + Key: + False + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 2 + 3 + fill + + + + + + + True + True + False + True + 0 + + True + * + False + + + 1 + 2 + 2 + 3 + + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-open + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + + + + 2 + 3 + 2 + 3 + fill + + + + + + 0 + False + True + + + + + False + True + + + + + + True + X.509 False False GTK_JUSTIFY_LEFT @@ -377,7 +748,7 @@ X.509 with Password Authentication False 0.5 0.5 - 12 + 0 0 PANGO_ELLIPSIZE_NONE -1 @@ -385,470 +756,270 @@ X.509 with Password Authentication 0 - 0 - False - True + tab - - 3 + True - 3 - 3 False - 6 - 6 + 6 - + + 6 True - True - False - True - 0 - - True - * - False - - - 1 - 2 - 0 - 1 - - - - - - True - CA file: - True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - openvpn-ca - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - True - Certificate: - False - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - True - False - True - 0 - - True - * - False - - - 1 - 2 - 1 - 2 - - - - - - - True - True - GTK_RELIEF_NORMAL - True + 3 + 3 + False + 6 + 12 - + True - 0.5 + True + True + True + 0 + + True + * + False + + + 1 + 2 + 0 + 1 + + + + + + True + Shared Key: + True + False + GTK_JUSTIFY_LEFT + False + False + 1 0.5 - 0 - 0 - 0 - 0 - 0 - 0 + 0 + 0 + openvpn-ca + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + True + Local IP: + False + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 1 + 2 + + + + + + + True + Remote IP: + False + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 2 + 3 + fill + + + + + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 2 + 3 + + + + + + + True + True + GTK_RELIEF_NORMAL + True - + True - False - 2 + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 - + True - gtk-open - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - + False + 2 - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + + + True + gtk-open + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + - - 0 - False - False - + + 2 + 3 + 0 + 1 + fill + + - 2 - 3 - 0 - 1 - fill - - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-open - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - 2 - 3 - 1 - 2 - fill - - - - - - - True - Key: - False - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - True - False - True - 0 - - True - * - False - - - 1 - 2 - 2 - 3 - - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-open - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - 2 - 3 - 2 - 3 - fill - + 0 + False + True - 0 - True - True + False + True - - - 0 - True - True - - - - - False - True - - - - - - True - X.509 - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - True - False - 6 - - - - True - False - 0 - + True - + Shared key False False GTK_JUSTIFY_LEFT @@ -856,7 +1027,7 @@ X.509 with Password Authentication False 0.5 0.5 - 12 + 0 0 PANGO_ELLIPSIZE_NONE -1 @@ -864,308 +1035,277 @@ X.509 with Password Authentication 0 - 0 - False - True + tab - - 3 + True - 3 - 3 False - 12 - 6 + 6 - + + 6 True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 0 - 1 - - - - - - True - Shared Key: - True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - openvpn-ca - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - True - Local IP: - False - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 1 - 2 - - - - - - - True - Remote IP: - False - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 2 - 3 - - - - - - - True - True - GTK_RELIEF_NORMAL - True + 3 + 3 + False + 6 + 12 - + True - 0.5 + True + True + True + 0 + + True + * + False + + + 1 + 2 + 0 + 1 + + + + + + True + CA file: + True + False + GTK_JUSTIFY_LEFT + False + False + 1 0.5 - 0 - 0 - 0 - 0 - 0 - 0 + 0 + 0 + openvpn-ca + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + True + Username: + False + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 1 + 2 + + + + + + + True + True + GTK_RELIEF_NORMAL + True - + True - False - 2 + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 - + True - gtk-open - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - + False + 2 - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + + + True + gtk-open + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + - - 0 - False - False - + + 2 + 3 + 0 + 1 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 2 + 3 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 8 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 2 + 3 + fill + + - 2 - 3 - 0 - 1 - fill - + 0 + False + True - 0 - True - True + False + True - - - 0 - True - True - - - - - False - True - - - - - - True - Shared key - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - True - False - 6 - - - - True - False - 0 - + True - + Password False False GTK_JUSTIFY_LEFT @@ -1173,7 +1313,7 @@ X.509 with Password Authentication False 0.5 0.5 - 12 + 0 0 PANGO_ELLIPSIZE_NONE -1 @@ -1181,297 +1321,20 @@ X.509 with Password Authentication 0 - 0 - False - True - - - - - - 3 - True - 3 - 3 - False - 6 - 6 - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 0 - 1 - - - - - - True - CA file: - True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - openvpn-ca - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - True - Username: - False - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 1 - 2 - - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-open - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - 2 - 3 - 0 - 1 - fill - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 8 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 2 - 3 - fill - - - - - - 0 - True - True + tab - 0 - True - True + 0 + 2 + 2 + 3 + fill + fill - - False - True - - - - - - True - Password - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - @@ -1482,8 +1345,8 @@ X.509 with Password Authentication - 0 - True + 12 + False True @@ -1496,35 +1359,16 @@ X.509 with Password Authentication 3 - + True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 12 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - True - - + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 @@ -1552,35 +1396,16 @@ X.509 with Password Authentication - + True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 12 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - True - - + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 @@ -1632,16 +1457,11 @@ X.509 with Password Authentication - - 0 - True - True - 0 - True + False True @@ -2085,7 +1905,7 @@ X.509 with Password Authentication 0 - True + False True @@ -2096,7 +1916,7 @@ X.509 with Password Authentication 0 - True + False True @@ -2116,7 +1936,7 @@ X.509 with Password Authentication GTK_JUSTIFY_LEFT True False - 0.5 + 0 0.5 0 0 @@ -2221,7 +2041,7 @@ X.509 with Password Authentication 0 - True + False True diff --git a/vpn-daemons/pptp/properties/nm-pptp-dialog.glade b/vpn-daemons/pptp/properties/nm-pptp-dialog.glade index 2da3be538a..e2e2520a46 100644 --- a/vpn-daemons/pptp/properties/nm-pptp-dialog.glade +++ b/vpn-daemons/pptp/properties/nm-pptp-dialog.glade @@ -9,17 +9,18 @@ GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False - True + False False True False False GDK_WINDOW_TYPE_HINT_NORMAL GDK_GRAVITY_NORTH_WEST + True + False - 12 True False 12 @@ -37,6 +38,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -46,51 +51,34 @@ - + True False - 6 + 18 - - True - <b>Connection Name</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - True - - - - - + True False - 0 + 6 - + True - + <b>Connection Name</b> False - False + True GTK_JUSTIFY_LEFT False False - 0.5 + 0 0.5 - 12 + 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -100,51 +88,40 @@ - + True - False - 6 + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 - - True - _Name used to identify the connection to the private network, e.g. "Campus VPN" or "Corporate Network" - True - False - GTK_JUSTIFY_LEFT - True - False - 0 - 0.5 - 0 - 0 - - - 0 - False - True - - - - - + True False - 0 + 6 - + True - - False + _Name used to identify the connection to the private network, e.g. "Campus VPN" or "Corporate Network" + True False GTK_JUSTIFY_LEFT - False + True False - 0.5 + 0 0.5 - 12 + 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -167,16 +144,11 @@ 0 - True - True + False + False - - 0 - True - True - @@ -188,171 +160,71 @@ 0 - True + False True - - - 0 - True - True - - - - - - True - False - 0 - - True - <b>Required Information</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - 12 + True False 6 - + True - False - 0 - - - - True - _Gateway: - True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - pptp-remote - - - 0 - False - False - - - - - - True - True - True - True - 0 - - True - * - False - - - 0 - True - True - - + <b>Required Information</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 - True - True + False + False - - - 0 - True - True - - - - - - 12 - True - True - True - True - GTK_POS_TOP - False - False - + True - False - 6 + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 - + True False - 0 + 6 - + True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 12 - 0 - - - 0 - False - True - - - - - - True - 1 - 2 False - 12 - 6 + 12 - + True - Username: - False + _Gateway: + True False GTK_JUSTIFY_LEFT False @@ -361,249 +233,21 @@ 0.5 0 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 0 - 1 - - - - - - 0 - True - True - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 12 - 0 - - - 0 - False - False - - - - - 0 - True - True - - - - - - True - Your password must be defined -in /etc/ppp/chap-secrets - False - False - GTK_JUSTIFY_CENTER - True - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - False - True - - - - - - True - MS CHAP-v1/v2 - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - tab - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - True - True - 6 - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 12 - 0 - - - 0 - False - True - - - - - - True - False - 6 - - - - True - True - _Only use VPN connection for these addresses - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 12 - 0 - - - 0 - False - True - - - - - - True - False - 6 - - - - True - <i>example: 172.16.0.0/16 10.11.12.0/24</i> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 + pptp-remote + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 False - True + False - + True True True @@ -621,6 +265,150 @@ in /etc/ppp/chap-secrets + + 0 + False + True + + + + + + True + True + True + True + GTK_POS_TOP + False + False + + + + 6 + True + False + 6 + + + + True + 1 + 2 + False + 6 + 12 + + + + True + Username: + False + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 0 + 1 + + + + + + 0 + False + True + + + + + + True + Your password must be defined +in /etc/ppp/chap-secrets + False + False + GTK_JUSTIFY_LEFT + True + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + False + True + + + + + + True + MS CHAP-v1/v2 + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + tab + + + 0 True @@ -628,49 +416,6 @@ in /etc/ppp/chap-secrets - - 0 - True - True - - - - - - True - True - Use MPPC compression - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - Require MPPE encryption - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - @@ -680,56 +425,49 @@ in /etc/ppp/chap-secrets + + 0 + False + True + - - - 0 - True - True - - - - - - True - GTK_BUTTONBOX_END - 0 - + True - True True - GTK_RELIEF_NORMAL - True + True + 6 - + True 0.5 0.5 - 0 - 0 + 1 + 1 0 0 - 0 + 12 0 - + True False - 2 + 6 - + True - gtk-add - 4 - 0.5 - 0.5 - 0 - 0 + True + _Only use VPN connection for these addresses + True + GTK_RELIEF_NORMAL + True + False + False + True 0 @@ -739,18 +477,106 @@ in /etc/ppp/chap-secrets - + True - _Import Saved Configuration... - True - False - GTK_JUSTIFY_LEFT - False - False 0.5 0.5 - 0 - 0 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + False + 6 + + + + True + <i>example: 172.16.0.0/16 10.11.12.0/24</i> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + True + + + + + + True + True + True + True + 0 + + True + * + False + + + 0 + True + True + + + + + + + 0 + False + True + + + + + + True + True + Use MPPC compression + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + True + Require MPPE encryption + True + GTK_RELIEF_NORMAL + True + False + False + True 0 @@ -763,6 +589,98 @@ in /etc/ppp/chap-secrets + + 0 + False + True + + + + + + True + GTK_BUTTONBOX_END + 0 + + + + True + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-add + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + _Import Saved Configuration... + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + + + + + + 0 + False + True + diff --git a/vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade b/vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade index 0d3f1d744a..d5010c19dd 100644 --- a/vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade +++ b/vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade @@ -9,7 +9,7 @@ GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False - True + False False True False @@ -21,10 +21,9 @@ - 12 True False - 12 + 6 @@ -52,54 +51,29 @@ - + True False - 6 + 18 - - True - <b>Connection Name</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - True - - - - - + True False - 0 + 6 - + True - + <b>Connection Name</b> False - False + True GTK_JUSTIFY_LEFT False False - 0.5 + 0 0.5 - 12 + 0 0 PANGO_ELLIPSIZE_NONE -1 @@ -114,56 +88,37 @@ - + True - False - 6 + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 - - True - _Name used to identify the connection to the private network, e.g. "Campus VPN" or "Corporate Network" - True - False - GTK_JUSTIFY_LEFT - True - False - 0 - 0.5 - 0 - 0 - vpnc-connection-name - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - True - - - - - + True False - 0 + 6 - + True - - False + _Name used to identify the connection to the private network, e.g. "Campus VPN" or "Corporate Network" + True False GTK_JUSTIFY_LEFT - False + True False - 0.5 + 0 0.5 - 12 + 0 0 + vpnc-connection-name PANGO_ELLIPSIZE_NONE -1 False @@ -190,16 +145,11 @@ 0 - True - True + False + False - - 0 - True - True - @@ -215,63 +165,25 @@ True - - - 0 - True - True - - - - - - True - False - 6 - - True - <b>Required Information</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - True - - - - - + True False - 0 + 6 - + True - + <b>Required Information</b> False - False + True GTK_JUSTIFY_LEFT False False - 0.5 + 0 0.5 - 12 + 0 0 PANGO_ELLIPSIZE_NONE -1 @@ -286,113 +198,127 @@ - + True - 2 - 2 - False - 12 - 6 + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 - + True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 0 - 1 - - + 2 + 2 + False + 6 + 12 - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 1 - 2 - - + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 0 + 1 + + - - - True - _Gateway: - True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - vpnc-gateway - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 1 + 2 + + - - - True - G_roup Name: - True - False - GTK_JUSTIFY_LEFT - False - False - 1 - 0.5 - 0 - 0 - vpnc-group-name - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + + + True + _Gateway: + True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + vpnc-gateway + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + True + G_roup Name: + True + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + vpnc-group-name + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + - - 0 - 1 - 1 - 2 - fill - 0 - True + False True @@ -403,119 +329,43 @@ True - - - 0 - True - True - - - - - - True - True - False - 6 - + True - False - 0 + True + False + 6 - + True - - False - False - GTK_JUSTIFY_LEFT - False - False 0.5 0.5 - 12 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - True - - - - - - True - False - 6 + 1 + 1 + 0 + 0 + 12 + 0 - - True - True - Override _user name - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - True - True - - - - - + True False - 0 + 6 - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 12 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - True - - - - - + True True - True - True - 0 - - True - * - False + Override _user name + True + GTK_RELIEF_NORMAL + True + False + False + True 0 @@ -523,156 +373,275 @@ True - - - 0 - True - True - - - - - - True - True - Use _domain for authentication - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - False - 0 - + True - - False - False - GTK_JUSTIFY_LEFT - False - False 0.5 0.5 - 12 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - True - - - - - - True - True - True - True - 0 - - True - * - False - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - True - _Only use VPN connection for these addresses - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 12 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - True - - - - - - True - False - 6 + 1 + 1 + 0 + 0 + 12 + 0 - + True - <i>example: 172.16.0.0/16 10.11.12.0/24</i> - False - True + True + True + True + 0 + + True + * + False + + + + + 0 + True + True + + + + + + True + True + Use _domain for authentication + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + True + True + True + 0 + + True + * + False + + + + + 0 + True + True + + + + + + True + True + _Only use VPN connection for these addresses + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + False + 6 + + + + True + <i>example: 172.16.0.0/16 10.11.12.0/24</i> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + True + + + + + + True + True + True + True + 0 + + True + * + False + + + 0 + True + True + + + + + + + 0 + True + True + + + + + + + + + + True + O_ptional Information + True + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + True + True + + + + + + True + GTK_BUTTONBOX_END + 0 + + + + True + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-add + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + _Import Saved Configuration... + True + False GTK_JUSTIFY_LEFT False False - 0 + 0.5 0.5 0 0 @@ -684,72 +653,20 @@ 0 False - True - - - - - - True - True - True - True - 0 - - True - * - False - - - 0 - True - True + False - - 0 - True - True - - - 0 - True - True - - - 0 - True - True - - - - - - True - O_ptional Information - True - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - label_item + 0 + True + True @@ -759,93 +676,6 @@ True - - - - True - GTK_BUTTONBOX_END - 0 - - - - True - True - True - GTK_RELIEF_NORMAL - True - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-add - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - _Import Saved Configuration... - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - - - 0 - True - True - -