Commit 579c7a3e authored by William Jon McCann's avatar William Jon McCann Committed by William Jon McCann

Update copyright date.

2004-06-29  William Jon McCann  <mccann@jhu.edu>

	* src/callbacks.c (on_about_activate): Update copyright date.

	* src/gnome-nettool.glade: Use sentence capitalization for combobox
	labels.  Make network device combobox expand to fill space.  Make
	statistics text not expand to fill space.  Remove redundant verb
	from ping radio button label.  Fixes #144393.

	* src/gnome-nettool.glade:
	* src/main.c (load_ping_widgets_from_xml)
	(load_traceroute_widgets_from_xml, load_info_widgets_from_xml)
	(load_scan_widgets_from_xml, load_lookup_widgets_from_xml)
	(load_finger_widgets_from_xml, load_whois_widgets_from_xml):
	Activate the combobox when the label mnemonic is used.

	* src/callbacks.c (on_about_activate):
	* pixmaps/Makefile.am (pixmaps_DATA): Return the application
	icon into the pixmap directory so the .desktop file can find it.

2004-06-14  William Jon McCann  <mccann@jhu.edu>

	* src/callbacks.c (gn_quit_app): Use gboolean type for
	delete-event handler.
parent 70721c11
2004-06-29 William Jon McCann <mccann@jhu.edu>
* src/callbacks.c (on_about_activate): Update copyright date.
* src/gnome-nettool.glade: Use sentence capitalization for combobox
labels. Make network device combobox expand to fill space. Make
statistics text not expand to fill space. Remove redundant verb
from ping radio button label. Fixes #144393.
* src/gnome-nettool.glade:
* src/main.c (load_ping_widgets_from_xml)
(load_traceroute_widgets_from_xml, load_info_widgets_from_xml)
(load_scan_widgets_from_xml, load_lookup_widgets_from_xml)
(load_finger_widgets_from_xml, load_whois_widgets_from_xml):
Activate the combobox when the label mnemonic is used.
* src/callbacks.c (on_about_activate):
* pixmaps/Makefile.am (pixmaps_DATA): Return the application
icon into the pixmap directory so the .desktop file can find it.
2004-06-14 William Jon McCann <mccann@jhu.edu>
* src/callbacks.c (gn_quit_app): Use gboolean type for
delete-event handler.
2004-06-23 Carlos Garca Campos <carlosgc@gnome.org>
* src/callbacks.c (on_page_switch), src/finger.c (finger_do),
......
......@@ -2,9 +2,12 @@ pixmaps_DATA = 16_ethernet.xpm \
16_loopback.xpm \
16_plip.xpm \
16_ppp.xpm \
gnome-nettool.png \
irda-16.png \
network.png \
wavelan-16.png
EXTRA_DIST = $(pixmaps_DATA)
icondir = $(datadir)/pixmaps
icon_DATA = gnome-nettool.png
EXTRA_DIST = $(pixmaps_DATA) \
$(icon_DATA)
......@@ -287,7 +287,7 @@ on_whois_activate (GtkWidget * widget, gpointer data)
}
}
void
gboolean
gn_quit_app (GtkWidget * widget, gpointer data)
{
gint status, pid;
......@@ -302,6 +302,8 @@ gn_quit_app (GtkWidget * widget, gpointer data)
netinfo_progress_indicator_stop (NULL);
gtk_main_quit ();
return FALSE;
}
void
......@@ -322,7 +324,7 @@ on_about_activate (GtkWidget *menu_item, gpointer data)
parent = (GtkWindow *) data;
g_sprintf (copyright, "Copyright \xc2\xa9 2003 %s", "Germán Poo Caamaño");
g_sprintf (copyright, "Copyright \xc2\xa9 2003-2004 %s", "Germán Poo Caamaño");
if (about_box != NULL) {
gtk_window_present (GTK_WINDOW (about_box));
......@@ -333,7 +335,7 @@ on_about_activate (GtkWidget *menu_item, gpointer data)
{
gchar *filename = NULL;
filename = g_build_filename (PIXMAPS_DIR, "gnome-nettool.png", NULL);
filename = g_build_filename (GNOME_ICONDIR, "gnome-nettool.png", NULL);
if (filename != NULL) {
pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
g_free (filename);
......
......@@ -21,7 +21,7 @@ void on_whois_activate (GtkWidget * editable, gpointer data);
void on_configure_button_clicked (GtkButton * widget, gpointer data);
/* General stuff */
void gn_quit_app (GtkWidget * widget, gpointer data);
gboolean gn_quit_app (GtkWidget * widget, gpointer data);
void on_about_activate (GtkWidget *menu_item, gpointer data);
......
......@@ -151,9 +151,9 @@
<property name="spacing">12</property>
<child>
<widget class="GtkLabel" id="label118">
<widget class="GtkLabel" id="info_combo_label">
<property name="visible">True</property>
<property name="label" translatable="yes">_Network Device</property>
<property name="label" translatable="yes">_Network device:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
......@@ -177,7 +177,7 @@
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
......@@ -337,7 +337,7 @@
<child>
<widget class="GtkHBox" id="hbox_info_detail">
<property name="visible">True</property>
<property name="homogeneous">True</property>
<property name="homogeneous">False</property>
<property name="spacing">4</property>
<child>
......@@ -1281,7 +1281,8 @@
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="fill">False</property>
<property name="pack_type">GTK_PACK_END</property>
</packing>
</child>
</widget>
......@@ -1334,9 +1335,9 @@
<property name="column_spacing">6</property>
<child>
<widget class="GtkLabel" id="label108">
<widget class="GtkLabel" id="ping_host_label">
<property name="visible">True</property>
<property name="label" translatable="yes">_Network Address: </property>
<property name="label" translatable="yes">_Network address:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
......@@ -1374,7 +1375,7 @@
<child>
<widget class="GtkLabel" id="label109">
<property name="visible">True</property>
<property name="label" translatable="yes">Send: </property>
<property name="label" translatable="yes">Send:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
......@@ -1905,7 +1906,7 @@
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="expand">False</property>
<property name="fill">True</property>
</packing>
</child>
......@@ -2108,7 +2109,7 @@
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="expand">False</property>
<property name="fill">True</property>
</packing>
</child>
......@@ -2116,7 +2117,8 @@
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="fill">False</property>
<property name="pack_type">GTK_PACK_END</property>
</packing>
</child>
</widget>
......@@ -2163,12 +2165,12 @@
<widget class="GtkHBox" id="hbox43">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<property name="spacing">6</property>
<child>
<widget class="GtkLabel" id="label110">
<property name="visible">True</property>
<property name="label" translatable="yes">Display: </property>
<property name="label" translatable="yes">Display:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
......@@ -2259,7 +2261,7 @@
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="padding">4</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
......@@ -2429,9 +2431,9 @@
<property name="spacing">6</property>
<child>
<widget class="GtkLabel" id="label111">
<widget class="GtkLabel" id="traceroute_host_label">
<property name="visible">True</property>
<property name="label" translatable="yes">_Network Address: </property>
<property name="label" translatable="yes">_Network address:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
......@@ -2632,9 +2634,9 @@
<property name="spacing">6</property>
<child>
<widget class="GtkLabel" id="label112">
<widget class="GtkLabel" id="scan_host_label">
<property name="visible">True</property>
<property name="label" translatable="yes">_Network Address: </property>
<property name="label" translatable="yes">_Network address:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
......@@ -2838,9 +2840,9 @@
<property name="column_spacing">6</property>
<child>
<widget class="GtkLabel" id="label113">
<widget class="GtkLabel" id="lookup_host_label">
<property name="visible">True</property>
<property name="label" translatable="yes">_Network Address: </property>
<property name="label" translatable="yes">_Network address:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
......@@ -2876,9 +2878,9 @@
</child>
<child>
<widget class="GtkLabel" id="label114">
<widget class="GtkLabel" id="lookup_type_label">
<property name="visible">True</property>
<property name="label" translatable="yes">_Information Type: </property>
<property name="label" translatable="yes">_Information type:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
......@@ -3087,9 +3089,9 @@
<property name="column_spacing">6</property>
<child>
<widget class="GtkLabel" id="label115">
<widget class="GtkLabel" id="finger_user_label">
<property name="visible">True</property>
<property name="label" translatable="yes">_Username: </property>
<property name="label" translatable="yes">_Username:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
......@@ -3111,9 +3113,9 @@
</child>
<child>
<widget class="GtkLabel" id="label116">
<widget class="GtkLabel" id="finger_host_label">
<property name="visible">True</property>
<property name="label" translatable="yes">_Network Address: </property>
<property name="label" translatable="yes">_Network address:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
......@@ -3343,9 +3345,9 @@
<property name="spacing">6</property>
<child>
<widget class="GtkLabel" id="label117">
<widget class="GtkLabel" id="whois_host_label">
<property name="visible">True</property>
<property name="label" translatable="yes">_Domain Address: </property>
<property name="label" translatable="yes">_Domain address:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
......
......@@ -257,6 +257,7 @@ load_ping_widgets_from_xml (GladeXML * xml)
{
Netinfo *pinger;
GtkWidget *vbox_ping;
GtkWidget *label;
GtkEntry *entry_host;
GtkTreeModel *model;
GtkEntryCompletion *completion;
......@@ -293,6 +294,9 @@ load_ping_widgets_from_xml (GladeXML * xml)
pinger->stbar_text = NULL;
vbox_ping = glade_xml_get_widget (xml, "vbox_ping");
label = glade_xml_get_widget (xml, "ping_host_label");
gtk_label_set_mnemonic_widget (GTK_LABEL (label), pinger->host);
pinger->button_callback = G_CALLBACK (on_ping_activate);
pinger->process_line = NETINFO_FOREACH_FUNC (ping_foreach_with_tree);
......@@ -338,6 +342,7 @@ load_traceroute_widgets_from_xml (GladeXML * xml)
{
Netinfo *tracer;
GtkWidget *vbox_traceroute;
GtkWidget *label;
GtkEntry *entry_host;
GtkTreeModel *model;
GtkEntryCompletion *completion;
......@@ -369,6 +374,9 @@ load_traceroute_widgets_from_xml (GladeXML * xml)
vbox_traceroute = glade_xml_get_widget (xml, "vbox_traceroute");
label = glade_xml_get_widget (xml, "traceroute_host_label");
gtk_label_set_mnemonic_widget (GTK_LABEL (label), tracer->host);
tracer->button_callback = G_CALLBACK (on_traceroute_activate);
tracer->process_line = NETINFO_FOREACH_FUNC (traceroute_foreach_with_tree);
tracer->copy_output = NETINFO_COPY_FUNC (traceroute_copy_to_clipboard);
......@@ -561,6 +569,9 @@ load_info_widgets_from_xml (GladeXML * xml)
gtk_size_group_add_widget (group, label2);
g_object_unref (group);
label1 = glade_xml_get_widget (xml, "info_combo_label");
gtk_label_set_mnemonic_widget (GTK_LABEL (label1), info->combo);
/*
#ifdef IFCONFIG_PROGRAM
*/
......@@ -595,6 +606,7 @@ load_scan_widgets_from_xml (GladeXML * xml)
{
Netinfo *scan;
GtkEntry *entry_host;
GtkWidget *label;
GtkTreeModel *model;
GtkEntryCompletion *completion;
GtkTooltips *tips;
......@@ -623,6 +635,9 @@ load_scan_widgets_from_xml (GladeXML * xml)
scan->status_bar = glade_xml_get_widget (xml, "statusbar");
scan->stbar_text = NULL;
label = glade_xml_get_widget (xml, "scan_host_label");
gtk_label_set_mnemonic_widget (GTK_LABEL (label), scan->host);
scan->button_callback = G_CALLBACK (on_scan_activate);
scan->copy_output = NETINFO_COPY_FUNC (scan_copy_to_clipboard);
scan->process_line = NETINFO_FOREACH_FUNC (scan_foreach);
......@@ -711,6 +726,7 @@ load_lookup_widgets_from_xml (GladeXML * xml)
{
Netinfo *lookup;
GtkWidget *vbox_lookup;
GtkWidget *label;
GtkEntry *entry_host;
GtkTreeModel *model;
GtkEntryCompletion *completion;
......@@ -743,6 +759,11 @@ load_lookup_widgets_from_xml (GladeXML * xml)
vbox_lookup = glade_xml_get_widget (xml, "vbox_lookup");
label = glade_xml_get_widget (xml, "lookup_host_label");
gtk_label_set_mnemonic_widget (GTK_LABEL (label), lookup->host);
label = glade_xml_get_widget (xml, "lookup_type_label");
gtk_label_set_mnemonic_widget (GTK_LABEL (label), lookup->type);
lookup->button_callback = G_CALLBACK (on_lookup_activate);
lookup->process_line = NETINFO_FOREACH_FUNC (lookup_foreach_with_tree);
lookup->copy_output = NETINFO_COPY_FUNC (lookup_copy_to_clipboard);
......@@ -789,6 +810,7 @@ load_finger_widgets_from_xml (GladeXML * xml)
{
Netinfo *finger;
GtkWidget *vbox_finger;
GtkWidget *label;
PangoFontDescription *font_desc;
GtkEntry *entry_host;
GtkTreeModel *model;
......@@ -823,6 +845,11 @@ load_finger_widgets_from_xml (GladeXML * xml)
vbox_finger = glade_xml_get_widget (xml, "vbox_finger");
label = glade_xml_get_widget (xml, "finger_user_label");
gtk_label_set_mnemonic_widget (GTK_LABEL (label), finger->user);
label = glade_xml_get_widget (xml, "finger_host_label");
gtk_label_set_mnemonic_widget (GTK_LABEL (label), finger->host);
font_desc = pango_font_description_new ();
pango_font_description_set_family (font_desc, "monospace");
gtk_widget_modify_font (finger->output, font_desc);
......@@ -900,6 +927,7 @@ load_whois_widgets_from_xml (GladeXML * xml)
{
Netinfo *whois;
GtkWidget *vbox_whois;
GtkWidget *label;
GtkEntry *entry_host;
GtkTreeModel *model;
GtkEntryCompletion *completion;
......@@ -933,6 +961,9 @@ load_whois_widgets_from_xml (GladeXML * xml)
vbox_whois = glade_xml_get_widget (xml, "vbox_whois");
label = glade_xml_get_widget (xml, "whois_host_label");
gtk_label_set_mnemonic_widget (GTK_LABEL (label), whois->host);
font_desc = pango_font_description_new ();
pango_font_description_set_family (font_desc, "monospace");
gtk_widget_modify_font (whois->output, font_desc);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment