"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/libs/tagging.c" between
darktable-3.0.0.rc1.tar.xz and darktable-3.0.0.rc2.tar.xz

About: darktable is an open source photography workflow application and RAW developer. A virtual lighttable and darkroom for photographers. Release candidate.

tagging.c  (darktable-3.0.0.rc1.tar.xz):tagging.c  (darktable-3.0.0.rc2.tar.xz)
skipping to change at line 1163 skipping to change at line 1163
gtk_tree_model_get(model, &iter, DT_LIB_TAGGING_COL_PATH, &tagname, gtk_tree_model_get(model, &iter, DT_LIB_TAGGING_COL_PATH, &tagname,
DT_LIB_TAGGING_COL_ID, &tagid, -1); DT_LIB_TAGGING_COL_ID, &tagid, -1);
if (!tagid) return; if (!tagid) return;
const guint img_count = dt_tag_remove(tagid, FALSE); const guint img_count = dt_tag_remove(tagid, FALSE);
if (img_count > 0 || dt_conf_get_bool("plugins/lighttable/tagging/ask_before_d elete_tag")) if (img_count > 0 || dt_conf_get_bool("plugins/lighttable/tagging/ask_before_d elete_tag"))
{ {
GtkWidget *win = dt_ui_main_window(darktable.gui->ui); GtkWidget *win = dt_ui_main_window(darktable.gui->ui);
GtkWidget *dialog = gtk_dialog_new_with_buttons(_("delete tag?"), GTK_WINDOW (win), GTK_DIALOG_DESTROY_WITH_PARENT, GtkWidget *dialog = gtk_dialog_new_with_buttons(_("delete tag?"), GTK_WINDOW (win), GTK_DIALOG_DESTROY_WITH_PARENT,
_("delete"), GTK_RESPONSE_YES, _("cancel"), GT K_RESPONSE_NONE, NULL); _("cancel"), GTK_RESPONSE_NONE, _("delete"), G TK_RESPONSE_YES, NULL);
gtk_window_set_default_size(GTK_WINDOW(dialog), 300, -1); gtk_window_set_default_size(GTK_WINDOW(dialog), 300, -1);
GtkWidget *area = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); GtkWidget *area = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
GtkWidget *vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8); GtkWidget *vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 8); gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
gtk_container_add(GTK_CONTAINER(area), vbox); gtk_container_add(GTK_CONTAINER(area), vbox);
text = g_strdup_printf(_("tag: %s "), tagname); text = g_strdup_printf(_("tag: %s "), tagname);
label = gtk_label_new(text); label = gtk_label_new(text);
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, TRUE, 0);
g_free(text); g_free(text);
skipping to change at line 1260 skipping to change at line 1260
gtk_tree_model_get(model, &iter, DT_LIB_TAGGING_COL_PATH, &tagname, gtk_tree_model_get(model, &iter, DT_LIB_TAGGING_COL_PATH, &tagname,
DT_LIB_TAGGING_COL_ID, &tagid, -1); DT_LIB_TAGGING_COL_ID, &tagid, -1);
gint tag_count = 0; gint tag_count = 0;
gint img_count = 0; gint img_count = 0;
dt_tag_count_tags_images(tagname, &tag_count, &img_count); dt_tag_count_tags_images(tagname, &tag_count, &img_count);
if (tag_count == 0) return; if (tag_count == 0) return;
GtkWidget *win = dt_ui_main_window(darktable.gui->ui); GtkWidget *win = dt_ui_main_window(darktable.gui->ui);
GtkWidget *dialog = gtk_dialog_new_with_buttons( _("delete branch"), GTK_WINDO W(win), GTK_DIALOG_DESTROY_WITH_PARENT, GtkWidget *dialog = gtk_dialog_new_with_buttons( _("delete branch"), GTK_WINDO W(win), GTK_DIALOG_DESTROY_WITH_PARENT,
_("delete"), GTK_RESPONSE_YES, _("cancel"), GTK_ RESPONSE_NONE, NULL); _("cancel"), GTK_RESPONSE_NONE, _("delete"), GTK _RESPONSE_YES, NULL);
gtk_window_set_default_size(GTK_WINDOW(dialog), 300, -1); gtk_window_set_default_size(GTK_WINDOW(dialog), 300, -1);
GtkWidget *area = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); GtkWidget *area = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
GtkWidget *vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8); GtkWidget *vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 8); gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
gtk_container_add(GTK_CONTAINER(area), vbox); gtk_container_add(GTK_CONTAINER(area), vbox);
text = g_strdup_printf(_("tag: %s "), tagname); text = g_strdup_printf(_("tag: %s "), tagname);
label = gtk_label_new(text); label = gtk_label_new(text);
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, TRUE, 0);
g_free(text); g_free(text);
skipping to change at line 1348 skipping to change at line 1348
GtkTreeModel *model = NULL; GtkTreeModel *model = NULL;
GtkTreeView *view = d->dictionary_view; GtkTreeView *view = d->dictionary_view;
GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(view)) ; GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(view)) ;
if(!gtk_tree_selection_get_selected(selection, &model, &iter)) return; if(!gtk_tree_selection_get_selected(selection, &model, &iter)) return;
gtk_tree_model_get(model, &iter, DT_LIB_TAGGING_COL_TAG, &tagname, gtk_tree_model_get(model, &iter, DT_LIB_TAGGING_COL_TAG, &tagname,
DT_LIB_TAGGING_COL_PATH, &path, DT_LIB_TAGGING_COL_ID, &tagid, -1); DT_LIB_TAGGING_COL_PATH, &path, DT_LIB_TAGGING_COL_ID, &tagid, -1);
GtkWidget *win = dt_ui_main_window(darktable.gui->ui); GtkWidget *win = dt_ui_main_window(darktable.gui->ui);
GtkWidget *dialog = gtk_dialog_new_with_buttons(_("create tag"), GTK_WINDOW(wi n), GTK_DIALOG_DESTROY_WITH_PARENT, GtkWidget *dialog = gtk_dialog_new_with_buttons(_("create tag"), GTK_WINDOW(wi n), GTK_DIALOG_DESTROY_WITH_PARENT,
_("save"), GTK_RESPONSE_YES, _("cancel"), GTK_RESPONSE_NONE, NULL); _("cancel"), GTK_RESPONSE_NONE, _("save") , GTK_RESPONSE_YES, NULL);
gtk_window_set_default_size(GTK_WINDOW(dialog), 300, -1); gtk_window_set_default_size(GTK_WINDOW(dialog), 300, -1);
GtkWidget *area = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); GtkWidget *area = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
GtkWidget *vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8); GtkWidget *vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 8); gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
gtk_container_add(GTK_CONTAINER(area), vbox); gtk_container_add(GTK_CONTAINER(area), vbox);
GtkWidget *box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); GtkWidget *box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(vbox), box, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), box, FALSE, TRUE, 0);
label = gtk_label_new(_("name: ")); label = gtk_label_new(_("name: "));
gtk_box_pack_start(GTK_BOX(box), label, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(box), label, FALSE, TRUE, 0);
skipping to change at line 1516 skipping to change at line 1516
DT_LIB_TAGGING_COL_SYNONYM, &synonyms_list, DT_LIB_TAGGING_COL_ID, &ta gid, -1); DT_LIB_TAGGING_COL_SYNONYM, &synonyms_list, DT_LIB_TAGGING_COL_ID, &ta gid, -1);
char *subtag = g_strrstr(tagname, "|"); char *subtag = g_strrstr(tagname, "|");
gint tag_count; gint tag_count;
gint img_count; gint img_count;
dt_tag_count_tags_images(tagname, &tag_count, &img_count); dt_tag_count_tags_images(tagname, &tag_count, &img_count);
if (tag_count == 0) return; if (tag_count == 0) return;
GtkWidget *win = dt_ui_main_window(darktable.gui->ui); GtkWidget *win = dt_ui_main_window(darktable.gui->ui);
GtkWidget *dialog = gtk_dialog_new_with_buttons(_("edit tag"), GTK_WINDOW(win) , GTK_DIALOG_DESTROY_WITH_PARENT, GtkWidget *dialog = gtk_dialog_new_with_buttons(_("edit tag"), GTK_WINDOW(win) , GTK_DIALOG_DESTROY_WITH_PARENT,
_("save"), GTK_RESPONSE_YES, _("cancel"), GTK_RESPONSE_NONE, NULL); _("cancel"), GTK_RESPONSE_NONE, _("save") , GTK_RESPONSE_YES, NULL);
gtk_window_set_default_size(GTK_WINDOW(dialog), 300, -1); gtk_window_set_default_size(GTK_WINDOW(dialog), 300, -1);
GtkWidget *area = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); GtkWidget *area = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
GtkWidget *vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8); GtkWidget *vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 8); gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
gtk_container_add(GTK_CONTAINER(area), vbox); gtk_container_add(GTK_CONTAINER(area), vbox);
text = g_strdup_printf(_("tag: %s "), tagname); text = g_strdup_printf(_("tag: %s "), tagname);
label = gtk_label_new(text); label = gtk_label_new(text);
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, TRUE, 0);
g_free(text); g_free(text);
skipping to change at line 1736 skipping to change at line 1736
gtk_tree_model_get(model, &iter, DT_LIB_TAGGING_COL_PATH, &tagname, gtk_tree_model_get(model, &iter, DT_LIB_TAGGING_COL_PATH, &tagname,
DT_LIB_TAGGING_COL_ID, &tagid, -1); DT_LIB_TAGGING_COL_ID, &tagid, -1);
gint tag_count; gint tag_count;
gint img_count; gint img_count;
dt_tag_count_tags_images(tagname, &tag_count, &img_count); dt_tag_count_tags_images(tagname, &tag_count, &img_count);
if (tag_count == 0) return; if (tag_count == 0) return;
GtkWidget *win = dt_ui_main_window(darktable.gui->ui); GtkWidget *win = dt_ui_main_window(darktable.gui->ui);
GtkWidget *dialog = gtk_dialog_new_with_buttons(_("rename path?"), GTK_WINDOW( win), GTK_DIALOG_DESTROY_WITH_PARENT, GtkWidget *dialog = gtk_dialog_new_with_buttons(_("rename path?"), GTK_WINDOW( win), GTK_DIALOG_DESTROY_WITH_PARENT,
_("rename"), GTK_RESPONSE_YES, _("cancel" ), GTK_RESPONSE_NONE, NULL); _("cancel"), GTK_RESPONSE_NONE, _("rename "), GTK_RESPONSE_YES, NULL);
gtk_window_set_default_size(GTK_WINDOW(dialog), 300, -1); gtk_window_set_default_size(GTK_WINDOW(dialog), 300, -1);
GtkWidget *area = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); GtkWidget *area = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
GtkWidget *vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8); GtkWidget *vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 8); gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
gtk_container_add(GTK_CONTAINER(area), vbox); gtk_container_add(GTK_CONTAINER(area), vbox);
text = g_strdup_printf(_("selected path: %s "), tagname); text = g_strdup_printf(_("selected path: %s "), tagname);
label = gtk_label_new(text); label = gtk_label_new(text);
gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, TRUE, 0);
g_free(text); g_free(text);
 End of changes. 5 change blocks. 
5 lines changed or deleted 5 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)