Wed, Sep 04, 2013 at 02:26:23PM CEST, [email protected] wrote: >On Tuesday 03 of September 2013 16:57:05 Jiri Pirko wrote: >> Signed-off-by: Jiri Pirko <[email protected]> >> --- >> src/Makefile.am | 2 + >> src/applet-device-team.c | 165 ++++++++++++++++ >> src/applet-device-team.h | 27 +++ >> src/applet.c | 12 ++ >> src/applet.h | 1 + >> src/connection-editor/Makefile.am | 6 + >> src/connection-editor/ce-page-team-port.ui | 38 ++++ >> src/connection-editor/ce-page-team.ui | 185 ++++++++++++++++++ >> src/connection-editor/new-connection.c | 7 + >> src/connection-editor/nm-connection-editor.c | 12 +- >> src/connection-editor/nm-connection-list.c | 3 +- >> src/connection-editor/page-team-port.c | 165 ++++++++++++++++ >> src/connection-editor/page-team-port.h | 55 ++++++ >> src/connection-editor/page-team.c | 269 >> > >It looks good to me. Just three things: >1. mnemonics keys (Alt-letter) in editor are not unique - see my attached >patch
ok >2. missing Team device handling in libnm-gtk - see my attached patch ok >3. I guess JSON config is the filename with the config data. In that case you >should use file picker instead of simple text GtkEntry. nope, that's string. We can extend it with loading file later. > >Jirka > >PS: It seemed to me that I saw bond connection under team device in nm-applet. >But, I have to >test it once more. What do you mean exactly? > >From 18ba7a2d57428a27fe48f76107194f158a362711 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <[email protected]> >Date: Wed, 4 Sep 2013 13:32:26 +0200 >Subject: [PATCH 1/3] editor: use unambiguous mnemonic kyes for Team and > TeamPort pages >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > > >Signed-off-by: Jiří Klimeš <[email protected]> >--- > src/connection-editor/ce-page-team-port.ui | 2 +- > src/connection-editor/ce-page-team.ui | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > >diff --git a/src/connection-editor/ce-page-team-port.ui >b/src/connection-editor/ce-page-team-port.ui >index e45c759..382e9c1 100644 >--- a/src/connection-editor/ce-page-team-port.ui >+++ b/src/connection-editor/ce-page-team-port.ui >@@ -14,7 +14,7 @@ > <property name="visible">True</property> > <property name="can_focus">False</property> > <property name="xalign">0</property> >- <property name="label" translatable="yes">JSON _config:</property> >+ <property name="label" translatable="yes">_JSON config:</property> > <property name="use_underline">True</property> > <property name="mnemonic_widget">team_port_json_config</property> > </object> >diff --git a/src/connection-editor/ce-page-team.ui >b/src/connection-editor/ce-page-team.ui >index 8288d9d..135d043 100644 >--- a/src/connection-editor/ce-page-team.ui >+++ b/src/connection-editor/ce-page-team.ui >@@ -20,7 +20,7 @@ > <property name="visible">True</property> > <property name="can_focus">False</property> > <property name="xalign">0</property> >- <property name="label" translatable="yes">Teamed >_connections:</property> >+ <property name="label" translatable="yes">_Teamed >connections:</property> > <property name="use_underline">True</property> > </object> > <packing> >@@ -35,7 +35,7 @@ > <property name="visible">True</property> > <property name="can_focus">False</property> > <property name="xalign">0</property> >- <property name="label" translatable="yes">JSON _config:</property> >+ <property name="label" translatable="yes">_JSON config:</property> > <property name="use_underline">True</property> > <property name="mnemonic_widget">team_json_config</property> > </object> >-- >1.7.11.7 > >From 89e21415733788ff446ee69663b0266870c176f7 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <[email protected]> >Date: Wed, 4 Sep 2013 13:34:05 +0200 >Subject: [PATCH 2/3] libnm-gtk: recognize Team as a valid virtual device >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > > >Signed-off-by: Jiří Klimeš <[email protected]> >--- > src/libnm-gtk/nm-ui-utils.c | 5 +++++ > 1 file changed, 5 insertions(+) > >diff --git a/src/libnm-gtk/nm-ui-utils.c b/src/libnm-gtk/nm-ui-utils.c >index 4d28bae..69ede41 100644 >--- a/src/libnm-gtk/nm-ui-utils.c >+++ b/src/libnm-gtk/nm-ui-utils.c >@@ -335,6 +335,8 @@ nma_utils_get_device_type_name (NMDevice *device) > return _("InfiniBand"); > case NM_DEVICE_TYPE_BOND: > return _("Bond"); >+ case NM_DEVICE_TYPE_TEAM: >+ return _("Team"); > case NM_DEVICE_TYPE_BRIDGE: > return _("Bridge"); > case NM_DEVICE_TYPE_VLAN: >@@ -353,6 +355,7 @@ get_device_type_name_with_iface (NMDevice *device) > > switch (nm_device_get_device_type (device)) { > case NM_DEVICE_TYPE_BOND: >+ case NM_DEVICE_TYPE_TEAM: > case NM_DEVICE_TYPE_BRIDGE: > case NM_DEVICE_TYPE_VLAN: > return g_strdup_printf ("%s (%s)", type_name, > nm_device_get_iface (device)); >@@ -557,6 +560,8 @@ nma_utils_get_connection_device_name (NMConnection >*connection) > > if (!strcmp (type, NM_SETTING_BOND_SETTING_NAME)) > display_type = _("Bond"); >+ else if (!strcmp (type, NM_SETTING_TEAM_SETTING_NAME)) >+ display_type = _("Team"); > else if (!strcmp (type, NM_SETTING_BRIDGE_SETTING_NAME)) > display_type = _("Bridge"); > else if (!strcmp (type, NM_SETTING_VLAN_SETTING_NAME)) >-- >1.7.11.7 > _______________________________________________ networkmanager-list mailing list [email protected] https://mail.gnome.org/mailman/listinfo/networkmanager-list
