Mercurial > emacs

comparison src/gtkutil.c @ 72614:af91ff74c754

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* gtkutil.c (xg_get_file_with_chooser): Change file chooser message for writing files. Call gtk_file_chooser_set_current_name to keep default filename.
author Jan Djärv <jan.h.d@swipnet.se>
date Sat, 02 Sep 2006 18:10:15 +0000
parents 070b40db0b2a
children 9db8c9a68f0f
comparison
equal deleted inserted replaced
72613:760e84d650e1 72614:af91ff74c754
1325 1325
1326 message[0] = '\0'; 1326 message[0] = '\0';
1327 if (action != GTK_FILE_CHOOSER_ACTION_SAVE) 1327 if (action != GTK_FILE_CHOOSER_ACTION_SAVE)
1328 strcat (message, "\nType C-l to display a file name text entry box.\n"); 1328 strcat (message, "\nType C-l to display a file name text entry box.\n");
1329 strcat (message, "\nIf you don't like this file selector, customize " 1329 strcat (message, "\nIf you don't like this file selector, customize "
1330 "use-file-dialog\nto turn it off, or type C-x C-f to visit files."); 1330 "use-file-dialog\nto turn it off, or type ");
1331 1331 if (action != GTK_FILE_CHOOSER_ACTION_SAVE)
1332 strcat (message, "C-x C-f to visit files.");
1333 else
1334 strcat (message, "C-x C-w to write files.");
1335
1332 wmessage = gtk_label_new (message); 1336 wmessage = gtk_label_new (message);
1333 gtk_widget_show (wmessage); 1337 gtk_widget_show (wmessage);
1334 gtk_box_pack_start (GTK_BOX (wbox), wtoggle, FALSE, FALSE, 0); 1338 gtk_box_pack_start (GTK_BOX (wbox), wtoggle, FALSE, FALSE, 0);
1335 gtk_box_pack_start (GTK_BOX (wbox), wmessage, FALSE, FALSE, 0); 1339 gtk_box_pack_start (GTK_BOX (wbox), wmessage, FALSE, FALSE, 0);
1336 gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (filewin), wbox); 1340 gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (filewin), wbox);
1338 if (default_filename) 1342 if (default_filename)
1339 { 1343 {
1340 Lisp_Object file; 1344 Lisp_Object file;
1341 struct gcpro gcpro1; 1345 struct gcpro gcpro1;
1342 GCPRO1 (file); 1346 GCPRO1 (file);
1347 char *utf8_filename;
1343 1348
1344 file = build_string (default_filename); 1349 file = build_string (default_filename);
1345 1350
1346 /* File chooser does not understand ~/... in the file name. It must be 1351 /* File chooser does not understand ~/... in the file name. It must be
1347 an absolute name starting with /. */ 1352 an absolute name starting with /. */
1348 if (default_filename[0] != '/') 1353 if (default_filename[0] != '/')
1349 file = Fexpand_file_name (file, Qnil); 1354 file = Fexpand_file_name (file, Qnil);
1350 1355
1351 default_filename = SSDATA (file); 1356 utf8_filename = SSDATA (ENCODE_UTF_8 (file));
1352 if (Ffile_directory_p (file)) 1357 if (! NILP (Ffile_directory_p (file)))
1353 gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (filewin), 1358 gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (filewin),
1354 default_filename); 1359 utf8_filename);
1355 else 1360 else
1356 gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (filewin), 1361 {
1357 default_filename); 1362 char *cp = strrchr (utf8_filename, '/');
1363 if (cp) ++cp;
1364 else cp = utf8_filename;
1365 gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (filewin),
1366 utf8_filename);
1367 gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (filewin), cp);
1368 }
1358 1369
1359 UNGCPRO; 1370 UNGCPRO;
1360 } 1371 }
1361 1372
1362 *func = xg_get_file_name_from_chooser; 1373 *func = xg_get_file_name_from_chooser;