Mercurial > geeqie.yaz

comparison src/utilops.c @ 254:9faf34f047b1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make the wmclass value unique among the code by defining it in main header file as GQ_WMCLASS. Before this patch, it was set using PACKAGE (="geeqie"), or by the hardcoded string "Geeqie". Now all Geeqie windows have the same value for wmclass.
author zas_
date Thu, 03 Apr 2008 23:29:14 +0000
parents 73efc1ba150f
children 9995c5fb202a
comparison
equal deleted inserted replaced
253:b932b6928e20 254:9faf34f047b1
294 GenericDialog *file_util_warning_dialog(const gchar *heading, const gchar *message, 294 GenericDialog *file_util_warning_dialog(const gchar *heading, const gchar *message,
295 const gchar *icon_stock_id, GtkWidget *parent) 295 const gchar *icon_stock_id, GtkWidget *parent)
296 { 296 {
297 GenericDialog *gd; 297 GenericDialog *gd;
298 298
299 gd = file_util_gen_dlg(heading, "Geeqie", "warning", parent, TRUE, NULL, NULL); 299 gd = file_util_gen_dlg(heading, GQ_WMCLASS, "warning", parent, TRUE, NULL, NULL);
300 generic_dialog_add_message(gd, icon_stock_id, heading, message); 300 generic_dialog_add_message(gd, icon_stock_id, heading, message);
301 generic_dialog_add_button(gd, GTK_STOCK_OK, NULL, file_util_warning_dialog_ok_cb, TRUE); 301 generic_dialog_add_button(gd, GTK_STOCK_OK, NULL, file_util_warning_dialog_ok_cb, TRUE);
302 if (place_dialogs_under_mouse) 302 if (place_dialogs_under_mouse)
303 { 303 {
304 gtk_window_set_position(GTK_WINDOW(gd->dialog), GTK_WIN_POS_MOUSE); 304 gtk_window_set_position(GTK_WINDOW(gd->dialog), GTK_WIN_POS_MOUSE);
642 static GenericDialog *file_util_move_multiple_confirm_dialog(FileDataMult *fdm) 642 static GenericDialog *file_util_move_multiple_confirm_dialog(FileDataMult *fdm)
643 { 643 {
644 GenericDialog *gd; 644 GenericDialog *gd;
645 GtkWidget *hbox; 645 GtkWidget *hbox;
646 646
647 gd = file_util_gen_dlg(_("Overwrite file"), "Geeqie", "dlg_confirm", 647 gd = file_util_gen_dlg(_("Overwrite file"), GQ_WMCLASS, "dlg_confirm",
648 NULL, TRUE, 648 NULL, TRUE,
649 file_util_move_multiple_cancel_cb, fdm); 649 file_util_move_multiple_cancel_cb, fdm);
650 650
651 generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION, 651 generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION,
652 _("Overwrite file?"), 652 _("Overwrite file?"),
724 { 724 {
725 title = _("Source to move matches destination"); 725 title = _("Source to move matches destination");
726 text = g_strdup_printf(_("Unable to move file:\n%s\nto itself."), fdm->dest); 726 text = g_strdup_printf(_("Unable to move file:\n%s\nto itself."), fdm->dest);
727 } 727 }
728 728
729 gd = file_util_gen_dlg(title, "Geeqie", "dlg_confirm", 729 gd = file_util_gen_dlg(title, GQ_WMCLASS, "dlg_confirm",
730 NULL, TRUE, 730 NULL, TRUE,
731 file_util_move_multiple_cancel_cb, fdm); 731 file_util_move_multiple_cancel_cb, fdm);
732 generic_dialog_add_message(gd, GTK_STOCK_DIALOG_WARNING, title, text); 732 generic_dialog_add_message(gd, GTK_STOCK_DIALOG_WARNING, title, text);
733 g_free(text); 733 g_free(text);
734 generic_dialog_add_button(gd, GTK_STOCK_GO_FORWARD, _("Co_ntinue"), 734 generic_dialog_add_button(gd, GTK_STOCK_GO_FORWARD, _("Co_ntinue"),
810 else 810 else
811 { 811 {
812 title = _("Error moving file"); 812 title = _("Error moving file");
813 text = g_strdup_printf(_("Unable to move file:\n%s\nto:\n%s\nduring multiple file move."), fdm->source_fd->path, fdm->dest); 813 text = g_strdup_printf(_("Unable to move file:\n%s\nto:\n%s\nduring multiple file move."), fdm->source_fd->path, fdm->dest);
814 } 814 }
815 gd = file_util_gen_dlg(title, "Geeqie", "dlg_confirm", 815 gd = file_util_gen_dlg(title, GQ_WMCLASS, "dlg_confirm",
816 NULL, TRUE, 816 NULL, TRUE,
817 file_util_move_multiple_cancel_cb, fdm); 817 file_util_move_multiple_cancel_cb, fdm);
818 generic_dialog_add_message(gd, GTK_STOCK_DIALOG_WARNING, title, text); 818 generic_dialog_add_message(gd, GTK_STOCK_DIALOG_WARNING, title, text);
819 g_free(text); 819 g_free(text);
820 820
972 else if (isfile(fds->dest) && !fds->confirmed) 972 else if (isfile(fds->dest) && !fds->confirmed)
973 { 973 {
974 GenericDialog *gd; 974 GenericDialog *gd;
975 GtkWidget *hbox; 975 GtkWidget *hbox;
976 976
977 gd = file_util_gen_dlg(_("Overwrite file"), "Geeqie", "dlg_confirm", 977 gd = file_util_gen_dlg(_("Overwrite file"), GQ_WMCLASS, "dlg_confirm",
978 NULL, TRUE, 978 NULL, TRUE,
979 file_util_move_single_cancel_cb, fds); 979 file_util_move_single_cancel_cb, fds);
980 980
981 generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION, 981 generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION,
982 _("Overwrite file?"), 982 _("Overwrite file?"),
1195 text = _("Move multiple files"); 1195 text = _("Move multiple files");
1196 } 1196 }
1197 stock_id = GTK_STOCK_OK; 1197 stock_id = GTK_STOCK_OK;
1198 } 1198 }
1199 1199
1200 fdlg = file_util_file_dlg(title, "Geeqie", "dlg_copymove", parent, 1200 fdlg = file_util_file_dlg(title, GQ_WMCLASS, "dlg_copymove", parent,
1201 file_util_move_cancel_cb, NULL); 1201 file_util_move_cancel_cb, NULL);
1202 generic_dialog_add_message(GENERIC_DIALOG(fdlg), NULL, text, NULL); 1202 generic_dialog_add_message(GENERIC_DIALOG(fdlg), NULL, text, NULL);
1203 1203
1204 if (fd) 1204 if (fd)
1205 { 1205 {
1520 list = list->next; 1520 list = list->next;
1521 } 1521 }
1522 if (resume_data) 1522 if (resume_data)
1523 { 1523 {
1524 g_string_append(msg, _("\n Continue multiple delete operation?")); 1524 g_string_append(msg, _("\n Continue multiple delete operation?"));
1525 d = file_util_gen_dlg(_("Delete failed"), "Geeqie", "dlg_confirm", 1525 d = file_util_gen_dlg(_("Delete failed"), GQ_WMCLASS, "dlg_confirm",
1526 NULL, TRUE, 1526 NULL, TRUE,
1527 file_util_delete_ext_cancel_cb, resume_data); 1527 file_util_delete_ext_cancel_cb, resume_data);
1528 1528
1529 generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, NULL, msg->str); 1529 generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, NULL, msg->str);
1530 1530
1612 if (source_list) 1612 if (source_list)
1613 { 1613 {
1614 GenericDialog *d; 1614 GenericDialog *d;
1615 gchar *text; 1615 gchar *text;
1616 1616
1617 d = file_util_gen_dlg(_("Delete failed"), "Geeqie", "dlg_confirm", 1617 d = file_util_gen_dlg(_("Delete failed"), GQ_WMCLASS, "dlg_confirm",
1618 NULL, TRUE, 1618 NULL, TRUE,
1619 file_util_delete_multiple_cancel_cb, source_list); 1619 file_util_delete_multiple_cancel_cb, source_list);
1620 1620
1621 text = g_strdup_printf(_("Unable to delete file:\n %s\n Continue multiple delete operation?"), fd->path); 1621 text = g_strdup_printf(_("Unable to delete file:\n %s\n Continue multiple delete operation?"), fd->path);
1622 generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, NULL, text); 1622 generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, NULL, text);
1757 GtkWidget *label; 1757 GtkWidget *label;
1758 ImageWindow *imd; 1758 ImageWindow *imd;
1759 gchar *buf; 1759 gchar *buf;
1760 1760
1761 gd = file_util_gen_dlg(_("Delete files - Geeqie"), 1761 gd = file_util_gen_dlg(_("Delete files - Geeqie"),
1762 "Geeqie", "dlg_confirm", parent, TRUE, 1762 GQ_WMCLASS, "dlg_confirm", parent, TRUE,
1763 file_util_delete_multiple_cancel_cb, source_list); 1763 file_util_delete_multiple_cancel_cb, source_list);
1764 1764
1765 generic_dialog_add_message(gd, NULL, _("Delete multiple files"), NULL); 1765 generic_dialog_add_message(gd, NULL, _("Delete multiple files"), NULL);
1766 1766
1767 generic_dialog_add_image(gd, NULL, NULL, NULL, NULL, NULL, TRUE); 1767 generic_dialog_add_image(gd, NULL, NULL, NULL, NULL, NULL, TRUE);
1852 { 1852 {
1853 GenericDialog *gd; 1853 GenericDialog *gd;
1854 GtkWidget *table; 1854 GtkWidget *table;
1855 gchar *base; 1855 gchar *base;
1856 1856
1857 gd = file_util_gen_dlg(_("Delete file - Geeqie"), "Geeqie", "dlg_confirm", 1857 gd = file_util_gen_dlg(_("Delete file - Geeqie"), GQ_WMCLASS, "dlg_confirm",
1858 parent, TRUE, 1858 parent, TRUE,
1859 file_util_delete_cancel_cb, file_data_ref(fd)); 1859 file_util_delete_cancel_cb, file_data_ref(fd));
1860 1860
1861 generic_dialog_add_message(gd, NULL, _("Delete file?"), NULL); 1861 generic_dialog_add_message(gd, NULL, _("Delete file?"), NULL);
1862 1862
2009 2009
2010 if (isfile(fdlg->dest_path) && !fdlg->type) 2010 if (isfile(fdlg->dest_path) && !fdlg->type)
2011 { 2011 {
2012 GenericDialog *gd; 2012 GenericDialog *gd;
2013 2013
2014 gd = file_util_gen_dlg(_("Overwrite file"), "Geeqie", "dlg_confirm", 2014 gd = file_util_gen_dlg(_("Overwrite file"), GQ_WMCLASS, "dlg_confirm",
2015 NULL, TRUE, 2015 NULL, TRUE,
2016 file_util_rename_multiple_cancel_cb, rd); 2016 file_util_rename_multiple_cancel_cb, rd);
2017 2017
2018 generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION, 2018 generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION,
2019 _("Overwrite file?"), 2019 _("Overwrite file?"),
2539 const gchar *name; 2539 const gchar *name;
2540 2540
2541 rd = g_new0(RenameDataMult, 1); 2541 rd = g_new0(RenameDataMult, 1);
2542 2542
2543 rd->fdlg = file_util_file_dlg(_("Rename - Geeqie"), 2543 rd->fdlg = file_util_file_dlg(_("Rename - Geeqie"),
2544 "Geeqie", "dlg_rename", parent, 2544 GQ_WMCLASS, "dlg_rename", parent,
2545 file_util_rename_multiple_close_cb, rd); 2545 file_util_rename_multiple_close_cb, rd);
2546 generic_dialog_add_message(GENERIC_DIALOG(rd->fdlg), NULL, _("Rename multiple files"), NULL); 2546 generic_dialog_add_message(GENERIC_DIALOG(rd->fdlg), NULL, _("Rename multiple files"), NULL);
2547 file_dialog_add_button(rd->fdlg, GTK_STOCK_OK, _("_Rename"), file_util_rename_multiple_cb, TRUE); 2547 file_dialog_add_button(rd->fdlg, GTK_STOCK_OK, _("_Rename"), file_util_rename_multiple_cb, TRUE);
2548 2548
2549 rd->fdlg->source_fd = file_data_ref(source_list->data); 2549 rd->fdlg->source_fd = file_data_ref(source_list->data);
2727 { 2727 {
2728 if (isfile(fds->dest) && !fds->confirmed) 2728 if (isfile(fds->dest) && !fds->confirmed)
2729 { 2729 {
2730 GenericDialog *gd; 2730 GenericDialog *gd;
2731 2731
2732 gd = file_util_gen_dlg(_("Overwrite file"), "Geeqie", "dlg_confirm", 2732 gd = file_util_gen_dlg(_("Overwrite file"), GQ_WMCLASS, "dlg_confirm",
2733 NULL, TRUE, 2733 NULL, TRUE,
2734 file_util_rename_single_cancel_cb, fds); 2734 file_util_rename_single_cancel_cb, fds);
2735 2735
2736 generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION, 2736 generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION,
2737 _("Overwrite file?"), 2737 _("Overwrite file?"),
2795 { 2795 {
2796 FileDialog *fdlg; 2796 FileDialog *fdlg;
2797 GtkWidget *table; 2797 GtkWidget *table;
2798 const gchar *name; 2798 const gchar *name;
2799 2799
2800 fdlg = file_util_file_dlg(_("Rename - Geeqie"), "Geeqie", "dlg_rename", parent, 2800 fdlg = file_util_file_dlg(_("Rename - Geeqie"), GQ_WMCLASS, "dlg_rename", parent,
2801 file_util_rename_single_close_cb, NULL); 2801 file_util_rename_single_close_cb, NULL);
2802 2802
2803 generic_dialog_add_message(GENERIC_DIALOG(fdlg), NULL, _("Rename file"), NULL); 2803 generic_dialog_add_message(GENERIC_DIALOG(fdlg), NULL, _("Rename file"), NULL);
2804 generic_dialog_add_image(GENERIC_DIALOG(fdlg), NULL, source_fd, NULL, NULL, NULL, FALSE); 2804 generic_dialog_add_image(GENERIC_DIALOG(fdlg), NULL, source_fd, NULL, NULL, NULL, FALSE);
2805 2805
2917 FileDialog *fdlg; 2917 FileDialog *fdlg;
2918 gchar *text; 2918 gchar *text;
2919 2919
2920 if (!isdir(path)) return; 2920 if (!isdir(path)) return;
2921 2921
2922 fdlg = file_util_file_dlg(_("New folder - Geeqie"), "Geeqie", "dlg_newdir", parent, 2922 fdlg = file_util_file_dlg(_("New folder - Geeqie"), GQ_WMCLASS, "dlg_newdir", parent,
2923 file_util_create_dir_close_cb, NULL); 2923 file_util_create_dir_close_cb, NULL);
2924 2924
2925 text = g_strdup_printf(_("Create folder in:\n%s\nnamed:"), path); 2925 text = g_strdup_printf(_("Create folder in:\n%s\nnamed:"), path);
2926 generic_dialog_add_message(GENERIC_DIALOG(fdlg), NULL, NULL, text); 2926 generic_dialog_add_message(GENERIC_DIALOG(fdlg), NULL, NULL, text);
2927 g_free(text); 2927 g_free(text);
3315 ud->type = UTILITY_TYPE_DELETE_LINK; 3315 ud->type = UTILITY_TYPE_DELETE_LINK;
3316 ud->source_fd = file_data_ref(fd); 3316 ud->source_fd = file_data_ref(fd);
3317 ud->dlist = NULL; 3317 ud->dlist = NULL;
3318 ud->flist = NULL; 3318 ud->flist = NULL;
3319 3319
3320 ud->gd = file_util_gen_dlg(_("Delete folder"), "Geeqie", "dlg_confirm", 3320 ud->gd = file_util_gen_dlg(_("Delete folder"), GQ_WMCLASS, "dlg_confirm",
3321 parent, TRUE, 3321 parent, TRUE,
3322 file_util_delete_dir_cancel_cb, ud); 3322 file_util_delete_dir_cancel_cb, ud);
3323 3323
3324 text = g_strdup_printf(_("This will delete the symbolic link:\n\n%s\n\n" 3324 text = g_strdup_printf(_("This will delete the symbolic link:\n\n%s\n\n"
3325 "The folder this link points to will not be deleted."), 3325 "The folder this link points to will not be deleted."),
3364 { 3364 {
3365 GenericDialog *gd; 3365 GenericDialog *gd;
3366 GtkWidget *box; 3366 GtkWidget *box;
3367 gchar *text; 3367 gchar *text;
3368 3368
3369 gd = file_util_gen_dlg(_("Folder contains subfolders"), "Geeqie", "dlg_warning", 3369 gd = file_util_gen_dlg(_("Folder contains subfolders"), GQ_WMCLASS, "dlg_warning",
3370 parent, TRUE, NULL, NULL); 3370 parent, TRUE, NULL, NULL);
3371 generic_dialog_add_button(gd, GTK_STOCK_CLOSE, NULL, NULL, TRUE); 3371 generic_dialog_add_button(gd, GTK_STOCK_CLOSE, NULL, NULL, TRUE);
3372 3372
3373 text = g_strdup_printf(_("Unable to delete the folder:\n\n%s\n\n" 3373 text = g_strdup_printf(_("Unable to delete the folder:\n\n%s\n\n"
3374 "This folder contains subfolders which must be moved before it can be deleted."), 3374 "This folder contains subfolders which must be moved before it can be deleted."),
3399 ud->dlist = dlist; 3399 ud->dlist = dlist;
3400 dlist = NULL; 3400 dlist = NULL;
3401 ud->flist = filelist_sort_path(flist); 3401 ud->flist = filelist_sort_path(flist);
3402 flist = NULL; 3402 flist = NULL;
3403 3403
3404 ud->gd = file_util_gen_dlg(_("Delete folder"), "Geeqie", "dlg_confirm", 3404 ud->gd = file_util_gen_dlg(_("Delete folder"), GQ_WMCLASS, "dlg_confirm",
3405 parent, TRUE, file_util_delete_dir_cancel_cb, ud); 3405 parent, TRUE, file_util_delete_dir_cancel_cb, ud);
3406 generic_dialog_add_button(ud->gd, GTK_STOCK_DELETE, NULL, file_util_delete_dir_ok_cb, TRUE); 3406 generic_dialog_add_button(ud->gd, GTK_STOCK_DELETE, NULL, file_util_delete_dir_ok_cb, TRUE);
3407 3407
3408 text = g_strdup_printf(_("This will delete the folder:\n\n%s\n\n" 3408 text = g_strdup_printf(_("This will delete the folder:\n\n%s\n\n"
3409 "The contents of this folder will also be deleted."), 3409 "The contents of this folder will also be deleted."),