sharpetronics/geany
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #327 from ntrel/open-file-exists

Browse Source 
Allow user to edit open dialog filename when file doesn't exist
This commit is contained in:
Nick Treleaven 2014-09-01 17:01:41 +01:00
commit a733bf9b2a
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/dialogs.c
View File

@ -123,8 +123,10 @@ static void file_chooser_set_filter_idx(GtkFileChooser *chooser, guint idx)
} }
static void open_file_dialog_handle_response(GtkWidget *dialog, gint response) static gboolean open_file_dialog_handle_response(GtkWidget *dialog, gint response)
{ {
gboolean ret = TRUE;
if (response == GTK_RESPONSE_ACCEPT || response == GEANY_RESPONSE_VIEW) if (response == GTK_RESPONSE_ACCEPT || response == GEANY_RESPONSE_VIEW)
{ {
GSList *filelist; GSList *filelist;
@ -150,7 +152,18 @@ static void open_file_dialog_handle_response(GtkWidget *dialog, gint response)
filelist = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(dialog)); filelist = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(dialog));
if (filelist != NULL) if (filelist != NULL)
{ {
document_open_files(filelist, ro, ft, charset); const gchar *first = filelist->data;
// When there's only one filename it may have been typed manually
if (!filelist->next && !g_file_test(first, G_FILE_TEST_EXISTS))
{
dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("\"%s\" was not found."), first);
ret = FALSE;
}
else
{
document_open_files(filelist, ro, ft, charset);
}
g_slist_foreach(filelist, (GFunc) g_free, NULL); /* free filenames */ g_slist_foreach(filelist, (GFunc) g_free, NULL); /* free filenames */
} }
g_slist_free(filelist); g_slist_free(filelist);
@ -158,6 +171,7 @@ static void open_file_dialog_handle_response(GtkWidget *dialog, gint response)
if (app->project && !EMPTY(app->project->base_path)) if (app->project && !EMPTY(app->project->base_path))
gtk_file_chooser_remove_shortcut_folder(GTK_FILE_CHOOSER(dialog), gtk_file_chooser_remove_shortcut_folder(GTK_FILE_CHOOSER(dialog),
app->project->base_path, NULL); app->project->base_path, NULL);
return ret;
} }
@ -456,7 +470,6 @@ void dialogs_show_open_file(void)
#endif #endif
{ {
GtkWidget *dialog = create_open_file_dialog(); GtkWidget *dialog = create_open_file_dialog();
gint response;
open_file_dialog_apply_settings(dialog); open_file_dialog_apply_settings(dialog);
@ -467,8 +480,8 @@ void dialogs_show_open_file(void)
gtk_file_chooser_add_shortcut_folder(GTK_FILE_CHOOSER(dialog), gtk_file_chooser_add_shortcut_folder(GTK_FILE_CHOOSER(dialog),
app->project->base_path, NULL); app->project->base_path, NULL);
response = gtk_dialog_run(GTK_DIALOG(dialog)); while (!open_file_dialog_handle_response(dialog,
open_file_dialog_handle_response(dialog, response); gtk_dialog_run(GTK_DIALOG(dialog))));
gtk_widget_destroy(dialog); gtk_widget_destroy(dialog);
} }
g_free(initdir); g_free(initdir);