Merge branch 'nm-gui-ts'

Adds fields for local and remote TS to the GUI.

Closes strongswan/strongswan#2580

src/frontends/gnome/po/de.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager-strongswan\n"
 "Report-Msgid-Bugs-To: https://github.com/strongswan/strongswan\n"
-"POT-Creation-Date: 2024-10-15 17:58+0200\n"
+"POT-Creation-Date: 2025-02-07 11:44+0100\n"
 "PO-Revision-Date: 2019-12-18 17:10+0100\n"
 "Last-Translator: Tobias Brunner\n"
 "Language-Team: de <info@strongswan.org>\n"
@@ -85,13 +85,13 @@ msgstr "Smartcard"
 msgid "Choose a server or CA certificate…"
 msgstr "Server- oder CA-Zertifikat auswählen…"
 
-#: properties/nm-strongswan-dialog.ui:25 properties/nm-strongswan-dialog.ui:765
+#: properties/nm-strongswan-dialog.ui:25 properties/nm-strongswan-dialog.ui:858
-#: properties/nm-strongswan-dialog.ui:818
+#: properties/nm-strongswan-dialog.ui:911
 msgid "_Cancel"
 msgstr "Abbre_chen"
 
-#: properties/nm-strongswan-dialog.ui:34 properties/nm-strongswan-dialog.ui:774
+#: properties/nm-strongswan-dialog.ui:34 properties/nm-strongswan-dialog.ui:867
-#: properties/nm-strongswan-dialog.ui:827
+#: properties/nm-strongswan-dialog.ui:920
 msgid "_Select"
 msgstr "_Auswählen"
 
@@ -285,7 +285,7 @@ msgstr "_IKE:"
 
 #: properties/nm-strongswan-dialog.ui:673
 msgid "A list of proposals for IKE separated by \";\""
-msgstr "Eine Liste von Proposals für IKE getrennt mit \";\""
+msgstr "Eine Liste von Proposals für IKE, getrennt mit \";\""
 
 #: properties/nm-strongswan-dialog.ui:686
 msgid "_ESP:"
@@ -293,17 +293,45 @@ msgstr "_ESP:"
 
 #: properties/nm-strongswan-dialog.ui:699
 msgid "A list of proposals for ESP separated by \";\""
-msgstr "Eine Liste von Proposals für ESP getrennt mit \";\""
+msgstr "Eine Liste von Proposals für ESP, getrennt mit \";\""
 
 #: properties/nm-strongswan-dialog.ui:724
 msgid "Algorithms"
 msgstr "Algorithmen"
 
-#: properties/nm-strongswan-dialog.ui:755
+#: properties/nm-strongswan-dialog.ui:751
+msgid "_Local TS:"
+msgstr "_Lokale TS:"
+
+#: properties/nm-strongswan-dialog.ui:764
+msgid "A list of local traffic selectors separated by \";\""
+msgstr "Eine Liste von lokalen Traffic-Selektoren, getrennt mit \";\""
+
+#: properties/nm-strongswan-dialog.ui:767
+msgid "(Defaults to dynamic)"
+msgstr "(Standardwert ist dynamic)"
+
+#: properties/nm-strongswan-dialog.ui:778
+msgid "Re_mote TS:"
+msgstr "En_tfernte TS:"
+
+#: properties/nm-strongswan-dialog.ui:791
+msgid "A list of remote traffic selectors separated by \";\""
+msgstr "Eine Liste von entfernten Traffic-Selektoren, getrennt mit \";\""
+
+#: properties/nm-strongswan-dialog.ui:794
+msgid "(Defaults to 0.0.0.0/0;::/0)"
+msgstr "(Standardwert ist 0.0.0.0/0;::/0)"
+
+#: properties/nm-strongswan-dialog.ui:817
+msgid "Traffic"
+msgstr "Verkehr"
+
+#: properties/nm-strongswan-dialog.ui:848
 msgid "Choose a client certificate…"
 msgstr "Client-Zertifikat auswählen…"
 
-#: properties/nm-strongswan-dialog.ui:808
+#: properties/nm-strongswan-dialog.ui:901
 msgid "Choose a private key…"
 msgstr "Privaten Schlüssel auswählen…"
 

src/frontends/gnome/properties/nm-strongswan-dialog.ui

@@ -728,6 +728,99 @@
             <property name="tab-fill">False</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkBox" id="traffic-vbox">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="valign">start</property>
+            <property name="orientation">vertical</property>
+            <property name="margin">6</property>
+            <property name="spacing">6</property>
+            <child>
+              <!-- n-columns=2 n-rows=2 -->
+              <object class="GtkGrid">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="row-spacing">6</property>
+                <property name="column-spacing">6</property>
+                <property name="row-homogeneous">True</property>
+                <child>
+                  <object class="GtkLabel" id="local-ts-label">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="label" translatable="yes">_Local TS:</property>
+                    <property name="use-underline">True</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="local-ts-entry">
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="tooltip-text" translatable="yes">A list of local traffic selectors separated by ";"</property>
+                    <property name="hexpand">True</property>
+                    <property name="invisible-char">•</property>
+                    <property name="placeholder-text" translatable="yes">(Defaults to dynamic)</property>
+                  </object>
+                  <packing>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="remote-ts-label">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="label" translatable="yes">Re_mote TS:</property>
+                    <property name="use-underline">True</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="remote-ts-entry">
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="tooltip-text" translatable="yes">A list of remote traffic selectors separated by ";"</property>
+                    <property name="hexpand">True</property>
+                    <property name="invisible-char">•</property>
+                    <property name="placeholder-text" translatable="yes">(Defaults to 0.0.0.0/0;::/0)</property>
+                  </object>
+                  <packing>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child type="tab">
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="label" translatable="yes">Traffic</property>
+          </object>
+          <packing>
+            <property name="position">2</property>
+            <property name="tab-fill">False</property>
+          </packing>
+        </child>
         <child>
           <placeholder/>
         </child>

src/frontends/gnome/properties/nm-strongswan.c

@@ -544,6 +544,18 @@ init_plugin_ui (StrongswanPluginUiWidget *self, NMConnection *connection, GError
 	}
 	g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (settings_changed_cb), self);
 
+	widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "local-ts-entry"));
+	value = nm_setting_vpn_get_data_item (settings, "local-ts");
+	if (value)
+		gtk_editable_set_text (GTK_EDITABLE (widget), value);
+	g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (settings_changed_cb), self);
+
+	widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "remote-ts-entry"));
+	value = nm_setting_vpn_get_data_item (settings, "remote-ts");
+	if (value)
+		gtk_editable_set_text (GTK_EDITABLE (widget), value);
+	g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (settings_changed_cb), self);
+
 	return TRUE;
 }
 
@@ -740,6 +752,9 @@ update_connection (NMVpnEditor *iface,
 		g_free (str);
 	}
 
+	save_entry (settings, priv->builder, "local-ts-entry", "local-ts");
+	save_entry (settings, priv->builder, "remote-ts-entry", "remote-ts");
+
 	nm_connection_add_setting (connection, NM_SETTING (settings));
 	return TRUE;
 }