[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r11976 - in gnunet-gtk: contrib src
From: |
gnunet |
Subject: |
[GNUnet-SVN] r11976 - in gnunet-gtk: contrib src |
Date: |
Sun, 27 Jun 2010 15:13:31 +0200 |
Author: grothoff
Date: 2010-06-27 15:13:31 +0200 (Sun, 27 Jun 2010)
New Revision: 11976
Modified:
gnunet-gtk/contrib/open_directory_dialog.glade
gnunet-gtk/src/fs_event_handler.c
gnunet-gtk/src/main_window_open_directory.c
Log:
cosmetics
Modified: gnunet-gtk/contrib/open_directory_dialog.glade
===================================================================
--- gnunet-gtk/contrib/open_directory_dialog.glade 2010-06-27 13:13:07 UTC
(rev 11975)
+++ gnunet-gtk/contrib/open_directory_dialog.glade 2010-06-27 13:13:31 UTC
(rev 11976)
@@ -2,10 +2,13 @@
<interface>
<requires lib="gtk+" version="2.20"/>
<!-- interface-naming-policy project-wide -->
+ <object class="GtkFileFilter" id="gnunet_directory_filter"/>
<object class="GtkFileChooserDialog" id="GNUNET_GTK_open_directory_dialog">
+ <property name="can_default">True</property>
<property name="border_width">5</property>
<property name="type_hint">normal</property>
<property name="has_separator">False</property>
+ <property name="filter">gnunet_directory_filter</property>
<property name="create_folders">False</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox3">
@@ -38,6 +41,7 @@
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
Modified: gnunet-gtk/src/fs_event_handler.c
===================================================================
--- gnunet-gtk/src/fs_event_handler.c 2010-06-27 13:13:07 UTC (rev 11975)
+++ gnunet-gtk/src/fs_event_handler.c 2010-06-27 13:13:31 UTC (rev 11976)
@@ -637,17 +637,20 @@
/**
- * Stop completed downloads (or those that failed).
+ * Stop completed downloads (or those that failed). Should
+ * iterate over the underlying tree store and stop all
+ * completed entries. Furthermore, if the resulting tree
+ * store is empty and has no search associated with it,
+ * the tab should be closed.
*/
static void
clear_downloads (GtkButton *button,
gpointer user_data)
{
struct SearchTab *tab = user_data;
- if (tab->sc != NULL)
- {
- }
- GNUNET_break (0);
+
+ GNUNET_assert (tab != NULL);
+ GNUNET_break (0); /* not implemented */
}
@@ -749,6 +752,8 @@
"_search_result_label_clear_button"));
g_signal_connect(G_OBJECT(tab->clear_button), "clicked",
G_CALLBACK(clear_downloads), tab);
+ /* FIXME: clear not implemented, hence not visible... */
+ gtk_widget_set_visible (tab->clear_button, FALSE);
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",
@@ -921,6 +926,8 @@
utab = setup_search (NULL, NULL);
gtk_widget_set_visible (utab->close_button,
FALSE);
+ gtk_widget_set_visible (utab->pause_button,
+ FALSE);
}
else
{
Modified: gnunet-gtk/src/main_window_open_directory.c
===================================================================
--- gnunet-gtk/src/main_window_open_directory.c 2010-06-27 13:13:07 UTC (rev
11975)
+++ gnunet-gtk/src/main_window_open_directory.c 2010-06-27 13:13:31 UTC (rev
11976)
@@ -98,6 +98,7 @@
char *filename;
struct GNUNET_DISK_FileHandle *fh;
struct GNUNET_DISK_MapHandle *mh;
+ GtkFileFilter *ff;
uint64_t fsize;
void * ddata;
@@ -109,6 +110,10 @@
}
ad = GTK_WIDGET (gtk_builder_get_object (builder,
"GNUNET_GTK_open_directory_dialog"));
+ ff = GTK_FILE_FILTER (gtk_builder_get_object (builder,
+ "gnunet_directory_filter"));
+ /* FIXME: some day, write a custom file filter for gnunet-directories... */
+ gtk_file_filter_add_pattern (ff, "*" GNUNET_FS_DIRECTORY_EXT);
if (GTK_RESPONSE_OK != gtk_dialog_run (GTK_DIALOG (ad)))
{
gtk_widget_destroy (ad);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r11976 - in gnunet-gtk: contrib src,
gnunet <=