From 4100c69d9c7814e5bc9b20f0505547d89a1a04bf Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert.ancell@canonical.com>
Date: Fri, 18 Oct 2019 13:42:49 +1300
Subject: [PATCH] network: Move panel properties into GtkBuilder files

---
 .../network/connection-editor/details-page.ui  | 18 ++++++++++++++++++
 panels/network/network-mobile.ui               | 12 ++++++++++++
 panels/network/network-wifi.ui                 | 14 +++++++++++---
 panels/network/panel-common.c                  |  2 --
 4 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/panels/network/connection-editor/details-page.ui b/panels/network/connection-editor/details-page.ui
index af7ffc76f..7c2fecdec 100644
--- a/panels/network/connection-editor/details-page.ui
+++ b/panels/network/connection-editor/details-page.ui
@@ -36,6 +36,8 @@
         <property name="xalign">0</property>
         <property name="label">Weak</property>
         <property name="selectable">True</property>
+        <property name="max-width-chars">50</property>
+        <property name="ellipsize">end</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
@@ -70,6 +72,8 @@
         <property name="label">1Mb/sec</property>
         <property name="selectable">True</property>
         <property name="hexpand">True</property>
+        <property name="max-width-chars">50</property>
+        <property name="ellipsize">end</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
@@ -213,6 +217,8 @@
         <property name="label">WPA</property>
         <property name="selectable">True</property>
         <property name="hexpand">True</property>
+        <property name="max-width-chars">50</property>
+        <property name="ellipsize">end</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
@@ -229,6 +235,8 @@
         <property name="label">127.0.0.1</property>
         <property name="selectable">True</property>
         <property name="hexpand">True</property>
+        <property name="max-width-chars">50</property>
+        <property name="ellipsize">end</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
@@ -245,6 +253,8 @@
         <property name="label">::1</property>
         <property name="selectable">True</property>
         <property name="hexpand">True</property>
+        <property name="max-width-chars">50</property>
+        <property name="ellipsize">end</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
@@ -261,6 +271,8 @@
         <property name="label">AA:BB:CC:DD:55:66:77:88</property>
         <property name="selectable">True</property>
         <property name="hexpand">True</property>
+        <property name="max-width-chars">50</property>
+        <property name="ellipsize">end</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
@@ -277,6 +289,8 @@
         <property name="label">127.0.0.1</property>
         <property name="selectable">True</property>
         <property name="hexpand">True</property>
+        <property name="max-width-chars">50</property>
+        <property name="ellipsize">end</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
@@ -295,6 +309,8 @@
         <property name="wrap">True</property>
         <property name="selectable">True</property>
         <property name="hexpand">True</property>
+        <property name="max-width-chars">50</property>
+        <property name="ellipsize">end</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
@@ -311,6 +327,8 @@
         <property name="label">today</property>
         <property name="selectable">True</property>
         <property name="hexpand">True</property>
+        <property name="max-width-chars">50</property>
+        <property name="ellipsize">end</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
diff --git a/panels/network/network-mobile.ui b/panels/network/network-mobile.ui
index 3e9602242..00640bb4d 100644
--- a/panels/network/network-mobile.ui
+++ b/panels/network/network-mobile.ui
@@ -65,6 +65,8 @@
                 <property name="xalign">0</property>
                 <property name="label">1234567890</property>
                 <property name="selectable">True</property>
+                <property name="max-width-chars">50</property>
+                <property name="ellipsize">end</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -80,6 +82,8 @@
                 <property name="xalign">0</property>
                 <property name="label">SuperTel Supremo	</property>
                 <property name="selectable">True</property>
+                <property name="max-width-chars">50</property>
+                <property name="ellipsize">end</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -95,6 +99,8 @@
                 <property name="xalign">0</property>
                 <property name="label">127.0.0.1</property>
                 <property name="selectable">True</property>
+                <property name="max-width-chars">50</property>
+                <property name="ellipsize">end</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -109,6 +115,8 @@
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="selectable">True</property>
+                <property name="max-width-chars">50</property>
+                <property name="ellipsize">end</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -123,6 +131,8 @@
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="selectable">True</property>
+                <property name="max-width-chars">50</property>
+                <property name="ellipsize">end</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -139,6 +149,8 @@
                 <property name="yalign">0</property>
                 <property name="wrap">True</property>
                 <property name="selectable">True</property>
+                <property name="max-width-chars">50</property>
+                <property name="ellipsize">end</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
diff --git a/panels/network/network-wifi.ui b/panels/network/network-wifi.ui
index 4322f3e18..ba758485f 100644
--- a/panels/network/network-wifi.ui
+++ b/panels/network/network-wifi.ui
@@ -161,6 +161,8 @@
                 <property name="xalign">0</property>
                 <property name="label"></property>
                 <property name="selectable">True</property>
+                <property name="max-width-chars">50</property>
+                <property name="ellipsize">end</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -176,6 +178,8 @@
                 <property name="xalign">0</property>
                 <property name="label"></property>
                 <property name="selectable">True</property>
+                <property name="max-width-chars">50</property>
+                <property name="ellipsize">end</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -191,6 +195,8 @@
                 <property name="xalign">0</property>
                 <property name="label"></property>
                 <property name="selectable">True</property>
+                <property name="max-width-chars">50</property>
+                <property name="ellipsize">end</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -224,9 +230,11 @@
                 <property name="xalign">0</property>
                 <property name="label"></property>
                 <property name="selectable">True</property>
-                    <attributes>
-                      <attribute name="font-desc" value="Monospace"/>
-                    </attributes>
+                <property name="max-width-chars">50</property>
+                <property name="ellipsize">end</property>
+                <attributes>
+                  <attribute name="font-desc" value="Monospace"/>
+                </attributes>
               </object>
               <packing>
                 <property name="left_attach">1</property>
diff --git a/panels/network/panel-common.c b/panels/network/panel-common.c
index 9b15d11ba..bb1b59029 100644
--- a/panels/network/panel-common.c
+++ b/panels/network/panel-common.c
@@ -328,8 +328,6 @@ panel_set_device_widget_details (GtkLabel *heading,
                 gtk_widget_show (GTK_WIDGET (heading));
                 gtk_widget_show (GTK_WIDGET (widget));
                 gtk_label_set_label (widget, value);
-                gtk_label_set_max_width_chars (widget, 50);
-                gtk_label_set_ellipsize (widget, PANGO_ELLIPSIZE_END);
         }
         return TRUE;
 }