From 43afa6d5de37f36c196459bb441311a65bcc386c Mon Sep 17 00:00:00 2001 From: rbuj Date: Mon, 14 Dec 2020 15:44:45 +0100 Subject: netspeed: show all IP addresses on tooltip if enabled --- netspeed/data/netspeed-preferences.ui | 130 ++++++++++++--------- .../org.mate.panel.applet.netspeed.gschema.xml.in | 5 + netspeed/src/netspeed.c | 84 ++++++++++--- 3 files changed, 142 insertions(+), 77 deletions(-) diff --git a/netspeed/data/netspeed-preferences.ui b/netspeed/data/netspeed-preferences.ui index 62b0e601..9bc04f65 100644 --- a/netspeed/data/netspeed-preferences.ui +++ b/netspeed/data/netspeed-preferences.ui @@ -1,42 +1,42 @@ - + True - False - help-browser + False + help-browser True - False - window-close + False + window-close - False - 12 + False + 12 MATE Netspeed Preferences - mate-netspeed-applet - dialog + mate-netspeed-applet + dialog - False + False vertical 2 - False - end + False + end _Help True - True - True + True + True image1 - True - True + True + True True @@ -48,13 +48,13 @@ _Close True - True - True - True - True + True + True + True + True image2 - True - True + True + True True @@ -72,34 +72,34 @@ True - False - 0 - none + False + 0 + none True - False - 12 + False + 12 True - False - 5 + False + 5 vertical 6 True - False + False 12 True - False + False start Network _device: - True - network_device_combo + True + network_device_combo False @@ -110,7 +110,7 @@ True - False + False @@ -130,11 +130,11 @@ Show _sum instead of in & out True - True - False + True + False start - True - True + True + True @@ -147,11 +147,11 @@ Show _bits instead of bytes True - True - False + True + False start - True - True + True + True @@ -164,11 +164,11 @@ _Change icon according to the selected device True - True - False + True + False start - True - True + True + True @@ -181,11 +181,11 @@ Show _icon True - True - False + True + False start - True - True + True + True @@ -198,11 +198,11 @@ Show signal _quality icon for wireless devices True - True - False + True + False start - True - True + True + True @@ -211,6 +211,23 @@ 5 + + + Show all _IP addresses on tooltip + True + True + False + start + True + True + + + + False + True + 6 + + @@ -218,7 +235,7 @@ True - False + False start General Settings @@ -239,8 +256,5 @@ button1 button2 - - - diff --git a/netspeed/data/org.mate.panel.applet.netspeed.gschema.xml.in b/netspeed/data/org.mate.panel.applet.netspeed.gschema.xml.in index 88b6a8aa..a45dadb1 100644 --- a/netspeed/data/org.mate.panel.applet.netspeed.gschema.xml.in +++ b/netspeed/data/org.mate.panel.applet.netspeed.gschema.xml.in @@ -15,6 +15,11 @@ Show bits If true, show speed in bits instead of bytes. + + false + Show IPv4 and IPv6 addresses on tooltip + If true, show both IP addresses if enabled. + true Show icon diff --git a/netspeed/src/netspeed.c b/netspeed/src/netspeed.c index 7683928c..b3e88847 100644 --- a/netspeed/src/netspeed.c +++ b/netspeed/src/netspeed.c @@ -99,6 +99,7 @@ typedef struct guint timeout_id; char *up_cmd; char *down_cmd; + gboolean show_all_addresses; gboolean show_sum; gboolean show_bits; gboolean change_icon; @@ -1079,7 +1080,6 @@ device_change_cb (GtkComboBox *combo, update_applet (applet); } - /* Handle preference dialog response event */ static void @@ -1102,6 +1102,15 @@ pref_response_cb (GtkDialog *dialog, applet->settings = NULL; } +/* Called when the showalladdresses checkbutton is toggled... + */ +static void +showalladdresses_change_cb (GtkToggleButton *togglebutton, + MateNetspeedApplet *applet) +{ + applet->show_all_addresses = gtk_toggle_button_get_active (togglebutton); +} + /* Called when the showsum checkbutton is toggled... */ static void @@ -1183,6 +1192,10 @@ settings_cb (GtkAction *action, gtk_dialog_set_default_response (GTK_DIALOG (applet->settings), GTK_RESPONSE_CLOSE); + g_settings_bind (applet->gsettings, "show-all-addresses", + gtk_builder_get_object (builder, "show_all_addresses_checkbutton"), + "active", G_SETTINGS_BIND_DEFAULT); + g_settings_bind (applet->gsettings, "show-sum", gtk_builder_get_object (builder, "show_sum_checkbutton"), "active", G_SETTINGS_BIND_DEFAULT); @@ -1224,6 +1237,7 @@ settings_cb (GtkAction *action, /* signals */ gtk_builder_add_callback_symbols (builder, "on_network_device_combo_changed", G_CALLBACK (device_change_cb), + "on_show_all_addresses_checkbutton_toggled", G_CALLBACK (showalladdresses_change_cb), "on_show_sum_checkbutton_toggled", G_CALLBACK (showsum_change_cb), "on_show_bits_checkbutton_toggled", G_CALLBACK (showbits_change_cb), "on_change_icon_checkbutton_toggled", G_CALLBACK (changeicon_change_cb), @@ -1517,32 +1531,63 @@ update_tooltip (MateNetspeedApplet* applet) char ipv6_text [INET6_ADDRSTRLEN]; char *ip; - if (applet->devinfo->ip) { - format_ipv4 (applet->devinfo->ip, ipv4_text); - ip = ipv4_text; - } else { + if (applet->show_all_addresses) { format_ipv6 (applet->devinfo->ipv6, ipv6_text); - if (strlen (ipv6_text) > 2) { - ip = ipv6_text; + if (applet->devinfo->ip) { + format_ipv4 (applet->devinfo->ip, ipv4_text); + if (strlen (ipv6_text) > 2) { + g_string_printf (tooltip, + _("%s: %s and %s"), + applet->devinfo->name, + ipv4_text, + ipv6_text); + } else { + g_string_printf (tooltip, + _("%s: %s"), + applet->devinfo->name, + ipv4_text); + } + } else { + if (strlen (ipv6_text) > 2) { + g_string_printf (tooltip, + _("%s: %s"), + applet->devinfo->name, + ipv4_text); + } else { + g_string_printf (tooltip, + _("%s: has no ip"), + applet->devinfo->name); + } + } + } else { + if (applet->devinfo->ip) { + format_ipv4 (applet->devinfo->ip, ipv4_text); + ip = ipv4_text; } else { - ip = _("has no ip"); + format_ipv6 (applet->devinfo->ipv6, ipv6_text); + if (strlen (ipv6_text) > 2) { + ip = ipv6_text; + } else { + ip = _("has no ip"); + } } + g_string_printf (tooltip, + _("%s: %s"), + applet->devinfo->name, + ip); } if (applet->show_sum) { - g_string_printf (tooltip, - _("%s: %s\nin: %s out: %s"), - applet->devinfo->name, - ip, - applet->devinfo->rx_rate, - applet->devinfo->tx_rate); + g_string_append_printf (tooltip, + _("\nin: %s out: %s"), + applet->devinfo->rx_rate, + applet->devinfo->tx_rate); } else { - g_string_printf (tooltip, - _("%s: %s\nsum: %s"), - applet->devinfo->name, - ip, - applet->devinfo->sum_rate); + g_string_append_printf (tooltip, + _("\nsum: %s"), + applet->devinfo->sum_rate); } + #ifdef HAVE_NL if (applet->devinfo->type == DEV_WIRELESS) g_string_append_printf (tooltip, @@ -1635,6 +1680,7 @@ mate_netspeed_applet_factory (MatePanelApplet *applet_widget, /* Get stored settings from gsettings */ + applet->show_all_addresses = g_settings_get_boolean (applet->gsettings, "show-all-addresses"); applet->show_sum = g_settings_get_boolean (applet->gsettings, "show-sum"); applet->show_bits = g_settings_get_boolean (applet->gsettings, "show-bits"); applet->show_icon = g_settings_get_boolean (applet->gsettings, "show-icon"); -- cgit v1.2.1