aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/fs/fs.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/fs/fs.c')
-rw-r--r--src/plugins/fs/fs.c87
1 files changed, 57 insertions, 30 deletions
diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c
index 6026ad7d..015f26c5 100644
--- a/src/plugins/fs/fs.c
+++ b/src/plugins/fs/fs.c
@@ -212,7 +212,7 @@ saveEventProcessor (void *cls)
212 case GNUNET_FSUI_upload_progress: 212 case GNUNET_FSUI_upload_progress:
213 fs_upload_update (event->data.UploadProgress.uc.cctx, 213 fs_upload_update (event->data.UploadProgress.uc.cctx,
214 event->data.UploadProgress.completed, 214 event->data.UploadProgress.completed,
215 event->data.UploadProgress.total); 215 event->data.UploadProgress.total);
216 break; 216 break;
217 case GNUNET_FSUI_upload_completed: 217 case GNUNET_FSUI_upload_completed:
218 fs_upload_complete (event->data.UploadCompleted.uc.cctx, 218 fs_upload_complete (event->data.UploadCompleted.uc.cctx,
@@ -251,8 +251,8 @@ saveEventProcessor (void *cls)
251 default: 251 default:
252 GNUNET_GEBREAK (ectx, 0); 252 GNUNET_GEBREAK (ectx, 0);
253 GNUNET_GELOG (ectx, 253 GNUNET_GELOG (ectx,
254 GNUNET_GEERROR, 254 GNUNET_GEERROR,
255 _("Unhandled (unknown) FSUI event: %u.\n"), event->type); 255 _("Unhandled (unknown) FSUI event: %u.\n"), event->type);
256 break; 256 break;
257 } 257 }
258 return ret; 258 return ret;
@@ -277,12 +277,17 @@ on_upload_summary_selection_changed (gpointer signal, gpointer cls)
277 selection = 277 selection =
278 gtk_tree_view_get_selection (GTK_TREE_VIEW 278 gtk_tree_view_get_selection (GTK_TREE_VIEW
279 (glade_xml_get_widget 279 (glade_xml_get_widget
280 (GNUNET_GTK_get_main_glade_XML (), "activeUploadsList"))); 280 (GNUNET_GTK_get_main_glade_XML (),
281 button = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "cancelUploadButton"); 281 "activeUploadsList")));
282 button =
283 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
284 "cancelUploadButton");
282 gtk_widget_set_sensitive (button, 285 gtk_widget_set_sensitive (button,
283 gtk_tree_selection_count_selected_rows (selection) 286 gtk_tree_selection_count_selected_rows (selection)
284 > 0); 287 > 0);
285 button = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "stopUploadButton"); 288 button =
289 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
290 "stopUploadButton");
286 gtk_widget_set_sensitive (button, 291 gtk_widget_set_sensitive (button,
287 gtk_tree_selection_count_selected_rows (selection) 292 gtk_tree_selection_count_selected_rows (selection)
288 > 0); 293 > 0);
@@ -301,12 +306,17 @@ on_download_summary_selection_changed (gpointer signal, gpointer cls)
301 selection = 306 selection =
302 gtk_tree_view_get_selection (GTK_TREE_VIEW 307 gtk_tree_view_get_selection (GTK_TREE_VIEW
303 (glade_xml_get_widget 308 (glade_xml_get_widget
304 (GNUNET_GTK_get_main_glade_XML (), "activeDownloadsList"))); 309 (GNUNET_GTK_get_main_glade_XML (),
305 button = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "abortDownloadButton"); 310 "activeDownloadsList")));
311 button =
312 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
313 "abortDownloadButton");
306 gtk_widget_set_sensitive (button, 314 gtk_widget_set_sensitive (button,
307 gtk_tree_selection_count_selected_rows (selection) 315 gtk_tree_selection_count_selected_rows (selection)
308 > 0); 316 > 0);
309 button = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "stopDownloadButton"); 317 button =
318 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
319 "stopDownloadButton");
310 gtk_widget_set_sensitive (button, 320 gtk_widget_set_sensitive (button,
311 gtk_tree_selection_count_selected_rows (selection) 321 gtk_tree_selection_count_selected_rows (selection)
312 > 0); 322 > 0);
@@ -325,12 +335,17 @@ on_search_summary_selection_changed (gpointer signal, gpointer cls)
325 selection = 335 selection =
326 gtk_tree_view_get_selection (GTK_TREE_VIEW 336 gtk_tree_view_get_selection (GTK_TREE_VIEW
327 (glade_xml_get_widget 337 (glade_xml_get_widget
328 (GNUNET_GTK_get_main_glade_XML (), "activeSearchesSummary"))); 338 (GNUNET_GTK_get_main_glade_XML (),
329 button = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "cancelSearchButton"); 339 "activeSearchesSummary")));
340 button =
341 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
342 "cancelSearchButton");
330 gtk_widget_set_sensitive (button, 343 gtk_widget_set_sensitive (button,
331 gtk_tree_selection_count_selected_rows (selection) 344 gtk_tree_selection_count_selected_rows (selection)
332 > 0); 345 > 0);
333 button = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "stopSearchButton"); 346 button =
347 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
348 "stopSearchButton");
334 gtk_widget_set_sensitive (button, 349 gtk_widget_set_sensitive (button,
335 gtk_tree_selection_count_selected_rows (selection) 350 gtk_tree_selection_count_selected_rows (selection)
336 > 0); 351 > 0);
@@ -423,16 +438,20 @@ fs_summary_start ()
423 438
424 /* keyword list setup */ 439 /* keyword list setup */
425 searchCB 440 searchCB
426 = GTK_COMBO_BOX_ENTRY (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), 441 =
427 "fssearchKeywordComboBoxEntry")); 442 GTK_COMBO_BOX_ENTRY (glade_xml_get_widget
443 (GNUNET_GTK_get_main_glade_XML (),
444 "fssearchKeywordComboBoxEntry"));
428 model = gtk_list_store_new (1, G_TYPE_STRING /* search string */ ); 445 model = gtk_list_store_new (1, G_TYPE_STRING /* search string */ );
429 gtk_combo_box_set_model (GTK_COMBO_BOX (searchCB), GTK_TREE_MODEL (model)); 446 gtk_combo_box_set_model (GTK_COMBO_BOX (searchCB), GTK_TREE_MODEL (model));
430 gtk_combo_box_entry_set_text_column (searchCB, 0); 447 gtk_combo_box_entry_set_text_column (searchCB, 0);
431 448
432 /* search namespace selection setup */ 449 /* search namespace selection setup */
433 searchCB 450 searchCB
434 = GTK_COMBO_BOX_ENTRY (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), 451 =
435 "searchNamespaceComboBoxEntry")); 452 GTK_COMBO_BOX_ENTRY (glade_xml_get_widget
453 (GNUNET_GTK_get_main_glade_XML (),
454 "searchNamespaceComboBoxEntry"));
436 455
437 model = gtk_list_store_new (NS_SEARCH_NUM, G_TYPE_STRING, /* what we show */ 456 model = gtk_list_store_new (NS_SEARCH_NUM, G_TYPE_STRING, /* what we show */
438 G_TYPE_STRING, /* GNUNET_EncName of namespace */ 457 G_TYPE_STRING, /* GNUNET_EncName of namespace */
@@ -442,8 +461,10 @@ fs_summary_start ()
442 gtk_combo_box_entry_set_text_column (searchCB, NS_SEARCH_DESCRIPTION); 461 gtk_combo_box_entry_set_text_column (searchCB, NS_SEARCH_DESCRIPTION);
443 462
444 /* search summary setup */ 463 /* search summary setup */
445 searchList = GTK_TREE_VIEW (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), 464 searchList =
446 "activeSearchesSummary")); 465 GTK_TREE_VIEW (glade_xml_get_widget
466 (GNUNET_GTK_get_main_glade_XML (),
467 "activeSearchesSummary"));
447 search_summary = gtk_list_store_new (SEARCH_SUMMARY_NUM, G_TYPE_STRING, /* name */ 468 search_summary = gtk_list_store_new (SEARCH_SUMMARY_NUM, G_TYPE_STRING, /* name */
448 G_TYPE_INT, /* # results */ 469 G_TYPE_INT, /* # results */
449 G_TYPE_POINTER); /* internal: search list */ 470 G_TYPE_POINTER); /* internal: search list */
@@ -486,8 +507,9 @@ fs_summary_start ()
486 gtk_tree_view_column_set_resizable (column, TRUE); 507 gtk_tree_view_column_set_resizable (column, TRUE);
487 508
488 /* download summary setup */ 509 /* download summary setup */
489 downloadList = GTK_TREE_VIEW (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), 510 downloadList =
490 "activeDownloadsList")); 511 GTK_TREE_VIEW (glade_xml_get_widget
512 (GNUNET_GTK_get_main_glade_XML (), "activeDownloadsList"));
491 download_summary = gtk_tree_store_new (DOWNLOAD_NUM, G_TYPE_STRING, /* name (full-path file name) */ 513 download_summary = gtk_tree_store_new (DOWNLOAD_NUM, G_TYPE_STRING, /* name (full-path file name) */
492 G_TYPE_STRING, /* name (user-friendly name) */ 514 G_TYPE_STRING, /* name (user-friendly name) */
493 G_TYPE_UINT64, /* size */ 515 G_TYPE_UINT64, /* size */
@@ -553,10 +575,10 @@ fs_summary_start ()
553 gtk_tree_view_column_set_resizable (column, TRUE); 575 gtk_tree_view_column_set_resizable (column, TRUE);
554 576
555 /* upload summary setup */ 577 /* upload summary setup */
556 uploadList = GTK_TREE_VIEW (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), 578 uploadList =
557 "activeUploadsList")); 579 GTK_TREE_VIEW (glade_xml_get_widget
558 g_signal_connect_swapped (uploadList, 580 (GNUNET_GTK_get_main_glade_XML (), "activeUploadsList"));
559 "button-press-event", 581 g_signal_connect_swapped (uploadList, "button-press-event",
560 G_CALLBACK (upload_click_handler), uploadList); 582 G_CALLBACK (upload_click_handler), uploadList);
561 upload_summary = gtk_tree_store_new (UPLOAD_NUM, G_TYPE_STRING, /* filename */ 583 upload_summary = gtk_tree_store_new (UPLOAD_NUM, G_TYPE_STRING, /* filename */
562 G_TYPE_INT, /* progress */ 584 G_TYPE_INT, /* progress */
@@ -594,7 +616,9 @@ fs_summary_start ()
594 TRUE); 616 TRUE);
595 /* upload entry setup */ 617 /* upload entry setup */
596 uploadEntry 618 uploadEntry
597 = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "uploadFilenameComboBoxEntry"); 619 =
620 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
621 "uploadFilenameComboBoxEntry");
598 622
599 model = gtk_list_store_new (1, G_TYPE_STRING); 623 model = gtk_list_store_new (1, G_TYPE_STRING);
600 gtk_combo_box_set_model (GTK_COMBO_BOX (uploadEntry), 624 gtk_combo_box_set_model (GTK_COMBO_BOX (uploadEntry),
@@ -644,15 +668,16 @@ init_fs (struct GNUNET_GEContext *e, struct GNUNET_GC_Configuration *c)
644 GNUNET_CO_init (ectx, cfg); 668 GNUNET_CO_init (ectx, cfg);
645 tab = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "fsnotebook"); 669 tab = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "fsnotebook");
646 gtk_widget_show (tab); 670 gtk_widget_show (tab);
647 book = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "mainnotebook"); 671 book =
672 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "mainnotebook");
648 num = gtk_notebook_get_current_page (GTK_NOTEBOOK (book)); 673 num = gtk_notebook_get_current_page (GTK_NOTEBOOK (book));
649 gtk_notebook_set_current_page (GTK_NOTEBOOK (book), 1); 674 gtk_notebook_set_current_page (GTK_NOTEBOOK (book), 1);
650 gtk_notebook_set_current_page (GTK_NOTEBOOK (book), num); 675 gtk_notebook_set_current_page (GTK_NOTEBOOK (book), num);
651 fs_summary_start (); 676 fs_summary_start ();
652 fs_collection_start (); 677 fs_collection_start ();
653 fs_namespace_start (); 678 fs_namespace_start ();
654 ctx = GNUNET_FSUI_start (ectx, cfg, "gnunet-gtk", 8, /* FIXME: allow user to configure download parallelism */ 679 ctx = GNUNET_FSUI_start (ectx, cfg, "gnunet-gtk", 8, /* FIXME: allow user to configure download parallelism */
655 GNUNET_YES, &eventProcessor, NULL); 680 GNUNET_YES, &eventProcessor, NULL);
656} 681}
657 682
658static void * 683static void *
@@ -692,13 +717,15 @@ getColorCode (enum GNUNET_URITRACK_STATE state)
692 return "cyan"; 717 return "cyan";
693 if ((state & GNUNET_URITRACK_DOWNLOAD_STARTED) && 718 if ((state & GNUNET_URITRACK_DOWNLOAD_STARTED) &&
694 (0 == (state & 719 (0 == (state &
695 (GNUNET_URITRACK_DOWNLOAD_COMPLETED | GNUNET_URITRACK_DOWNLOAD_ABORTED)))) 720 (GNUNET_URITRACK_DOWNLOAD_COMPLETED |
721 GNUNET_URITRACK_DOWNLOAD_ABORTED))))
696 return "yellow"; 722 return "yellow";
697 if (state & GNUNET_URITRACK_DOWNLOAD_COMPLETED) 723 if (state & GNUNET_URITRACK_DOWNLOAD_COMPLETED)
698 return "springgreen"; 724 return "springgreen";
699 if (state & GNUNET_URITRACK_DOWNLOAD_ABORTED) 725 if (state & GNUNET_URITRACK_DOWNLOAD_ABORTED)
700 return "red"; 726 return "red";
701 if (state & (GNUNET_URITRACK_SEARCH_RESULT | GNUNET_URITRACK_DIRECTORY_FOUND)) 727 if (state &
728 (GNUNET_URITRACK_SEARCH_RESULT | GNUNET_URITRACK_DIRECTORY_FOUND))
702 return "gray"; 729 return "gray";
703 return "white"; 730 return "white";
704} 731}