Mercurial > hg > forks > geeqie

comparison src/editors.c @ 2745:86dad5529aed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with upstream changes.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 13 Apr 2018 19:06:23 +0300
parents 10ca4efb9d48 0b612372e82c
children 49bd0d974e88
comparison
equal deleted inserted replaced
2733:28978fd4c263 2745:86dad5529aed
109 static const gchar *conv_table[][2] = { 109 static const gchar *conv_table[][2] = {
110 {"application/x-ufraw", ".ufraw"}, 110 {"application/x-ufraw", ".ufraw"},
111 {"image/*", "*"}, 111 {"image/*", "*"},
112 {"image/bmp", ".bmp"}, 112 {"image/bmp", ".bmp"},
113 {"image/gif", ".gif"}, 113 {"image/gif", ".gif"},
114 {"image/jpeg", ".jpeg;.jpg"}, 114 {"image/jpeg", ".jpeg;.jpg;.mpo"},
115 {"image/jpg", ".jpg;.jpeg"}, 115 {"image/jpg", ".jpg;.jpeg"},
116 {"image/bpg", ".bpg"}, 116 {"image/bpg", ".bpg"},
117 {"image/pcx", ".pcx"}, 117 {"image/pcx", ".pcx"},
118 {"image/png", ".png"}, 118 {"image/png", ".png"},
119 {"image/svg", ".svg"}, 119 {"image/svg", ".svg"},
120 {"image/svg+xml", ".svg"}, 120 {"image/svg+xml", ".svg"},
121 {"image/svg+xml-compressed", ".svg"}, 121 {"image/svg+xml-compressed", ".svg"},
122 {"image/tiff", ".tiff;.tif"}, 122 {"image/tiff", ".tiff;.tif;.mef"},
123 {"image/vnd-ms.dds", ".dds"},
124 {"image/x-adobe-dng", ".dng"},
123 {"image/x-bmp", ".bmp"}, 125 {"image/x-bmp", ".bmp"},
124 {"image/x-canon-crw", ".crw"}, 126 {"image/x-canon-crw", ".crw"},
125 {"image/x-canon-cr2", ".cr2"}, 127 {"image/x-canon-cr2", ".cr2"},
126 {"image/x-cr2", ".cr2"}, 128 {"image/x-cr2", ".cr2"},
127 {"image/x-dcraw", "%raw"}, 129 {"image/x-dcraw", "%raw;.mos"},
128 {"image/x-epson-erf", "%erf"}, 130 {"image/x-epson-erf", "%erf"},
129 {"image/x-ico", ".ico"}, 131 {"image/x-ico", ".ico"},
132 {"image/x-kodak-kdc", ".kdc"},
130 {"image/x-mrw", ".mrw"}, 133 {"image/x-mrw", ".mrw"},
131 {"image/x-minolta-mrw", ".mrw"}, 134 {"image/x-minolta-mrw", ".mrw"},
132 {"image/x-MS-bmp", ".bmp"}, 135 {"image/x-MS-bmp", ".bmp"},
133 {"image/x-nef", ".nef"}, 136 {"image/x-nef", ".nef"},
134 {"image/x-nikon-nef", ".nef"}, 137 {"image/x-nikon-nef", ".nef"},
138 {"image/x-panasonic-raw", ".raw"},
139 {"image/x-panasonic-rw2", ".rw2"},
140 {"image/x-pentax-pef", ".pef"},
135 {"image/x-orf", ".orf"}, 141 {"image/x-orf", ".orf"},
136 {"image/x-olympus-orf", ".orf"}, 142 {"image/x-olympus-orf", ".orf"},
137 {"image/x-pcx", ".pcx"}, 143 {"image/x-pcx", ".pcx"},
138 {"image/xpm", ".xpm"}, 144 {"image/xpm", ".xpm"},
139 {"image/x-png", ".png"}, 145 {"image/x-png", ".png"},
143 {"image/x-portable-pixmap", ".ppm"}, 149 {"image/x-portable-pixmap", ".ppm"},
144 {"image/x-psd", ".psd"}, 150 {"image/x-psd", ".psd"},
145 {"image/x-raf", ".raf"}, 151 {"image/x-raf", ".raf"},
146 {"image/x-fuji-raf", ".raf"}, 152 {"image/x-fuji-raf", ".raf"},
147 {"image/x-sgi", ".sgi"}, 153 {"image/x-sgi", ".sgi"},
154 {"image/x-sony-arw", ".arw"},
155 {"image/x-sony-sr2", ".sr2"},
156 {"image/x-sony-srf", ".srf"},
148 {"image/x-tga", ".tga"}, 157 {"image/x-tga", ".tga"},
149 {"image/x-xbitmap", ".xbm"}, 158 {"image/x-xbitmap", ".xbm"},
150 {"image/x-xcf", ".xcf"}, 159 {"image/x-xcf", ".xcf"},
151 {"image/x-xpixmap", ".xpm"}, 160 {"image/x-xpixmap", ".xpm"},
152 {"image/x-x3f", ".x3f"}, 161 {"image/x-x3f", ".x3f"},
162 {"application/x-navi-animation", ".ani"},
153 {"application/x-ptoptimizer-script", ".pto"}, 163 {"application/x-ptoptimizer-script", ".pto"},
154 {NULL, NULL}}; 164 {NULL, NULL}};
155 165
156 gint i, j; 166 gint i, j;
157 GList *list = NULL; 167 GList *list = NULL;
542 552
543 vd->gd = file_util_gen_dlg(_("Edit command results"), "editor_results", 553 vd->gd = file_util_gen_dlg(_("Edit command results"), "editor_results",
544 NULL, FALSE, 554 NULL, FALSE,
545 NULL, ed); 555 NULL, ed);
546 buf = g_strdup_printf(_("Output of %s"), text); 556 buf = g_strdup_printf(_("Output of %s"), text);
547 generic_dialog_add_message(vd->gd, NULL, buf, NULL, TRUE); 557 generic_dialog_add_message(vd->gd, NULL, buf, NULL, FALSE);
548 g_free(buf); 558 g_free(buf);
549 vd->button_stop = generic_dialog_add_button(vd->gd, GTK_STOCK_STOP, NULL, 559 vd->button_stop = generic_dialog_add_button(vd->gd, GTK_STOCK_STOP, NULL,
550 editor_verbose_window_stop, FALSE); 560 editor_verbose_window_stop, FALSE);
551 gtk_widget_set_sensitive(vd->button_stop, FALSE); 561 gtk_widget_set_sensitive(vd->button_stop, FALSE);
552 vd->button_close = generic_dialog_add_button(vd->gd, GTK_STOCK_CLOSE, NULL, 562 vd->button_close = generic_dialog_add_button(vd->gd, GTK_STOCK_CLOSE, NULL,