Mercurial > geeqie.yaz

comparison src/dupe.c @ 333:767b53cd9ab7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename thumbnails related options.
author zas_
date Sat, 12 Apr 2008 09:41:44 +0000
parents b16b9b8979e5
children 07490120df2d
comparison
equal deleted inserted replaced
332:3c4bad726e98 333:767b53cd9ab7
1325 dupe_window_update_progress(dw, _("Loading thumbs..."), 1325 dupe_window_update_progress(dw, _("Loading thumbs..."),
1326 length == 0 ? 0.0 : (gdouble)(row) / length, FALSE); 1326 length == 0 ? 0.0 : (gdouble)(row) / length, FALSE);
1327 1327
1328 dw->thumb_item = di; 1328 dw->thumb_item = di;
1329 thumb_loader_free(dw->thumb_loader); 1329 thumb_loader_free(dw->thumb_loader);
1330 dw->thumb_loader = thumb_loader_new(options->thumb_max_width, options->thumb_max_height); 1330 dw->thumb_loader = thumb_loader_new(options->thumbnails.max_width, options->thumbnails.max_height);
1331 1331
1332 thumb_loader_set_callbacks(dw->thumb_loader, 1332 thumb_loader_set_callbacks(dw->thumb_loader,
1333 dupe_thumb_done_cb, 1333 dupe_thumb_done_cb,
1334 dupe_thumb_error_cb, 1334 dupe_thumb_error_cb,
1335 NULL, 1335 NULL,
1391 if (di->width == 0 && di->height == 0) 1391 if (di->width == 0 && di->height == 0)
1392 { 1392 {
1393 di->width = gdk_pixbuf_get_width(pixbuf); 1393 di->width = gdk_pixbuf_get_width(pixbuf);
1394 di->height = gdk_pixbuf_get_height(pixbuf); 1394 di->height = gdk_pixbuf_get_height(pixbuf);
1395 } 1395 }
1396 if (options->enable_thumb_caching) 1396 if (options->thumbnails.enable_caching)
1397 { 1397 {
1398 dupe_item_write_cache(di); 1398 dupe_item_write_cache(di);
1399 } 1399 }
1400 1400
1401 image_sim_alternate_processing(di->simd); 1401 image_sim_alternate_processing(di->simd);
1449 if (!di->md5sum) 1449 if (!di->md5sum)
1450 { 1450 {
1451 dupe_window_update_progress(dw, _("Reading checksums..."), 1451 dupe_window_update_progress(dw, _("Reading checksums..."),
1452 dw->setup_count == 0 ? 0.0 : (gdouble)(dw->setup_n - 1) / dw->setup_count, FALSE); 1452 dw->setup_count == 0 ? 0.0 : (gdouble)(dw->setup_n - 1) / dw->setup_count, FALSE);
1453 1453
1454 if (options->enable_thumb_caching) 1454 if (options->thumbnails.enable_caching)
1455 { 1455 {
1456 dupe_item_read_cache(di); 1456 dupe_item_read_cache(di);
1457 if (di->md5sum) return TRUE; 1457 if (di->md5sum) return TRUE;
1458 } 1458 }
1459 1459
1460 di->md5sum = md5_text_from_file_utf8(di->fd->path, ""); 1460 di->md5sum = md5_text_from_file_utf8(di->fd->path, "");
1461 if (options->enable_thumb_caching) 1461 if (options->thumbnails.enable_caching)
1462 { 1462 {
1463 dupe_item_write_cache(di); 1463 dupe_item_write_cache(di);
1464 } 1464 }
1465 return TRUE; 1465 return TRUE;
1466 } 1466 }
1482 if (di->width == 0 && di->height == 0) 1482 if (di->width == 0 && di->height == 0)
1483 { 1483 {
1484 dupe_window_update_progress(dw, _("Reading dimensions..."), 1484 dupe_window_update_progress(dw, _("Reading dimensions..."),
1485 dw->setup_count == 0 ? 0.0 : (gdouble)(dw->setup_n - 1) / dw->setup_count, FALSE); 1485 dw->setup_count == 0 ? 0.0 : (gdouble)(dw->setup_n - 1) / dw->setup_count, FALSE);
1486 1486
1487 if (options->enable_thumb_caching) 1487 if (options->thumbnails.enable_caching)
1488 { 1488 {
1489 dupe_item_read_cache(di); 1489 dupe_item_read_cache(di);
1490 if (di->width != 0 || di->height != 0) return TRUE; 1490 if (di->width != 0 || di->height != 0) return TRUE;
1491 } 1491 }
1492 1492
1493 image_load_dimensions(di->fd, &di->width, &di->height); 1493 image_load_dimensions(di->fd, &di->width, &di->height);
1494 if (options->enable_thumb_caching) 1494 if (options->thumbnails.enable_caching)
1495 { 1495 {
1496 dupe_item_write_cache(di); 1496 dupe_item_write_cache(di);
1497 } 1497 }
1498 return TRUE; 1498 return TRUE;
1499 } 1499 }
1516 if (!di->simd) 1516 if (!di->simd)
1517 { 1517 {
1518 dupe_window_update_progress(dw, _("Reading similarity data..."), 1518 dupe_window_update_progress(dw, _("Reading similarity data..."),
1519 dw->setup_count == 0 ? 0.0 : (gdouble)dw->setup_n / dw->setup_count, FALSE); 1519 dw->setup_count == 0 ? 0.0 : (gdouble)dw->setup_n / dw->setup_count, FALSE);
1520 1520
1521 if (options->enable_thumb_caching) 1521 if (options->thumbnails.enable_caching)
1522 { 1522 {
1523 dupe_item_read_cache(di); 1523 dupe_item_read_cache(di);
1524 if (cache_sim_data_filled(di->simd)) 1524 if (cache_sim_data_filled(di->simd))
1525 { 1525 {
1526 image_sim_alternate_processing(di->simd); 1526 image_sim_alternate_processing(di->simd);
2749 GList *list; 2749 GList *list;
2750 2750
2751 column = gtk_tree_view_get_column(GTK_TREE_VIEW(listview), DUPE_COLUMN_THUMB - 1); 2751 column = gtk_tree_view_get_column(GTK_TREE_VIEW(listview), DUPE_COLUMN_THUMB - 1);
2752 if (!column) return; 2752 if (!column) return;
2753 2753
2754 gtk_tree_view_column_set_fixed_width(column, (thumb) ? options->thumb_max_width : 4); 2754 gtk_tree_view_column_set_fixed_width(column, (thumb) ? options->thumbnails.max_width : 4);
2755 2755
2756 list = gtk_tree_view_column_get_cell_renderers(column); 2756 list = gtk_tree_view_column_get_cell_renderers(column);
2757 if (!list) return; 2757 if (!list) return;
2758 cell = list->data; 2758 cell = list->data;
2759 g_list_free(list); 2759 g_list_free(list);
2760 2760
2761 g_object_set(G_OBJECT(cell), "height", (thumb) ? options->thumb_max_height : -1, NULL); 2761 g_object_set(G_OBJECT(cell), "height", (thumb) ? options->thumbnails.max_height : -1, NULL);
2762 gtk_tree_view_columns_autosize(GTK_TREE_VIEW(listview)); 2762 gtk_tree_view_columns_autosize(GTK_TREE_VIEW(listview));
2763 } 2763 }
2764 2764
2765 2765
2766 /* 2766 /*