diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/fs/fs.c | 38 | ||||
-rw-r--r-- | src/plugins/fs/search.c | 42 |
2 files changed, 52 insertions, 28 deletions
diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c index 1bf8877f..4514bb9a 100644 --- a/src/plugins/fs/fs.c +++ b/src/plugins/fs/fs.c | |||
@@ -461,39 +461,43 @@ static void fs_summary_start() { | |||
461 | NULL, | 461 | NULL, |
462 | NULL, | 462 | NULL, |
463 | 0); | 463 | 0); |
464 | renderer = gtk_cell_renderer_progress_new(); | 464 | |
465 | renderer = gtk_cell_renderer_text_new(); | ||
466 | g_object_set (renderer, "xalign", 1.00, NULL); | ||
465 | col = gtk_tree_view_insert_column_with_attributes(downloadList, | 467 | col = gtk_tree_view_insert_column_with_attributes(downloadList, |
466 | -1, | 468 | -1, |
467 | _("Name"), | 469 | _("Size"), |
468 | renderer, | 470 | renderer, |
469 | "value", DOWNLOAD_PROGRESS, | 471 | "text", DOWNLOAD_HSIZE, |
470 | "text", DOWNLOAD_SHORTNAME, | ||
471 | NULL); | 472 | NULL); |
473 | |||
472 | column = gtk_tree_view_get_column(downloadList, | 474 | column = gtk_tree_view_get_column(downloadList, |
473 | col - 1); | 475 | col - 1); |
474 | gtk_tree_view_column_set_resizable(column, TRUE); | 476 | gtk_tree_view_column_set_resizable(column, TRUE); |
475 | gtk_tree_view_column_set_clickable(column, TRUE); | 477 | gtk_tree_view_column_set_clickable(column, TRUE); |
476 | gtk_tree_view_column_set_reorderable(column, TRUE); | 478 | gtk_tree_view_column_set_reorderable(column, TRUE); |
477 | gtk_tree_view_column_set_sort_column_id(column, DOWNLOAD_PROGRESS); | 479 | gtk_tree_view_column_set_sort_column_id(column, DOWNLOAD_SIZE); |
478 | /*gtk_tree_view_column_set_sort_indicator(column, TRUE);*/ | ||
479 | gtk_tree_view_column_set_resizable(column, TRUE); | 480 | gtk_tree_view_column_set_resizable(column, TRUE); |
480 | renderer = gtk_cell_renderer_text_new(); | 481 | |
481 | g_object_set (renderer, "xalign", 1.00, NULL); | 482 | renderer = gtk_cell_renderer_progress_new(); |
482 | col = gtk_tree_view_insert_column_with_attributes(downloadList, | 483 | col = gtk_tree_view_insert_column_with_attributes(downloadList, |
483 | -1, | 484 | -1, |
484 | _("Size"), | 485 | _("Name"), |
485 | renderer, | 486 | renderer, |
486 | "text", DOWNLOAD_HSIZE, | 487 | "value", DOWNLOAD_PROGRESS, |
488 | "text", DOWNLOAD_SHORTNAME, | ||
487 | NULL); | 489 | NULL); |
488 | 490 | g_object_set(G_OBJECT(renderer), | |
491 | "width", 400, | ||
492 | NULL); | ||
489 | column = gtk_tree_view_get_column(downloadList, | 493 | column = gtk_tree_view_get_column(downloadList, |
490 | col - 1); | 494 | col - 1); |
491 | gtk_tree_view_column_set_resizable(column, TRUE); | 495 | gtk_tree_view_column_set_resizable(column, TRUE); |
492 | gtk_tree_view_column_set_clickable(column, TRUE); | 496 | gtk_tree_view_column_set_clickable(column, TRUE); |
493 | gtk_tree_view_column_set_reorderable(column, TRUE); | 497 | gtk_tree_view_column_set_reorderable(column, TRUE); |
494 | gtk_tree_view_column_set_sort_column_id(column, DOWNLOAD_SIZE); | 498 | gtk_tree_view_column_set_sort_column_id(column, DOWNLOAD_PROGRESS); |
495 | /*gtk_tree_view_column_set_sort_indicator(column, TRUE);*/ | ||
496 | gtk_tree_view_column_set_resizable(column, TRUE); | 499 | gtk_tree_view_column_set_resizable(column, TRUE); |
500 | |||
497 | renderer = gtk_cell_renderer_text_new(); | 501 | renderer = gtk_cell_renderer_text_new(); |
498 | col = gtk_tree_view_insert_column_with_attributes(downloadList, | 502 | col = gtk_tree_view_insert_column_with_attributes(downloadList, |
499 | -1, | 503 | -1, |
@@ -501,11 +505,15 @@ static void fs_summary_start() { | |||
501 | renderer, | 505 | renderer, |
502 | "text", DOWNLOAD_URISTRING, | 506 | "text", DOWNLOAD_URISTRING, |
503 | NULL); | 507 | NULL); |
508 | g_object_set(G_OBJECT(renderer), | ||
509 | "wrap-width", 30, | ||
510 | "width-chars", 30, | ||
511 | "ellipsize", PANGO_ELLIPSIZE_END, | ||
512 | NULL); | ||
504 | column = gtk_tree_view_get_column(downloadList, | 513 | column = gtk_tree_view_get_column(downloadList, |
505 | col - 1); | 514 | col - 1); |
506 | gtk_tree_view_column_set_resizable(column, TRUE); | 515 | gtk_tree_view_column_set_resizable(column, TRUE); |
507 | gtk_tree_view_column_set_reorderable(column, TRUE); | 516 | gtk_tree_view_column_set_reorderable(column, TRUE); |
508 | /*gtk_tree_view_column_set_sort_indicator(column, TRUE);*/ | ||
509 | gtk_tree_view_column_set_resizable(column, TRUE); | 517 | gtk_tree_view_column_set_resizable(column, TRUE); |
510 | 518 | ||
511 | /* upload summary setup */ | 519 | /* upload summary setup */ |
@@ -531,6 +539,7 @@ static void fs_summary_start() { | |||
531 | NULL, | 539 | NULL, |
532 | NULL, | 540 | NULL, |
533 | 0); | 541 | 0); |
542 | |||
534 | renderer = gtk_cell_renderer_progress_new(); | 543 | renderer = gtk_cell_renderer_progress_new(); |
535 | col = gtk_tree_view_insert_column_with_attributes(uploadList, | 544 | col = gtk_tree_view_insert_column_with_attributes(uploadList, |
536 | -1, | 545 | -1, |
@@ -542,6 +551,7 @@ static void fs_summary_start() { | |||
542 | gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(uploadList, | 551 | gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(uploadList, |
543 | col - 1), | 552 | col - 1), |
544 | TRUE); | 553 | TRUE); |
554 | |||
545 | renderer = gtk_cell_renderer_text_new(); | 555 | renderer = gtk_cell_renderer_text_new(); |
546 | col = gtk_tree_view_insert_column_with_attributes(uploadList, | 556 | col = gtk_tree_view_insert_column_with_attributes(uploadList, |
547 | -1, | 557 | -1, |
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c index 5c2b0df7..5f409413 100644 --- a/src/plugins/fs/search.c +++ b/src/plugins/fs/search.c | |||
@@ -469,6 +469,11 @@ fs_search_started(struct FSUI_SearchList * fsui_list, | |||
469 | renderer, | 469 | renderer, |
470 | "text", SEARCH_NAME, | 470 | "text", SEARCH_NAME, |
471 | NULL); | 471 | NULL); |
472 | g_object_set(G_OBJECT(renderer), | ||
473 | "wrap-width", 45, | ||
474 | "width-chars", 45, | ||
475 | "ellipsize", PANGO_ELLIPSIZE_END, | ||
476 | NULL); | ||
472 | column = gtk_tree_view_get_column(list->treeview, | 477 | column = gtk_tree_view_get_column(list->treeview, |
473 | col - 1); | 478 | col - 1); |
474 | gtk_tree_view_column_set_resizable(column, TRUE); | 479 | gtk_tree_view_column_set_resizable(column, TRUE); |
@@ -500,6 +505,11 @@ fs_search_started(struct FSUI_SearchList * fsui_list, | |||
500 | renderer, | 505 | renderer, |
501 | "text", SEARCH_MIME, | 506 | "text", SEARCH_MIME, |
502 | NULL); | 507 | NULL); |
508 | g_object_set(G_OBJECT(renderer), | ||
509 | "wrap-width", 30, | ||
510 | "width-chars", 30, | ||
511 | "ellipsize", PANGO_ELLIPSIZE_END, | ||
512 | NULL); | ||
503 | column = gtk_tree_view_get_column(list->treeview, | 513 | column = gtk_tree_view_get_column(list->treeview, |
504 | col - 1); | 514 | col - 1); |
505 | gtk_tree_view_column_set_resizable(column, TRUE); | 515 | gtk_tree_view_column_set_resizable(column, TRUE); |
@@ -507,20 +517,6 @@ fs_search_started(struct FSUI_SearchList * fsui_list, | |||
507 | gtk_tree_view_column_set_reorderable(column, TRUE); | 517 | gtk_tree_view_column_set_reorderable(column, TRUE); |
508 | gtk_tree_view_column_set_sort_column_id(column, SEARCH_MIME); | 518 | gtk_tree_view_column_set_sort_column_id(column, SEARCH_MIME); |
509 | 519 | ||
510 | renderer = gtk_cell_renderer_text_new(); | ||
511 | col = gtk_tree_view_insert_column_with_attributes(list->treeview, | ||
512 | -1, | ||
513 | _("Meta-data"), | ||
514 | renderer, | ||
515 | "text", SEARCH_DESC, | ||
516 | NULL); | ||
517 | column = gtk_tree_view_get_column(list->treeview, | ||
518 | col - 1); | ||
519 | gtk_tree_view_column_set_resizable(column, TRUE); | ||
520 | gtk_tree_view_column_set_clickable(column, TRUE); | ||
521 | gtk_tree_view_column_set_reorderable(column, TRUE); | ||
522 | gtk_tree_view_column_set_sort_column_id(column, SEARCH_DESC); | ||
523 | /*gtk_tree_view_column_set_sort_indicator(column, TRUE);*/ | ||
524 | if (YES != GC_get_configuration_value_yesno(cfg, | 520 | if (YES != GC_get_configuration_value_yesno(cfg, |
525 | "GNUNET-GTK", | 521 | "GNUNET-GTK", |
526 | "DISABLE-PREVIEWS", | 522 | "DISABLE-PREVIEWS", |
@@ -539,6 +535,24 @@ fs_search_started(struct FSUI_SearchList * fsui_list, | |||
539 | gtk_tree_view_column_set_resizable(column, TRUE); | 535 | gtk_tree_view_column_set_resizable(column, TRUE); |
540 | } | 536 | } |
541 | 537 | ||
538 | renderer = gtk_cell_renderer_text_new(); | ||
539 | col = gtk_tree_view_insert_column_with_attributes(list->treeview, | ||
540 | -1, | ||
541 | _("Meta-data"), | ||
542 | renderer, | ||
543 | "text", SEARCH_DESC, | ||
544 | NULL); | ||
545 | column = gtk_tree_view_get_column(list->treeview, | ||
546 | col - 1); | ||
547 | g_object_set(G_OBJECT(renderer), | ||
548 | "wrap-width", 60, | ||
549 | "width-chars", 60, | ||
550 | "ellipsize", PANGO_ELLIPSIZE_NONE, | ||
551 | NULL); | ||
552 | gtk_tree_view_column_set_resizable(column, TRUE); | ||
553 | gtk_tree_view_column_set_clickable(column, TRUE); | ||
554 | gtk_tree_view_column_set_reorderable(column, TRUE); | ||
555 | gtk_tree_view_column_set_sort_column_id(column, SEARCH_DESC); | ||
542 | 556 | ||
543 | /* add entry in search summary */ | 557 | /* add entry in search summary */ |
544 | gtk_list_store_append(search_summary, | 558 | gtk_list_store_append(search_summary, |