network-manager-openvpn r63 - in trunk: . properties
- From: dcbw svn gnome org
- To: svn-commits-list gnome org
- Subject: network-manager-openvpn r63 - in trunk: . properties
- Date: Mon, 23 Mar 2009 22:59:20 +0000 (UTC)
Author: dcbw
Date: Mon Mar 23 22:59:20 2009
New Revision: 63
URL: http://svn.gnome.org/viewvc/network-manager-openvpn?rev=63&view=rev
Log:
2009-03-23 Dan Williams <dcbw redhat com>
* properties/nm-openvpn-dialog.glade
properties/auth-helpers.c
- Add a 'remote ip' entry to static-key mode
Modified:
trunk/ChangeLog
trunk/properties/auth-helpers.c
trunk/properties/nm-openvpn-dialog.glade
Modified: trunk/properties/auth-helpers.c
==============================================================================
--- trunk/properties/auth-helpers.c (original)
+++ trunk/properties/auth-helpers.c Mon Mar 23 22:59:20 2009
@@ -301,6 +301,15 @@
if (value && strlen (value))
gtk_entry_set_text (GTK_ENTRY (widget), value);
}
+
+ widget = glade_xml_get_widget (xml, "sk_remote_address_entry");
+ gtk_size_group_add_widget (group, widget);
+ g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (changed_cb), user_data);
+ if (s_vpn) {
+ value = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_REMOTE_IP);
+ if (value && strlen (value))
+ gtk_entry_set_text (GTK_ENTRY (widget), value);
+ }
}
static gboolean
@@ -415,6 +424,16 @@
NM_OPENVPN_KEY_LOCAL_IP);
return FALSE;
}
+
+ widget = glade_xml_get_widget (xml, "sk_remote_address_entry");
+ str = gtk_entry_get_text (GTK_ENTRY (widget));
+ if (!str || !strlen (str)) {
+ g_set_error (error,
+ OPENVPN_PLUGIN_UI_ERROR,
+ OPENVPN_PLUGIN_UI_ERROR_INVALID_PROPERTY,
+ NM_OPENVPN_KEY_REMOTE_IP);
+ return FALSE;
+ }
} else
g_assert_not_reached ();
@@ -522,6 +541,13 @@
str = gtk_entry_get_text (GTK_ENTRY (widget));
if (str && strlen (str))
nm_setting_vpn_add_data_item (s_vpn, NM_OPENVPN_KEY_LOCAL_IP, str);
+
+ /* Update remote address */
+ widget = glade_xml_get_widget (xml, "sk_remote_address_entry");
+ g_assert (widget);
+ str = gtk_entry_get_text (GTK_ENTRY (widget));
+ if (str && strlen (str))
+ nm_setting_vpn_add_data_item (s_vpn, NM_OPENVPN_KEY_REMOTE_IP, str);
} else
g_assert_not_reached ();
Modified: trunk/properties/nm-openvpn-dialog.glade
==============================================================================
--- trunk/properties/nm-openvpn-dialog.glade (original)
+++ trunk/properties/nm-openvpn-dialog.glade Mon Mar 23 22:59:20 2009
@@ -37,6 +37,19 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
+ <widget class="GtkLabel" id="label23">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Gateway:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">gateway_entry</property>
+ </widget>
+ <packing>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="xalign">1</property>
@@ -54,19 +67,6 @@
<property name="y_options"></property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label23">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Gateway:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">gateway_entry</property>
- </widget>
- <packing>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
</widget>
</child>
</widget>
@@ -107,30 +107,19 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkAlignment" id="alignment3">
+ <widget class="GtkCheckButton" id="show_passwords">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="xscale">0</property>
- <child>
- <widget class="GtkComboBox" id="auth_combo">
- <property name="visible">True</property>
- <property name="items" translatable="yes"> </property>
- </widget>
- </child>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Show passwords</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
<property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label26">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Type:</property>
- </widget>
- <packing>
- <property name="x_options"></property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
@@ -147,51 +136,45 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkAlignment" id="alignment5">
+ <widget class="GtkAlignment" id="alignment22">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="xscale">0</property>
<child>
- <widget class="GtkFileChooserButton" id="tls_user_cert_chooser">
+ <widget class="GtkEntry" id="tls_private_key_password_entry">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
</widget>
</child>
</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="label3">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">User Certificate:</property>
- </widget>
- <packing>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label2">
+ <widget class="GtkLabel" id="label29">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">CA Certificate:</property>
+ <property name="label" translatable="yes">Private Key Password:</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_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="GtkAlignment" id="alignment4">
+ <widget class="GtkAlignment" id="alignment6">
<property name="visible">True</property>
<property name="xalign">1</property>
- <property name="xscale">0</property>
+ <property name="xscale">0.019999999552965164</property>
<child>
- <widget class="GtkFileChooserButton" id="tls_ca_cert_chooser">
+ <widget class="GtkFileChooserButton" id="tls_private_key_chooser">
<property name="visible">True</property>
</widget>
</child>
@@ -199,8 +182,8 @@
<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="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
@@ -217,12 +200,12 @@
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment6">
+ <widget class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
<property name="xalign">1</property>
- <property name="xscale">0.019999999552965164</property>
+ <property name="xscale">0</property>
<child>
- <widget class="GtkFileChooserButton" id="tls_private_key_chooser">
+ <widget class="GtkFileChooserButton" id="tls_ca_cert_chooser">
<property name="visible">True</property>
</widget>
</child>
@@ -230,41 +213,47 @@
<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="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label29">
+ <widget class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Private Key Password:</property>
+ <property name="label" translatable="yes">CA Certificate:</property>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_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="GtkAlignment" id="alignment22">
+ <widget class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">User Certificate:</property>
+ </widget>
+ <packing>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment5">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="xscale">0</property>
<child>
- <widget class="GtkEntry" id="tls_private_key_password_entry">
+ <widget class="GtkFileChooserButton" id="tls_user_cert_chooser">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="visibility">False</property>
</widget>
</child>
</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>
@@ -288,96 +277,96 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkAlignment" id="alignment7">
+ <widget class="GtkAlignment" id="alignment20">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="xscale">0</property>
<child>
- <widget class="GtkEntry" id="pw_username_entry">
+ <widget class="GtkEntry" id="pw_password_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="visibility">False</property>
</widget>
</child>
</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="GtkLabel" id="label5">
+ <widget class="GtkAlignment" id="alignment10">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">User name:</property>
+ <property name="xalign">1</property>
+ <property name="xscale">0</property>
+ <child>
+ <widget class="GtkFileChooserButton" id="pw_ca_cert_chooser">
+ <property name="visible">True</property>
+ </widget>
+ </child>
</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="GtkLabel" id="label7">
+ <widget class="GtkLabel" id="label27">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">CA Certificate:</property>
+ <property name="label" translatable="yes">Password:</property>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label27">
+ <widget class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Password:</property>
+ <property name="label" translatable="yes">CA Certificate:</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment10">
+ <widget class="GtkLabel" id="label5">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="xscale">0</property>
- <child>
- <widget class="GtkFileChooserButton" id="pw_ca_cert_chooser">
- <property name="visible">True</property>
- </widget>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">User name:</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="GtkAlignment" id="alignment20">
+ <widget class="GtkAlignment" id="alignment7">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="xscale">0</property>
<child>
- <widget class="GtkEntry" id="pw_password_entry">
+ <widget class="GtkEntry" id="pw_username_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="visibility">False</property>
</widget>
</child>
</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>
@@ -405,73 +394,99 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkAlignment" id="alignment11">
+ <widget class="GtkAlignment" id="alignment23">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="xscale">0</property>
<child>
- <widget class="GtkEntry" id="pw_tls_username_entry">
+ <widget class="GtkEntry" id="pw_tls_private_key_password_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="visibility">False</property>
</widget>
</child>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label10">
+ <widget class="GtkLabel" id="label30">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">User name:</property>
+ <property name="label" translatable="yes">Private Key Password:</property>
</widget>
<packing>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label6">
+ <widget class="GtkAlignment" id="alignment12">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="xscale">0</property>
+ <child>
+ <widget class="GtkFileChooserButton" id="pw_tls_private_key_chooser">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">CA Certificate:</property>
+ <property name="label" translatable="yes">Private Key:</property>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label8">
+ <widget class="GtkLabel" id="label28">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">User Certificate:</property>
+ <property name="label" translatable="yes">Password:</property>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment13">
+ <widget class="GtkAlignment" id="alignment21">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="xscale">0</property>
<child>
- <widget class="GtkFileChooserButton" id="pw_tls_ca_cert_chooser">
+ <widget class="GtkEntry" id="pw_tls_password_entry">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
</widget>
</child>
</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="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
@@ -495,99 +510,73 @@
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment21">
+ <widget class="GtkAlignment" id="alignment13">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="xscale">0</property>
<child>
- <widget class="GtkEntry" id="pw_tls_password_entry">
+ <widget class="GtkFileChooserButton" id="pw_tls_ca_cert_chooser">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="visibility">False</property>
</widget>
</child>
</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="GtkLabel" id="label28">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Password:</property>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_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="label9">
+ <widget class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Private Key:</property>
+ <property name="label" translatable="yes">User Certificate:</property>
</widget>
<packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment12">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="xscale">0</property>
- <child>
- <widget class="GtkFileChooserButton" id="pw_tls_private_key_chooser">
- <property name="visible">True</property>
- </widget>
- </child>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">CA Certificate:</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</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="label30">
+ <widget class="GtkLabel" id="label10">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Private Key Password:</property>
+ <property name="label" translatable="yes">User name:</property>
</widget>
<packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment23">
+ <widget class="GtkAlignment" id="alignment11">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="xscale">0</property>
<child>
- <widget class="GtkEntry" id="pw_tls_private_key_password_entry">
+ <widget class="GtkEntry" id="pw_tls_username_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="visibility">False</property>
</widget>
</child>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
<property name="y_options"></property>
</packing>
</child>
@@ -610,70 +599,86 @@
<child>
<widget class="GtkTable" id="table6">
<property name="visible">True</property>
- <property name="n_rows">4</property>
+ <property name="n_rows">5</property>
<property name="n_columns">2</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <placeholder/>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment17">
+ <widget class="GtkAlignment" id="alignment25">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="xscale">0</property>
<child>
- <widget class="GtkLabel" id="sk_dir_help_label">
+ <widget class="GtkEntry" id="sk_local_address_entry">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><i>If key direction is used, it must be the opposite of that used on the VPN peer. For example, if the peer uses '1', this connection must use '0'. If you are unsure what value to use, contact your system administrator.</i></property>
- <property name="use_markup">True</property>
- <property name="wrap">True</property>
+ <property name="can_focus">True</property>
</widget>
</child>
</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="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment16">
+ <widget class="GtkLabel" id="label31">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Remote IP Address:</property>
+ <property name="justify">GTK_JUSTIFY_RIGHT</property>
+ </widget>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label20">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Local IP Address:</property>
+ <property name="justify">GTK_JUSTIFY_RIGHT</property>
+ </widget>
+ <packing>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment18">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="xscale">0</property>
<child>
- <widget class="GtkComboBox" id="sk_direction_combo">
+ <widget class="GtkEntry" id="sk_remote_address_entry">
<property name="visible">True</property>
- <property name="items" translatable="yes"> </property>
+ <property name="can_focus">True</property>
</widget>
</child>
</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="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment15">
+ <widget class="GtkLabel" id="label12">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="xscale">0</property>
- <child>
- <widget class="GtkFileChooserButton" id="sk_key_chooser">
- <property name="visible">True</property>
- </widget>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Key Direction:</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>
@@ -688,44 +693,62 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label12">
+ <widget class="GtkAlignment" id="alignment15">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Key Direction:</property>
+ <property name="xalign">1</property>
+ <property name="xscale">0</property>
+ <child>
+ <widget class="GtkFileChooserButton" id="sk_key_chooser">
+ <property name="visible">True</property>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label20">
+ <widget class="GtkAlignment" id="alignment16">
<property name="visible">True</property>
- <property name="label" translatable="yes">Local IP Address:</property>
+ <property name="xalign">1</property>
+ <property name="xscale">0</property>
+ <child>
+ <widget class="GtkComboBox" id="sk_direction_combo">
+ <property name="visible">True</property>
+ <property name="items" translatable="yes"> </property>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <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="GtkAlignment" id="alignment18">
+ <widget class="GtkAlignment" id="alignment17">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="xscale">0</property>
<child>
- <widget class="GtkEntry" id="sk_local_address_entry">
+ <widget class="GtkLabel" id="sk_dir_help_label">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><i>If key direction is used, it must be the opposite of that used on the VPN peer. For example, if the peer uses '1', this connection must use '0'. If you are unsure what value to use, contact your system administrator.</i></property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
</widget>
</child>
</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="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
@@ -753,22 +776,33 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="show_passwords">
+ <widget class="GtkLabel" id="label26">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Show passwords</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Type:</property>
</widget>
<packing>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
+ <child>
+ <widget class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="xscale">0</property>
+ <child>
+ <widget class="GtkComboBox" id="auth_combo">
+ <property name="visible">True</property>
+ <property name="items" translatable="yes"> </property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ </packing>
+ </child>
</widget>
</child>
</widget>
@@ -964,50 +998,50 @@
<property name="column_spacing">12</property>
<property name="row_spacing">12</property>
<child>
- <widget class="GtkComboBox" id="hmacauth_combo">
+ <widget class="GtkComboBox" id="cipher_combo">
<property name="visible">True</property>
<property name="items" translatable="yes"> </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="GtkLabel" id="label24">
+ <widget class="GtkLabel" id="label19">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">HMAC Authentication:</property>
+ <property name="label" translatable="yes">Cipher:</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label19">
+ <widget class="GtkLabel" id="label24">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Cipher:</property>
+ <property name="label" translatable="yes">HMAC Authentication:</property>
</widget>
<packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="cipher_combo">
+ <widget class="GtkComboBox" id="hmacauth_combo">
<property name="visible">True</property>
<property name="items" translatable="yes"> </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>
@@ -1041,6 +1075,19 @@
<placeholder/>
</child>
<child>
+ <widget class="GtkCheckButton" id="tls_auth_checkbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Use additional TLS authentication</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="right_attach">2</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkTable" id="table8">
<property name="visible">True</property>
<property name="n_rows">3</property>
@@ -1051,34 +1098,17 @@
<placeholder/>
</child>
<child>
- <widget class="GtkLabel" id="tls_auth_label">
+ <widget class="GtkLabel" id="direction_label">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Key File:</property>
- </widget>
- </child>
- <child>
- <widget class="GtkComboBox" id="direction_combo">
- <property name="visible">True</property>
- <property name="items" translatable="yes"> </property>
+ <property name="label" translatable="yes">Key Direction:</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>
</packing>
</child>
<child>
- <widget class="GtkFileChooserButton" id="tls_auth_chooser">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
<widget class="GtkAlignment" id="alignment19">
<property name="visible">True</property>
<property name="xalign">1</property>
@@ -1102,16 +1132,33 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="direction_label">
+ <widget class="GtkFileChooserButton" id="tls_auth_chooser">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Key Direction:</property>
</widget>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkComboBox" id="direction_combo">
+ <property name="visible">True</property>
+ <property name="items" translatable="yes"> </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>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="tls_auth_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Key File:</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -1120,19 +1167,6 @@
<property name="bottom_attach">2</property>
</packing>
</child>
- <child>
- <widget class="GtkCheckButton" id="tls_auth_checkbutton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Use additional TLS authentication</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="right_attach">2</property>
- </packing>
- </child>
</widget>
<packing>
<property name="position">2</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
