[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r19660 - in gnunet-gtk: contrib src/fs
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r19660 - in gnunet-gtk: contrib src/fs |
|
Date: |
Fri, 3 Feb 2012 00:39:49 +0100 |
Author: grothoff
Date: 2012-02-03 00:39:49 +0100 (Fri, 03 Feb 2012)
New Revision: 19660
Modified:
gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade
gnunet-gtk/contrib/gnunet_fs_gtk_open_url_dialog.glade
gnunet-gtk/src/fs/gnunet-fs-gtk_advertise-pseudonym.c
gnunet-gtk/src/fs/gnunet-fs-gtk_open-uri.c
gnunet-gtk/src/fs/gnunet-fs-gtk_publish-dialog.c
Log:
-fixes
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade 2012-02-02 23:15:04 UTC
(rev 19659)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade 2012-02-02 23:39:49 UTC
(rev 19660)
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
<interface>
<requires lib="gtk+" version="2.20"/>
+ <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAdjustment"
id="GNUNET_GTK_edit_publication_metadata_preview_image_horizontal_adjustment">
<property name="upper">100</property>
<property name="step_increment">1</property>
@@ -49,141 +50,213 @@
<property name="page_increment">10</property>
<property name="page_size">10</property>
</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="GtkListStore" id="anonymity_level_liststore">
+ <columns>
+ <!-- column-name Name -->
+ <column type="gchararray"/>
+ <!-- column-name Level -->
+ <column type="guint"/>
+ <!-- column-name Color -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">None</col>
+ <col id="1">0</col>
+ <col id="2" translatable="yes">#AAAA00000000</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Normal</col>
+ <col id="1">1</col>
+ <col id="2" translatable="yes">#000000000000</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Paranoid</col>
+ <col id="1">10</col>
+ <col id="2" translatable="yes">#0000AAAA0000</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="main_window_search_mime_liststore">
+ <columns>
+ <!-- column-name MIME -->
+ <column type="gchararray"/>
+ <!-- column-name Type -->
+ <column type="gchararray"/>
+ <!-- column-name Extension -->
+ <column type="gchararray"/>
+ <!-- column-name Lossyness -->
+ <column type="gchararray"/>
+ <!-- column-name Freedom -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0"> </col>
+ <col id="1" translatable="yes">Any</col>
+ <col id="2" translatable="yes"> </col>
+ <col id="3" translatable="yes"> </col>
+ <col id="4" translatable="yes"> </col>
+ </row>
+ <row>
+ <col id="0">plain/text</col>
+ <col id="1" translatable="yes">Text</col>
+ <col id="2">txt</col>
+ <col id="3" translatable="yes">N/A</col>
+ <col id="4" translatable="yes">N/A</col>
+ </row>
+ <row>
+ <col id="0">application/zip</col>
+ <col id="1" translatable="yes">Zip</col>
+ <col id="2">zip</col>
+ <col id="3" translatable="yes">lossless</col>
+ <col id="4" translatable="yes">free</col>
+ </row>
+ <row>
+ <col id="0">audio/mpeg</col>
+ <col id="1" translatable="yes">MPEG audio</col>
+ <col id="2">mp3, mp2, mpeg</col>
+ <col id="3" translatable="yes">lossy</col>
+ <col id="4" translatable="yes">non-free</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkTreeStore" id="main_window_search_namespace_treestore">
+ <columns>
+ <!-- column-name Name -->
+ <column type="gchararray"/>
+ <!-- column-name Key -->
+ <column type="gpointer"/>
+ <!-- column-name Root -->
+ <column type="gchararray"/>
+ <!-- column-name Tooltip -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
<object class="GtkWindow" id="GNUNET_GTK_main_window">
- <property name="can_focus">False</property>
<property name="title" translatable="yes">gnunet-fs-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="realize" handler="GNUNET_GTK_main_window_realize_cb"
swapped="no"/>
- <signal name="delete-event" handler="GNUNET_GTK_quit_cb" after="yes"
swapped="no"/>
+ <signal name="realize" handler="GNUNET_GTK_main_window_realize_cb"/>
+ <signal name="delete_event" handler="GNUNET_GTK_quit_cb" after="yes"/>
<child>
<object class="GtkVBox" id="GNUNET_GTK_main_window_vbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkStatusbar" id="GNUNET_GTK_status_bar">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<object class="GtkMenuBar" id="GNUNET_GTK_main_menu">
<property name="visible">True</property>
- <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>
<property name="use_underline">True</property>
<child type="submenu">
<object class="GtkMenu"
id="GNUNET_GTK_main_menu_file_sharing_box">
- <property name="can_focus">False</property>
<child>
<object class="GtkImageMenuItem"
id="GNUNET_GTK_main_menu_file_create_pseudonym">
<property name="label" translatable="yes">_Create
pseudonym</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">Create a pseudonym for publishing content. Note that you
can also publish content anonymously (without using a pseudonym).</property>
<property name="accel_path"><gnunet-fs-gtk>/File
sharing/Create pseudonym</property>
<property name="use_underline">True</property>
<property name="image">new_stock_image</property>
<property name="use_stock">False</property>
<accelerator key="n" signal="activate"
modifiers="GDK_CONTROL_MASK"/>
- <signal name="activate"
handler="GNUNET_GTK_main_menu_create_pseudonym_activate_cb" swapped="no"/>
+ <signal name="activate"
handler="GNUNET_GTK_main_menu_create_pseudonym_activate_cb"/>
</object>
</child>
<child>
<object class="GtkImageMenuItem"
id="GNUNET_GTK_main_menu_file_advertise_pseudonym">
<property name="label" translatable="yes">_Advertise
Pseudonym</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="image">index_stock_image</property>
<property name="use_stock">False</property>
- <signal name="activate"
handler="GNUNET_GTK_main_menu_file_advertise_pseudonym_activate_cb"
swapped="no"/>
+ <signal name="activate"
handler="GNUNET_GTK_main_menu_file_advertise_pseudonym_activate_cb"/>
</object>
</child>
<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>
<property name="accel_path"><gnunet-fs-gtk>/File
sharing/Publish</property>
<property name="use_underline">True</property>
<property name="image">up_stock_image</property>
<property name="use_stock">False</property>
<accelerator key="a" signal="activate"
modifiers="GDK_CONTROL_MASK"/>
- <signal name="activate"
handler="GNUNET_GTK_main_menu_file_publish_activate_cb" swapped="no"/>
+ <signal name="activate"
handler="GNUNET_GTK_main_menu_file_publish_activate_cb"/>
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem"
id="GNUNET_GTK_main_menu_file_sep1">
- <property name="can_focus">False</property>
- </object>
+ <object class="GtkSeparatorMenuItem"
id="GNUNET_GTK_main_menu_file_sep1"/>
</child>
<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>
<property name="accel_path"><gnunet-fs-gtk>/File
sharing/Download</property>
<property name="use_underline">True</property>
<property name="image">down_stock_image</property>
<property name="use_stock">False</property>
<accelerator key="d" signal="activate"
modifiers="GDK_CONTROL_MASK"/>
- <signal name="activate"
handler="GNUNET_GTK_main_menu_file_download_uri_activate_cb" swapped="no"/>
+ <signal name="activate"
handler="GNUNET_GTK_main_menu_file_download_uri_activate_cb"/>
</object>
</child>
<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>
<property name="accel_path"><gnunet-fs-gtk>/File
sharing/Open directory</property>
<property name="use_underline">True</property>
<property name="image">open_stock_image</property>
<property name="use_stock">False</property>
<accelerator key="F3" signal="activate"/>
- <signal name="activate"
handler="GNUNET_GTK_main_menu_file_open_gnunet_directory_activate_cb"
swapped="no"/>
+ <signal name="activate"
handler="GNUNET_GTK_main_menu_file_open_gnunet_directory_activate_cb"/>
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem"
id="GNUNET_GTK_main_menu_file_sep2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
</object>
</child>
<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>
<property
name="accel_path"><gnunet-fs-gtk>/Quit</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<accelerator key="q" signal="activate"
modifiers="GDK_CONTROL_MASK"/>
- <signal name="activate" handler="GNUNET_GTK_quit_cb"
swapped="no"/>
+ <signal name="activate" handler="GNUNET_GTK_quit_cb"/>
</object>
</child>
</object>
@@ -192,20 +265,15 @@
</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>
<child type="submenu">
<object class="GtkMenu" id="GNUNET_GTK_main_menu_edit_box">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<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>
<property
name="accel_path"><gnunet-fs-gtk>/Edit/Preferences</property>
<property name="use_underline">True</property>
@@ -218,49 +286,40 @@
</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>
<property name="use_underline">True</property>
<child type="submenu">
<object class="GtkMenu" id="GNUNET_GTK_main_menu_view_box">
<property name="visible">True</property>
- <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>
<property name="label"
translatable="yes">Metadata</property>
<property name="use_underline">True</property>
<property name="active">True</property>
- <signal name="toggled"
handler="GNUNET_GTK_main_menu_view_metadata_toggled_cb" swapped="no"/>
+ <signal name="toggled"
handler="GNUNET_GTK_main_menu_view_metadata_toggled_cb"/>
</object>
</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>
<property name="label"
translatable="yes">Preview</property>
<property name="use_underline">True</property>
<property name="active">True</property>
- <signal name="toggled"
handler="GNUNET_GTK_main_menu_view_preview_toggled_cb" swapped="no"/>
+ <signal name="toggled"
handler="GNUNET_GTK_main_menu_view_preview_toggled_cb"/>
</object>
</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>
<property name="label"
translatable="yes">Search</property>
<property name="use_underline">True</property>
<property name="active">True</property>
- <signal name="toggled"
handler="GNUNET_GTK_main_menu_view_search_toggled_cb" swapped="no"/>
+ <signal name="toggled"
handler="GNUNET_GTK_main_menu_view_search_toggled_cb"/>
</object>
</child>
</object>
@@ -269,26 +328,21 @@
</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>
<property name="use_underline">True</property>
<child type="submenu">
<object class="GtkMenu" id="GNUNET_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">
<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>
<property
name="accel_path"><gnunet-fs-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_GTK_main_menu_help_about_activate_cb"/>
</object>
</child>
</object>
@@ -298,20 +352,17 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="main_window_search_hbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="spacing">4</property>
<child>
<object class="GtkLabel" id="main_window_search_namespace_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label" translatable="yes">Namespace:</property>
</object>
<packing>
@@ -323,7 +374,6 @@
<child>
<object class="GtkLabel"
id="main_window_search_selected_namespace_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label"><none></property>
<property name="single_line_mode">True</property>
</object>
@@ -336,27 +386,23 @@
<child>
<object class="GtkAlignment"
id="main_window_search_namespace_combobox_alignment">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
<object class="GtkToggleButton"
id="main_window_search_namespace_dropdown_button">
- <property name="use_action_appearance">False</property>
<property name="width_request">21</property>
<property name="height_request">21</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_ENTER_NOTIFY_MASK |
GDK_LEAVE_NOTIFY_MASK | GDK_STRUCTURE_MASK</property>
- <property name="use_action_appearance">False</property>
<property name="image_position">right</property>
- <signal name="toggled"
handler="GNUNET_FS_GTK_search_namespace_dropdown_button_toggled_cb"
swapped="no"/>
- <signal name="leave-notify-event"
handler="GNUNET_FS_GTK_search_namespace_selector_window_leave_notify_event_cb"
swapped="no"/>
- <signal name="enter-notify-event"
handler="GNUNET_FS_GTK_search_namespace_dropdown_button_enter_notify_event_cb"
swapped="no"/>
+ <signal name="leave_notify_event"
handler="GNUNET_FS_GTK_search_namespace_selector_window_leave_notify_event_cb"/>
+ <signal name="toggled"
handler="GNUNET_FS_GTK_search_namespace_dropdown_button_toggled_cb"/>
+ <signal name="enter_notify_event"
handler="GNUNET_FS_GTK_search_namespace_dropdown_button_enter_notify_event_cb"/>
<child>
<object class="GtkArrow" id="arrow1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="arrow_type">down</property>
</object>
</child>
@@ -375,18 +421,15 @@
<child>
<object class="GtkAlignment"
id="main_window_search_button_alignment">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="yscale">0</property>
<child>
<object class="GtkButton" id="main_window_search_button">
<property name="label" translatable="yes">Find:</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>
- <property name="use_action_appearance">False</property>
<property name="image">find_stock_image</property>
- <signal name="clicked"
handler="main_window_search_button_clicked_cb" swapped="no"/>
+ <signal name="clicked"
handler="main_window_search_button_clicked_cb"/>
</object>
</child>
</object>
@@ -401,22 +444,17 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">●</property>
<property name="invisible_char_set">True</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
- <signal name="key-press-event"
handler="main_window_search_entry_key_press_event_cb" swapped="no"/>
+ <signal name="key_press_event"
handler="main_window_search_entry_key_press_event_cb"/>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">5</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="main_window_search_anonymity_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label" translatable="yes">Anonymity:</property>
</object>
<packing>
@@ -428,12 +466,10 @@
<child>
<object class="GtkAlignment"
id="main_window_search_anonymity_combobox_alignment">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="yscale">0</property>
<child>
<object class="GtkComboBox"
id="main_window_search_anonymity_combobox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="model">anonymity_level_liststore</property>
<property name="active">1</property>
<child>
@@ -461,7 +497,6 @@
<child>
<object class="GtkLabel" id="main_window_search_mime_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label" translatable="yes">Type:</property>
</object>
<packing>
@@ -473,12 +508,10 @@
<child>
<object class="GtkAlignment"
id="main_window_search_mime_combobox_alignment">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="yscale">0</property>
<child>
<object class="GtkComboBox"
id="main_window_search_mime_combobox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property
name="model">main_window_search_mime_liststore</property>
<property name="active">0</property>
<child>
@@ -542,7 +575,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="scrollable">True</property>
- <signal name="switch-page"
handler="GNUNET_GTK_main_window_notebook_switch_page_cb" after="yes"
swapped="no"/>
+ <signal name="switch_page"
handler="GNUNET_GTK_main_window_notebook_switch_page_cb" after="yes"/>
</object>
<packing>
<property name="resize">True</property>
@@ -552,13 +585,11 @@
<child>
<object class="GtkVBox" id="GNUNET_GTK_main_window_extras_vbox">
<property name="visible">True</property>
- <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>
<property name="tooltip_text" translatable="yes">Thumbnail
associated with the currently selected content</property>
<property name="pixel_size">256</property>
@@ -580,17 +611,14 @@
<object class="GtkTreeView"
id="GNUNET_GTK_main_window_metadata_treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property
name="model">GNUNET_GTK_meta_data_list_store</property>
<property name="hadjustment">adjustment1</property>
<property name="vadjustment">adjustment2</property>
- <property
name="model">GNUNET_GTK_meta_data_list_store</property>
<property name="search_column">0</property>
<property name="rubber_banding">True</property>
<property name="enable_grid_lines">both</property>
- <signal name="button-press-event"
handler="GNUNET_GTK_main_window_metadata_treeview_button_press_event_cb"
swapped="no"/>
- <signal name="popup-menu"
handler="GNUNET_GTK_main_window_metadata_treeview_popup_menu_cb" swapped="no"/>
- <child internal-child="selection">
- <object class="GtkTreeSelection"
id="treeview-selection2"/>
- </child>
+ <signal name="button_press_event"
handler="GNUNET_GTK_main_window_metadata_treeview_button_press_event_cb"/>
+ <signal name="popup_menu"
handler="GNUNET_GTK_main_window_metadata_treeview_popup_menu_cb"/>
<child>
<object class="GtkTreeViewColumn"
id="GNUNET_GTK_main_window_metadata_type_column">
<property name="sizing">autosize</property>
@@ -628,8 +656,6 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -641,36 +667,23 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">3</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="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
</child>
</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>
@@ -709,131 +722,28 @@
</object>
<object class="GtkImage" id="down_stock_image">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="stock">gtk-go-down</property>
</object>
<object class="GtkImage" id="find_stock_image">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="stock">gtk-find</property>
</object>
<object class="GtkImage" id="index_stock_image">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="stock">gtk-index</property>
</object>
- <object class="GtkListStore" id="anonymity_level_liststore">
- <columns>
- <!-- column-name Name -->
- <column type="gchararray"/>
- <!-- column-name Level -->
- <column type="guint"/>
- <!-- column-name Color -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">None</col>
- <col id="1">0</col>
- <col id="2" translatable="yes">#AAAA00000000</col>
- </row>
- <row>
- <col id="0" translatable="yes">Normal</col>
- <col id="1">1</col>
- <col id="2" translatable="yes">#000000000000</col>
- </row>
- <row>
- <col id="0" translatable="yes">Paranoid</col>
- <col id="1">10</col>
- <col id="2" translatable="yes">#0000AAAA0000</col>
- </row>
- </data>
- </object>
- <object class="GtkListStore" id="main_window_search_mime_liststore">
- <columns>
- <!-- column-name MIME -->
- <column type="gchararray"/>
- <!-- column-name Type -->
- <column type="gchararray"/>
- <!-- column-name Extension -->
- <column type="gchararray"/>
- <!-- column-name Lossyness -->
- <column type="gchararray"/>
- <!-- column-name Freedom -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0"> </col>
- <col id="1" translatable="yes">Any</col>
- <col id="2" translatable="yes"> </col>
- <col id="3" translatable="yes"> </col>
- <col id="4" translatable="yes"> </col>
- </row>
- <row>
- <col id="0">plain/text</col>
- <col id="1" translatable="yes">Text</col>
- <col id="2">txt</col>
- <col id="3" translatable="yes">N/A</col>
- <col id="4" translatable="yes">N/A</col>
- </row>
- <row>
- <col id="0">application/zip</col>
- <col id="1" translatable="yes">Zip</col>
- <col id="2">zip</col>
- <col id="3" translatable="yes">lossless</col>
- <col id="4" translatable="yes">free</col>
- </row>
- <row>
- <col id="0">audio/mpeg</col>
- <col id="1" translatable="yes">MPEG audio</col>
- <col id="2">mp3, mp2, mpeg</col>
- <col id="3" translatable="yes">lossy</col>
- <col id="4" translatable="yes">non-free</col>
- </row>
- </data>
- </object>
- <object class="GtkSizeGroup" id="enties_and_comboboxes_sizegroup">
- <property name="mode">vertical</property>
- <widgets>
- <widget name="main_window_search_entry"/>
- <widget name="main_window_search_anonymity_combobox"/>
- <widget name="main_window_search_mime_combobox"/>
- </widgets>
- </object>
- <object class="GtkAdjustment" id="expiration_year_adjustment">
- <property name="upper">9999</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkTreeStore" id="main_window_search_namespace_treestore">
- <columns>
- <!-- column-name Name -->
- <column type="gchararray"/>
- <!-- column-name Key -->
- <column type="gpointer"/>
- <!-- column-name Root -->
- <column type="gchararray"/>
- <!-- column-name Tooltip -->
- <column type="gchararray"/>
- </columns>
- </object>
<object class="GtkMenu" id="metadata_popup_menu">
<property name="visible">True</property>
- <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>
<property name="use_underline">True</property>
- <signal name="activate"
handler="GNUNET_GTK_FS_metadata_copy_selection_activated" swapped="no"/>
+ <signal name="activate"
handler="GNUNET_GTK_FS_metadata_copy_selection_activated"/>
</object>
</child>
</object>
<object class="GtkWindow" id="namespace_selector_window">
- <property name="can_focus">False</property>
<property name="events">GDK_LEAVE_NOTIFY_MASK |
GDK_STRUCTURE_MASK</property>
<property name="resizable">False</property>
<property name="destroy_with_parent">True</property>
@@ -845,8 +755,8 @@
<property name="deletable">False</property>
<property name="transient_for">GNUNET_GTK_main_window</property>
<property name="mnemonics_visible">False</property>
- <signal name="leave-notify-event"
handler="GNUNET_FS_GTK_search_namespace_selector_window_leave_notify_event_cb"
swapped="no"/>
- <signal name="enter-notify-event"
handler="GNUNET_FS_GTK_search_namespace_dropdown_button_enter_notify_event_cb"
swapped="no"/>
+ <signal name="leave_notify_event"
handler="GNUNET_FS_GTK_search_namespace_selector_window_leave_notify_event_cb"/>
+ <signal name="enter_notify_event"
handler="GNUNET_FS_GTK_search_namespace_dropdown_button_enter_notify_event_cb"/>
<child>
<object class="GtkTreeView" id="namespace_selector_treeview">
<property name="visible">True</property>
@@ -858,11 +768,8 @@
<property name="hover_selection">True</property>
<property name="hover_expand">True</property>
<property name="tooltip_column">3</property>
- <signal name="button-press-event"
handler="GNUNET_FS_GTK_namespace_selector_treeview_button_press_event_cb"
swapped="no"/>
- <signal name="button-release-event"
handler="GNUNET_FS_GTK_namespace_selector_treeview_button_release_event_cb"
swapped="no"/>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="treeview-selection3"/>
- </child>
+ <signal name="button_press_event"
handler="GNUNET_FS_GTK_namespace_selector_treeview_button_press_event_cb"/>
+ <signal name="button_release_event"
handler="GNUNET_FS_GTK_namespace_selector_treeview_button_release_event_cb"/>
<child>
<object class="GtkTreeViewColumn" id="name_column">
<property name="sizing">autosize</property>
@@ -892,17 +799,32 @@
</object>
<object class="GtkImage" id="new_stock_image">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="stock">gtk-new</property>
</object>
<object class="GtkImage" id="open_stock_image">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="stock">gtk-open</property>
</object>
+ <object class="GtkImage" id="up_stock_image">
+ <property name="visible">True</property>
+ <property name="stock">gtk-go-up</property>
+ </object>
+ <object class="GtkSizeGroup" id="enties_and_comboboxes_sizegroup">
+ <property name="mode">vertical</property>
+ <widgets>
+ <widget name="main_window_search_mime_combobox"/>
+ <widget name="main_window_search_anonymity_combobox"/>
+ <widget name="main_window_search_entry"/>
+ </widgets>
+ </object>
+ <object class="GtkAdjustment" id="expiration_year_adjustment">
+ <property name="upper">9999</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkAdjustment" id="priority_adjustment">
- <property name="upper">10000000</property>
<property name="value">1000</property>
+ <property name="upper">10000000</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
@@ -911,11 +833,6 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkImage" id="up_stock_image">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-go-up</property>
- </object>
<object class="GtkSizeGroup" id="sizegroup4"/>
<object class="GtkSizeGroup" id="sizegroup5"/>
</interface>
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_open_url_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_open_url_dialog.glade 2012-02-02
23:15:04 UTC (rev 19659)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_open_url_dialog.glade 2012-02-02
23:39:49 UTC (rev 19660)
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
<interface>
<requires lib="gtk+" version="2.20"/>
+ <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkWindow" id="GNUNET_GTK_open_url_window">
- <property name="can_focus">False</property>
<property name="title" translatable="yes">Enter the URI to be
downloaded</property>
<property name="modal">True</property>
<property name="default_width">640</property>
@@ -11,21 +11,18 @@
<property name="skip_taskbar_hint">True</property>
<property name="skip_pager_hint">True</property>
<property name="deletable">False</property>
- <property name="transient_for">GNUNET_GTK_main_window</property>
- <signal name="delete-event"
handler="GNUNET_GTK_open_url_window_delete_event_cb" swapped="no"/>
+ <signal name="delete_event"
handler="GNUNET_GTK_open_url_window_delete_event_cb"/>
<child>
<object class="GtkVBox" id="GNUNET_GTK_open_url_dialog_main_vbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkHBox" id="GNUNET_GTK_open_url_dialog_query_hbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
<object class="GtkLabel"
id="GNUNET_GTK_open_url_dialog_url_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label" translatable="yes">_URI:</property>
<property name="use_underline">True</property>
<property
name="mnemonic_widget">GNUNET_GTK_open_url_dialog_url_textview</property>
@@ -38,15 +35,13 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkFrame"
id="GNUNET_GTK_open_url_dialog_url_frame">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">in</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkAlignment"
id="GNUNET_GTK_open_url_dialog_url_alignment">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
<object class="GtkTextView"
id="GNUNET_GTK_open_url_dialog_url_textview">
<property name="visible">True</property>
@@ -56,7 +51,7 @@
<property name="indent">20</property>
<property
name="buffer">GNUNET_GTK_open_url_dialog_url_textview_buffer</property>
<property name="accepts_tab">False</property>
- <signal name="key-press-event"
handler="GNUNET_GTK_open_url_dialog_url_textview_key_press_event_cb"
swapped="no"/>
+ <signal name="key_press_event"
handler="GNUNET_GTK_open_url_dialog_url_textview_key_press_event_cb"/>
</object>
</child>
</object>
@@ -66,86 +61,40 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox1">
+ <object class="GtkHBox"
id="GNUNET_GTK_open_url_dialog_anonymity_hbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
- <object class="GtkButton"
id="GNUNET_GTK_open_url_dialog_execute_button">
- <property name="label">_Execute</property>
- <property name="use_action_appearance">False</property>
+ <object class="GtkLabel"
id="GNUNET_GTK_open_url_dialog_anonymity_label">
<property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
- <property name="image">execute_stock_image</property>
+ <property name="label"
translatable="yes">_Anonymity:</property>
<property name="use_underline">True</property>
- <signal name="clicked"
handler="GNUNET_GTK_open_url_dialog_execute_button_clicked_cb" swapped="no"/>
+ <property
name="mnemonic_widget">GNUNET_GTK_open_url_dialog_anonymity_combobox</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">4</property>
<property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton"
id="GNUNET_GTK_open_url_dialog_cancel_button">
- <property name="label">gtk-cancel</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>
- <property name="use_action_appearance">False</property>
- <property name="use_stock">True</property>
- <signal name="clicked"
handler="GNUNET_GTK_open_url_dialog_cancel_button_clicked_cb" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">4</property>
- <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">4</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox8">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
<object class="GtkAlignment"
id="GNUNET_GTK_open_url_dialog_anonymity_combobox_alignment">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="yscale">0</property>
<child>
<object class="GtkComboBox"
id="GNUNET_GTK_open_url_dialog_anonymity_combobox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="model">main_window_search_anonymity_liststore</property>
<property name="active">1</property>
<child>
<object class="GtkCellRendererText"
id="GNUNET_GTK_open_url_dialog_anonymity_combobox_renderer"/>
@@ -170,13 +119,24 @@
<property name="position">0</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="GNUNET_GTK_open_url_dialog_button_hbox">
+ <property name="visible">True</property>
<child>
- <object class="GtkLabel"
id="GNUNET_GTK_open_url_dialog_anonymity_label">
+ <object class="GtkButton"
id="GNUNET_GTK_open_url_dialog_cancel_button">
+ <property name="label">gtk-cancel</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">_Anonymity:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">GNUNET_GTK_open_url_dialog_anonymity_combobox</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked"
handler="GNUNET_GTK_open_url_dialog_cancel_button_clicked_cb"/>
</object>
<packing>
<property name="expand">False</property>
@@ -186,18 +146,42 @@
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkButton"
id="GNUNET_GTK_open_url_dialog_execute_button">
+ <property name="label">_Execute</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="image">execute-stock-image</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked"
handler="GNUNET_GTK_open_url_dialog_execute_button_clicked_cb"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">4</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="padding">4</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
<object class="GtkTextBuffer"
id="GNUNET_GTK_open_url_dialog_url_textview_buffer">
- <signal name="changed"
handler="GNUNET_GTK_open_url_dialog_url_textview_buffer_changed_cb"
swapped="no"/>
+ <signal name="changed"
handler="GNUNET_GTK_open_url_dialog_url_textview_buffer_changed_cb"/>
</object>
-
+ <object class="GtkImage" id="execute-stock-image">
+ <property name="visible">True</property>
+ <property name="stock">gtk-execute</property>
+ </object>
</interface>
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_advertise-pseudonym.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_advertise-pseudonym.c 2012-02-02
23:15:04 UTC (rev 19659)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_advertise-pseudonym.c 2012-02-02
23:39:49 UTC (rev 19660)
@@ -209,7 +209,8 @@
GtkBuilder *builder = GTK_BUILDER (user_data);
GtkTreeModel *tm;
GtkTreeIter iter;
-
+
+ fprintf (stderr, "DELETE!\n");
tm = GTK_TREE_MODEL (gtk_builder_get_object (builder,
"GNUNET_GTK_select_pseudonym_liststore"));
if (gtk_tree_model_get_iter_first (tm, &iter))
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_open-uri.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_open-uri.c 2012-02-02 23:15:04 UTC (rev
19659)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_open-uri.c 2012-02-02 23:39:49 UTC (rev
19660)
@@ -42,7 +42,7 @@
GNUNET_GTK_open_url_dialog_execute_button_clicked_cb (GtkButton * button,
gpointer user_data)
{
- GtkBuilder *builder;
+ GtkBuilder *builder = GTK_BUILDER (user_data);
GtkWidget *dialog;
GtkTextBuffer *tb;
GtkTextIter ti_start, ti_end;
@@ -51,7 +51,6 @@
char *uris;
struct GNUNET_FS_Uri *uri;
- builder = GTK_BUILDER (user_data);
dialog =
GTK_WIDGET (gtk_builder_get_object
(builder, "GNUNET_GTK_open_url_window"));
@@ -149,7 +148,7 @@
GtkBuilder *builder = GTK_BUILDER (user_data);
g_object_unref (G_OBJECT (builder));
- return TRUE;
+ return FALSE;
}
@@ -239,6 +238,7 @@
GtkTextIter ti_start;
GtkTextIter ti_end;
GtkWidget *toplevel;
+ GtkComboBox *combo;
builder =
GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_open_url_dialog.glade", NULL);
@@ -259,7 +259,10 @@
/* FIXME-FEATURE: query the clipboard, maybe there's valid URI in there?
* If so, get it. */
-
+ combo = GTK_COMBO_BOX (gtk_builder_get_object
+ (builder,
+ "GNUNET_GTK_open_url_dialog_anonymity_combobox"));
+ gtk_combo_box_set_model (combo, GNUNET_FS_GTK_get_anonymity_level_list_store
());
toplevel = gtk_widget_get_toplevel (dummy);
if (GTK_IS_WINDOW (toplevel))
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (toplevel));
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_publish-dialog.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_publish-dialog.c 2012-02-02 23:15:04 UTC
(rev 19659)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_publish-dialog.c 2012-02-02 23:39:49 UTC
(rev 19660)
@@ -1748,8 +1748,8 @@
* @param widget the widget that generated the close event
* @param even the close event
* @param user_data master publishing dialog context of our window
- * @return TRUE to refuse to close, FALSE if we closed the window
- * FIXME: are these return codes correct?
+ * @return TRUE to refuse to close (stops other handlers from being invoked)
+ * FALSE to allow closing the window
*/
gboolean
GNUNET_GTK_master_publish_dialog_delete_event_cb (GtkWidget * widget,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r19660 - in gnunet-gtk: contrib src/fs,
gnunet <=