Attached is a patch that updates the three things you mentioned below
for the GTK2 interface (added hide downloaded, search_handle_ignored
combo, and download counter thing). A few less things for stephane to
do.
About the 'servent', I think it's probably not the best term in the
world, it may be a little too subtle for those with poorer spelling
skills. I forgot most of you folks are europeans (you are, right?) so
this is less of an issue. I sometimes worry about our american friends
though. I recently had a buddy up from new york who pronounced foyer
such that it would rhyme with lawyer. He thought I was crazy, mais
c'est la vie. Maybe they drink too much 'Lite' beer.
emile
ps. Raphael: You may know this already but: In case you ever venture
into gtk2, glade-2 is nearly identical interface-wise to glade. glade-2
can't handle gtk1 files though (they changed the glade file XML format)
but glade and glade-2 can coexist nicely on the same system.
On Thu, 2003-08-07 at 07:05, Raphael Manfredi wrote:
> Note that I've also done some further modification in the GTK1 GUI that
> would need propagation to GTK2: I've obsoleted mark_ignored and replaced
> it with a combo, backed by the property "search_handle_ignored_files".
> Again, all what is needed is a change via glade, all the connections
> are here (and to obsolete--remove actually--the "mark_ignored" property).
>
> Also I now count the amount of actively and passively queued entries, and
> display them on the download pane. See latest CVS for more information.
> I haven't sent the notice of the changes yet because those were minor.
> Again, all the connections are done, all what is needed is the update
> of the glade file.
>
> Finally, there is another new search property: "search_hide_downloaded"
> which is a pure GUI prop, that has a checkbox in GTK1 "Hide downloaded files".
>
? gtk-gnutella-current/.tm_project.cache
? gtk-gnutella-current/Makefile
? gtk-gnutella-current/config.cache
? gtk-gnutella-current/config.h
? gtk-gnutella-current/config.log
? gtk-gnutella-current/config.status
? gtk-gnutella-current/gtk-gnutella.spec
? gtk-gnutella-current/gtk_gnutella.prj
? gtk-gnutella-current/gtk_gnutella.pws
? gtk-gnutella-current/stamp-h
? gtk-gnutella-current/intl/Makefile
? gtk-gnutella-current/po/Makefile
? gtk-gnutella-current/po/Makefile.in
? gtk-gnutella-current/po/POTFILES
? gtk-gnutella-current/po/es.gmo
? gtk-gnutella-current/po/fr.gmo
? gtk-gnutella-current/po/nl.gmo
? gtk-gnutella-current/src/.deps
? gtk-gnutella-current/src/Makefile
? gtk-gnutella-current/src/getdate.c
? gtk-gnutella-current/src/gtk-gnutella
? gtk-gnutella-current/src/gtkg
Index: gtk-gnutella-current/gtk2-gnutella.glade
===================================================================
RCS file: /cvsroot/gtk-gnutella/gtk-gnutella-current/gtk2-gnutella.glade,v
retrieving revision 1.70
diff -u -r1.70 gtk2-gnutella.glade
--- gtk-gnutella-current/gtk2-gnutella.glade 2 Aug 2003 22:31:57 -0000 1.70
+++ gtk-gnutella-current/gtk2-gnutella.glade 8 Aug 2003 01:00:02 -0000
@@ -12807,18 +12807,136 @@
<property name="shadow_type">GTK_SHADOW_IN</property>
<child>
- <widget class="GtkLabel" id="label_dl_running_count">
+ <widget class="GtkHBox" id="hbox234">
<property name="visible">True</property>
- <property name="label" translatable="yes">[running
downloads]</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_RIGHT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">1</property>
- <property name="yalign">0.5</property>
- <property name="xpad">5</property>
- <property name="ypad">0</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">4</property>
+
+ <child>
+ <widget class="GtkLabel"
id="label_dl_running_count">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">[running]</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_RIGHT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">1</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">5</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label708">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">(</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_RIGHT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel"
id="label_dl_active_count">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">[active]</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_RIGHT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">1</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">5</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label710">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">,</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_RIGHT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel"
id="label_dl_aqueued_count">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">[aqueued]</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_RIGHT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label712">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">)</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_RIGHT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
</widget>
</child>
</widget>
@@ -13309,7 +13427,49 @@
<child>
<widget class="GtkLabel" id="label588">
<property name="visible">True</property>
- <property name="label"
translatable="yes">alive)</property>
+ <property name="label" translatable="yes">alive
with</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel"
id="label_dl_pqueued_count">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">[pqueued]</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label714">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">passive)</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property
name="justify">GTK_JUSTIFY_LEFT</property>
@@ -14128,38 +14288,16 @@
<property name="border_width">2</property>
<property name="visible">True</property>
<property name="n_rows">3</property>
- <property name="n_columns">6</property>
+ <property name="n_columns">5</property>
<property name="homogeneous">False</property>
<property name="row_spacing">2</property>
<property name="column_spacing">4</property>
<child>
- <widget class="GtkSpinButton"
id="spinbutton_search_max_results">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="climb_rate">1</property>
- <property name="digits">0</property>
- <property name="numeric">True</property>
- <property name="update_policy">GTK_UPDATE_ALWAYS</property>
- <property name="snap_to_ticks">False</property>
- <property name="wrap">False</property>
- <property name="adjustment">5000 1 50000 1 10 10</property>
- </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">shrink|fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkCheckButton"
id="checkbutton_search_remove_downloaded">
+ <widget class="GtkCheckButton"
id="checkbutton_search_jump_to_downloads">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Remove files
manually selected for download</property>
+ <property name="label" translatable="yes">_Jump to
downloads</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -14167,20 +14305,22 @@
<property name="draw_indicator">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">5</property>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_padding">4</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton"
id="checkbutton_search_autoselect_fuzzy">
+ <widget class="GtkCheckButton"
id="checkbutton_search_autoselect">
<property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Automatically
select all other results with the same name or urn:sha1.</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Use fu_zzy
matching</property>
+ <property name="label" translatable="yes">Enable
_autoselect</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -14188,20 +14328,21 @@
<property name="draw_indicator">True</property>
</widget>
<packing>
- <property name="left_attach">4</property>
- <property name="right_attach">5</property>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
<property name="top_attach">0</property>
<property name="bottom_attach">1</property>
+ <property name="x_padding">4</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton"
id="checkbutton_search_mark_ignored">
+ <widget class="GtkCheckButton"
id="checkbutton_search_remove_downloaded">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Mark ignored
files</property>
+ <property name="label" translatable="yes">_Remove files
manually selected for download</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -14209,10 +14350,11 @@
<property name="draw_indicator">True</property>
</widget>
<packing>
- <property name="left_attach">5</property>
- <property name="right_attach">6</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">0</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_padding">4</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
@@ -14232,7 +14374,7 @@
</widget>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">4</property>
+ <property name="right_attach">2</property>
<property name="top_attach">0</property>
<property name="bottom_attach">1</property>
<property name="x_options">fill</property>
@@ -14241,10 +14383,35 @@
</child>
<child>
- <widget class="GtkCheckButton"
id="checkbutton_search_jump_to_downloads">
+ <widget class="GtkLabel" id="label557">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Max. _number of
results</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property
name="mnemonic_widget">spinbutton_search_max_results</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">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkCheckButton"
id="checkbutton_search_autoselect_fuzzy">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Jump to
downloads</property>
+ <property name="label" translatable="yes">Use fu_zzy
matching</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -14252,21 +14419,81 @@
<property name="draw_indicator">True</property>
</widget>
<packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkSpinButton"
id="spinbutton_search_max_results">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">0</property>
+ <property name="numeric">True</property>
+ <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ <property name="snap_to_ticks">False</property>
+ <property name="wrap">False</property>
+ <property name="adjustment">5000 1 50000 1 10 10</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_padding">4</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label557">
+ <widget class="GtkCombo"
id="combo_search_handle_ignored_files">
<property name="visible">True</property>
- <property name="label" translatable="yes">Max. _number of
results</property>
- <property name="use_underline">True</property>
+ <property name="value_in_list">False</property>
+ <property name="allow_empty">True</property>
+ <property name="case_sensitive">False</property>
+ <property name="enable_arrow_keys">True</property>
+ <property name="enable_arrows_always">False</property>
+
+ <child internal-child="entry">
+ <widget class="GtkEntry" id="combo-entry6">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char"
translatable="yes">*</property>
+ <property name="activates_default">False</property>
+ </widget>
+ </child>
+
+ <child internal-child="list">
+ <widget class="GtkList" id="combo-list6">
+ <property name="visible">True</property>
+ <property
name="selection_mode">GTK_SELECTION_BROWSE</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">4</property>
+ <property name="right_attach">5</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label707">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Ignored files
are</property>
+ <property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
@@ -14275,25 +14502,22 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property
name="mnemonic_widget">spinbutton_search_max_results</property>
</widget>
<packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="x_padding">4</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton"
id="checkbutton_search_autoselect">
+ <widget class="GtkCheckButton"
id="checkbutton_search_hide_downloaded">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Automatically
select all other results with the same name or urn:sha1.</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Enable
_autoselect</property>
+ <property name="label" translatable="yes">_Hide downloaded
files</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
@@ -14301,11 +14525,10 @@
<property name="draw_indicator">True</property>
</widget>
<packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">5</property>
<property name="top_attach">0</property>
<property name="bottom_attach">1</property>
- <property name="x_padding">4</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
Index: gtk-gnutella-current/src/gnet_property.c
===================================================================
RCS file: /cvsroot/gtk-gnutella/gtk-gnutella-current/src/gnet_property.c,v
retrieving revision 1.86
diff -u -r1.86 gnet_property.c
--- gtk-gnutella-current/src/gnet_property.c 6 Aug 2003 20:09:35 -0000 1.86
+++ gtk-gnutella-current/src/gnet_property.c 8 Aug 2003 01:00:28 -0000
@@ -313,8 +313,6 @@
guint32 max_ultrapeers_def = 3;
guint32 max_leaves = 15;
guint32 max_leaves_def = 15;
-gboolean mark_ignored = FALSE;
-gboolean mark_ignored_def = FALSE;
guint32 search_handle_ignored_files = 0;
guint32 search_handle_ignored_files_def = 0;
prop_def_choice_t search_handle_ignored_files_choices[] = {
@@ -2951,425 +2949,408 @@
/*
- * PROP_MARK_IGNORED:
+ * PROP_SEARCH_HANDLE_IGNORED_FILES:
*
* General data:
*/
- gnet_property->props[134].name = "mark_ignored";
- gnet_property->props[134].desc = _("Mark files that would be ignored when
downloaded. This uses a little additional CPU power so it's off by default. If you
don't have a very slow box, you might want to turn this on.");
- gnet_property->props[134].ev_changed = event_new("mark_ignored_changed");
- gnet_property->props[134].save = FALSE;
+ gnet_property->props[134].name = "search_handle_ignored_files";
+ gnet_property->props[134].desc = _("What to do with files that will be ignored
for downloading.");
+ gnet_property->props[134].ev_changed =
event_new("search_handle_ignored_files_changed");
+ gnet_property->props[134].save = TRUE;
gnet_property->props[134].vector_size = 1;
/* Type specific data: */
- gnet_property->props[134].type = PROP_TYPE_BOOLEAN;
- gnet_property->props[134].data.boolean.def = &mark_ignored_def;
- gnet_property->props[134].data.boolean.value = &mark_ignored;
+ gnet_property->props[134].type = PROP_TYPE_MULTICHOICE;
+ gnet_property->props[134].data.guint32.def = &search_handle_ignored_files_def;
+ gnet_property->props[134].data.guint32.value = &search_handle_ignored_files;
+ gnet_property->props[134].data.guint32.max = 0xFFFFFFFF;
+ gnet_property->props[134].data.guint32.min = 0x00000000;
+ gnet_property->props[134].data.guint32.choices =
search_handle_ignored_files_choices;
/*
- * PROP_SEARCH_HANDLE_IGNORED_FILES:
+ * PROP_CONFIGURED_PEERMODE:
*
* General data:
*/
- gnet_property->props[135].name = "search_handle_ignored_files";
- gnet_property->props[135].desc = _("What to do with files that will be ignored
for downloading.");
- gnet_property->props[135].ev_changed =
event_new("search_handle_ignored_files_changed");
+ gnet_property->props[135].name = "configured_peermode";
+ gnet_property->props[135].desc = _("The peer mode you want to operate as for
gtk-gnutella. When auto is selected, gtk-gnutella will start as a leaf node and may
be promoted to an ultra node if bandwidth and uptime permits, provided that you are
not firewalled.");
+ gnet_property->props[135].ev_changed = event_new("configured_peermode_changed");
gnet_property->props[135].save = TRUE;
gnet_property->props[135].vector_size = 1;
/* Type specific data: */
gnet_property->props[135].type = PROP_TYPE_MULTICHOICE;
- gnet_property->props[135].data.guint32.def = &search_handle_ignored_files_def;
- gnet_property->props[135].data.guint32.value = &search_handle_ignored_files;
+ gnet_property->props[135].data.guint32.def = &configured_peermode_def;
+ gnet_property->props[135].data.guint32.value = &configured_peermode;
gnet_property->props[135].data.guint32.max = 0xFFFFFFFF;
gnet_property->props[135].data.guint32.min = 0x00000000;
- gnet_property->props[135].data.guint32.choices =
search_handle_ignored_files_choices;
+ gnet_property->props[135].data.guint32.choices = configured_peermode_choices;
/*
- * PROP_CONFIGURED_PEERMODE:
+ * PROP_CURRENT_PEERMODE:
*
* General data:
*/
- gnet_property->props[136].name = "configured_peermode";
- gnet_property->props[136].desc = _("The peer mode you want to operate as for
gtk-gnutella. When auto is selected, gtk-gnutella will start as a leaf node and may
be promoted to an ultra node if bandwidth and uptime permits, provided that you are
not firewalled.");
- gnet_property->props[136].ev_changed = event_new("configured_peermode_changed");
- gnet_property->props[136].save = TRUE;
+ gnet_property->props[136].name = "current_peermode";
+ gnet_property->props[136].desc = _("Current peer mode for gtk-gnutella");
+ gnet_property->props[136].ev_changed = event_new("current_peermode_changed");
+ gnet_property->props[136].save = FALSE;
gnet_property->props[136].vector_size = 1;
/* Type specific data: */
gnet_property->props[136].type = PROP_TYPE_MULTICHOICE;
- gnet_property->props[136].data.guint32.def = &configured_peermode_def;
- gnet_property->props[136].data.guint32.value = &configured_peermode;
+ gnet_property->props[136].data.guint32.def = ¤t_peermode_def;
+ gnet_property->props[136].data.guint32.value = ¤t_peermode;
gnet_property->props[136].data.guint32.max = 0xFFFFFFFF;
gnet_property->props[136].data.guint32.min = 0x00000000;
- gnet_property->props[136].data.guint32.choices = configured_peermode_choices;
+ gnet_property->props[136].data.guint32.choices = current_peermode_choices;
/*
- * PROP_CURRENT_PEERMODE:
+ * PROP_SYS_NOFILE:
*
* General data:
*/
- gnet_property->props[137].name = "current_peermode";
- gnet_property->props[137].desc = _("Current peer mode for gtk-gnutella");
- gnet_property->props[137].ev_changed = event_new("current_peermode_changed");
+ gnet_property->props[137].name = "sys_nofile";
+ gnet_property->props[137].desc = _("How many file descriptors a process can
open.");
+ gnet_property->props[137].ev_changed = event_new("sys_nofile_changed");
gnet_property->props[137].save = FALSE;
gnet_property->props[137].vector_size = 1;
/* Type specific data: */
- gnet_property->props[137].type = PROP_TYPE_MULTICHOICE;
- gnet_property->props[137].data.guint32.def = ¤t_peermode_def;
- gnet_property->props[137].data.guint32.value = ¤t_peermode;
+ gnet_property->props[137].type = PROP_TYPE_GUINT32;
+ gnet_property->props[137].data.guint32.def = &sys_nofile_def;
+ gnet_property->props[137].data.guint32.value = &sys_nofile;
+ gnet_property->props[137].data.guint32.choices = NULL;
gnet_property->props[137].data.guint32.max = 0xFFFFFFFF;
gnet_property->props[137].data.guint32.min = 0x00000000;
- gnet_property->props[137].data.guint32.choices = current_peermode_choices;
/*
- * PROP_SYS_NOFILE:
+ * PROP_SYS_PHYSMEM:
*
* General data:
*/
- gnet_property->props[138].name = "sys_nofile";
- gnet_property->props[138].desc = _("How many file descriptors a process can
open.");
- gnet_property->props[138].ev_changed = event_new("sys_nofile_changed");
+ gnet_property->props[138].name = "sys_physmem";
+ gnet_property->props[138].desc = _("How many KB of physical memory is
available.");
+ gnet_property->props[138].ev_changed = event_new("sys_physmem_changed");
gnet_property->props[138].save = FALSE;
gnet_property->props[138].vector_size = 1;
/* Type specific data: */
gnet_property->props[138].type = PROP_TYPE_GUINT32;
- gnet_property->props[138].data.guint32.def = &sys_nofile_def;
- gnet_property->props[138].data.guint32.value = &sys_nofile;
+ gnet_property->props[138].data.guint32.def = &sys_physmem_def;
+ gnet_property->props[138].data.guint32.value = &sys_physmem;
gnet_property->props[138].data.guint32.choices = NULL;
gnet_property->props[138].data.guint32.max = 0xFFFFFFFF;
gnet_property->props[138].data.guint32.min = 0x00000000;
/*
- * PROP_SYS_PHYSMEM:
+ * PROP_DL_QUEUE_COUNT:
*
* General data:
*/
- gnet_property->props[139].name = "sys_physmem";
- gnet_property->props[139].desc = _("How many KB of physical memory is
available.");
- gnet_property->props[139].ev_changed = event_new("sys_physmem_changed");
+ gnet_property->props[139].name = "dl_queue_count";
+ gnet_property->props[139].desc = _("How many downloads are currently held in the
queue.");
+ gnet_property->props[139].ev_changed = event_new("dl_queue_count_changed");
gnet_property->props[139].save = FALSE;
gnet_property->props[139].vector_size = 1;
/* Type specific data: */
gnet_property->props[139].type = PROP_TYPE_GUINT32;
- gnet_property->props[139].data.guint32.def = &sys_physmem_def;
- gnet_property->props[139].data.guint32.value = &sys_physmem;
+ gnet_property->props[139].data.guint32.def = &dl_queue_count_def;
+ gnet_property->props[139].data.guint32.value = &dl_queue_count;
gnet_property->props[139].data.guint32.choices = NULL;
gnet_property->props[139].data.guint32.max = 0xFFFFFFFF;
gnet_property->props[139].data.guint32.min = 0x00000000;
/*
- * PROP_DL_QUEUE_COUNT:
+ * PROP_DL_RUNNING_COUNT:
*
* General data:
*/
- gnet_property->props[140].name = "dl_queue_count";
- gnet_property->props[140].desc = _("How many downloads are currently held in the
queue.");
- gnet_property->props[140].ev_changed = event_new("dl_queue_count_changed");
+ gnet_property->props[140].name = "dl_running_count";
+ gnet_property->props[140].desc = _("How many downloads are currently running
(downloading / connecting).");
+ gnet_property->props[140].ev_changed = event_new("dl_running_count_changed");
gnet_property->props[140].save = FALSE;
gnet_property->props[140].vector_size = 1;
/* Type specific data: */
gnet_property->props[140].type = PROP_TYPE_GUINT32;
- gnet_property->props[140].data.guint32.def = &dl_queue_count_def;
- gnet_property->props[140].data.guint32.value = &dl_queue_count;
+ gnet_property->props[140].data.guint32.def = &dl_running_count_def;
+ gnet_property->props[140].data.guint32.value = &dl_running_count;
gnet_property->props[140].data.guint32.choices = NULL;
gnet_property->props[140].data.guint32.max = 0xFFFFFFFF;
gnet_property->props[140].data.guint32.min = 0x00000000;
/*
- * PROP_DL_RUNNING_COUNT:
+ * PROP_DL_ACTIVE_COUNT:
*
* General data:
*/
- gnet_property->props[141].name = "dl_running_count";
- gnet_property->props[141].desc = _("How many downloads are currently running
(downloading / connecting).");
- gnet_property->props[141].ev_changed = event_new("dl_running_count_changed");
+ gnet_property->props[141].name = "dl_active_count";
+ gnet_property->props[141].desc = _("How many downloads are currently active.");
+ gnet_property->props[141].ev_changed = event_new("dl_active_count_changed");
gnet_property->props[141].save = FALSE;
gnet_property->props[141].vector_size = 1;
/* Type specific data: */
gnet_property->props[141].type = PROP_TYPE_GUINT32;
- gnet_property->props[141].data.guint32.def = &dl_running_count_def;
- gnet_property->props[141].data.guint32.value = &dl_running_count;
+ gnet_property->props[141].data.guint32.def = &dl_active_count_def;
+ gnet_property->props[141].data.guint32.value = &dl_active_count;
gnet_property->props[141].data.guint32.choices = NULL;
gnet_property->props[141].data.guint32.max = 0xFFFFFFFF;
gnet_property->props[141].data.guint32.min = 0x00000000;
/*
- * PROP_DL_ACTIVE_COUNT:
+ * PROP_DL_AQUEUED_COUNT:
*
* General data:
*/
- gnet_property->props[142].name = "dl_active_count";
- gnet_property->props[142].desc = _("How many downloads are currently active.");
- gnet_property->props[142].ev_changed = event_new("dl_active_count_changed");
+ gnet_property->props[142].name = "dl_aqueued_count";
+ gnet_property->props[142].desc = _("How many downloads are currently actively
queued.");
+ gnet_property->props[142].ev_changed = event_new("dl_aqueued_count_changed");
gnet_property->props[142].save = FALSE;
gnet_property->props[142].vector_size = 1;
/* Type specific data: */
gnet_property->props[142].type = PROP_TYPE_GUINT32;
- gnet_property->props[142].data.guint32.def = &dl_active_count_def;
- gnet_property->props[142].data.guint32.value = &dl_active_count;
+ gnet_property->props[142].data.guint32.def = &dl_aqueued_count_def;
+ gnet_property->props[142].data.guint32.value = &dl_aqueued_count;
gnet_property->props[142].data.guint32.choices = NULL;
gnet_property->props[142].data.guint32.max = 0xFFFFFFFF;
gnet_property->props[142].data.guint32.min = 0x00000000;
/*
- * PROP_DL_AQUEUED_COUNT:
+ * PROP_DL_PQUEUED_COUNT:
*
* General data:
*/
- gnet_property->props[143].name = "dl_aqueued_count";
- gnet_property->props[143].desc = _("How many downloads are currently actively
queued.");
- gnet_property->props[143].ev_changed = event_new("dl_aqueued_count_changed");
+ gnet_property->props[143].name = "dl_pqueued_count";
+ gnet_property->props[143].desc = _("How many downloads are currently passively
queued.");
+ gnet_property->props[143].ev_changed = event_new("dl_pqueued_count_changed");
gnet_property->props[143].save = FALSE;
gnet_property->props[143].vector_size = 1;
/* Type specific data: */
gnet_property->props[143].type = PROP_TYPE_GUINT32;
- gnet_property->props[143].data.guint32.def = &dl_aqueued_count_def;
- gnet_property->props[143].data.guint32.value = &dl_aqueued_count;
+ gnet_property->props[143].data.guint32.def = &dl_pqueued_count_def;
+ gnet_property->props[143].data.guint32.value = &dl_pqueued_count;
gnet_property->props[143].data.guint32.choices = NULL;
gnet_property->props[143].data.guint32.max = 0xFFFFFFFF;
gnet_property->props[143].data.guint32.min = 0x00000000;
/*
- * PROP_DL_PQUEUED_COUNT:
+ * PROP_DL_QALIVE_COUNT:
*
* General data:
*/
- gnet_property->props[144].name = "dl_pqueued_count";
- gnet_property->props[144].desc = _("How many downloads are currently passively
queued.");
- gnet_property->props[144].ev_changed = event_new("dl_pqueued_count_changed");
+ gnet_property->props[144].name = "dl_qalive_count";
+ gnet_property->props[144].desc = _("How many queued downloads are currently
responsive (remote servent answering requests).");
+ gnet_property->props[144].ev_changed = event_new("dl_qalive_count_changed");
gnet_property->props[144].save = FALSE;
gnet_property->props[144].vector_size = 1;
/* Type specific data: */
gnet_property->props[144].type = PROP_TYPE_GUINT32;
- gnet_property->props[144].data.guint32.def = &dl_pqueued_count_def;
- gnet_property->props[144].data.guint32.value = &dl_pqueued_count;
+ gnet_property->props[144].data.guint32.def = &dl_qalive_count_def;
+ gnet_property->props[144].data.guint32.value = &dl_qalive_count;
gnet_property->props[144].data.guint32.choices = NULL;
gnet_property->props[144].data.guint32.max = 0xFFFFFFFF;
gnet_property->props[144].data.guint32.min = 0x00000000;
/*
- * PROP_DL_QALIVE_COUNT:
+ * PROP_DL_BYTE_COUNT:
*
* General data:
*/
- gnet_property->props[145].name = "dl_qalive_count";
- gnet_property->props[145].desc = _("How many queued downloads are currently
responsive (remote servent answering requests).");
- gnet_property->props[145].ev_changed = event_new("dl_qalive_count_changed");
+ gnet_property->props[145].name = "dl_byte_count";
+ gnet_property->props[145].desc = _("Amount of bytes downloaded so far, HTTP
headers notwithstanding.");
+ gnet_property->props[145].ev_changed = event_new("dl_byte_count_changed");
gnet_property->props[145].save = FALSE;
gnet_property->props[145].vector_size = 1;
/* Type specific data: */
gnet_property->props[145].type = PROP_TYPE_GUINT32;
- gnet_property->props[145].data.guint32.def = &dl_qalive_count_def;
- gnet_property->props[145].data.guint32.value = &dl_qalive_count;
+ gnet_property->props[145].data.guint32.def = &dl_byte_count_def;
+ gnet_property->props[145].data.guint32.value = &dl_byte_count;
gnet_property->props[145].data.guint32.choices = NULL;
gnet_property->props[145].data.guint32.max = 0xFFFFFFFF;
gnet_property->props[145].data.guint32.min = 0x00000000;
/*
- * PROP_DL_BYTE_COUNT:
+ * PROP_UL_BYTE_COUNT:
*
* General data:
*/
- gnet_property->props[146].name = "dl_byte_count";
- gnet_property->props[146].desc = _("Amount of bytes downloaded so far, HTTP
headers notwithstanding.");
- gnet_property->props[146].ev_changed = event_new("dl_byte_count_changed");
+ gnet_property->props[146].name = "ul_byte_count";
+ gnet_property->props[146].desc = _("Amount of bytes uploaded so far, HTTP headers
notwithstanding.");
+ gnet_property->props[146].ev_changed = event_new("ul_byte_count_changed");
gnet_property->props[146].save = FALSE;
gnet_property->props[146].vector_size = 1;
/* Type specific data: */
gnet_property->props[146].type = PROP_TYPE_GUINT32;
- gnet_property->props[146].data.guint32.def = &dl_byte_count_def;
- gnet_property->props[146].data.guint32.value = &dl_byte_count;
+ gnet_property->props[146].data.guint32.def = &ul_byte_count_def;
+ gnet_property->props[146].data.guint32.value = &ul_byte_count;
gnet_property->props[146].data.guint32.choices = NULL;
gnet_property->props[146].data.guint32.max = 0xFFFFFFFF;
gnet_property->props[146].data.guint32.min = 0x00000000;
/*
- * PROP_UL_BYTE_COUNT:
+ * PROP_PFSP_SERVER:
*
* General data:
*/
- gnet_property->props[147].name = "ul_byte_count";
- gnet_property->props[147].desc = _("Amount of bytes uploaded so far, HTTP headers
notwithstanding.");
- gnet_property->props[147].ev_changed = event_new("ul_byte_count_changed");
- gnet_property->props[147].save = FALSE;
+ gnet_property->props[147].name = "pfsp_server";
+ gnet_property->props[147].desc = _("Whether gtk-gnutella should serve partial
files whilst they are still incompletely downloaded. Recommended for network's health
unless you already share many files, in which case it does no harm to leave it in, but
will not matter as much.");
+ gnet_property->props[147].ev_changed = event_new("pfsp_server_changed");
+ gnet_property->props[147].save = TRUE;
gnet_property->props[147].vector_size = 1;
/* Type specific data: */
- gnet_property->props[147].type = PROP_TYPE_GUINT32;
- gnet_property->props[147].data.guint32.def = &ul_byte_count_def;
- gnet_property->props[147].data.guint32.value = &ul_byte_count;
- gnet_property->props[147].data.guint32.choices = NULL;
- gnet_property->props[147].data.guint32.max = 0xFFFFFFFF;
- gnet_property->props[147].data.guint32.min = 0x00000000;
+ gnet_property->props[147].type = PROP_TYPE_BOOLEAN;
+ gnet_property->props[147].data.boolean.def = &pfsp_server_def;
+ gnet_property->props[147].data.boolean.value = &pfsp_server;
/*
- * PROP_PFSP_SERVER:
+ * PROP_PFSP_FIRST_CHUNK:
*
* General data:
*/
- gnet_property->props[148].name = "pfsp_server";
- gnet_property->props[148].desc = _("Whether gtk-gnutella should serve partial
files whilst they are still incompletely downloaded. Recommended for network's health
unless you already share many files, in which case it does no harm to leave it in, but
will not matter as much.");
- gnet_property->props[148].ev_changed = event_new("pfsp_server_changed");
+ gnet_property->props[148].name = "pfsp_first_chunk";
+ gnet_property->props[148].desc = _("When partial file sharing (PFSP) is enabled,
gtk-gnutella will strive to download chunks in a random order, to maximize the
spreading of the file in the network. However, this makes auditing (file type,
pre-viewing, etc...) of the file impossible. This field sets the size in bytes of the
first chunk of data that should be continuously downloaded at the beginning of the
file. Don't set it too large.");
+ gnet_property->props[148].ev_changed = event_new("pfsp_first_chunk_changed");
gnet_property->props[148].save = TRUE;
gnet_property->props[148].vector_size = 1;
/* Type specific data: */
- gnet_property->props[148].type = PROP_TYPE_BOOLEAN;
- gnet_property->props[148].data.boolean.def = &pfsp_server_def;
- gnet_property->props[148].data.boolean.value = &pfsp_server;
+ gnet_property->props[148].type = PROP_TYPE_GUINT32;
+ gnet_property->props[148].data.guint32.def = &pfsp_first_chunk_def;
+ gnet_property->props[148].data.guint32.value = &pfsp_first_chunk;
+ gnet_property->props[148].data.guint32.choices = NULL;
+ gnet_property->props[148].data.guint32.max = 0xFFFFFFFF;
+ gnet_property->props[148].data.guint32.min = 0x00000000;
/*
- * PROP_PFSP_FIRST_CHUNK:
+ * PROP_FUZZY_FILTER_DMESH:
*
* General data:
*/
- gnet_property->props[149].name = "pfsp_first_chunk";
- gnet_property->props[149].desc = _("When partial file sharing (PFSP) is enabled,
gtk-gnutella will strive to download chunks in a random order, to maximize the
spreading of the file in the network. However, this makes auditing (file type,
pre-viewing, etc...) of the file impossible. This field sets the size in bytes of the
first chunk of data that should be continuously downloaded at the beginning of the
file. Don't set it too large.");
- gnet_property->props[149].ev_changed = event_new("pfsp_first_chunk_changed");
+ gnet_property->props[149].name = "fuzzy_filter_dmesh";
+ gnet_property->props[149].desc = _("Whether to apply a fuzzy filter on download
mesh entries. Thepurpose of this filtering is to remove entries whose names are too
different to be sensibly part of the same mesh. When activated, your mesh will
probably be more consistent at the cost of extra CPU time, and at the cost of losing
some valid entries in the process.");
+ gnet_property->props[149].ev_changed = event_new("fuzzy_filter_dmesh_changed");
gnet_property->props[149].save = TRUE;
gnet_property->props[149].vector_size = 1;
/* Type specific data: */
- gnet_property->props[149].type = PROP_TYPE_GUINT32;
- gnet_property->props[149].data.guint32.def = &pfsp_first_chunk_def;
- gnet_property->props[149].data.guint32.value = &pfsp_first_chunk;
- gnet_property->props[149].data.guint32.choices = NULL;
- gnet_property->props[149].data.guint32.max = 0xFFFFFFFF;
- gnet_property->props[149].data.guint32.min = 0x00000000;
+ gnet_property->props[149].type = PROP_TYPE_BOOLEAN;
+ gnet_property->props[149].data.boolean.def = &fuzzy_filter_dmesh_def;
+ gnet_property->props[149].data.boolean.value = &fuzzy_filter_dmesh;
/*
- * PROP_FUZZY_FILTER_DMESH:
+ * PROP_CRAWLER_VISIT_COUNT:
*
* General data:
*/
- gnet_property->props[150].name = "fuzzy_filter_dmesh";
- gnet_property->props[150].desc = _("Whether to apply a fuzzy filter on download
mesh entries. Thepurpose of this filtering is to remove entries whose names are too
different to be sensibly part of the same mesh. When activated, your mesh will
probably be more consistent at the cost of extra CPU time, and at the cost of losing
some valid entries in the process.");
- gnet_property->props[150].ev_changed = event_new("fuzzy_filter_dmesh_changed");
- gnet_property->props[150].save = TRUE;
+ gnet_property->props[150].name = "crawler_visit_count";
+ gnet_property->props[150].desc = _("Number of crawler visits during this
session");
+ gnet_property->props[150].ev_changed = event_new("crawler_visit_count_changed");
+ gnet_property->props[150].save = FALSE;
gnet_property->props[150].vector_size = 1;
/* Type specific data: */
- gnet_property->props[150].type = PROP_TYPE_BOOLEAN;
- gnet_property->props[150].data.boolean.def = &fuzzy_filter_dmesh_def;
- gnet_property->props[150].data.boolean.value = &fuzzy_filter_dmesh;
+ gnet_property->props[150].type = PROP_TYPE_GUINT32;
+ gnet_property->props[150].data.guint32.def = &crawler_visit_count_def;
+ gnet_property->props[150].data.guint32.value = &crawler_visit_count;
+ gnet_property->props[150].data.guint32.choices = NULL;
+ gnet_property->props[150].data.guint32.max = 0xFFFFFFFF;
+ gnet_property->props[150].data.guint32.min = 0x00000000;
/*
- * PROP_CRAWLER_VISIT_COUNT:
+ * PROP_HOST_RUNS_NTP:
*
* General data:
*/
- gnet_property->props[151].name = "crawler_visit_count";
- gnet_property->props[151].desc = _("Number of crawler visits during this
session");
- gnet_property->props[151].ev_changed = event_new("crawler_visit_count_changed");
- gnet_property->props[151].save = FALSE;
+ gnet_property->props[151].name = "host_runs_ntp";
+ gnet_property->props[151].desc = _("Whether the clock of this host is kept
accurate via NTP. When you enable this, the computed clock skew is ignored.");
+ gnet_property->props[151].ev_changed = event_new("host_runs_ntp_changed");
+ gnet_property->props[151].save = TRUE;
gnet_property->props[151].vector_size = 1;
/* Type specific data: */
- gnet_property->props[151].type = PROP_TYPE_GUINT32;
- gnet_property->props[151].data.guint32.def = &crawler_visit_count_def;
- gnet_property->props[151].data.guint32.value = &crawler_visit_count;
- gnet_property->props[151].data.guint32.choices = NULL;
- gnet_property->props[151].data.guint32.max = 0xFFFFFFFF;
- gnet_property->props[151].data.guint32.min = 0x00000000;
+ gnet_property->props[151].type = PROP_TYPE_BOOLEAN;
+ gnet_property->props[151].data.boolean.def = &host_runs_ntp_def;
+ gnet_property->props[151].data.boolean.value = &host_runs_ntp;
/*
- * PROP_HOST_RUNS_NTP:
+ * PROP_CLOCK_SKEW:
*
* General data:
*/
- gnet_property->props[152].name = "host_runs_ntp";
- gnet_property->props[152].desc = _("Whether the clock of this host is kept
accurate via NTP. When you enable this, the computed clock skew is ignored.");
- gnet_property->props[152].ev_changed = event_new("host_runs_ntp_changed");
+ gnet_property->props[152].name = "clock_skew";
+ gnet_property->props[152].desc = _("The signed clock skew of this host compared
to absolute time. Adding this skew to the host clock should give the true time.");
+ gnet_property->props[152].ev_changed = event_new("clock_skew_changed");
gnet_property->props[152].save = TRUE;
gnet_property->props[152].vector_size = 1;
/* Type specific data: */
- gnet_property->props[152].type = PROP_TYPE_BOOLEAN;
- gnet_property->props[152].data.boolean.def = &host_runs_ntp_def;
- gnet_property->props[152].data.boolean.value = &host_runs_ntp;
+ gnet_property->props[152].type = PROP_TYPE_GUINT32;
+ gnet_property->props[152].data.guint32.def = &clock_skew_def;
+ gnet_property->props[152].data.guint32.value = &clock_skew;
+ gnet_property->props[152].data.guint32.choices = NULL;
+ gnet_property->props[152].data.guint32.max = 0xFFFFFFFF;
+ gnet_property->props[152].data.guint32.min = 0x00000000;
/*
- * PROP_CLOCK_SKEW:
+ * PROP_NODE_MONITOR_UNSTABLE_IP:
*
* General data:
*/
- gnet_property->props[153].name = "clock_skew";
- gnet_property->props[153].desc = _("The signed clock skew of this host compared
to absolute time. Adding this skew to the host clock should give the true time.");
- gnet_property->props[153].ev_changed = event_new("clock_skew_changed");
+ gnet_property->props[153].name = "node_monitor_unstable_ip";
+ gnet_property->props[153].desc = _("Whether gtk-gnutella should keep track of the
IP of unstable servents it encounters, preventing further connections attempts to/from
them.");
+ gnet_property->props[153].ev_changed =
event_new("node_monitor_unstable_ip_changed");
gnet_property->props[153].save = TRUE;
gnet_property->props[153].vector_size = 1;
/* Type specific data: */
- gnet_property->props[153].type = PROP_TYPE_GUINT32;
- gnet_property->props[153].data.guint32.def = &clock_skew_def;
- gnet_property->props[153].data.guint32.value = &clock_skew;
- gnet_property->props[153].data.guint32.choices = NULL;
- gnet_property->props[153].data.guint32.max = 0xFFFFFFFF;
- gnet_property->props[153].data.guint32.min = 0x00000000;
+ gnet_property->props[153].type = PROP_TYPE_BOOLEAN;
+ gnet_property->props[153].data.boolean.def = &node_monitor_unstable_ip_def;
+ gnet_property->props[153].data.boolean.value = &node_monitor_unstable_ip;
/*
- * PROP_NODE_MONITOR_UNSTABLE_IP:
+ * PROP_NODE_MONITOR_UNSTABLE_SERVENTS:
*
* General data:
*/
- gnet_property->props[154].name = "node_monitor_unstable_ip";
- gnet_property->props[154].desc = _("Whether gtk-gnutella should keep track of the
IP of unstable servents it encounters, preventing further connections attempts to/from
them.");
- gnet_property->props[154].ev_changed =
event_new("node_monitor_unstable_ip_changed");
+ gnet_property->props[154].name = "node_monitor_unstable_servents";
+ gnet_property->props[154].desc = _("Whether gtk-gnutella should determine the
servent types (as identified by their vendor string) that are unstable, preventing
further connections to/from them. This only works when gtk-gnutella already keeps
track of unstable IP addresses.");
+ gnet_property->props[154].ev_changed =
event_new("node_monitor_unstable_servents_changed");
gnet_property->props[154].save = TRUE;
gnet_property->props[154].vector_size = 1;
/* Type specific data: */
gnet_property->props[154].type = PROP_TYPE_BOOLEAN;
- gnet_property->props[154].data.boolean.def = &node_monitor_unstable_ip_def;
- gnet_property->props[154].data.boolean.value = &node_monitor_unstable_ip;
-
-
- /*
- * PROP_NODE_MONITOR_UNSTABLE_SERVENTS:
- *
- * General data:
- */
- gnet_property->props[155].name = "node_monitor_unstable_servents";
- gnet_property->props[155].desc = _("Whether gtk-gnutella should determine the
servent types (as identified by their vendor string) that are unstable, preventing
further connections to/from them. This only works when gtk-gnutella already keeps
track of unstable IP addresses.");
- gnet_property->props[155].ev_changed =
event_new("node_monitor_unstable_servents_changed");
- gnet_property->props[155].save = TRUE;
- gnet_property->props[155].vector_size = 1;
-
- /* Type specific data: */
- gnet_property->props[155].type = PROP_TYPE_BOOLEAN;
- gnet_property->props[155].data.boolean.def =
&node_monitor_unstable_servents_def;
- gnet_property->props[155].data.boolean.value = &node_monitor_unstable_servents;
+ gnet_property->props[154].data.boolean.def =
&node_monitor_unstable_servents_def;
+ gnet_property->props[154].data.boolean.value = &node_monitor_unstable_servents;
gnet_property->byName = g_hash_table_new(g_str_hash, g_str_equal);
for (n = 0; n < GNET_PROPERTY_NUM; n ++) {
Index: gtk-gnutella-current/src/gnet_property.h
===================================================================
RCS file: /cvsroot/gtk-gnutella/gtk-gnutella-current/src/gnet_property.h,v
retrieving revision 1.48
diff -u -r1.48 gnet_property.h
--- gtk-gnutella-current/src/gnet_property.h 6 Aug 2003 20:09:35 -0000 1.48
+++ gtk-gnutella-current/src/gnet_property.h 8 Aug 2003 01:00:28 -0000
@@ -169,7 +169,6 @@
PROP_DOWNLOAD_REQUIRE_SERVER_NAME,
PROP_MAX_ULTRAPEERS,
PROP_MAX_LEAVES,
- PROP_MARK_IGNORED,
PROP_SEARCH_HANDLE_IGNORED_FILES,
PROP_CONFIGURED_PEERMODE,
PROP_CURRENT_PEERMODE,
Index: gtk-gnutella-current/src/gnet_property_priv.h
===================================================================
RCS file: /cvsroot/gtk-gnutella/gtk-gnutella-current/src/gnet_property_priv.h,v
retrieving revision 1.46
diff -u -r1.46 gnet_property_priv.h
--- gtk-gnutella-current/src/gnet_property_priv.h 6 Aug 2003 20:09:35 -0000
1.46
+++ gtk-gnutella-current/src/gnet_property_priv.h 8 Aug 2003 01:00:28 -0000
@@ -164,7 +164,6 @@
extern gboolean download_require_server_name;
extern guint32 max_ultrapeers;
extern guint32 max_leaves;
-extern gboolean mark_ignored;
extern guint32 search_handle_ignored_files;
extern guint32 configured_peermode;
extern guint32 current_peermode;
Index: gtk-gnutella-current/src/gnet_props.ag
===================================================================
RCS file: /cvsroot/gtk-gnutella/gtk-gnutella-current/src/gnet_props.ag,v
retrieving revision 1.77
diff -u -r1.77 gnet_props.ag
--- gtk-gnutella-current/src/gnet_props.ag 6 Aug 2003 20:09:35 -0000 1.77
+++ gtk-gnutella-current/src/gnet_props.ag 8 Aug 2003 01:00:28 -0000
@@ -1599,22 +1599,6 @@
};
};
-/*
- * XXX the followingo only kept for the GTK2 frontend which does not
- * XXX make use of the new "search_process_ignored_files" property.
- * XXX --RAM, 06/08/2003
- */
-prop = {
- name = "mark_ignored";
- desc = "Mark files that would be ignored when downloaded. This uses a "
- "little additional CPU power so it's off by default. If you "
- "don't have a very slow box, you might want to turn this on.";
- save = FALSE;
- type = boolean;
- data = {
- default = FALSE;
- };
-};
prop = {
name = "search_handle_ignored_files";
@@ -1882,4 +1866,3 @@
default = FALSE;
};
};
-
Index: gtk-gnutella-current/src/interface-glade2.c
===================================================================
RCS file: /cvsroot/gtk-gnutella/gtk-gnutella-current/src/interface-glade2.c,v
retrieving revision 1.71
diff -u -r1.71 interface-glade2.c
--- gtk-gnutella-current/src/interface-glade2.c 2 Aug 2003 22:31:59 -0000 1.71
+++ gtk-gnutella-current/src/interface-glade2.c 8 Aug 2003 01:00:34 -0000
@@ -1433,7 +1433,7 @@
gtk_misc_set_alignment (GTK_MISC (label492), 0, 0.5);
gtk_misc_set_padding (GTK_MISC (label492), 10, 0);
- label493 = gtk_label_new (_("Rapha\303�l Manfredi"));
+ label493 = gtk_label_new (_("Rapha\303\253l Manfredi"));
gtk_widget_set_name (label493, "label493");
gtk_widget_show (label493);
gtk_box_pack_start (GTK_BOX (vbox88), label493, FALSE, FALSE, 0);
@@ -1441,7 +1441,7 @@
gtk_misc_set_alignment (GTK_MISC (label493), 0, 0.5);
gtk_misc_set_padding (GTK_MISC (label493), 10, 0);
- label494 = gtk_label_new (_("Rapha\303�l Manfredi"));
+ label494 = gtk_label_new (_("Rapha\303\253l Manfredi"));
gtk_widget_set_name (label494, "label494");
gtk_widget_show (label494);
gtk_box_pack_start (GTK_BOX (vbox88), label494, FALSE, FALSE, 0);
@@ -1547,7 +1547,7 @@
gtk_container_set_border_width (GTK_CONTAINER (button_about_close), 6);
GTK_WIDGET_SET_FLAGS (button_about_close, GTK_CAN_DEFAULT);
- label538 = gtk_label_new (_("@(#) $Id: interface-glade2.c,v 1.71 2003/08/02
22:31:59 cbiere Exp $"));
+ label538 = gtk_label_new (_("@(#) $Id: gtk2-gnutella.glade,v 1.70 2003/08/02
22:31:57 cbiere Exp $"));
gtk_widget_set_name (label538, "label538");
gtk_box_pack_start (GTK_BOX (vbox67), label538, FALSE, FALSE, 0);
gtk_widget_set_sensitive (label538, FALSE);
@@ -7239,7 +7239,13 @@
GtkWidget *image30;
GtkWidget *label411;
GtkWidget *viewport29;
+ GtkWidget *hbox234;
GtkWidget *label_dl_running_count;
+ GtkWidget *label708;
+ GtkWidget *label_dl_active_count;
+ GtkWidget *label710;
+ GtkWidget *label_dl_aqueued_count;
+ GtkWidget *label712;
GtkWidget *checkbutton_dl_show_settings;
GtkWidget *alignment77;
GtkWidget *hbox216;
@@ -7271,6 +7277,8 @@
GtkWidget *label586;
GtkWidget *label_dl_qalive_count;
GtkWidget *label588;
+ GtkWidget *label_dl_pqueued_count;
+ GtkWidget *label714;
GtkWidget *label328;
GtkWidget *label671;
GtkWidget *vpaned2;
@@ -7600,14 +7608,51 @@
(GtkAttachOptions) (GTK_EXPAND | GTK_SHRINK | GTK_FILL),
(GtkAttachOptions) (GTK_SHRINK | GTK_FILL), 0, 0);
- label_dl_running_count = gtk_label_new (_("[running downloads]"));
+ hbox234 = gtk_hbox_new (FALSE, 4);
+ gtk_widget_set_name (hbox234, "hbox234");
+ gtk_widget_show (hbox234);
+ gtk_container_add (GTK_CONTAINER (viewport29), hbox234);
+
+ label_dl_running_count = gtk_label_new (_("[running]"));
gtk_widget_set_name (label_dl_running_count, "label_dl_running_count");
gtk_widget_show (label_dl_running_count);
- gtk_container_add (GTK_CONTAINER (viewport29), label_dl_running_count);
+ gtk_box_pack_start (GTK_BOX (hbox234), label_dl_running_count, TRUE, TRUE, 0);
gtk_label_set_justify (GTK_LABEL (label_dl_running_count), GTK_JUSTIFY_RIGHT);
gtk_misc_set_alignment (GTK_MISC (label_dl_running_count), 1, 0.5);
gtk_misc_set_padding (GTK_MISC (label_dl_running_count), 5, 0);
+ label708 = gtk_label_new (_("("));
+ gtk_widget_set_name (label708, "label708");
+ gtk_widget_show (label708);
+ gtk_box_pack_start (GTK_BOX (hbox234), label708, FALSE, FALSE, 0);
+ gtk_label_set_justify (GTK_LABEL (label708), GTK_JUSTIFY_RIGHT);
+
+ label_dl_active_count = gtk_label_new (_("[active]"));
+ gtk_widget_set_name (label_dl_active_count, "label_dl_active_count");
+ gtk_widget_show (label_dl_active_count);
+ gtk_box_pack_start (GTK_BOX (hbox234), label_dl_active_count, FALSE, FALSE, 0);
+ gtk_label_set_justify (GTK_LABEL (label_dl_active_count), GTK_JUSTIFY_RIGHT);
+ gtk_misc_set_alignment (GTK_MISC (label_dl_active_count), 1, 0.5);
+ gtk_misc_set_padding (GTK_MISC (label_dl_active_count), 5, 0);
+
+ label710 = gtk_label_new (_(","));
+ gtk_widget_set_name (label710, "label710");
+ gtk_widget_show (label710);
+ gtk_box_pack_start (GTK_BOX (hbox234), label710, FALSE, FALSE, 0);
+ gtk_label_set_justify (GTK_LABEL (label710), GTK_JUSTIFY_RIGHT);
+
+ label_dl_aqueued_count = gtk_label_new (_("[aqueued]"));
+ gtk_widget_set_name (label_dl_aqueued_count, "label_dl_aqueued_count");
+ gtk_widget_show (label_dl_aqueued_count);
+ gtk_box_pack_start (GTK_BOX (hbox234), label_dl_aqueued_count, FALSE, FALSE, 0);
+ gtk_label_set_justify (GTK_LABEL (label_dl_aqueued_count), GTK_JUSTIFY_RIGHT);
+
+ label712 = gtk_label_new (_(")"));
+ gtk_widget_set_name (label712, "label712");
+ gtk_widget_show (label712);
+ gtk_box_pack_start (GTK_BOX (hbox234), label712, FALSE, FALSE, 0);
+ gtk_label_set_justify (GTK_LABEL (label712), GTK_JUSTIFY_RIGHT);
+
checkbutton_dl_show_settings = gtk_toggle_button_new ();
gtk_widget_set_name (checkbutton_dl_show_settings, "checkbutton_dl_show_settings");
gtk_widget_show (checkbutton_dl_show_settings);
@@ -7797,12 +7842,24 @@
gtk_box_pack_start (GTK_BOX (hbox212), label_dl_qalive_count, FALSE, FALSE, 0);
gtk_label_set_justify (GTK_LABEL (label_dl_qalive_count), GTK_JUSTIFY_LEFT);
- label588 = gtk_label_new (_("alive)"));
+ label588 = gtk_label_new (_("alive with"));
gtk_widget_set_name (label588, "label588");
gtk_widget_show (label588);
gtk_box_pack_start (GTK_BOX (hbox212), label588, FALSE, FALSE, 0);
gtk_label_set_justify (GTK_LABEL (label588), GTK_JUSTIFY_LEFT);
+ label_dl_pqueued_count = gtk_label_new (_("[pqueued]"));
+ gtk_widget_set_name (label_dl_pqueued_count, "label_dl_pqueued_count");
+ gtk_widget_show (label_dl_pqueued_count);
+ gtk_box_pack_start (GTK_BOX (hbox212), label_dl_pqueued_count, FALSE, FALSE, 0);
+ gtk_label_set_justify (GTK_LABEL (label_dl_pqueued_count), GTK_JUSTIFY_LEFT);
+
+ label714 = gtk_label_new (_("passive)"));
+ gtk_widget_set_name (label714, "label714");
+ gtk_widget_show (label714);
+ gtk_box_pack_start (GTK_BOX (hbox212), label714, FALSE, FALSE, 0);
+ gtk_label_set_justify (GTK_LABEL (label714), GTK_JUSTIFY_LEFT);
+
label328 = gtk_label_new (_("Download queue"));
gtk_widget_set_name (label328, "label328");
gtk_widget_show (label328);
@@ -8056,7 +8113,13 @@
GLADE_HOOKUP_OBJECT (main_window_downloads_tab, image30, "image30");
GLADE_HOOKUP_OBJECT (main_window_downloads_tab, label411, "label411");
GLADE_HOOKUP_OBJECT (main_window_downloads_tab, viewport29, "viewport29");
+ GLADE_HOOKUP_OBJECT (main_window_downloads_tab, hbox234, "hbox234");
GLADE_HOOKUP_OBJECT (main_window_downloads_tab, label_dl_running_count,
"label_dl_running_count");
+ GLADE_HOOKUP_OBJECT (main_window_downloads_tab, label708, "label708");
+ GLADE_HOOKUP_OBJECT (main_window_downloads_tab, label_dl_active_count,
"label_dl_active_count");
+ GLADE_HOOKUP_OBJECT (main_window_downloads_tab, label710, "label710");
+ GLADE_HOOKUP_OBJECT (main_window_downloads_tab, label_dl_aqueued_count,
"label_dl_aqueued_count");
+ GLADE_HOOKUP_OBJECT (main_window_downloads_tab, label712, "label712");
GLADE_HOOKUP_OBJECT (main_window_downloads_tab, checkbutton_dl_show_settings,
"checkbutton_dl_show_settings");
GLADE_HOOKUP_OBJECT (main_window_downloads_tab, alignment77, "alignment77");
GLADE_HOOKUP_OBJECT (main_window_downloads_tab, hbox216, "hbox216");
@@ -8088,6 +8151,8 @@
GLADE_HOOKUP_OBJECT (main_window_downloads_tab, label586, "label586");
GLADE_HOOKUP_OBJECT (main_window_downloads_tab, label_dl_qalive_count,
"label_dl_qalive_count");
GLADE_HOOKUP_OBJECT (main_window_downloads_tab, label588, "label588");
+ GLADE_HOOKUP_OBJECT (main_window_downloads_tab, label_dl_pqueued_count,
"label_dl_pqueued_count");
+ GLADE_HOOKUP_OBJECT (main_window_downloads_tab, label714, "label714");
GLADE_HOOKUP_OBJECT (main_window_downloads_tab, label328, "label328");
GLADE_HOOKUP_OBJECT (main_window_downloads_tab, label671, "label671");
GLADE_HOOKUP_OBJECT (main_window_downloads_tab, vpaned2, "vpaned2");
@@ -8147,15 +8212,18 @@
GtkWidget *label190;
GtkWidget *frame_search_results_settings;
GtkWidget *table31;
- GtkObject *spinbutton_search_max_results_adj;
- GtkWidget *spinbutton_search_max_results;
+ GtkWidget *checkbutton_search_jump_to_downloads;
+ GtkWidget *checkbutton_search_autoselect;
GtkWidget *checkbutton_search_remove_downloaded;
- GtkWidget *checkbutton_search_autoselect_fuzzy;
- GtkWidget *checkbutton_search_mark_ignored;
GtkWidget *checkbutton_search_autoselect_ident;
- GtkWidget *checkbutton_search_jump_to_downloads;
GtkWidget *label557;
- GtkWidget *checkbutton_search_autoselect;
+ GtkWidget *checkbutton_search_autoselect_fuzzy;
+ GtkObject *spinbutton_search_max_results_adj;
+ GtkWidget *spinbutton_search_max_results;
+ GtkWidget *combo_search_handle_ignored_files;
+ GtkWidget *combo_entry6;
+ GtkWidget *label707;
+ GtkWidget *checkbutton_search_hide_downloaded;
GtkWidget *label358;
GtkWidget *frame80;
GtkWidget *scrolledwindow67;
@@ -8373,7 +8441,7 @@
gtk_widget_show (frame_search_results_settings);
gtk_box_pack_start (GTK_BOX (vbox107), frame_search_results_settings, FALSE, TRUE,
0);
- table31 = gtk_table_new (3, 6, FALSE);
+ table31 = gtk_table_new (3, 5, FALSE);
gtk_widget_set_name (table31, "table31");
gtk_widget_show (table31);
gtk_container_add (GTK_CONTAINER (frame_search_results_settings), table31);
@@ -8381,67 +8449,89 @@
gtk_table_set_row_spacings (GTK_TABLE (table31), 2);
gtk_table_set_col_spacings (GTK_TABLE (table31), 4);
- spinbutton_search_max_results_adj = gtk_adjustment_new (5000, 1, 50000, 1, 10, 10);
- spinbutton_search_max_results = gtk_spin_button_new (GTK_ADJUSTMENT
(spinbutton_search_max_results_adj), 1, 0);
- gtk_widget_set_name (spinbutton_search_max_results,
"spinbutton_search_max_results");
- gtk_widget_show (spinbutton_search_max_results);
- gtk_table_attach (GTK_TABLE (table31), spinbutton_search_max_results, 1, 2, 2, 3,
- (GtkAttachOptions) (GTK_SHRINK | GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton_search_max_results), TRUE);
-
- checkbutton_search_remove_downloaded = gtk_check_button_new_with_mnemonic
(_("_Remove files manually selected for download"));
- gtk_widget_set_name (checkbutton_search_remove_downloaded,
"checkbutton_search_remove_downloaded");
- gtk_widget_show (checkbutton_search_remove_downloaded);
- gtk_table_attach (GTK_TABLE (table31), checkbutton_search_remove_downloaded, 1, 5,
1, 2,
+ checkbutton_search_jump_to_downloads = gtk_check_button_new_with_mnemonic (_("_Jump
to downloads"));
+ gtk_widget_set_name (checkbutton_search_jump_to_downloads,
"checkbutton_search_jump_to_downloads");
+ gtk_widget_show (checkbutton_search_jump_to_downloads);
+ gtk_table_attach (GTK_TABLE (table31), checkbutton_search_jump_to_downloads, 0, 1,
1, 2,
(GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
+ (GtkAttachOptions) (0), 4, 0);
- checkbutton_search_autoselect_fuzzy = gtk_check_button_new_with_mnemonic (_("Use
fu_zzy matching"));
- gtk_widget_set_name (checkbutton_search_autoselect_fuzzy,
"checkbutton_search_autoselect_fuzzy");
- gtk_widget_show (checkbutton_search_autoselect_fuzzy);
- gtk_table_attach (GTK_TABLE (table31), checkbutton_search_autoselect_fuzzy, 4, 5,
0, 1,
+ checkbutton_search_autoselect = gtk_check_button_new_with_mnemonic (_("Enable
_autoselect"));
+ gtk_widget_set_name (checkbutton_search_autoselect,
"checkbutton_search_autoselect");
+ gtk_widget_show (checkbutton_search_autoselect);
+ gtk_table_attach (GTK_TABLE (table31), checkbutton_search_autoselect, 0, 1, 0, 1,
(GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
+ (GtkAttachOptions) (0), 4, 0);
+ gtk_tooltips_set_tip (tooltips, checkbutton_search_autoselect, _("Automatically
select all other results with the same name or urn:sha1."), NULL);
- checkbutton_search_mark_ignored = gtk_check_button_new_with_mnemonic (_("_Mark
ignored files"));
- gtk_widget_set_name (checkbutton_search_mark_ignored,
"checkbutton_search_mark_ignored");
- gtk_widget_show (checkbutton_search_mark_ignored);
- gtk_table_attach (GTK_TABLE (table31), checkbutton_search_mark_ignored, 5, 6, 1, 2,
+ checkbutton_search_remove_downloaded = gtk_check_button_new_with_mnemonic
(_("_Remove files manually selected for download"));
+ gtk_widget_set_name (checkbutton_search_remove_downloaded,
"checkbutton_search_remove_downloaded");
+ gtk_widget_show (checkbutton_search_remove_downloaded);
+ gtk_table_attach (GTK_TABLE (table31), checkbutton_search_remove_downloaded, 0, 2,
2, 3,
(GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
+ (GtkAttachOptions) (0), 4, 0);
checkbutton_search_autoselect_ident = gtk_check_button_new_with_mnemonic
(_("Autoselect _identical"));
gtk_widget_set_name (checkbutton_search_autoselect_ident,
"checkbutton_search_autoselect_ident");
gtk_widget_show (checkbutton_search_autoselect_ident);
- gtk_table_attach (GTK_TABLE (table31), checkbutton_search_autoselect_ident, 1, 4,
0, 1,
+ gtk_table_attach (GTK_TABLE (table31), checkbutton_search_autoselect_ident, 1, 2,
0, 1,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_tooltips_set_tip (tooltips, checkbutton_search_autoselect_ident, _("If on
autoselection only takes place if filesize matches exactly, if off filesize must be
equals or greater."), NULL);
- checkbutton_search_jump_to_downloads = gtk_check_button_new_with_mnemonic (_("_Jump
to downloads"));
- gtk_widget_set_name (checkbutton_search_jump_to_downloads,
"checkbutton_search_jump_to_downloads");
- gtk_widget_show (checkbutton_search_jump_to_downloads);
- gtk_table_attach (GTK_TABLE (table31), checkbutton_search_jump_to_downloads, 0, 1,
1, 2,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 4, 0);
-
label557 = gtk_label_new_with_mnemonic (_("Max. _number of results"));
gtk_widget_set_name (label557, "label557");
gtk_widget_show (label557);
- gtk_table_attach (GTK_TABLE (table31), label557, 0, 1, 2, 3,
+ gtk_table_attach (GTK_TABLE (table31), label557, 1, 2, 1, 2,
(GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 4, 0);
+ (GtkAttachOptions) (0), 0, 0);
gtk_label_set_justify (GTK_LABEL (label557), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label557), 0, 0.5);
- checkbutton_search_autoselect = gtk_check_button_new_with_mnemonic (_("Enable
_autoselect"));
- gtk_widget_set_name (checkbutton_search_autoselect,
"checkbutton_search_autoselect");
- gtk_widget_show (checkbutton_search_autoselect);
- gtk_table_attach (GTK_TABLE (table31), checkbutton_search_autoselect, 0, 1, 0, 1,
+ checkbutton_search_autoselect_fuzzy = gtk_check_button_new_with_mnemonic (_("Use
fu_zzy matching"));
+ gtk_widget_set_name (checkbutton_search_autoselect_fuzzy,
"checkbutton_search_autoselect_fuzzy");
+ gtk_widget_show (checkbutton_search_autoselect_fuzzy);
+ gtk_table_attach (GTK_TABLE (table31), checkbutton_search_autoselect_fuzzy, 2, 3,
0, 1,
(GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 4, 0);
- gtk_tooltips_set_tip (tooltips, checkbutton_search_autoselect, _("Automatically
select all other results with the same name or urn:sha1."), NULL);
+ (GtkAttachOptions) (0), 0, 0);
+
+ spinbutton_search_max_results_adj = gtk_adjustment_new (5000, 1, 50000, 1, 10, 10);
+ spinbutton_search_max_results = gtk_spin_button_new (GTK_ADJUSTMENT
(spinbutton_search_max_results_adj), 1, 0);
+ gtk_widget_set_name (spinbutton_search_max_results,
"spinbutton_search_max_results");
+ gtk_widget_show (spinbutton_search_max_results);
+ gtk_table_attach (GTK_TABLE (table31), spinbutton_search_max_results, 2, 3, 1, 2,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton_search_max_results), TRUE);
+
+ combo_search_handle_ignored_files = gtk_combo_new ();
+ g_object_set_data (G_OBJECT (GTK_COMBO (combo_search_handle_ignored_files)->popwin),
+ "GladeParentKey", combo_search_handle_ignored_files);
+ gtk_widget_set_name (combo_search_handle_ignored_files,
"combo_search_handle_ignored_files");
+ gtk_widget_show (combo_search_handle_ignored_files);
+ gtk_table_attach (GTK_TABLE (table31), combo_search_handle_ignored_files, 4, 5, 2,
3,
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+
+ combo_entry6 = GTK_COMBO (combo_search_handle_ignored_files)->entry;
+ gtk_widget_set_name (combo_entry6, "combo_entry6");
+ gtk_widget_show (combo_entry6);
+
+ label707 = gtk_label_new (_("Ignored files are"));
+ gtk_widget_set_name (label707, "label707");
+ gtk_widget_show (label707);
+ gtk_table_attach (GTK_TABLE (table31), label707, 3, 4, 2, 3,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_label_set_justify (GTK_LABEL (label707), GTK_JUSTIFY_LEFT);
+ gtk_misc_set_alignment (GTK_MISC (label707), 0, 0.5);
+
+ checkbutton_search_hide_downloaded = gtk_check_button_new_with_mnemonic (_("_Hide
downloaded files"));
+ gtk_widget_set_name (checkbutton_search_hide_downloaded,
"checkbutton_search_hide_downloaded");
+ gtk_widget_show (checkbutton_search_hide_downloaded);
+ gtk_table_attach (GTK_TABLE (table31), checkbutton_search_hide_downloaded, 3, 5, 0,
1,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
label358 = gtk_label_new (_("General search settings (affect all searches)"));
gtk_widget_set_name (label358, "label358");
@@ -8945,14 +9035,17 @@
GLADE_HOOKUP_OBJECT (main_window_search_tab, label190, "label190");
GLADE_HOOKUP_OBJECT (main_window_search_tab, frame_search_results_settings,
"frame_search_results_settings");
GLADE_HOOKUP_OBJECT (main_window_search_tab, table31, "table31");
- GLADE_HOOKUP_OBJECT (main_window_search_tab, spinbutton_search_max_results,
"spinbutton_search_max_results");
+ GLADE_HOOKUP_OBJECT (main_window_search_tab, checkbutton_search_jump_to_downloads,
"checkbutton_search_jump_to_downloads");
+ GLADE_HOOKUP_OBJECT (main_window_search_tab, checkbutton_search_autoselect,
"checkbutton_search_autoselect");
GLADE_HOOKUP_OBJECT (main_window_search_tab, checkbutton_search_remove_downloaded,
"checkbutton_search_remove_downloaded");
- GLADE_HOOKUP_OBJECT (main_window_search_tab, checkbutton_search_autoselect_fuzzy,
"checkbutton_search_autoselect_fuzzy");
- GLADE_HOOKUP_OBJECT (main_window_search_tab, checkbutton_search_mark_ignored,
"checkbutton_search_mark_ignored");
GLADE_HOOKUP_OBJECT (main_window_search_tab, checkbutton_search_autoselect_ident,
"checkbutton_search_autoselect_ident");
- GLADE_HOOKUP_OBJECT (main_window_search_tab, checkbutton_search_jump_to_downloads,
"checkbutton_search_jump_to_downloads");
GLADE_HOOKUP_OBJECT (main_window_search_tab, label557, "label557");
- GLADE_HOOKUP_OBJECT (main_window_search_tab, checkbutton_search_autoselect,
"checkbutton_search_autoselect");
+ GLADE_HOOKUP_OBJECT (main_window_search_tab, checkbutton_search_autoselect_fuzzy,
"checkbutton_search_autoselect_fuzzy");
+ GLADE_HOOKUP_OBJECT (main_window_search_tab, spinbutton_search_max_results,
"spinbutton_search_max_results");
+ GLADE_HOOKUP_OBJECT (main_window_search_tab, combo_search_handle_ignored_files,
"combo_search_handle_ignored_files");
+ GLADE_HOOKUP_OBJECT (main_window_search_tab, combo_entry6, "combo_entry6");
+ GLADE_HOOKUP_OBJECT (main_window_search_tab, label707, "label707");
+ GLADE_HOOKUP_OBJECT (main_window_search_tab, checkbutton_search_hide_downloaded,
"checkbutton_search_hide_downloaded");
GLADE_HOOKUP_OBJECT (main_window_search_tab, label358, "label358");
GLADE_HOOKUP_OBJECT (main_window_search_tab, frame80, "frame80");
GLADE_HOOKUP_OBJECT (main_window_search_tab, scrolledwindow67, "scrolledwindow67");
Index: gtk-gnutella-current/src/settings_gui.c
===================================================================
RCS file: /cvsroot/gtk-gnutella/gtk-gnutella-current/src/settings_gui.c,v
retrieving revision 1.119
diff -u -r1.119 settings_gui.c
--- gtk-gnutella-current/src/settings_gui.c 6 Aug 2003 20:21:40 -0000 1.119
+++ gtk-gnutella-current/src/settings_gui.c 8 Aug 2003 01:00:34 -0000
@@ -207,7 +207,6 @@
static gboolean downloads_count_changed(property_t prop);
static gboolean current_peermode_changed(property_t prop);
static gboolean clock_skew_changed(property_t prop);
-static gboolean mark_ignored_changed(property_t prop);
/* FIXME:
* move to separate file and autogenerate from high-level description.
@@ -1701,14 +1700,6 @@
},
{
get_main_window,
- PROP_MARK_IGNORED, // XXX -- only until GTK2 frontend is updated
- mark_ignored_changed,
- TRUE,
- "checkbutton_search_mark_ignored",
- FREQ_UPDATES, 0
- },
- {
- get_main_window,
PROP_LIBRARY_REBUILDING,
library_rebuilding_changed,
TRUE,
@@ -2184,21 +2175,6 @@
#endif
-// XXX until "mark_ignored" is removed
-static gboolean mark_ignored_changed(property_t prop)
-{
-#ifdef USE_GTK2
- gboolean val;
-
- gnet_prop_get_boolean_val(prop, &val);
-
- if (prop)
- gnet_prop_set_guint32_val(PROP_SEARCH_HANDLE_IGNORED_FILES,
- val ? SEARCH_IGN_DISPLAY_AS_IS : SEARCH_IGN_DISPLAY_MARKED);
-#endif
-
- return FALSE;
-}
static gboolean update_entry(property_t prop)
{
