[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r30434 - in gnunet-gtk: . contrib src/include src/namestore
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r30434 - in gnunet-gtk: . contrib src/include src/namestore |
|
Date: |
Sun, 27 Oct 2013 19:46:21 +0100 |
Author: grothoff
Date: 2013-10-27 19:46:21 +0100 (Sun, 27 Oct 2013)
New Revision: 30434
Modified:
gnunet-gtk/configure.ac
gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade
gnunet-gtk/contrib/gnunet_gtk.glade
gnunet-gtk/src/include/gnunet_gtk_namestore_plugin.h
gnunet-gtk/src/namestore/gnunet-namestore-gtk.c
Log:
-doxygen
Modified: gnunet-gtk/configure.ac
===================================================================
--- gnunet-gtk/configure.ac 2013-10-27 18:43:00 UTC (rev 30433)
+++ gnunet-gtk/configure.ac 2013-10-27 18:46:21 UTC (rev 30434)
@@ -115,6 +115,8 @@
AM_CONDITIONAL(MINGW, test "$build_target" = "mingw")
+
+
AC_SUBST(ENABLE_ON_UNIX)
AC_SUBST(ENABLE_ON_W32)
@@ -482,6 +484,10 @@
packagesrcdir=`cd $srcdir && pwd`
AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [source dir])
+GN_PLUGIN_LDFLAGS="-export-dynamic -avoid-version -module -no-undefined"
+
+AC_SUBST(GN_PLUGIN_LDFLAGS)
+
AC_SUBST(GNUNET_GNS_GTK_NAME, "GNUnet-GNS-GTK", [name of the program])
AC_SUBST(GNUNET_FS_GTK_NAME, "GNUnet-FS-GTK", [name of the program])
AC_SUBST(GNUNET_PEERINFO_GTK_NAME, "GNUnet-Peerinfo-GTK", [name of the
program])
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade 2013-10-27 18:43:00 UTC
(rev 30433)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade 2013-10-27 18:46:21 UTC
(rev 30434)
@@ -32,52 +32,6 @@
<column type="guint"/>
</columns>
</object>
- <object class="GtkListStore" id="GNUNET_GTK_meta_data_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 -->
- <column type="guint"/>
- <!-- column-name country_name -->
- <column type="gchararray"/>
- <!-- column-name country_flag -->
- <column type="GdkPixbuf"/>
- <!-- column-name bandwidth -->
- <column type="guint64"/>
- </columns>
- </object>
- <object class="GtkListStore" id="GNUNET_GTK_select_pseudonym_liststore">
- <columns>
- <!-- column-name namespace_name -->
- <column type="gchararray"/>
- <!-- column-name namespace_handle -->
- <column type="gpointer"/>
- </columns>
- </object>
- <object class="GtkAdjustment" id="adjustment1">
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- <property name="page_size">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustment2">
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- <property name="page_size">10</property>
- </object>
<object class="GtkWindow" id="GNUNET_GTK_main_window">
<property name="can_focus">False</property>
<property name="events">GDK_BUTTON_PRESS_MASK |
GDK_STRUCTURE_MASK</property>
@@ -137,7 +91,6 @@
<property name="can_focus">False</property>
<child>
<object class="GtkMenuItem"
id="GNUNET_GTK_main_menu_file_sharing">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_File
sharing</property>
@@ -148,7 +101,6 @@
<child>
<object class="GtkImageMenuItem"
id="GNUNET_GTK_main_menu_file_publish">
<property name="label"
translatable="yes">_Publish</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text"
translatable="yes">Publish files or directories on GNUnet</property>
@@ -162,7 +114,6 @@
</child>
<child>
<object class="GtkMenuItem"
id="GNUNET_GTK_main_menu_unindex">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_List
indexed files</property>
@@ -179,7 +130,6 @@
<child>
<object class="GtkImageMenuItem"
id="GNUNET_GTK_main_menu_file_download_uri">
<property name="label"
translatable="yes">_Download</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text"
translatable="yes">Download a file or directory with a known URI.</property>
@@ -194,7 +144,6 @@
<child>
<object class="GtkImageMenuItem"
id="GNUNET_GTK_main_menu_file_open_gnunet_directory">
<property name="label" translatable="yes">_Open GNUnet
directory</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Use
this option to browse a GNUnet directory file that has been previously
downloaded.</property>
@@ -215,7 +164,6 @@
<child>
<object class="GtkImageMenuItem"
id="GNUNET_GTK_main_menu_file_quit">
<property name="label">gtk-quit</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Exit
gnunet-fs-gtk. Active file-sharing operations will resume upon
restart.</property>
@@ -232,7 +180,6 @@
</child>
<child>
<object class="GtkMenuItem" id="GNUNET_GTK_main_menu_edit">
- <property name="use_action_appearance">False</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Edit</property>
<property name="use_underline">True</property>
@@ -243,7 +190,6 @@
<child>
<object class="GtkImageMenuItem"
id="GNUNET_GTK_main_menu_edit_preferences">
<property name="label">gtk-preferences</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Edit
the system configuration.</property>
@@ -258,7 +204,6 @@
</child>
<child>
<object class="GtkMenuItem" id="GNUNET_GTK_main_menu_view">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_View</property>
@@ -269,7 +214,6 @@
<property name="can_focus">False</property>
<child>
<object class="GtkCheckMenuItem"
id="GNUNET_GTK_main_menu_view_metadata">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Show
meta data in main window</property>
@@ -281,7 +225,6 @@
</child>
<child>
<object class="GtkCheckMenuItem"
id="GNUNET_GTK_main_menu_view_preview">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Show
preview (when available)</property>
@@ -293,7 +236,6 @@
</child>
<child>
<object class="GtkCheckMenuItem"
id="GNUNET_GTK_main_menu_search_preview">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Show
search box in main window</property>
@@ -309,7 +251,6 @@
</child>
<child>
<object class="GtkMenuItem" id="GNUNET_GTK_main_menu_help">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Help</property>
@@ -321,7 +262,6 @@
<child>
<object class="GtkImageMenuItem"
id="GNUNET_GTK_main_menu_help_about">
<property name="label">gtk-about</property>
- <property name="use_action_appearance">False</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-fs-gtk</property>
@@ -394,7 +334,6 @@
<child>
<object class="GtkButton" id="GNUNET_FS_GTK_save_button">
<property name="label">gtk-save</property>
- <property name="use_action_appearance">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Remember the
specified namespace for later.
@@ -458,7 +397,6 @@
<child>
<object class="GtkButton" id="main_window_search_button">
<property name="label" translatable="yes">Search</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -723,7 +661,6 @@
<child>
<object class="GtkButton"
id="GNUNET_GTK_search_frame_download_filename_change_button">
<property name="label">…</property>
- <property
name="use_action_appearance">False</property>
<property name="height_request">1</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -799,7 +736,6 @@
<child>
<object class="GtkCheckButton"
id="GNUNET_GTK_search_frame_download_recursive_checkbox">
<property name="label"
translatable="yes">Recursive</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -826,7 +762,6 @@
<child>
<object class="GtkButton"
id="GNUNET_GTK_search_frame_download_download_button">
<property name="label"
translatable="yes">Download!</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -854,7 +789,7 @@
</child>
</object>
<packing>
- <property name="resize">True</property>
+ <property name="resize">False</property>
<property name="shrink">False</property>
</packing>
</child>
@@ -864,8 +799,6 @@
<property name="can_focus">False</property>
<child>
<object class="GtkImage"
id="GNUNET_GTK_main_window_preview_image">
- <property name="width_request">128</property>
- <property name="height_request">128</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
@@ -875,6 +808,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="padding">5</property>
<property name="position">0</property>
</packing>
</child>
@@ -882,6 +816,7 @@
<object class="GtkScrolledWindow"
id="GNUNET_GTK_main_window_metadata_scroll">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="tooltip_text" translatable="yes">File meta
data</property>
<property name="hadjustment">adjustment1</property>
<property name="vadjustment">adjustment2</property>
<property name="shadow_type">in</property>
@@ -955,6 +890,52 @@
</object>
</child>
</object>
+ <object class="GtkListStore" id="GNUNET_GTK_meta_data_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 -->
+ <column type="guint"/>
+ <!-- column-name country_name -->
+ <column type="gchararray"/>
+ <!-- column-name country_flag -->
+ <column type="GdkPixbuf"/>
+ <!-- column-name bandwidth -->
+ <column type="guint64"/>
+ </columns>
+ </object>
+ <object class="GtkListStore" id="GNUNET_GTK_select_pseudonym_liststore">
+ <columns>
+ <!-- column-name namespace_name -->
+ <column type="gchararray"/>
+ <!-- column-name namespace_handle -->
+ <column type="gpointer"/>
+ </columns>
+ </object>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ <property name="page_size">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment2">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ <property name="page_size">10</property>
+ </object>
<object class="GtkAdjustment" id="adjustment3">
<property name="upper">100</property>
<property name="step_increment">1</property>
@@ -1121,8 +1102,8 @@
<col id="0">mimetype:audio</col>
<col id="1" translatable="yes">Audio</col>
<col id="2">wav, mp3, ogg, ...</col>
- <col id="3" translatable="no"></col>
- <col id="4" translatable="no"></col>
+ <col id="3"/>
+ <col id="4"/>
</row>
<row>
<col id="0">audio/ogg</col>
@@ -1142,8 +1123,8 @@
<col id="0">mimetype:video</col>
<col id="1" translatable="yes">Vorbis</col>
<col id="2">ogv, mpeg, mp4, flv, ...</col>
- <col id="3" translatable="no"></col>
- <col id="4" translatable="no"></col>
+ <col id="3"/>
+ <col id="4"/>
</row>
<row>
<col id="0">video/ogg</col>
@@ -1220,7 +1201,6 @@
<property name="can_focus">False</property>
<child>
<object class="GtkMenuItem" id="Copy selection">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Copy selection</property>
Modified: gnunet-gtk/contrib/gnunet_gtk.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_gtk.glade 2013-10-27 18:43:00 UTC (rev 30433)
+++ gnunet-gtk/contrib/gnunet_gtk.glade 2013-10-27 18:46:21 UTC (rev 30434)
@@ -28,6 +28,7 @@
<property name="height_request">50</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="tooltip_text"
translatable="yes">Statistics</property>
<property name="pixbuf">statistics.png</property>
</object>
<packing>
@@ -52,6 +53,7 @@
<property name="height_request">50</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Information about
known and connected peers</property>
<property name="pixbuf">peerinfo.png</property>
</object>
<packing>
@@ -77,6 +79,7 @@
<property name="height_request">0</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">GNU Name System
Zone Management</property>
<property name="pixbuf">gns.png</property>
</object>
<packing>
@@ -102,6 +105,7 @@
<property name="height_request">0</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="tooltip_text"
translatable="yes">File-Sharing</property>
<property name="pixbuf">fs.png</property>
</object>
<packing>
@@ -127,6 +131,7 @@
<property name="height_request">0</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Identity
management</property>
<property name="pixbuf">identity.png</property>
</object>
<packing>
@@ -151,6 +156,7 @@
<property name="height_request">50</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="tooltip_text"
translatable="yes">Configuration</property>
<property name="pixbuf">setup.png</property>
</object>
<packing>
Modified: gnunet-gtk/src/include/gnunet_gtk_namestore_plugin.h
===================================================================
--- gnunet-gtk/src/include/gnunet_gtk_namestore_plugin.h 2013-10-27
18:43:00 UTC (rev 30433)
+++ gnunet-gtk/src/include/gnunet_gtk_namestore_plugin.h 2013-10-27
18:46:21 UTC (rev 30434)
@@ -82,7 +82,8 @@
* The `n_value` is the existing value of the record as a string.
*/
void (*load)(void *cls,
- gchar *n_value);
+ gchar *n_value,
+ GtkBuilder *builder);
/**
* Function that will be called to retrieve the final value of the
Modified: gnunet-gtk/src/namestore/gnunet-namestore-gtk.c
===================================================================
--- gnunet-gtk/src/namestore/gnunet-namestore-gtk.c 2013-10-27 18:43:00 UTC
(rev 30433)
+++ gnunet-gtk/src/namestore/gnunet-namestore-gtk.c 2013-10-27 18:46:21 UTC
(rev 30434)
@@ -2006,7 +2006,7 @@
* A different zone was selected in the zone toggle bar. Load the
* appropriate zone.
*
- * @param togglebutton button that was toggled (could be to "on" or "off", we
only react to "on")
+ * @param widget button that was toggled (could be to "on" or "off", we only
react to "on")
* @param user_data builder, unused
*/
void
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r30434 - in gnunet-gtk: . contrib src/include src/namestore,
gnunet <=