Revision: 3641 http://geany.svn.sourceforge.net/geany/?rev=3641&view=rev Author: ntrel Date: 2009-03-20 16:33:59 +0000 (Fri, 20 Mar 2009)
Log Message: ----------- Fix setting Open dialog filetype on opening a file.
Modified Paths: -------------- branches/reorder-filetypes/ChangeLog branches/reorder-filetypes/src/dialogs.c
Modified: branches/reorder-filetypes/ChangeLog =================================================================== --- branches/reorder-filetypes/ChangeLog 2009-03-20 16:18:32 UTC (rev 3640) +++ branches/reorder-filetypes/ChangeLog 2009-03-20 16:33:59 UTC (rev 3641) @@ -4,6 +4,8 @@ src/filetypes.c, src/filetypes.h, src/symbols.c: Make GEANY_FILETYPES_NONE = 0; other things are now broken, e.g. setting Open dialog filetypes. + * src/dialogs.c: + Fix setting Open dialog filetype on opening a file.
2009-03-19 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: branches/reorder-filetypes/src/dialogs.c =================================================================== --- branches/reorder-filetypes/src/dialogs.c 2009-03-20 16:18:32 UTC (rev 3640) +++ branches/reorder-filetypes/src/dialogs.c 2009-03-20 16:33:59 UTC (rev 3641) @@ -207,23 +207,20 @@ add_file_open_extra_widget()); filetype_combo = ui_lookup_widget(ui_widgets.open_filesel, "filetype_combo");
+ gtk_combo_box_append_text(GTK_COMBO_BOX(filetype_combo), _("Detect by file extension")); /* add FileFilters(start with "All Files") */ gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(ui_widgets.open_filesel), filetypes_create_file_filter(filetypes[GEANY_FILETYPES_NONE])); /* now create meta filter "All Source" */ gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(ui_widgets.open_filesel), filetypes_create_file_filter_all_source()); - for (i = 0; i < filetypes_array->len; i++) + for (i = 1; i < filetypes_array->len; i++) { - if (i == GEANY_FILETYPES_NONE) - continue; - gtk_combo_box_append_text(GTK_COMBO_BOX(filetype_combo), filetypes[i]->title); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(ui_widgets.open_filesel), filetypes_create_file_filter(filetypes[i])); } - gtk_combo_box_append_text(GTK_COMBO_BOX(filetype_combo), _("Detect by file extension")); - gtk_combo_box_set_active(GTK_COMBO_BOX(filetype_combo), filetypes_array->len - 1); + gtk_combo_box_set_active(GTK_COMBO_BOX(filetype_combo), 0);
/* fill encoding combo box */ encoding_combo = ui_lookup_widget(ui_widgets.open_filesel, "encoding_combo");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.