[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r18825 - in gnunet-gtk: contrib src/fs
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r18825 - in gnunet-gtk: contrib src/fs |
|
Date: |
Mon, 26 Dec 2011 13:05:15 +0100 |
Author: grothoff
Date: 2011-12-26 13:05:15 +0100 (Mon, 26 Dec 2011)
New Revision: 18825
Removed:
gnunet-gtk/contrib/gnunet_fs_gtk_search_dialog.glade
gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_search.c
Modified:
gnunet-gtk/contrib/Makefile.am
gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade
gnunet-gtk/src/fs/Makefile.am
gnunet-gtk/src/fs/gnunet-fs-gtk.c
Log:
-LRN: removing sentimental code - #1759
Modified: gnunet-gtk/contrib/Makefile.am
===================================================================
--- gnunet-gtk/contrib/Makefile.am 2011-12-25 21:38:42 UTC (rev 18824)
+++ gnunet-gtk/contrib/Makefile.am 2011-12-26 12:05:15 UTC (rev 18825)
@@ -25,7 +25,6 @@
gnunet_fs_gtk_publish_edit_dialog.glade \
gnunet_fs_gtk_publish_file_dialog.glade \
gnunet_fs_gtk_publish_tab.glade \
- gnunet_fs_gtk_search_dialog.glade \
gnunet_fs_gtk_search_tab.glade \
gnunet_fs_gtk_select_pseudonym_dialog.glade \
gnunet_gtk_status_bar_menu.glade \
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade 2011-12-25 21:38:42 UTC
(rev 18824)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade 2011-12-26 12:05:15 UTC
(rev 18825)
@@ -877,26 +877,6 @@
</object>
</child>
<child>
- <object class="GtkImageMenuItem"
id="GNUNET_GTK_main_menu_file_search">
- <property name="label"
translatable="yes">_Search</property>
- <property name="use_action_appearance">False</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text"
translatable="yes">Search GNUnet for files</property>
- <property name="accel_path"><gnunet-fs-gtk>/File
sharing/Search</property>
- <property name="use_underline">True</property>
- <property name="use_stock">False</property>
- <accelerator key="s" signal="activate"
modifiers="GDK_CONTROL_MASK"/>
- <signal name="activate"
handler="GNUNET_GTK_main_menu_file_search_activate_cb" swapped="no"/>
- </object>
- </child>
- <child>
- <object class="GtkSeparatorMenuItem"
id="GNUNET_GTK_main_menu_file_sep2">
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- </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>
@@ -927,7 +907,7 @@
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem"
id="GNUNET_GTK_main_menu_file_sep3">
+ <object class="GtkSeparatorMenuItem"
id="GNUNET_GTK_main_menu_file_sep2">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -1064,31 +1044,6 @@
</packing>
</child>
<child>
- <object class="GtkToolbar" id="GNUNET_GTK_main_window_toolbar">
- <property name="can_focus">False</property>
- <property name="toolbar_style">icons</property>
- <child>
- <object class="GtkToolButton" id="GNUNET_GTK_toolbar_search">
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">_Search</property>
- <property name="use_underline">True</property>
- <property name="stock_id">gtk-find</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</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="main_window_search_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -1316,7 +1271,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -1443,7 +1398,7 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
Deleted: gnunet-gtk/contrib/gnunet_fs_gtk_search_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_search_dialog.glade 2011-12-25
21:38:42 UTC (rev 18824)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_search_dialog.glade 2011-12-26
12:05:15 UTC (rev 18825)
@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
- <requires lib="gtk+" version="2.20"/>
- <!-- interface-naming-policy project-wide -->
- <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="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="GNUNET_GTK_search_anonymity_adjustment">
- <property name="upper">100000</property>
- <property name="value">1</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkDialog" id="GNUNET_GTK_search_dialog">
- <property name="width_request">500</property>
- <property name="height_request">350</property>
- <property name="border_width">5</property>
- <property name="title" translatable="yes">Search GNUnet</property>
- <property name="modal">True</property>
- <property name="destroy_with_parent">True</property>
- <property name="icon_name">system-search</property>
- <property name="type_hint">dialog</property>
- <property name="skip_taskbar_hint">True</property>
- <property name="skip_pager_hint">True</property>
- <property name="has_separator">False</property>
- <child internal-child="vbox">
- <object class="GtkVBox" id="GNUNET_GTK_search_dialog_main_vbox">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkHBox" id="GNUNET_GTK_search_dialog_query_hbox">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel"
id="GNUNET_GTK_search_dialog_keyword_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Query:</property>
- <property name="use_underline">True</property>
- <property name="selectable">True</property>
- <property
name="mnemonic_widget">GNUNET_GTK_search_dialog_keyword_entry</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry"
id="GNUNET_GTK_search_dialog_keyword_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- <property name="activates_default">True</property>
- <property name="caps_lock_warning">False</property>
- <property name="primary_icon_stock">gtk-find</property>
- <property name="primary_icon_tooltip_text"
translatable="yes">Separate multiple keywords with spaces, prefix mandatory
keywords with "+"</property>
- <signal name="activate"
handler="GNUNET_GTK_search_dialog_search_button_clicked_cb" swapped="no"/>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel"
id="GNUNET_GTK_search_dialog_anonymity_label">
- <property name="visible">True</property>
- <property name="label"
translatable="yes">_Anonymity:</property>
- <property name="use_underline">True</property>
- <property name="selectable">True</property>
- <property
name="mnemonic_widget">GNUNET_GTK_search_dialog_anonymity_spin_button</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton"
id="GNUNET_GTK_search_dialog_anonymity_spin_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- <property name="caps_lock_warning">False</property>
- <property
name="adjustment">GNUNET_GTK_search_anonymity_adjustment</property>
- <property name="climb_rate">1</property>
- <property name="numeric">True</property>
- <signal name="value-changed"
handler="GNUNET_GTK_anonymity_spin_button_value_changed_cb" swapped="no"/>
- </object>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">5</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow"
id="GNUNET_GTK_search_dialog_namespace_scrolled_window">
- <property name="height_request">100</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hadjustment">adjustment1</property>
- <property name="vadjustment">adjustment2</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <child>
- <object class="GtkTreeView"
id="GNUNET_GTK_search_dialog_namespace_tree_view">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="model">GNUNET_GTK_namespace_list_store</property>
- <property name="hadjustment">adjustment1</property>
- <property name="vadjustment">adjustment2</property>
- <property name="reorderable">True</property>
- <property name="rules_hint">True</property>
- <signal name="row-activated"
handler="GNUNET_GTK_search_dialog_namespace_tree_view_row_activated_cb"
swapped="no"/>
- <child>
- <object class="GtkTreeViewColumn"
id="GNUNET_GTK_search_dialog_namespace_name_column">
- <property name="resizable">True</property>
- <property name="title" translatable="yes">Name</property>
- <property name="clickable">True</property>
- <property name="reorderable">True</property>
- <property name="sort_indicator">True</property>
- <child>
- <object class="GtkCellRendererText"
id="GNUNET_GTK_search_dialog_namespace_name_renderer"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkTreeViewColumn"
id="GNUNET_GTK_search_dialog_namespace_root_column">
- <property name="resizable">True</property>
- <property name="title" translatable="yes">Root</property>
- <property name="clickable">True</property>
- <child>
- <object class="GtkCellRendererText"
id="GNUNET_GTK_search_dialog_namespace_root_renderer"/>
- <attributes>
- <attribute name="text">1</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkTreeViewColumn"
id="GNUNET_GTK_search_dialog_namespace_description_column">
- <property name="title"
translatable="yes">Description</property>
- <property name="expand">True</property>
- <property name="clickable">True</property>
- <child>
- <object class="GtkCellRendererText"
id="GNUNET_GTK_search_dialog_namespace_description_renderer">
- <property name="wrap_mode">word</property>
- </object>
- <attributes>
- <attribute name="text">3</attribute>
- </attributes>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox"
id="GNUNET_GTK_search_dialog_action_area">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton"
id="GNUNET_GTK_search_dialog_cancel_button">
- <property name="label">gtk-cancel</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>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton"
id="GNUNET_GTK_search_dialog_search_button">
- <property name="label">gtk-find</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_search_dialog_search_button_clicked_cb" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- </child>
- <action-widgets>
- <action-widget
response="-6">GNUNET_GTK_search_dialog_cancel_button</action-widget>
- <action-widget
response="0">GNUNET_GTK_search_dialog_search_button</action-widget>
- </action-widgets>
- </object>
- <object class="GtkListStore" id="GNUNET_GTK_namespace_list_store">
- <columns>
- <!-- column-name unique_name -->
- <column type="gchararray"/>
- <!-- column-name namespace_root -->
- <column type="gchararray"/>
- <!-- column-name nsid -->
- <column type="gpointer"/>
- <!-- column-name namespace_description -->
- <column type="gchararray"/>
- </columns>
- </object>
-</interface>
Modified: gnunet-gtk/src/fs/Makefile.am
===================================================================
--- gnunet-gtk/src/fs/Makefile.am 2011-12-25 21:38:42 UTC (rev 18824)
+++ gnunet-gtk/src/fs/Makefile.am 2011-12-26 12:05:15 UTC (rev 18825)
@@ -20,7 +20,6 @@
gnunet-fs-gtk-main_window_create_pseudonym.c \
gnunet-fs-gtk-main_window_file_download.c \
gnunet-fs-gtk-main_window_file_publish.c \
- gnunet-fs-gtk-main_window_file_search.c \
gnunet-fs-gtk-main_window_open_directory.c \
gnunet-fs-gtk-main_window_adv_pseudonym.c \
gnunet-fs-gtk-main_window_view_toggles.c
Deleted: gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_search.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_search.c 2011-12-25
21:38:42 UTC (rev 18824)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_search.c 2011-12-26
12:05:15 UTC (rev 18825)
@@ -1,219 +0,0 @@
-/*
- This file is part of GNUnet
- (C) 2005, 2006, 2010 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
-*/
-
-/**
- * @file src/fs/gnunet-fs-gtk-main_window_file_search.c
- * @author Christian Grothoff
- */
-#include "gnunet-fs-gtk-common.h"
-#include "gnunet-fs-gtk.h"
-
-/**
- * Builder used for the search dialog.
- */
-static GtkBuilder *builder;
-
-
-/**
- * User double-clicked on namespace or pressed enter;
- * move namespace root to the 'keywords' line.
- */
-void
-GNUNET_GTK_search_dialog_namespace_tree_view_row_activated_cb (GtkTreeView *
- tree_view,
- GtkTreePath *
- path,
-
GtkTreeViewColumn
- * column,
- gpointer
- user_data)
-{
- GtkTreeModel *ls;
- GtkTreeSelection *sel;
- GtkEntry *query;
- GtkTreeIter iter;
- char *root;
-
- query =
- GTK_ENTRY (gtk_builder_get_object
- (builder, "GNUNET_GTK_search_dialog_keyword_entry"));
- sel = gtk_tree_view_get_selection (tree_view);
- if (TRUE == gtk_tree_selection_get_selected (sel, &ls, &iter))
- {
- gtk_tree_model_get (ls, &iter, 1, &root, -1);
- gtk_entry_set_text (query, root);
- GNUNET_free (root);
- }
-}
-
-
-void
-GNUNET_GTK_search_dialog_search_button_clicked_cb (GtkWidget * dummy,
- gpointer data)
-{
- GtkEntry *query;
- GtkSpinButton *anonymity;
- GtkTreeView *namespace;
- const char *keywords;
- char *emsg;
- struct GNUNET_FS_Uri *uri;
- GNUNET_HashCode *nsid;
- GtkTreeModel *ls;
- GtkTreeSelection *sel;
- GtkTreeIter iter;
-
- query =
- GTK_ENTRY (gtk_builder_get_object
- (builder, "GNUNET_GTK_search_dialog_keyword_entry"));
- anonymity =
- GTK_SPIN_BUTTON (gtk_builder_get_object
- (builder,
- "GNUNET_GTK_search_dialog_anonymity_spin_button"));
- namespace =
- GTK_TREE_VIEW (gtk_builder_get_object
- (builder,
"GNUNET_GTK_search_dialog_namespace_tree_view"));
- keywords = gtk_entry_get_text (query);
- nsid = NULL;
- sel = gtk_tree_view_get_selection (namespace);
- if (TRUE == gtk_tree_selection_get_selected (sel, &ls, &iter))
- gtk_tree_model_get (ls, &iter, 2, &nsid, -1);
- if (nsid != NULL)
- {
- uri = GNUNET_FS_uri_sks_create_from_nsid (nsid, keywords);
- GNUNET_assert (uri != NULL);
- }
- else
- {
- emsg = NULL;
- uri = GNUNET_FS_uri_ksk_create (keywords, &emsg);
- if (uri == NULL)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Invalid keyword string `%s':
%s"),
- keywords, emsg);
- GNUNET_free_non_null (emsg);
- return;
- }
- }
- GNUNET_FS_search_start (GNUNET_FS_GTK_get_fs_handle (), uri,
- gtk_spin_button_get_value_as_int (anonymity),
- GNUNET_FS_SEARCH_OPTION_NONE, NULL);
- GNUNET_FS_uri_destroy (uri);
-}
-
-
-
-/**
- * Add pseudonym data to list store
- *
- * @param cls closure (the 'GtkListStore')
- * @param pseudonym hash code of public key of pseudonym
- * @param md meta data known about the pseudonym
- * @param rating the local rating of the pseudonym
- * @return GNUNET_OK to continue iteration, GNUNET_SYSERR to abort
- */
-static int
-add_namespace_to_ls (void *cls, const GNUNET_HashCode * pseudonym,
- const struct GNUNET_CONTAINER_MetaData *md, int rating)
-{
- GtkListStore *ls = cls;
- char *root;
- char *ns_name;
- GNUNET_HashCode *nsid;
- char *description;
- char *uris;
- char *emsg;
- struct GNUNET_FS_Uri *uri;
- GtkTreeIter iter;
-
- ns_name =
- GNUNET_PSEUDONYM_id_to_name (GNUNET_FS_GTK_get_configuration (),
- pseudonym);
- nsid = GNUNET_malloc (sizeof (GNUNET_HashCode));
- *nsid = *pseudonym;
- root = NULL;
- uris = GNUNET_CONTAINER_meta_data_get_by_type (md, EXTRACTOR_METATYPE_URI);
- if (uris != NULL)
- {
- emsg = NULL;
- uri = GNUNET_FS_uri_parse (uris, &emsg);
- if (uri == NULL)
- GNUNET_free (emsg);
- root = GNUNET_FS_uri_sks_get_content_id (uri);
- GNUNET_FS_uri_destroy (uri);
- }
- description =
- GNUNET_CONTAINER_meta_data_get_first_by_types (md,
- EXTRACTOR_METATYPE_TITLE,
-
EXTRACTOR_METATYPE_BOOK_TITLE,
-
EXTRACTOR_METATYPE_DESCRIPTION,
-
EXTRACTOR_METATYPE_SUMMARY,
- EXTRACTOR_METATYPE_ALBUM,
-
EXTRACTOR_METATYPE_COMMENT,
-
EXTRACTOR_METATYPE_SUBJECT,
-
EXTRACTOR_METATYPE_KEYWORDS,
- -1);
- gtk_list_store_insert_with_values (ls, &iter, G_MAXINT, 0, ns_name, 1, root,
- 2, nsid, 3, description, -1);
- GNUNET_free (ns_name);
- GNUNET_free_non_null (root);
- GNUNET_free_non_null (description);
- return GNUNET_OK;
-}
-
-
-/**
- * Search selected in 'file' menu.
- */
-void
-GNUNET_GTK_main_menu_file_search_activate_cb (GtkWidget * dummy, gpointer data)
-{
- GtkWidget *ad;
- GtkListStore *ls;
- GtkTreeIter iter;
- GNUNET_HashCode *nsid;
-
- GNUNET_assert (builder == NULL);
- builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_search_dialog.glade");
- if (builder == NULL)
- return;
- ad = GTK_WIDGET (gtk_builder_get_object
- (builder, "GNUNET_GTK_search_dialog"));
- ls = GTK_LIST_STORE (gtk_builder_get_object
- (builder, "GNUNET_GTK_namespace_list_store"));
- GNUNET_PSEUDONYM_list_all (GNUNET_FS_GTK_get_configuration (),
- &add_namespace_to_ls, ls);
- gtk_dialog_run (GTK_DIALOG (ad));
-
- /* free nsids from 'ls' */
- if (TRUE == gtk_tree_model_get_iter_first (GTK_TREE_MODEL (ls), &iter))
- {
- do
- {
- gtk_tree_model_get (GTK_TREE_MODEL (ls), &iter, 2, &nsid, -1);
- GNUNET_free (nsid);
- }
- while (TRUE == gtk_tree_model_iter_next (GTK_TREE_MODEL (ls), &iter));
- }
- gtk_widget_destroy (ad);
- g_object_unref (G_OBJECT (builder));
- builder = NULL;
-}
-
-/* end of gnunet-fs-gtk-main_window_file_search.c */
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk.c 2011-12-25 21:38:42 UTC (rev 18824)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk.c 2011-12-26 12:05:15 UTC (rev 18825)
@@ -124,14 +124,7 @@
}
-/**
- * Search selected in 'file' menu. (from main_window_file_search.c)
- */
void
-GNUNET_GTK_main_menu_file_search_activate_cb (GtkWidget * dummy, gpointer
data);
-
-
-void
main_window_search_namespace_dropdown_button_toggled_cb (GtkToggleButton
*togglebutton,
gpointer user_data)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r18825 - in gnunet-gtk: contrib src/fs,
gnunet <=