[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r16753 - in gnunet-gtk: contrib src/peerinfo
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r16753 - in gnunet-gtk: contrib src/peerinfo |
|
Date: |
Sun, 11 Sep 2011 10:43:57 +0200 |
Author: grothoff
Date: 2011-09-11 10:43:57 +0200 (Sun, 11 Sep 2011)
New Revision: 16753
Modified:
gnunet-gtk/contrib/gnunet_peerinfo_gtk_main_window.glade
gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c
Log:
update
Modified: gnunet-gtk/contrib/gnunet_peerinfo_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_peerinfo_gtk_main_window.glade 2011-09-11
08:33:02 UTC (rev 16752)
+++ gnunet-gtk/contrib/gnunet_peerinfo_gtk_main_window.glade 2011-09-11
08:43:57 UTC (rev 16753)
@@ -2,61 +2,44 @@
<interface>
<requires lib="gtk+" version="2.20"/>
<!-- interface-naming-policy project-wide -->
- <object class="GtkWindow" id="GNUNET_GTK_PEERINFO_main_window">
+ <object class="GtkWindow" id="GNUNET_PEERINFO_GTK_main_window">
+ <property name="can_focus">False</property>
<property name="title" translatable="yes">gnunet-gtk</property>
<property name="window_position">center</property>
<property name="default_width">700</property>
<property name="default_height">500</property>
<property name="icon_name">gnunet-gtk</property>
- <signal name="delete-event" handler="GNUNET_GTK_quit_cb" after="yes"
swapped="no"/>
+ <signal name="delete-event" handler="GNUNET_PEERINFO_GTK_quit_cb"
after="yes" swapped="no"/>
<child>
- <object class="GtkVBox" id="GNUNET_GTK_main_window_vbox">
+ <object class="GtkVBox" id="GNUNET_PEERINFO_GTK_main_window_vbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
- <object class="GtkMenuBar" id="GNUNET_GTK_main_menu">
+ <object class="GtkMenuBar" id="GNUNET_PEERINFO_GTK_main_menu">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
- <object class="GtkMenuItem" id="GNUNET_GTK_main_menu_edit">
- <property name="use_action_appearance">False</property>
- <property name="label" translatable="yes">_Edit</property>
- <property name="use_underline">True</property>
- <child type="submenu">
- <object class="GtkMenu" id="GNUNET_GTK_main_menu_edit_box">
- <property name="visible">True</property>
- <child>
- <object class="GtkImageMenuItem"
id="GNUNET_GTK_main_menu_edit_preferences">
- <property name="label">gtk-preferences</property>
- <property name="visible">True</property>
- <property name="tooltip_text" translatable="yes">Edit
the system configuration.</property>
- <property name="use_action_appearance">False</property>
- <property
name="accel_path"><gnunet-gtk>/Edit/Preferences</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- </object>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="GNUNET_GTK_main_menu_help">
+ <object class="GtkMenuItem"
id="GNUNET_PEERINFO_GTK_main_menu_help">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_Help</property>
<property name="use_underline">True</property>
<child type="submenu">
- <object class="GtkMenu" id="GNUNET_GTK_main_menu_help_abou">
+ <object class="GtkMenu"
id="GNUNET_PEERINFO_GTK_main_menu_help_abou">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
- <object class="GtkImageMenuItem"
id="GNUNET_GTK_main_menu_help_about">
+ <object class="GtkImageMenuItem"
id="GNUNET_PEERINFO_GTK_main_menu_help_about">
<property name="label">gtk-about</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="tooltip_text"
translatable="yes">Display information about this version of
gnunet-gtk</property>
<property name="use_action_appearance">False</property>
<property
name="accel_path"><gnunet-gtk>/Help/About</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
- <signal name="activate"
handler="GNUNET_GTK_main_menu_help_about_activate_cb" swapped="no"/>
+ <signal name="activate"
handler="GNUNET_PEERINFO_GTK_main_menu_help_about_activate_cb" swapped="no"/>
</object>
</child>
</object>
@@ -71,7 +54,7 @@
</packing>
</child>
<child>
- <object class="GtkScrolledWindow"
id="GNUNET_GTK_main_window_peerinfo_scroll">
+ <object class="GtkScrolledWindow"
id="GNUNET_PEERINFO_GTK_main_window_scroll">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hadjustment">adjustment3</property>
@@ -79,24 +62,25 @@
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<child>
- <object class="GtkTreeView"
id="GNUNET_GTK_main_window_peerinfo_treeview">
+ <object class="GtkTreeView"
id="GNUNET_PEERINFO_GTK_main_window_treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property
name="model">GNUNET_GTK_peer_info_list_store</property>
+ <property
name="model">GNUNET_PEERINFO_GTK_peer_info_list_store</property>
<property name="hadjustment">adjustment3</property>
<property name="vadjustment">adjustment4</property>
<property name="reorderable">True</property>
<property name="search_column">0</property>
+ <property name="fixed_height_mode">True</property>
<child>
- <object class="GtkTreeViewColumn"
id="GNUNET_GTK_main_window_peerinfo_name_column">
- <property name="sizing">autosize</property>
+ <object class="GtkTreeViewColumn"
id="GNUNET_PEERINFO_GTK_main_window_name_column">
+ <property name="sizing">fixed</property>
<property name="title" translatable="yes">Peer</property>
<property name="expand">True</property>
<property name="clickable">True</property>
<property name="reorderable">True</property>
<property name="sort_column_id">0</property>
<child>
- <object class="GtkCellRendererText"
id="GNUNET_GTK_main_window_peerinfo_name_renderer">
+ <object class="GtkCellRendererText"
id="GNUNET_PEERINFO_GTK_main_window_name_renderer">
<property name="sensitive">False</property>
<property name="width_chars">16</property>
</object>
@@ -107,14 +91,14 @@
</object>
</child>
<child>
- <object class="GtkTreeViewColumn"
id="GNUNET_GTK_main_window_peerinfo_bandwidth_column">
- <property name="sizing">autosize</property>
+ <object class="GtkTreeViewColumn"
id="GNUNET_PEERINFO_GTK_main_window_bandwidth_column">
+ <property name="sizing">fixed</property>
<property name="title"
translatable="yes">Bandwidth</property>
<property name="clickable">True</property>
<property name="sort_order">descending</property>
<property name="sort_column_id">5</property>
<child>
- <object class="GtkCellRendererText"
id="GNUNET_GTK_main_window_peerinfo_bandwidth_renderer"/>
+ <object class="GtkCellRendererText"
id="GNUNET_PEERINFO_GTK_main_window_bandwidth_renderer"/>
<attributes>
<attribute name="text">4</attribute>
</attributes>
@@ -122,21 +106,33 @@
</object>
</child>
<child>
- <object class="GtkTreeViewColumn"
id="GNUNET_GTK_main_window_peerinfo_country_column">
- <property name="sizing">autosize</property>
+ <object class="GtkTreeViewColumn"
id="GNUNET_PEERINFO_GTK_main_window_country_column">
+ <property name="sizing">fixed</property>
<property name="title"
translatable="yes">Country</property>
<property name="clickable">True</property>
<property name="reorderable">True</property>
<property name="sort_indicator">True</property>
<property name="sort_column_id">3</property>
<child>
- <object class="GtkCellRendererPixbuf"
id="GNUNET_GTK_main_window_peerinfo_country_renderer"/>
+ <object class="GtkCellRendererPixbuf"
id="GNUNET_PEERINFO_GTK_main_window_country_renderer"/>
<attributes>
<attribute name="pixbuf">3</attribute>
</attributes>
</child>
</object>
</child>
+ <child>
+ <object class="GtkTreeViewColumn"
id="GNUNET_PEERINFO_GTK_main_window_address_treeviewcolumn">
+ <property name="sizing">fixed</property>
+ <property name="title"
translatable="yes">Addresses</property>
+ <child>
+ <object class="GtkCellRendererText"
id="GNUNET_PEERINFO_GTK_main_window_addresses_cellrenderertext"/>
+ <attributes>
+ <attribute name="text">5</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
</object>
</child>
</object>
@@ -146,34 +142,11 @@
<property name="position">1</property>
</packing>
</child>
- <child>
- <object class="GtkStatusbar" id="GNUNET_GTK_status_bar">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
</object>
</child>
</object>
- <object class="GtkListStore" id="GNUNET_GTK_meta_data_list_store">
+ <object class="GtkListStore" id="GNUNET_PEERINFO_GTK_list_store">
<columns>
- <!-- column-name extractor_meta_type -->
- <column type="guint"/>
- <!-- column-name extractor_meta_format -->
- <column type="guint"/>
- <!-- column-name extractor_meta_type_string -->
- <column type="gchararray"/>
- <!-- column-name extracotr_meta_value -->
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkListStore" id="GNUNET_GTK_peer_info_list_store">
- <columns>
<!-- column-name peer_identity -->
<column type="gchararray"/>
<!-- column-name number_of_known_addresses -->
@@ -184,6 +157,8 @@
<column type="GdkPixbuf"/>
<!-- column-name bandwidth -->
<column type="guint64"/>
+ <!-- column-name addresses -->
+ <column type="gchararray"/>
</columns>
</object>
<object class="GtkAdjustment" id="adjustment3">
Modified: gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c
===================================================================
--- gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c 2011-09-11 08:33:02 UTC
(rev 16752)
+++ gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c 2011-09-11 08:43:57 UTC
(rev 16753)
@@ -100,7 +100,7 @@
GNUNET_CRYPTO_hash_to_enc (&peer->hashPubKey, &enc);
npid = (const char *) &enc;
- ls = GTK_LIST_STORE (get_object ("GNUNET_GTK_peer_info_list_store"));
+ ls = GTK_LIST_STORE (get_object ("GNUNET_PEERINFO_GTK_list_store"));
tm = GTK_TREE_MODEL (ls);
found = GNUNET_NO;
if (TRUE == gtk_tree_model_get_iter_first (tm, &iter))
@@ -125,9 +125,12 @@
}
if (found == GNUNET_NO)
gtk_list_store_append (ls, &iter);
- gtk_list_store_set (ls, &iter, 0, npid, 1, 0 /* number of known addresses */
,
+ gtk_list_store_set (ls, &iter,
+ 0, npid,
+ 1, 0 /* number of known addresses */ ,
2, "" /* country name */ ,
3, NULL /* country flag */ ,
+ 4, "" /* addresses as strings */,
-1);
}
@@ -166,7 +169,7 @@
/* setup main window */
main_window =
- GTK_WIDGET (get_object ("GNUNET_GTK_PEERINFO_main_window"));
+ GTK_WIDGET (get_object ("GNUNET_PEERINFO_GTK_main_window"));
gtk_window_maximize (GTK_WINDOW (main_window));
GNUNET_GTK_tray_icon_create (GTK_WINDOW (main_window),
"gnunet-gtk" /* FIXME: different icon? */ ,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r16753 - in gnunet-gtk: contrib src/peerinfo,
gnunet <=