gnome-nettool r818 - in trunk: . src
- From: gpoo svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-nettool r818 - in trunk: . src
- Date: Fri, 12 Dec 2008 03:12:19 +0000 (UTC)
Author: gpoo
Date: Fri Dec 12 03:12:19 2008
New Revision: 818
URL: http://svn.gnome.org/viewvc/gnome-nettool?rev=818&view=rev
Log:
2008-12-12 German Poo-Caamano <gpoo gnome org>
* configure.in: Added dependency of gmodule-export-2.0 for better
use of libglade autoconnect.
* src/callbacks.[ch]:
* src/main.c:
* src/nettool.c: Clean up the code
* src/gnome-nettool.glade: Completed information for better a11y
support.
Modified:
trunk/ChangeLog
trunk/configure.in
trunk/src/callbacks.c
trunk/src/callbacks.h
trunk/src/gnome-nettool.glade
trunk/src/main.c
trunk/src/nettool.c
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Fri Dec 12 03:12:19 2008
@@ -36,6 +36,7 @@
gtk+-2.0 >= $GTK_REQUIRED
libglade-2.0 >= $LIBGLADE_REQUIRED
gconf-2.0 >= $GCONF_REQUIRED
+ gmodule-export-2.0
gnome-doc-utils
libgtop-2.0)
AC_SUBST(NETTOOL_CFLAGS)
Modified: trunk/src/callbacks.c
==============================================================================
--- trunk/src/callbacks.c (original)
+++ trunk/src/callbacks.c Fri Dec 12 03:12:19 2008
@@ -306,10 +306,10 @@
}
void
-on_about_activate (GtkWidget *menu_item, gpointer data)
+on_about_activate (gpointer window, GtkWidget *menu_item)
{
const gchar *authors[] = {
- "GermÃn Poo CaamaÃo <gpoo ubiobio cl>",
+ "GermÃn Poo CaamaÃo <gpoo gnome org>",
"William Jon McCann <mccann jhu edu>",
"Carlos Garcia Campos <carlosgc gnome org>",
"Rodrigo Moya <rodrigo gnome-db org>",
@@ -324,7 +324,7 @@
gchar copyright[1024];
GtkWindow *parent;
- parent = (GtkWindow *) data;
+ parent = (GtkWindow *) window;
/* Translators: %s is the name of the copyright holder */
g_sprintf (copyright, _("Copyright \xc2\xa9 2003-2008 %s"), "GermÃn Poo CaamaÃo");
@@ -386,13 +386,11 @@
}
void
-on_copy_activate (GtkWidget *menu_item, gpointer data)
+on_copy_activate (gpointer notebook, GtkWidget *menu_item)
{
gint page;
Netinfo *netinfo;
- GtkNotebook *notebook = (GtkNotebook *) data;
-
g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
page = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
@@ -407,12 +405,10 @@
}
void
-on_clear_history_activate (GtkWidget *menu_item, gpointer data)
+on_clear_history_activate (gpointer notebook, GtkWidget *menu_item)
{
Netinfo *netinfo;
- GtkNotebook *notebook = (GtkNotebook *) data;
-
g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
/* Pages all share a history id for host entry except whois */
@@ -450,6 +446,8 @@
} else {
netinfo_progress_indicator_stop (netinfo);
gtk_statusbar_pop (GTK_STATUSBAR (netinfo->status_bar), 0);
+ gtk_statusbar_push (GTK_STATUSBAR (netinfo->status_bar),
+ 0, _("Idle"));
}
/* Dear Translator: This is the Window Title. 'Network Tools' is the
@@ -461,11 +459,13 @@
}
void
-on_help_activate (GtkWidget *menu_item, gpointer window)
+on_help_activate (gpointer window, GtkWidget *menu_item)
{
GdkScreen *screen;
GError *error = NULL;
+ g_return_if_fail (GTK_IS_WINDOW (window));
+
screen = gtk_widget_get_screen (window);
gtk_show_uri (screen, "ghelp:gnome-nettool",
gtk_get_current_event_time (), &error);
Modified: trunk/src/callbacks.h
==============================================================================
--- trunk/src/callbacks.h (original)
+++ trunk/src/callbacks.h Fri Dec 12 03:12:19 2008
@@ -2,40 +2,40 @@
#include <gtk/gtk.h>
typedef void* (* NetinfoActivateFn) (GtkWidget *widget, gpointer data);
-void on_ping_activate (GtkWidget * editable, gpointer data);
+void on_ping_activate (GtkWidget *editable, gpointer data);
void on_ping_toggled (GtkToggleButton *button, gpointer data);
-void on_traceroute_activate (GtkWidget * editable, gpointer data);
+void on_traceroute_activate (GtkWidget *editable, gpointer data);
-void on_netstat_activate (GtkWidget * widget, gpointer data);
+void on_netstat_activate (GtkWidget *widget, gpointer data);
void on_info_nic_changed (GtkEntry *entry, gpointer output);
-void on_scan_activate (GtkWidget * widget, gpointer data);
+void on_scan_activate (GtkWidget *widget, gpointer data);
-void on_lookup_activate (GtkWidget * editable, gpointer data);
+void on_lookup_activate (GtkWidget *editable, gpointer data);
-void on_finger_activate (GtkWidget * editable, gpointer data);
+void on_finger_activate (GtkWidget *editable, gpointer data);
-void on_whois_activate (GtkWidget * editable, gpointer data);
+void on_whois_activate (GtkWidget *editable, gpointer data);
-void on_configure_button_clicked (GtkButton * widget, gpointer data);
+void on_configure_button_clicked (GtkButton *widget, gpointer data);
/* General stuff */
gboolean gn_quit_app (GtkWidget * widget, gpointer data);
void on_beep_activate (GtkWidget *menu_item, gpointer data);
-void on_copy_activate (GtkWidget *menu_item, gpointer data);
+void on_copy_activate (gpointer notebook, GtkWidget *menu_item);
-void on_clear_history_activate (GtkWidget *menu_item, gpointer data);
+void on_clear_history_activate (gpointer notebook, GtkWidget *menu_item);
-void on_page_switch (GtkNotebook * notebook,
- GtkNotebookPage * page,
- guint page_num,
- gpointer data);
+void on_page_switch (GtkNotebook *notebook,
+ GtkNotebookPage *page,
+ guint page_num,
+ gpointer data);
-void on_about_activate (GtkWidget *menu_item, gpointer data);
+void on_about_activate (gpointer window, GtkWidget *menu_item);
-void on_help_activate (GtkWidget *menu_item, gpointer data);
+void on_help_activate (gpointer window, GtkWidget *menu_item);
Modified: trunk/src/gnome-nettool.glade
==============================================================================
--- trunk/src/gnome-nettool.glade (original)
+++ trunk/src/gnome-nettool.glade Fri Dec 12 03:12:19 2008
@@ -36,6 +36,7 @@
<property name="label">gtk-quit</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
+ <signal name="activate" handler="gn_quit_app"/>
</widget>
</child>
</widget>
@@ -50,15 +51,11 @@
<child>
<widget class="GtkMenu" id="edit1_menu">
<child>
- <widget class="GtkImageMenuItem" id="m_copy">
+ <widget class="GtkMenuItem" id="m_copy">
<property name="visible">True</property>
- <property name="label">Copy as text _report</property>
+ <property name="label" translatable="yes">Copy as text _report</property>
<property name="use_underline">True</property>
- <child internal-child="image">
- <widget class="GtkImage" id="menu-item-image2">
- <property name="stock">gtk-missing-image</property>
- </widget>
- </child>
+ <signal name="activate" handler="on_copy_activate" object="notebook"/>
</widget>
</child>
<child>
@@ -71,6 +68,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Clear _History</property>
<property name="use_underline">True</property>
+ <signal name="activate" handler="on_clear_history_activate" object="notebook"/>
<child internal-child="image">
<widget class="GtkImage" id="image14">
<property name="visible">True</property>
@@ -97,6 +95,7 @@
<property name="label" translatable="yes">gtk-help</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
+ <signal name="activate" handler="on_help_activate" object="main_window"/>
</widget>
</child>
<child>
@@ -105,6 +104,7 @@
<property name="label">gtk-about</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
+ <signal name="activate" handler="on_about_activate" after="yes" object="main_window"/>
</widget>
</child>
</widget>
@@ -122,6 +122,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="border_width">4</property>
+ <signal name="switch_page" handler="on_page_switch"/>
<child>
<widget class="GtkVBox" id="vbox_info">
<property name="visible">True</property>
@@ -280,56 +281,45 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="info_state">
+ <widget class="GtkLabel" id="label_hw_address">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Not Available</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes">Hardware address:</property>
<accessibility>
- <atkrelation target="label_state" type="labelled-by"/>
+ <atkrelation target="info_hw_address" type="label-for"/>
</accessibility>
</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="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="info_link_speed">
+ <widget class="GtkLabel" id="label_multicast">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Not Available</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes">Multicast:</property>
<accessibility>
- <atkrelation target="label_link_speed" type="labelled-by"/>
+ <atkrelation target="info_multicast" type="label-for"/>
</accessibility>
</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="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="info_mtu">
+ <widget class="GtkLabel" id="label_mtu">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Not Available</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes">MTU:</property>
<accessibility>
- <atkrelation target="label_mtu" type="labelled-by"/>
+ <atkrelation target="info_mtu" type="label-for"/>
</accessibility>
</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="x_options">GTK_FILL</property>
@@ -337,84 +327,87 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="info_multicast">
+ <widget class="GtkLabel" id="label_link_speed">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Not Available</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes">Link speed:</property>
<accessibility>
- <atkrelation target="label_multicast" type="labelled-by"/>
+ <atkrelation target="info_link_speed" type="label-for"/>
</accessibility>
</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="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="info_hw_address">
+ <widget class="GtkLabel" id="label_state">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Not Available</property>
- <property name="justify">GTK_JUSTIFY_RIGHT</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes">State:</property>
<accessibility>
- <atkrelation target="label_hw_address" type="labelled-by"/>
+ <atkrelation target="info_state" type="label-for"/>
</accessibility>
</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="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_state">
+ <widget class="GtkLabel" id="info_hw_address">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">State:</property>
+ <property name="label" translatable="yes">Not Available</property>
+ <property name="justify">GTK_JUSTIFY_RIGHT</property>
+ <property name="selectable">True</property>
<accessibility>
- <atkrelation target="info_state" type="label-for"/>
+ <atkrelation target="label_hw_address" type="labelled-by"/>
</accessibility>
</widget>
<packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_link_speed">
+ <widget class="GtkLabel" id="info_multicast">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Link speed:</property>
+ <property name="label" translatable="yes">Not Available</property>
+ <property name="selectable">True</property>
<accessibility>
- <atkrelation target="info_link_speed" type="label-for"/>
+ <atkrelation target="label_multicast" type="labelled-by"/>
</accessibility>
</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="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_mtu">
+ <widget class="GtkLabel" id="info_mtu">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">MTU:</property>
+ <property name="label" translatable="yes">Not Available</property>
+ <property name="selectable">True</property>
<accessibility>
- <atkrelation target="info_mtu" type="label-for"/>
+ <atkrelation target="label_mtu" type="labelled-by"/>
</accessibility>
</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="x_options">GTK_FILL</property>
@@ -422,31 +415,39 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_multicast">
+ <widget class="GtkLabel" id="info_link_speed">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Multicast:</property>
+ <property name="label" translatable="yes">Not Available</property>
+ <property name="selectable">True</property>
<accessibility>
- <atkrelation target="info_multicast" type="label-for"/>
+ <atkrelation target="label_link_speed" type="labelled-by"/>
</accessibility>
</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="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_hw_address">
+ <widget class="GtkLabel" id="info_state">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Hardware address:</property>
+ <property name="label" translatable="yes">Not Available</property>
+ <property name="selectable">True</property>
<accessibility>
- <atkrelation target="info_hw_address" type="label-for"/>
+ <atkrelation target="label_state" type="labelled-by"/>
</accessibility>
</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="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
@@ -493,107 +494,121 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="label_collisions">
+ <widget class="GtkLabel" id="label_tx_bytes">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Collisions:</property>
- <property name="justify">GTK_JUSTIFY_RIGHT</property>
+ <property name="label" translatable="yes">Transmitted bytes:</property>
<accessibility>
- <atkrelation target="info_collisions" type="label-for"/>
+ <atkrelation target="info_tx_bytes" type="label-for"/>
</accessibility>
</widget>
<packing>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="info_collisions">
+ <widget class="GtkLabel" id="label_rx_bytes">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Received bytes:</property>
+ <accessibility>
+ <atkrelation target="info_rx_bytes" type="label-for"/>
+ </accessibility>
+ </widget>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="info_rx_bytes">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Not Available</property>
<property name="selectable">True</property>
<accessibility>
- <atkrelation target="label_collisions" type="labelled-by"/>
+ <atkrelation target="label_rx_bytes" type="labelled-by"/>
</accessibility>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_rx_errors">
+ <widget class="GtkLabel" id="info_tx_bytes">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Reception errors:</property>
+ <property name="label" translatable="yes">Not Available</property>
+ <property name="selectable">True</property>
<accessibility>
- <atkrelation target="info_rx_errors" type="label-for"/>
+ <atkrelation target="label_tx_bytes" type="labelled-by"/>
</accessibility>
</widget>
<packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="info_rx_errors">
+ <widget class="GtkLabel" id="info_tx_errors">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Not Available</property>
<property name="selectable">True</property>
<accessibility>
- <atkrelation target="label_rx_errors" type="labelled-by"/>
+ <atkrelation target="label_tx_errors" type="labelled-by"/>
</accessibility>
</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="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="GtkLabel" id="label_rx">
+ <widget class="GtkLabel" id="label_tx_errors">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Received packets:</property>
+ <property name="label" translatable="yes">Transmission errors:</property>
<accessibility>
- <atkrelation target="info_rx" type="label-for"/>
+ <atkrelation target="info_tx_errors" type="label-for"/>
</accessibility>
</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="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="info_rx">
+ <widget class="GtkLabel" id="info_tx">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Not Available</property>
<property name="selectable">True</property>
<accessibility>
- <atkrelation target="label_rx" type="labelled-by"/>
+ <atkrelation target="label_tx" type="labelled-by"/>
</accessibility>
</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">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
@@ -615,121 +630,107 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="info_tx">
+ <widget class="GtkLabel" id="info_rx">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Not Available</property>
<property name="selectable">True</property>
<accessibility>
- <atkrelation target="label_tx" type="labelled-by"/>
+ <atkrelation target="label_rx" type="labelled-by"/>
</accessibility>
</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">4</property>
+ <property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_tx_errors">
+ <widget class="GtkLabel" id="label_rx">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Transmission errors:</property>
+ <property name="label" translatable="yes">Received packets:</property>
<accessibility>
- <atkrelation target="info_tx_errors" type="label-for"/>
+ <atkrelation target="info_rx" type="label-for"/>
</accessibility>
</widget>
<packing>
- <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="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="info_tx_errors">
+ <widget class="GtkLabel" id="info_rx_errors">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Not Available</property>
<property name="selectable">True</property>
<accessibility>
- <atkrelation target="label_tx_errors" type="labelled-by"/>
+ <atkrelation target="label_rx_errors" type="labelled-by"/>
</accessibility>
</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">5</property>
+ <property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="info_tx_bytes">
+ <widget class="GtkLabel" id="label_rx_errors">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Not Available</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes">Reception errors:</property>
<accessibility>
- <atkrelation target="label_tx_bytes" type="labelled-by"/>
+ <atkrelation target="info_rx_errors" type="label-for"/>
</accessibility>
</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="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="info_rx_bytes">
+ <widget class="GtkLabel" id="info_collisions">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Not Available</property>
<property name="selectable">True</property>
<accessibility>
- <atkrelation target="label_rx_bytes" type="labelled-by"/>
+ <atkrelation target="label_collisions" type="labelled-by"/>
</accessibility>
</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="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_rx_bytes">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Received bytes:</property>
- <accessibility>
- <atkrelation target="info_rx_bytes" type="label-for"/>
- </accessibility>
- </widget>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_tx_bytes">
+ <widget class="GtkLabel" id="label_collisions">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Transmitted bytes:</property>
+ <property name="label" translatable="yes">Collisions:</property>
+ <property name="justify">GTK_JUSTIFY_RIGHT</property>
<accessibility>
- <atkrelation target="info_tx_bytes" type="label-for"/>
+ <atkrelation target="info_collisions" type="label-for"/>
</accessibility>
</widget>
<packing>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
@@ -797,56 +798,6 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="ping_host_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Network address:</property>
- <property name="use_underline">True</property>
- <accessibility>
- <atkrelation target="ping_host" type="label-for"/>
- </accessibility>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBoxEntry" id="ping_host">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="items" translatable="yes">Host</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">Network address</atkproperty>
- <atkrelation target="ping_host_label" type="labelled-by"/>
- </accessibility>
- <child internal-child="entry">
- <widget class="GtkEntry" id="comboboxentry-entry1">
- <accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">Network address</atkproperty>
- </accessibility>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label109">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Send:</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="GtkHBox" id="hbox25">
<property name="visible">True</property>
<property name="spacing">12</property>
@@ -920,12 +871,64 @@
<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="x_options">GTK_FILL</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label109">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Send:</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="GtkComboBoxEntry" id="ping_host">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="items" translatable="yes">Host</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Network address</atkproperty>
+ <atkrelation target="ping_host_label" type="labelled-by"/>
+ </accessibility>
+ <child internal-child="entry">
+ <widget class="GtkEntry" id="comboboxentry-entry1">
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text">Enter the network address to ping. For example: www.domain.com or 192.168.2.1</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Network address</atkproperty>
+ </accessibility>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="ping_host_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Network address:</property>
+ <property name="use_underline">True</property>
+ <accessibility>
+ <atkrelation target="ping_host" type="label-for"/>
+ </accessibility>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -1011,29 +1014,37 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="label_minimum">
+ <widget class="GtkLabel" id="ping_maximum">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Minimum:</property>
+ <property name="label" translatable="yes">0.0</property>
+ <property name="selectable">True</property>
<accessibility>
- <atkrelation target="ping_minimum" type="label-for"/>
+ <atkrelation target="label_maximum" type="labelled-by"/>
</accessibility>
</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="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_average">
+ <widget class="GtkLabel" id="ping_average">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Average:</property>
+ <property name="label" translatable="yes">0.0</property>
+ <property name="selectable">True</property>
<accessibility>
- <atkrelation target="ping_average" type="label-for"/>
+ <atkrelation target="label_average" type="labelled-by"/>
</accessibility>
</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="x_options">GTK_FILL</property>
@@ -1041,23 +1052,24 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_maximum">
+ <widget class="GtkLabel" id="ping_minimum">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Maximum:</property>
+ <property name="label" translatable="yes">0.0</property>
+ <property name="selectable">True</property>
<accessibility>
- <atkrelation target="ping_maximum" type="label-for"/>
+ <atkrelation target="label_minimum" type="labelled-by"/>
</accessibility>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label37">
+ <widget class="GtkLabel" id="label39">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">ms</property>
@@ -1065,6 +1077,8 @@
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</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>
@@ -1085,7 +1099,7 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label39">
+ <widget class="GtkLabel" id="label37">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">ms</property>
@@ -1093,42 +1107,36 @@
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</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="GtkLabel" id="ping_minimum">
+ <widget class="GtkLabel" id="label_maximum">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">0.0</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes">Maximum:</property>
<accessibility>
- <atkrelation target="label_minimum" type="labelled-by"/>
+ <atkrelation target="ping_maximum" type="label-for"/>
</accessibility>
</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="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ping_average">
+ <widget class="GtkLabel" id="label_average">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">0.0</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes">Average:</property>
<accessibility>
- <atkrelation target="label_average" type="labelled-by"/>
+ <atkrelation target="ping_average" type="label-for"/>
</accessibility>
</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="x_options">GTK_FILL</property>
@@ -1136,20 +1144,15 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ping_maximum">
+ <widget class="GtkLabel" id="label_minimum">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">0.0</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes">Minimum:</property>
<accessibility>
- <atkrelation target="label_maximum" type="labelled-by"/>
+ <atkrelation target="ping_minimum" type="label-for"/>
</accessibility>
</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="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
@@ -1191,31 +1194,32 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="label_packets_received">
+ <widget class="GtkLabel" id="label_packets_transmitted">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Packets received:</property>
+ <property name="label" translatable="yes">Packets transmitted:</property>
<accessibility>
- <atkrelation target="ping_packets_received" type="label-for"/>
+ <atkrelation target="ping_packets_transmitted" type="label-for"/>
</accessibility>
</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="label_packets_success">
+ <widget class="GtkLabel" id="ping_packets_success">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Successful packets:</property>
+ <property name="label" translatable="yes">0%</property>
+ <property name="selectable">True</property>
<accessibility>
- <atkrelation target="ping_packets_success" type="label-for"/>
+ <atkrelation target="label_packets_success" type="labelled-by"/>
</accessibility>
</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="x_options">GTK_FILL</property>
@@ -1223,54 +1227,51 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ping_packets_transmitted">
+ <widget class="GtkLabel" id="ping_packets_received">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">0</property>
<property name="selectable">True</property>
<accessibility>
- <atkrelation target="label_packets_transmitted" type="labelled-by"/>
+ <atkrelation target="label_packets_received" type="labelled-by"/>
</accessibility>
</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="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ping_packets_received">
+ <widget class="GtkLabel" id="ping_packets_transmitted">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">0</property>
<property name="selectable">True</property>
<accessibility>
- <atkrelation target="label_packets_received" type="labelled-by"/>
+ <atkrelation target="label_packets_transmitted" type="labelled-by"/>
</accessibility>
</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="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ping_packets_success">
+ <widget class="GtkLabel" id="label_packets_success">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">0%</property>
- <property name="selectable">True</property>
+ <property name="label" translatable="yes">Successful packets:</property>
<accessibility>
- <atkrelation target="label_packets_success" type="labelled-by"/>
+ <atkrelation target="ping_packets_success" type="label-for"/>
</accessibility>
</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="x_options">GTK_FILL</property>
@@ -1278,15 +1279,17 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_packets_transmitted">
+ <widget class="GtkLabel" id="label_packets_received">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Packets transmitted:</property>
+ <property name="label" translatable="yes">Packets received:</property>
<accessibility>
- <atkrelation target="ping_packets_transmitted" type="label-for"/>
+ <atkrelation target="ping_packets_received" type="label-for"/>
</accessibility>
</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>
@@ -1535,7 +1538,11 @@
<widget class="GtkTreeView" id="netstat_output">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="tooltip" translatable="yes">Output for net stat</property>
<property name="enable_search">False</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Netstat output</atkproperty>
+ </accessibility>
</widget>
</child>
</widget>
@@ -1591,6 +1598,8 @@
<property name="items" translatable="yes">Host</property>
<child internal-child="entry">
<widget class="GtkEntry" id="comboboxentry-entry2">
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text">Enter the network address to scan for open ports. For example: www.domain.com or 192.168.2.1</property>
<accessibility>
<atkrelation target="traceroute_host_label" type="labelled-by"/>
</accessibility>
@@ -1674,6 +1683,9 @@
<property name="can_focus">True</property>
<property name="tooltip" translatable="yes">Output for traceroute</property>
<property name="enable_search">False</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Traceroute output</atkproperty>
+ </accessibility>
</widget>
</child>
</widget>
@@ -1689,6 +1701,8 @@
<child>
<widget class="GtkLabel" id="traceroute">
<property name="visible">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text">Enter the network address to trace a route to. For example: www.domain.com or 192.168.2.1</property>
<property name="label" translatable="yes">Traceroute</property>
</widget>
<packing>
@@ -1729,6 +1743,11 @@
<property name="items" translatable="yes">Host</property>
<child internal-child="entry">
<widget class="GtkEntry" id="comboboxentry-entry3">
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text">Enter the network address to scan for open ports. For example: www.domain.com or 192.168.2.1</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Network address</atkproperty>
+ </accessibility>
</widget>
</child>
</widget>
@@ -1809,6 +1828,9 @@
<property name="can_focus">True</property>
<property name="tooltip" translatable="yes">Output for port scan</property>
<property name="enable_search">False</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Port scan output</atkproperty>
+ </accessibility>
</widget>
</child>
</widget>
@@ -1850,13 +1872,29 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="lookup_host_label">
+ <widget class="GtkComboBox" id="lookup_type">
+ <property name="visible">True</property>
+ <property name="can_focus">True</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="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="lookup_type_label">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Network address:</property>
+ <property name="label" translatable="yes">_Information type:</property>
<property name="use_underline">True</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>
@@ -1868,6 +1906,11 @@
<property name="items" translatable="yes">Host</property>
<child internal-child="entry">
<widget class="GtkEntry" id="comboboxentry-entry4">
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text">Enter the network address to lookup. For example: www.domain.com or 192.168.2.1</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Network address</atkproperty>
+ </accessibility>
</widget>
</child>
</widget>
@@ -1878,33 +1921,17 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="lookup_type_label">
+ <widget class="GtkLabel" id="lookup_host_label">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Information type:</property>
+ <property name="label" translatable="yes">_Network address:</property>
<property name="use_underline">True</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="lookup_type">
- <property name="visible">True</property>
- <property name="can_focus">True</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="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -1981,6 +2008,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip" translatable="yes">Output for lookup</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Lookup output</atkproperty>
+ </accessibility>
</widget>
</child>
</widget>
@@ -2022,29 +2052,27 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="finger_user_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Username:</property>
- <property name="use_underline">True</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="finger_host_label">
+ <widget class="GtkComboBoxEntry" id="finger_host">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Network address:</property>
- <property name="use_underline">True</property>
+ <property name="can_focus">True</property>
+ <property name="items" translatable="yes">Host</property>
+ <child internal-child="entry">
+ <widget class="GtkEntry" id="comboboxentry-entry6">
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text">Enter the network address to finger that user. For example: www.domain.com or 192.168.2.1</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Network address</atkproperty>
+ </accessibility>
+ </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="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -2054,6 +2082,11 @@
<property name="items" translatable="yes">User</property>
<child internal-child="entry">
<widget class="GtkEntry" id="comboboxentry-entry5">
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text">Enter the user to finger</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">User name</atkproperty>
+ </accessibility>
</widget>
</child>
</widget>
@@ -2064,22 +2097,29 @@
</packing>
</child>
<child>
- <widget class="GtkComboBoxEntry" id="finger_host">
+ <widget class="GtkLabel" id="finger_host_label">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="items" translatable="yes">Host</property>
- <child internal-child="entry">
- <widget class="GtkEntry" id="comboboxentry-entry6">
- </widget>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Network address:</property>
+ <property name="use_underline">True</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="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="finger_user_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Username:</property>
+ <property name="use_underline">True</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
</widget>
@@ -2159,6 +2199,9 @@
<property name="can_focus">True</property>
<property name="tooltip" translatable="yes">Output for finger</property>
<property name="editable">False</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Finger output</atkproperty>
+ </accessibility>
</widget>
</child>
</widget>
@@ -2214,6 +2257,11 @@
<property name="items" translatable="yes">Host</property>
<child internal-child="entry">
<widget class="GtkEntry" id="comboboxentry-entry7">
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_text">Enter a domain address to lookup its whois information. For example: www.domain.com or 192.168.2.1</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Domain address</atkproperty>
+ </accessibility>
</widget>
</child>
</widget>
@@ -2294,6 +2342,10 @@
<property name="can_focus">True</property>
<property name="tooltip" translatable="yes">Output for whois</property>
<property name="editable">False</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Whois output</atkproperty>
+ <atkproperty name="AtkObject::accessible_description" translatable="yes">Whois output</atkproperty>
+ </accessibility>
</widget>
</child>
</widget>
@@ -2309,7 +2361,11 @@
<child>
<widget class="GtkLabel" id="whois">
<property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Output for whois</property>
<property name="label" translatable="yes">Whois</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Whois output</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="type">tab</property>
Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c (original)
+++ trunk/src/main.c Fri Dec 12 03:12:19 2008
@@ -54,10 +54,10 @@
main (int argc, char *argv[])
{
GtkWidget *window;
- GtkWidget *menu_quit, *menu_about, *menu_copy, *menu_clear_history;
- GtkWidget *menu_beep, *menu_help;
+ GtkWidget *menu_beep;
GladeXML *xml;
GtkWidget *notebook;
+ GtkWidget *statusbar;
const gchar *dialog = DATADIR "gnome-nettool.glade";
Netinfo *pinger;
Netinfo *tracer;
@@ -136,6 +136,8 @@
xml = glade_xml_new (dialog, "main_window", NULL);
window = glade_xml_get_widget (xml, "main_window");
+ statusbar = glade_xml_get_widget (xml, "statusbar");
+ gtk_statusbar_push (GTK_STATUSBAR (statusbar), 0, _("Idle"));
g_signal_connect (G_OBJECT (window), "delete-event",
G_CALLBACK (gn_quit_app), NULL);
@@ -213,49 +215,15 @@
g_object_set_data (G_OBJECT (notebook), "finger", finger);
g_object_set_data (G_OBJECT (notebook), "whois", whois);
- menu_quit = glade_xml_get_widget (xml, "m_quit");
-
- g_signal_connect (G_OBJECT (menu_quit), "activate",
- G_CALLBACK (gn_quit_app),
- NULL);
-
menu_beep = glade_xml_get_widget (xml, "m_beep");
g_signal_connect (G_OBJECT (menu_beep), "activate",
G_CALLBACK (on_beep_activate),
(gpointer) pinger);
- menu_about = glade_xml_get_widget (xml, "m_about");
-
- g_signal_connect (G_OBJECT (menu_about), "activate",
- G_CALLBACK (on_about_activate),
- (gpointer) window);
-
- menu_copy = glade_xml_get_widget (xml, "m_copy");
-
- g_signal_connect (G_OBJECT (menu_copy), "activate",
- G_CALLBACK (on_copy_activate),
- (gpointer) notebook);
-
- menu_clear_history = glade_xml_get_widget (xml, "m_clear_history");
-
- g_signal_connect (G_OBJECT (menu_clear_history), "activate",
- G_CALLBACK (on_clear_history_activate),
- (gpointer) notebook);
-
- menu_help = glade_xml_get_widget (xml, "m_help_contents");
-
- g_signal_connect (G_OBJECT (menu_help), "activate",
- G_CALLBACK (on_help_activate),
- (gpointer) window);
-
-
glade_xml_signal_autoconnect (xml);
g_object_unref (G_OBJECT (xml));
- g_signal_connect (notebook, "switch_page",
- G_CALLBACK (on_page_switch), NULL);
-
gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), current_page);
gtk_widget_show (window);
@@ -302,7 +270,6 @@
GtkEntry *entry_host;
GtkTreeModel *model;
GtkEntryCompletion *completion;
- GtkTooltips *tips;
g_return_val_if_fail (xml != NULL, NULL);
@@ -351,11 +318,6 @@
/*gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (pinger->host), 0);*/
entry_host = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (pinger->host)));
- tips = gtk_tooltips_new ();
- gtk_tooltips_set_tip (tips, GTK_WIDGET (entry_host),
- _("Enter the network address to ping.\n"
- "For example: www.domain.com or 192.168.2.1"),
- NULL);
completion = gtk_entry_completion_new ();
gtk_entry_set_completion (entry_host, completion);
@@ -394,7 +356,6 @@
GtkEntry *entry_host;
GtkTreeModel *model;
GtkEntryCompletion *completion;
- GtkTooltips *tips;
g_return_val_if_fail (xml != NULL, NULL);
@@ -436,11 +397,6 @@
/*gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (tracer->host), 0);*/
entry_host = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (tracer->host)));
- tips = gtk_tooltips_new ();
- gtk_tooltips_set_tip (tips, GTK_WIDGET (entry_host),
- _("Enter the network address to trace a route to.\n"
- "For example: www.domain.com or 192.168.2.1"),
- NULL);
completion = gtk_entry_completion_new ();
gtk_entry_set_completion (entry_host, completion);
@@ -641,7 +597,6 @@
GtkWidget *label;
GtkTreeModel *model;
GtkEntryCompletion *completion;
- GtkTooltips *tips;
g_return_val_if_fail (xml != NULL, NULL);
@@ -681,11 +636,6 @@
/*gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (scan->host), 0);*/
entry_host = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (scan->host)));
- tips = gtk_tooltips_new ();
- gtk_tooltips_set_tip (tips, GTK_WIDGET (entry_host),
- _("Enter the network address to scan for open ports.\n"
- "For example: www.domain.com or 192.168.2.1"),
- NULL);
completion = gtk_entry_completion_new ();
gtk_entry_set_completion (entry_host, completion);
@@ -764,7 +714,6 @@
GtkEntry *entry_host;
GtkTreeModel *model;
GtkEntryCompletion *completion;
- GtkTooltips *tips;
g_return_val_if_fail (xml != NULL, NULL);
@@ -811,11 +760,6 @@
/*gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (lookup->host), 0);*/
entry_host = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (lookup->host)));
- tips = gtk_tooltips_new ();
- gtk_tooltips_set_tip (tips, GTK_WIDGET (entry_host),
- _("Enter the network address to lookup.\n"
- "For example: www.domain.com or 192.168.2.1"),
- NULL);
completion = gtk_entry_completion_new ();
gtk_entry_set_completion (entry_host, completion);
@@ -849,7 +793,6 @@
GtkEntry *entry_host;
GtkTreeModel *model;
GtkEntryCompletion *completion;
- GtkTooltips *tips;
g_return_val_if_fail (xml != NULL, NULL);
@@ -900,10 +843,6 @@
/*gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (finger->user), 0);*/
entry_host = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (finger->user)));
- tips = gtk_tooltips_new ();
- gtk_tooltips_set_tip (tips, GTK_WIDGET (entry_host),
- _("Enter the user to finger."),
- NULL);
completion = gtk_entry_completion_new ();
gtk_entry_set_completion (entry_host, completion);
@@ -927,11 +866,6 @@
/*gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (finger->host), 0);*/
entry_host = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (finger->host)));
- tips = gtk_tooltips_new ();
- gtk_tooltips_set_tip (tips, GTK_WIDGET (entry_host),
- _("Enter the network address to finger that user.\n"
- "For example: auth.domain.com or 192.168.2.1"),
- NULL);
completion = gtk_entry_completion_new ();
gtk_entry_set_completion (entry_host, completion);
@@ -965,7 +899,6 @@
GtkEntry *entry_host;
GtkTreeModel *model;
GtkEntryCompletion *completion;
- GtkTooltips *tips;
PangoFontDescription *font_desc;
@@ -1014,11 +947,6 @@
/*gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (whois->host), 0);*/
entry_host = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (whois->host)));
- tips = gtk_tooltips_new ();
- gtk_tooltips_set_tip (tips, GTK_WIDGET (entry_host),
- _("Enter a domain address to lookup its whois information.\n"
- "For example: www.domain.com or 192.168.2.1"),
- NULL);
completion = gtk_entry_completion_new ();
gtk_entry_set_completion (entry_host, completion);
Modified: trunk/src/nettool.c
==============================================================================
--- trunk/src/nettool.c (original)
+++ trunk/src/nettool.c Fri Dec 12 03:12:19 2008
@@ -175,9 +175,9 @@
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE,
- primary);
+ "%s", primary);
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
- secondary ? secondary : " ");
+ "%s", secondary ? secondary : " ");
gtk_window_set_title (GTK_WINDOW (dialog), "");
gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
@@ -457,6 +457,8 @@
netinfo->child_pid = 0;
gtk_statusbar_pop (GTK_STATUSBAR (netinfo->status_bar), 0);
+ gtk_statusbar_push (GTK_STATUSBAR (netinfo->status_bar),
+ 0, _("Idle"));
} else {
pango_font_description_set_weight (font_desc,
PANGO_WEIGHT_BOLD);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
