[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r19667 - in gnunet-gtk: contrib src/fs
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r19667 - in gnunet-gtk: contrib src/fs |
|
Date: |
Fri, 3 Feb 2012 13:32:22 +0100 |
Author: grothoff
Date: 2012-02-03 13:32:22 +0100 (Fri, 03 Feb 2012)
New Revision: 19667
Modified:
gnunet-gtk/contrib/gnunet_fs_gtk_search_tab.glade
gnunet-gtk/src/fs/gnunet-fs-gtk.c
gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c
gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.h
Log:
-gladifying more signal handlers
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_search_tab.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_search_tab.glade 2012-02-03 10:11:23 UTC
(rev 19666)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_search_tab.glade 2012-02-03 12:32:22 UTC
(rev 19667)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
<interface>
<requires lib="gtk+" version="2.20"/>
<!-- interface-naming-policy project-wide -->
@@ -41,7 +41,6 @@
</columns>
</object>
<object class="GtkWindow" id="_search_result_frame_window">
- <property name="can_focus">False</property>
<property name="type">popup</property>
<property name="title">You should never see this</property>
<property name="skip_taskbar_hint">True</property>
@@ -64,9 +63,13 @@
<property name="search_column">6</property>
<property name="enable_grid_lines">horizontal</property>
<property name="enable_tree_lines">True</property>
+ <signal name="cursor_changed"
handler="GNUNET_FS_GTK_search_treeview_cursor_changed"/>
+ <signal name="button_press_event"
handler="GNUNET_FS_GTK_search_treeview_button_press_event"/>
+ <signal name="row_activated"
handler="GNUNET_FS_GTK_search_treeview_row_activated"/>
+ <signal name="popup_menu"
handler="GNUNET_FS_GTK_search_treeview_popup_menu"/>
<child>
<object class="GtkTreeViewColumn"
id="search_result_description_column">
- <property name="title"
translatable="yes">Description</property>
+ <property name="title">Description</property>
<property name="expand">True</property>
<property name="clickable">True</property>
<property name="reorderable">True</property>
@@ -83,7 +86,7 @@
</child>
<child>
<object class="GtkTreeViewColumn"
id="search_result_availability_column">
- <property name="title"
translatable="yes">Availability</property>
+ <property name="title">Availability</property>
<property name="clickable">True</property>
<property name="reorderable">True</property>
<property name="sort_indicator">True</property>
@@ -99,7 +102,7 @@
</child>
<child>
<object class="GtkTreeViewColumn" id="search_result_mime_column">
- <property name="title" translatable="yes">Format</property>
+ <property name="title">Format</property>
<property name="clickable">True</property>
<property name="reorderable">True</property>
<property name="sort_indicator">True</property>
@@ -115,7 +118,7 @@
</child>
<child>
<object class="GtkTreeViewColumn"
id="search_result_completed_column">
- <property name="title" translatable="yes">Completed
(bytes)</property>
+ <property name="title">Completed (bytes)</property>
<property name="reorderable">True</property>
<property name="sort_indicator">True</property>
<property name="sort_column_id">14</property>
@@ -130,7 +133,7 @@
</child>
<child>
<object class="GtkTreeViewColumn" id="search_result_size_column">
- <property name="title" translatable="yes">Size</property>
+ <property name="title">Size</property>
<property name="clickable">True</property>
<property name="reorderable">True</property>
<property name="sort_indicator">True</property>
@@ -146,7 +149,7 @@
</child>
<child>
<object class="GtkTreeViewColumn"
id="search_result_progress_column">
- <property name="title" translatable="yes">Progress</property>
+ <property name="title">Progress</property>
<property name="clickable">True</property>
<property name="reorderable">True</property>
<property name="sort_indicator">True</property>
@@ -178,7 +181,7 @@
</child>
<child>
<object class="GtkTreeViewColumn"
id="search_result_preview_column">
- <property name="title" translatable="yes">Preview</property>
+ <property name="title">Preview</property>
<property name="reorderable">True</property>
<child>
<object class="GtkCellRendererPixbuf"
id="search_result_preview_renderer"/>
@@ -195,7 +198,6 @@
</child>
</object>
<object class="GtkWindow" id="_search_result_label_window">
- <property name="can_focus">False</property>
<property name="type">popup</property>
<property name="title" translatable="yes">You shouldn't see this
also</property>
<property name="type_hint">dock</property>
@@ -207,11 +209,9 @@
<child>
<object class="GtkHBox" id="_search_result_label_hbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
<object class="GtkAlignment"
id="_search_result_label_window_label_alignment">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="border_width">2</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
@@ -219,7 +219,6 @@
<object class="GtkLabel" id="_search_result_label_window_label">
<property name="height_request">30</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label">query</property>
</object>
</child>
@@ -233,18 +232,16 @@
<child>
<object class="GtkAlignment"
id="_search_result_label_play_button_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="GtkButton" id="_search_result_label_play_button">
- <property name="use_action_appearance">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <signal name="clicked"
handler="GNUNET_FS_GTK_search_result_play_button_clicked"/>
<child>
<object class="GtkImage" id="play_icon_stock_image">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="stock">gtk-media-play</property>
<property name="icon-size">2</property>
</object>
@@ -261,19 +258,17 @@
<child>
<object class="GtkAlignment"
id="_search_result_label_pause_button_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="GtkButton" id="_search_result_label_pause_button">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <signal name="clicked"
handler="GNUNET_FS_GTK_search_result_pause_button_clicked"/>
<child>
<object class="GtkImage" id="pause_icon_stock_image">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="stock">gtk-media-pause</property>
<property name="icon-size">2</property>
</object>
@@ -290,19 +285,17 @@
<child>
<object class="GtkAlignment"
id="_search_result_label_clear_button_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="GtkButton" id="_search_result_label_clear_button">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <signal name="clicked"
handler="GNUNET_FS_GTK_search_result_clear_button_clicked"/>
<child>
<object class="GtkImage" id="clear_icon_stock_image">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="stock">gtk-clear</property>
<property name="icon-size">2</property>
</object>
@@ -320,20 +313,18 @@
<child>
<object class="GtkAlignment"
id="_search_result_label_close_button_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="GtkButton" id="_search_result_label_close_button">
- <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="relief">half</property>
+ <signal name="clicked"
handler="GNUNET_FS_GTK_search_result_close_button_clicked"/>
<child>
<object class="GtkImage" id="close_icon_stock_image">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="stock">gtk-close</property>
<property name="icon-size">2</property>
</object>
@@ -353,10 +344,10 @@
<object class="GtkSizeGroup" id="_search_result_label_buttons_size_group">
<property name="mode">both</property>
<widgets>
- <widget name="_search_result_label_play_button"/>
- <widget name="_search_result_label_pause_button"/>
- <widget name="_search_result_label_clear_button"/>
<widget name="_search_result_label_close_button"/>
+ <widget name="_search_result_label_clear_button"/>
+ <widget name="_search_result_label_pause_button"/>
+ <widget name="_search_result_label_play_button"/>
</widgets>
</object>
</interface>
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk.c 2012-02-03 10:11:23 UTC (rev 19666)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk.c 2012-02-03 12:32:22 UTC (rev 19667)
@@ -150,7 +150,8 @@
("GNUNET_GTK_main_window"));
gtk_window_maximize (GTK_WINDOW (main_window));
- /* Allow multiple selection in metadata view; FIXME-STYLE: can we do this
with glade now? */
+ /* Allow multiple selection in metadata view; */
+ /* FIXME-GTK3: this can be done within (modern versions of) glade */
metadata_tree =
GTK_TREE_VIEW (GNUNET_FS_GTK_get_main_window_object
("GNUNET_GTK_main_window_metadata_treeview"));
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c 2012-02-03 10:11:23 UTC
(rev 19666)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c 2012-02-03 12:32:22 UTC
(rev 19667)
@@ -440,9 +440,11 @@
* @param column unused entry specifying which column the mouse was in
* @param user_data the 'struct SearchTab' that was activated
*/
-static void
-start_download_row_activated (GtkTreeView * tree_view, GtkTreePath * path,
- GtkTreeViewColumn * column, gpointer user_data)
+void
+GNUNET_FS_GTK_search_treeview_row_activated (GtkTreeView * tree_view,
+ GtkTreePath * path,
+ GtkTreeViewColumn * column,
+ gpointer user_data)
{
struct SearchTab *tab = user_data;
@@ -681,8 +683,9 @@
* @return FALSE if no menu could be popped up,
* TRUE if there is now a pop-up menu
*/
-static gboolean
-search_list_on_popup (GtkWidget *widget, gpointer user_data)
+gboolean
+GNUNET_FS_GTK_search_treeview_popup_menu (GtkWidget *widget,
+ gpointer user_data)
{
GtkTreeView *tv = GTK_TREE_VIEW (widget);
struct SearchTab *tab = user_data;
@@ -707,10 +710,10 @@
* @return FALSE if no menu could be popped up,
* TRUE if there is now a pop-up menu
*/
-static gboolean
-search_list_on_menu (GtkWidget * widget,
- GdkEvent * event,
- gpointer user_data)
+gboolean
+GNUNET_FS_GTK_search_treeview_button_press_event (GtkWidget * widget,
+ GdkEvent * event,
+ gpointer user_data)
{
GtkTreeView *tv = GTK_TREE_VIEW (widget);
GdkEventButton *event_button = (GdkEventButton *) event;
@@ -854,8 +857,9 @@
* @param tv the tree view in a search tab where the selection changed
* @param user_data the 'struct SearchTab' that contains the tree view
*/
-static void
-update_meta_data_views (GtkTreeView *tv, gpointer user_data)
+void
+GNUNET_FS_GTK_search_treeview_cursor_changed (GtkTreeView *tv,
+ gpointer user_data)
{
struct SearchTab *tab = user_data;
GtkImage *image;
@@ -925,7 +929,7 @@
continue;
tv = GTK_TREE_VIEW (gtk_builder_get_object
(tab->builder, "_search_result_frame"));
- update_meta_data_views (tv, tab);
+ GNUNET_FS_GTK_search_treeview_cursor_changed (tv, tab);
return;
}
/* active tab is not a search tab (likely the 'publish' tab),
@@ -946,8 +950,8 @@
* @param button the 'close' button
* @param user_data the 'struct SearchTab' of the tab to close
*/
-static void
-stop_search (GtkButton *button, gpointer user_data)
+void
+GNUNET_FS_GTK_search_result_close_button_clicked (GtkButton *button, gpointer
user_data)
{
struct SearchTab *tab = user_data;
struct GNUNET_FS_SearchContext *sc;
@@ -972,8 +976,8 @@
* @param button the 'pause' button
* @param user_data the 'struct SearchTab' of the tab to pause
*/
-static void
-pause_search (GtkButton *button, gpointer user_data)
+void
+GNUNET_FS_GTK_search_result_pause_button_clicked (GtkButton *button, gpointer
user_data)
{
struct SearchTab *tab = user_data;
@@ -994,8 +998,8 @@
* @param button the 'resume' button
* @param user_data the 'struct SearchTab' of the tab to resume
*/
-static void
-continue_search (GtkButton * button, gpointer user_data)
+void
+GNUNET_FS_GTK_search_result_play_button_clicked (GtkButton * button, gpointer
user_data)
{
struct SearchTab *tab = user_data;
@@ -1021,8 +1025,8 @@
* @param button the button pressed by the user
* @param user_data the 'struct SearchTab' of the respective tab to clean up
*/
-static void
-clear_downloads (GtkButton * button, gpointer user_data)
+void
+GNUNET_FS_GTK_search_result_clear_button_clicked (GtkButton * button, gpointer
user_data)
{
struct SearchTab *tab = user_data;
struct SearchResult *sr;
@@ -1204,7 +1208,7 @@
{
tv = GTK_TREE_VIEW (gtk_builder_get_object
(sr->tab->builder, "_search_result_frame"));
- update_meta_data_views (tv, sr->tab);
+ GNUNET_FS_GTK_search_treeview_cursor_changed (tv, sr->tab);
}
}
@@ -1399,7 +1403,6 @@
const struct GNUNET_FS_Uri *query)
{
struct SearchTab *tab;
- GtkTreeView *tv;
GtkNotebook *notebook;
GtkWindow *sf;
gint pages;
@@ -1446,44 +1449,18 @@
tab->label =
GTK_LABEL (gtk_builder_get_object
(tab->builder, "_search_result_label_window_label"));
-
- /* FIXME-UNCLEAN: connect these signals using glade!!! */
tab->close_button =
GTK_WIDGET (gtk_builder_get_object
(tab->builder, "_search_result_label_close_button"));
- g_signal_connect (G_OBJECT (tab->close_button), "clicked",
- G_CALLBACK (stop_search), tab);
- tab->clear_button =
- GTK_WIDGET (gtk_builder_get_object
- (tab->builder, "_search_result_label_clear_button"));
- g_signal_connect (G_OBJECT (tab->clear_button), "clicked",
- G_CALLBACK (clear_downloads), tab);
tab->play_button =
GTK_WIDGET (gtk_builder_get_object
(tab->builder, "_search_result_label_play_button"));
- g_signal_connect (G_OBJECT (tab->play_button), "clicked",
- G_CALLBACK (continue_search), tab);
tab->pause_button =
GTK_WIDGET (gtk_builder_get_object
(tab->builder, "_search_result_label_pause_button"));
- g_signal_connect (G_OBJECT (tab->pause_button), "clicked",
- G_CALLBACK (pause_search), tab);
/* patch text */
update_search_label (tab);
- /* add signal handlers; FIXME-UNCLEAN: again, connect these with glade... */
- tv = GTK_TREE_VIEW (gtk_builder_get_object
- (tab->builder, "_search_result_frame"));
- g_signal_connect (G_OBJECT (tv), "row-activated",
- G_CALLBACK (start_download_row_activated), tab);
- g_signal_connect (G_OBJECT (tv), "cursor-changed",
- G_CALLBACK (update_meta_data_views), tab);
- g_signal_connect (G_OBJECT (tv), "button_press_event",
- G_CALLBACK (search_list_on_menu), tab);
- g_signal_connect (G_OBJECT (tv), "popup-menu",
- G_CALLBACK (search_list_on_popup), tab);
-
-
/* make visible */
notebook =
GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
@@ -1534,7 +1511,6 @@
ret->frame = parent->tab->frame;
ret->tab_label = parent->tab->tab_label;
ret->close_button = parent->tab->close_button;
- ret->clear_button = parent->tab->clear_button;
ret->play_button = parent->tab->play_button;
ret->label = parent->tab->label;
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.h
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.h 2012-02-03 10:11:23 UTC
(rev 19666)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.h 2012-02-03 12:32:22 UTC
(rev 19667)
@@ -85,11 +85,6 @@
GtkWidget *close_button;
/**
- * Button to clear all entries for downloads that have completed.
- */
- GtkWidget *clear_button;
-
- /**
* Button to resume the search.
*/
GtkWidget *play_button;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r19667 - in gnunet-gtk: contrib src/fs,
gnunet <=