Commits April 2014

commits@lists.geany.org

1 participants
154 discussions

[geany/geany] 5217d6: Reword "Detect from file extension" from the open dialog
by Colomban Wendling 15 Apr '14

15 Apr '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 15 Apr 2014 13:58:08 UTC Commit: 5217d683caf6b9d747125923c55eaea16515b347 https://github.com/geany/geany/commit/5217d683caf6b9d747125923c55eaea16515b… Log Message: ----------- Reword "Detect from file extension" from the open dialog We don't actually detect from file extension only, and other references of the feature always use "Detect from file", so use it also in the open dialog. Modified Paths: -------------- src/dialogs.c Modified: src/dialogs.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -205,7 +205,7 @@ static GtkWidget *create_filetype_combo_box(void) store = gtk_tree_store_new(2, G_TYPE_INT, G_TYPE_STRING); gtk_tree_store_insert_with_values(store, &iter_detect, NULL, -1, - 0, GEANY_FILETYPES_NONE, 1, _("Detect by file extension"), -1); + 0, GEANY_FILETYPES_NONE, 1, _("Detect from file"), -1); gtk_tree_store_insert_with_values(store, &iter_compiled, NULL, -1, 0, -1, 1, _("Programming Languages"), -1); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] bb61df: Add a translation context to the open dialog's "View" button
by Colomban Wendling 15 Apr '14

15 Apr '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 15 Apr 2014 13:58:04 UTC Commit: bb61dfcdc3eef225f7eb61c6c48651b300eb7bbe https://github.com/geany/geany/commit/bb61dfcdc3eef225f7eb61c6c48651b300eb7… Log Message: ----------- Add a translation context to the open dialog's "View" button The "View" button string is the same as the View menu one, but one is an action (verb) and the other a noun, and as such might need to be translated differently. Modified Paths: -------------- src/dialogs.c Modified: src/dialogs.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -365,7 +365,7 @@ static GtkWidget *create_open_file_dialog(void) GTK_FILE_CHOOSER_ACTION_OPEN, NULL, NULL); gtk_widget_set_name(dialog, "GeanyDialog"); - viewbtn = gtk_dialog_add_button(GTK_DIALOG(dialog), _("_View"), GEANY_RESPONSE_VIEW); + viewbtn = gtk_dialog_add_button(GTK_DIALOG(dialog), C_("Open dialog action", "_View"), GEANY_RESPONSE_VIEW); gtk_widget_set_tooltip_text(viewbtn, _("Opens the file in read-only mode. If you choose more than one file to open, all files will be opened read-only.")); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 45f193: Merge branch 'cleaner-filetype-combo-box'
by Colomban Wendling 15 Apr '14

15 Apr '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 15 Apr 2014 13:57:26 UTC Commit: 45f193a17a8722dce003a05a84b092610f1c0ba7 https://github.com/geany/geany/commit/45f193a17a8722dce003a05a84b092610f1c0… Log Message: ----------- Merge branch 'cleaner-filetype-combo-box' Modified Paths: -------------- src/dialogs.c Modified: src/dialogs.c 125 files changed, 113 insertions(+), 12 deletions(-) =================================================================== @@ -80,13 +80,16 @@ filesel_state = { { 0, GEANY_ENCODINGS_MAX, /* default encoding is detect from file */ - 0, + GEANY_FILETYPES_NONE, /* default filetype is detect from extension */ FALSE, FALSE } }; +static gint filetype_combo_box_get_active_filetype(GtkComboBox *combo); + + /* gets the ID of the current file filter */ static guint file_chooser_get_filter_idx(GtkFileChooser *chooser) { @@ -134,11 +137,11 @@ static void open_file_dialog_handle_response(GtkWidget *dialog, gint response) filesel_state.open.more_options_visible = gtk_expander_get_expanded(GTK_EXPANDER(expander)); filesel_state.open.filter_idx = file_chooser_get_filter_idx(GTK_FILE_CHOOSER(dialog)); - filesel_state.open.filetype_idx = gtk_combo_box_get_active(GTK_COMBO_BOX(filetype_combo)); + filesel_state.open.filetype_idx = filetype_combo_box_get_active_filetype(GTK_COMBO_BOX(filetype_combo)); /* ignore detect from file item */ if (filesel_state.open.filetype_idx > 0) - ft = g_slist_nth_data(filetypes_by_title, (guint) filesel_state.open.filetype_idx); + ft = filetypes_index(filesel_state.open.filetype_idx); filesel_state.open.encoding_idx = ui_encodings_combo_box_get_active_encoding(GTK_COMBO_BOX(encoding_combo)); if (filesel_state.open.encoding_idx >= 0 && filesel_state.open.encoding_idx < GEANY_ENCODINGS_MAX) @@ -178,6 +181,111 @@ on_file_open_check_hidden_toggled(GtkToggleButton *togglebutton, GtkWidget *dial } +static void filetype_combo_cell_data_func(GtkCellLayout *cell_layout, GtkCellRenderer *cell, + GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data) +{ + gboolean sensitive = !gtk_tree_model_iter_has_child(tree_model, iter); + gchar *text; + + gtk_tree_model_get(tree_model, iter, 1, &text, -1); + g_object_set(cell, "sensitive", sensitive, "text", text, NULL); + g_free(text); +} + + +static GtkWidget *create_filetype_combo_box(void) +{ + GtkTreeStore *store; + GtkTreeIter iter_compiled, iter_script, iter_markup, iter_misc, iter_detect; + GtkTreeIter *iter_parent; + GtkWidget *combo; + GtkCellRenderer *renderer; + GSList *node; + + store = gtk_tree_store_new(2, G_TYPE_INT, G_TYPE_STRING); + + gtk_tree_store_insert_with_values(store, &iter_detect, NULL, -1, + 0, GEANY_FILETYPES_NONE, 1, _("Detect by file extension"), -1); + + gtk_tree_store_insert_with_values(store, &iter_compiled, NULL, -1, + 0, -1, 1, _("Programming Languages"), -1); + gtk_tree_store_insert_with_values(store, &iter_script, NULL, -1, + 0, -1, 1, _("Scripting Languages"), -1); + gtk_tree_store_insert_with_values(store, &iter_markup, NULL, -1, + 0, -1, 1, _("Markup Languages"), -1); + gtk_tree_store_insert_with_values(store, &iter_misc, NULL, -1, + 0, -1, 1, _("Miscellaneous"), -1); + + foreach_slist (node, filetypes_by_title) + { + GeanyFiletype *ft = node->data; + + if (ft->id == GEANY_FILETYPES_NONE) + continue; + + switch (ft->group) + { + case GEANY_FILETYPE_GROUP_COMPILED: iter_parent = &iter_compiled; break; + case GEANY_FILETYPE_GROUP_SCRIPT: iter_parent = &iter_script; break; + case GEANY_FILETYPE_GROUP_MARKUP: iter_parent = &iter_markup; break; + case GEANY_FILETYPE_GROUP_MISC: iter_parent = &iter_misc; break; + case GEANY_FILETYPE_GROUP_NONE: + default: iter_parent = NULL; + } + gtk_tree_store_insert_with_values(store, NULL, iter_parent, -1, + 0, (gint) ft->id, 1, ft->title, -1); + } + + combo = gtk_combo_box_new_with_model(GTK_TREE_MODEL(store)); + gtk_combo_box_set_active_iter(GTK_COMBO_BOX(combo), &iter_detect); + renderer = gtk_cell_renderer_text_new(); + gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), renderer, TRUE); + gtk_cell_layout_set_cell_data_func(GTK_CELL_LAYOUT(combo), renderer, + filetype_combo_cell_data_func, NULL, NULL); + + g_object_unref(store); + + return combo; +} + + +static gint filetype_combo_box_get_active_filetype(GtkComboBox *combo) +{ + gint id = 0; + GtkTreeIter iter; + + if (gtk_combo_box_get_active_iter(combo, &iter)) + { + GtkTreeModel *model = gtk_combo_box_get_model(combo); + gtk_tree_model_get(model, &iter, 0, &id, -1); + } + return id; +} + + +static gboolean filetype_combo_box_set_active_filetype(GtkComboBox *combo, const gint id) +{ + GtkTreeModel *model = gtk_combo_box_get_model(combo); + GtkTreeIter iter; + + if (gtk_tree_model_get_iter_first(model, &iter)) + { + do + { + gint row_id; + gtk_tree_model_get(model, &iter, 0, &row_id, -1); + if (id == row_id) + { + gtk_combo_box_set_active_iter(combo, &iter); + return TRUE; + } + } + while (ui_tree_model_iter_any_next(model, &iter, TRUE)); + } + return FALSE; +} + + static GtkWidget *add_file_open_extra_widget(GtkWidget *dialog) { GtkWidget *expander, *vbox, *table, *check_hidden; @@ -225,7 +333,7 @@ static GtkWidget *add_file_open_extra_widget(GtkWidget *dialog) (GtkAttachOptions) (0), 4, 5); /* the ebox is for the tooltip, because gtk_combo_box can't show tooltips */ filetype_ebox = gtk_event_box_new(); - filetype_combo = gtk_combo_box_text_new(); + filetype_combo = create_filetype_combo_box(); gtk_widget_set_tooltip_text(filetype_ebox, _("Explicitly defines a filetype for the file, if it would not be detected by filename extension.\nNote if you choose multiple files, they will all be opened with the chosen filetype.")); gtk_container_add(GTK_CONTAINER(filetype_ebox), filetype_combo); @@ -250,7 +358,6 @@ static GtkWidget *add_file_open_extra_widget(GtkWidget *dialog) static GtkWidget *create_open_file_dialog(void) { GtkWidget *dialog; - GtkWidget *filetype_combo; GtkWidget *viewbtn; GSList *node; @@ -278,9 +385,7 @@ static GtkWidget *create_open_file_dialog(void) /* add checkboxes and filename entry */ gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(dialog), add_file_open_extra_widget(dialog)); - filetype_combo = ui_lookup_widget(dialog, "filetype_combo"); - gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(filetype_combo), _("Detect by file extension")); /* add FileFilters(start with "All Files") */ gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filetypes_create_file_filter(filetypes[GEANY_FILETYPES_NONE])); @@ -293,11 +398,8 @@ static GtkWidget *create_open_file_dialog(void) if (G_UNLIKELY(ft->id == GEANY_FILETYPES_NONE)) continue; - gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(filetype_combo), ft->title); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filetypes_create_file_filter(ft)); } - gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(filetype_combo), 3); - gtk_combo_box_set_active(GTK_COMBO_BOX(filetype_combo), 0); g_signal_connect(dialog, "notify::show-hidden", G_CALLBACK(on_file_open_show_hidden_notify), NULL); @@ -318,18 +420,17 @@ static void open_file_dialog_apply_settings(GtkWidget *dialog) if (! initialized) { filesel_state.open.filter_idx = file_chooser_get_filter_idx(GTK_FILE_CHOOSER(dialog)); - filesel_state.open.filetype_idx = gtk_combo_box_get_active(GTK_COMBO_BOX(filetype_combo)); initialized = TRUE; } else { file_chooser_set_filter_idx(GTK_FILE_CHOOSER(dialog), filesel_state.open.filter_idx); - gtk_combo_box_set_active(GTK_COMBO_BOX(filetype_combo), filesel_state.open.filetype_idx); } gtk_expander_set_expanded(GTK_EXPANDER(expander), filesel_state.open.more_options_visible); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_hidden), filesel_state.open.show_hidden); ui_encodings_combo_box_set_active_encoding(GTK_COMBO_BOX(encoding_combo), filesel_state.open.encoding_idx); + filetype_combo_box_set_active_filetype(GTK_COMBO_BOX(filetype_combo), filesel_state.open.filetype_idx); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] aeab18: Merge branch 'unified-encoding-combo-boxes'
by Colomban Wendling 15 Apr '14

15 Apr '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 15 Apr 2014 13:57:13 UTC Commit: aeab183ef2a40943a4b7751a3e5127a5de63749a https://github.com/geany/geany/commit/aeab183ef2a40943a4b7751a3e5127a5de637… Log Message: ----------- Merge branch 'unified-encoding-combo-boxes' Modified Paths: -------------- data/geany.glade src/dialogs.c src/encodings.c src/encodings.h src/prefs.c src/search.c src/symbols.c src/ui_utils.c src/ui_utils.h Modified: data/geany.glade 18 files changed, 2 insertions(+), 16 deletions(-) =================================================================== @@ -433,12 +433,6 @@ </object> </child> </object> - <object class="GtkListStore" id="encoding_list"> - <columns> -  - <column type="gchararray"/> - </columns> - </object> <object class="GtkListStore" id="eol_list"> <columns>  @@ -4368,12 +4362,8 @@ <object class="GtkComboBox" id="combo_new_encoding"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="model">encoding_list</property> <child> - <object class="GtkCellRendererText" id="cellrenderertext6"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> + <object class="GtkCellRendererText" id="combo_new_encoding_renderer"/> </child> </object> </child> @@ -4434,12 +4424,8 @@ <object class="GtkComboBox" id="combo_open_encoding"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="model">encoding_list</property> <child> - <object class="GtkCellRendererText" id="cellrenderertext7"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> + <object class="GtkCellRendererText" id="combo_open_encoding_renderer"/> </child> </object> </child> Modified: src/dialogs.c 117 files changed, 5 insertions(+), 112 deletions(-) =================================================================== @@ -125,8 +125,6 @@ static void open_file_dialog_handle_response(GtkWidget *dialog, gint response) if (response == GTK_RESPONSE_ACCEPT || response == GEANY_RESPONSE_VIEW) { GSList *filelist; - GtkTreeModel *encoding_model; - GtkTreeIter encoding_iter; GeanyFiletype *ft = NULL; const gchar *charset = NULL; GtkWidget *expander = ui_lookup_widget(dialog, "more_options_expander"); @@ -142,9 +140,7 @@ static void open_file_dialog_handle_response(GtkWidget *dialog, gint response) if (filesel_state.open.filetype_idx > 0) ft = g_slist_nth_data(filetypes_by_title, (guint) filesel_state.open.filetype_idx); - encoding_model = gtk_combo_box_get_model(GTK_COMBO_BOX(encoding_combo)); - gtk_combo_box_get_active_iter(GTK_COMBO_BOX(encoding_combo), &encoding_iter); - gtk_tree_model_get(encoding_model, &encoding_iter, 0, &filesel_state.open.encoding_idx, -1); + filesel_state.open.encoding_idx = ui_encodings_combo_box_get_active_encoding(GTK_COMBO_BOX(encoding_combo)); if (filesel_state.open.encoding_idx >= 0 && filesel_state.open.encoding_idx < GEANY_ENCODINGS_MAX) charset = encodings[filesel_state.open.encoding_idx].charset; @@ -182,97 +178,6 @@ on_file_open_check_hidden_toggled(GtkToggleButton *togglebutton, GtkWidget *dial } -static gint encoding_combo_store_sort_func(GtkTreeModel *model, - GtkTreeIter *a, - GtkTreeIter *b, - gpointer data) -{ - gboolean a_has_child = gtk_tree_model_iter_has_child(model, a); - gboolean b_has_child = gtk_tree_model_iter_has_child(model, b); - gchar *a_string; - gchar *b_string; - gint cmp_res; - - if (a_has_child != b_has_child) - return a_has_child ? -1 : 1; - - gtk_tree_model_get(model, a, 1, &a_string, -1); - gtk_tree_model_get(model, b, 1, &b_string, -1); - cmp_res = strcmp(a_string, b_string); - g_free(a_string); - g_free(b_string); - return cmp_res; -} - - -static GtkTreeStore *create_encoding_combo_store(GtkTreeIter *iter_detect) -{ - GtkTreeStore *store; - GtkTreeIter iter_current, iter_westeuro, iter_easteuro, iter_eastasian, iter_asian, - iter_utf8, iter_middleeast; - GtkTreeIter *iter_parent; - gchar *encoding_string; - gint i; - - store = gtk_tree_store_new(2, G_TYPE_INT, G_TYPE_STRING); - - gtk_tree_store_append(store, iter_detect, NULL); - gtk_tree_store_set(store, iter_detect, 0, GEANY_ENCODINGS_MAX, 1, _("Detect from file"), -1); - - gtk_tree_store_append(store, &iter_westeuro, NULL); - gtk_tree_store_set(store, &iter_westeuro, 0, -1, 1, _("West European"), -1); - gtk_tree_store_append(store, &iter_easteuro, NULL); - gtk_tree_store_set(store, &iter_easteuro, 0, -1, 1, _("East European"), -1); - gtk_tree_store_append(store, &iter_eastasian, NULL); - gtk_tree_store_set(store, &iter_eastasian, 0, -1, 1, _("East Asian"), -1); - gtk_tree_store_append(store, &iter_asian, NULL); - gtk_tree_store_set(store, &iter_asian, 0, -1, 1, _("SE & SW Asian"), -1); - gtk_tree_store_append(store, &iter_middleeast, NULL); - gtk_tree_store_set(store, &iter_middleeast, 0, -1, 1, _("Middle Eastern"), -1); - gtk_tree_store_append(store, &iter_utf8, NULL); - gtk_tree_store_set(store, &iter_utf8, 0, -1, 1, _("Unicode"), -1); - - for (i = 0; i < GEANY_ENCODINGS_MAX; i++) - { - switch (encodings[i].group) - { - case WESTEUROPEAN: iter_parent = &iter_westeuro; break; - case EASTEUROPEAN: iter_parent = &iter_easteuro; break; - case EASTASIAN: iter_parent = &iter_eastasian; break; - case ASIAN: iter_parent = &iter_asian; break; - case MIDDLEEASTERN: iter_parent = &iter_middleeast; break; - case UNICODE: iter_parent = &iter_utf8; break; - case NONE: - default: iter_parent = NULL; - } - gtk_tree_store_append(store, &iter_current, iter_parent); - encoding_string = encodings_to_string(&encodings[i]); - gtk_tree_store_set(store, &iter_current, 0, i, 1, encoding_string, -1); - g_free(encoding_string); - /* restore the saved state */ - if (i == filesel_state.open.encoding_idx) - *iter_detect = iter_current; - } - - gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(store), 1, GTK_SORT_ASCENDING); - gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(store), 1, encoding_combo_store_sort_func, NULL, NULL); - - return store; -} - - -static void encoding_combo_cell_data_func(GtkCellLayout *cell_layout, - GtkCellRenderer *cell, - GtkTreeModel *tree_model, - GtkTreeIter *iter, - gpointer data) -{ - gboolean sensitive = !gtk_tree_model_iter_has_child(tree_model, iter); - - g_object_set(cell, "sensitive", sensitive, NULL); -} - - static GtkWidget *add_file_open_extra_widget(GtkWidget *dialog) { GtkWidget *expander, *vbox, *table, *check_hidden; @@ -304,7 +209,7 @@ static GtkWidget *add_file_open_extra_widget(GtkWidget *dialog) (GtkAttachOptions) (0), 4, 5); /* the ebox is for the tooltip, because gtk_combo_box can't show tooltips */ encoding_ebox = gtk_event_box_new(); - encoding_combo = gtk_combo_box_new(); + encoding_combo = ui_create_encodings_combo_box(TRUE, GEANY_ENCODINGS_MAX); gtk_widget_set_tooltip_text(encoding_ebox, _("Explicitly defines an encoding for the file, if it would not be detected. This is useful when you know that the encoding of a file cannot be detected correctly by Geany.\nNote if you choose multiple files, they will all be opened with the chosen encoding.")); gtk_container_add(GTK_CONTAINER(encoding_ebox), encoding_combo); @@ -345,10 +250,8 @@ static GtkWidget *add_file_open_extra_widget(GtkWidget *dialog) static GtkWidget *create_open_file_dialog(void) { GtkWidget *dialog; - GtkWidget *filetype_combo, *encoding_combo; + GtkWidget *filetype_combo; GtkWidget *viewbtn; - GtkCellRenderer *encoding_renderer; - GtkTreeIter encoding_iter; GSList *node; dialog = gtk_file_chooser_dialog_new(_("Open File"), GTK_WINDOW(main_widgets.window), @@ -396,17 +299,6 @@ static GtkWidget *create_open_file_dialog(void) gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(filetype_combo), 3); gtk_combo_box_set_active(GTK_COMBO_BOX(filetype_combo), 0); - /* fill encoding combo box */ - encoding_combo = ui_lookup_widget(dialog, "encoding_combo"); - gtk_combo_box_set_model(GTK_COMBO_BOX(encoding_combo), GTK_TREE_MODEL( - create_encoding_combo_store(&encoding_iter))); - gtk_combo_box_set_active_iter(GTK_COMBO_BOX(encoding_combo), &encoding_iter); - encoding_renderer = gtk_cell_renderer_text_new(); - gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(encoding_combo), encoding_renderer, TRUE); - gtk_cell_layout_add_attribute(GTK_CELL_LAYOUT(encoding_combo), encoding_renderer, "text", 1); - gtk_cell_layout_set_cell_data_func(GTK_CELL_LAYOUT(encoding_combo), encoding_renderer, - encoding_combo_cell_data_func, NULL, NULL); - g_signal_connect(dialog, "notify::show-hidden", G_CALLBACK(on_file_open_show_hidden_notify), NULL); @@ -419,6 +311,7 @@ static void open_file_dialog_apply_settings(GtkWidget *dialog) static gboolean initialized = FALSE; GtkWidget *check_hidden = ui_lookup_widget(dialog, "check_hidden"); GtkWidget *filetype_combo = ui_lookup_widget(dialog, "filetype_combo"); + GtkWidget *encoding_combo = ui_lookup_widget(dialog, "encoding_combo"); GtkWidget *expander = ui_lookup_widget(dialog, "more_options_expander"); /* we can't know the initial position of combo boxes, so retreive it the first time */ @@ -436,7 +329,7 @@ static void open_file_dialog_apply_settings(GtkWidget *dialog) } gtk_expander_set_expanded(GTK_EXPANDER(expander), filesel_state.open.more_options_visible); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_hidden), filesel_state.open.show_hidden); - /* encoding combo is restored at creating time, see create_encoding_combo_store() */ + ui_encodings_combo_box_set_active_encoding(GTK_COMBO_BOX(encoding_combo), filesel_state.open.encoding_idx); } Modified: src/encodings.c 117 files changed, 117 insertions(+), 0 deletions(-) =================================================================== @@ -497,6 +497,123 @@ void encodings_init(void) } +static gint encoding_combo_store_sort_func(GtkTreeModel *model, + GtkTreeIter *a, + GtkTreeIter *b, + gpointer data) +{ + gboolean a_has_child = gtk_tree_model_iter_has_child(model, a); + gboolean b_has_child = gtk_tree_model_iter_has_child(model, b); + gchar *a_string; + gchar *b_string; + gint cmp_res; + + if (a_has_child != b_has_child) + return a_has_child ? -1 : 1; + + gtk_tree_model_get(model, a, 1, &a_string, -1); + gtk_tree_model_get(model, b, 1, &b_string, -1); + cmp_res = strcmp(a_string, b_string); + g_free(a_string); + g_free(b_string); + return cmp_res; +} + + +GtkTreeStore *encodings_encoding_store_new(gboolean has_detect) +{ + GtkTreeStore *store; + GtkTreeIter iter_current, iter_westeuro, iter_easteuro, iter_eastasian, + iter_asian, iter_utf8, iter_middleeast; + GtkTreeIter *iter_parent; + gchar *encoding_string; + gint i; + + store = gtk_tree_store_new(2, G_TYPE_INT, G_TYPE_STRING); + + if (has_detect) + { + gtk_tree_store_append(store, &iter_current, NULL); + gtk_tree_store_set(store, &iter_current, 0, GEANY_ENCODINGS_MAX, 1, _("Detect from file"), -1); + } + + gtk_tree_store_append(store, &iter_westeuro, NULL); + gtk_tree_store_set(store, &iter_westeuro, 0, -1, 1, _("West European"), -1); + gtk_tree_store_append(store, &iter_easteuro, NULL); + gtk_tree_store_set(store, &iter_easteuro, 0, -1, 1, _("East European"), -1); + gtk_tree_store_append(store, &iter_eastasian, NULL); + gtk_tree_store_set(store, &iter_eastasian, 0, -1, 1, _("East Asian"), -1); + gtk_tree_store_append(store, &iter_asian, NULL); + gtk_tree_store_set(store, &iter_asian, 0, -1, 1, _("SE & SW Asian"), -1); + gtk_tree_store_append(store, &iter_middleeast, NULL); + gtk_tree_store_set(store, &iter_middleeast, 0, -1, 1, _("Middle Eastern"), -1); + gtk_tree_store_append(store, &iter_utf8, NULL); + gtk_tree_store_set(store, &iter_utf8, 0, -1, 1, _("Unicode"), -1); + + for (i = 0; i < GEANY_ENCODINGS_MAX; i++) + { + switch (encodings[i].group) + { + case WESTEUROPEAN: iter_parent = &iter_westeuro; break; + case EASTEUROPEAN: iter_parent = &iter_easteuro; break; + case EASTASIAN: iter_parent = &iter_eastasian; break; + case ASIAN: iter_parent = &iter_asian; break; + case MIDDLEEASTERN: iter_parent = &iter_middleeast; break; + case UNICODE: iter_parent = &iter_utf8; break; + case NONE: + default: iter_parent = NULL; + } + gtk_tree_store_append(store, &iter_current, iter_parent); + encoding_string = encodings_to_string(&encodings[i]); + gtk_tree_store_set(store, &iter_current, 0, i, 1, encoding_string, -1); + g_free(encoding_string); + } + + gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(store), 1, GTK_SORT_ASCENDING); + gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(store), 1, encoding_combo_store_sort_func, NULL, NULL); + + return store; +} + + +gint encodings_encoding_store_get_encoding(GtkTreeStore *store, GtkTreeIter *iter) +{ + gint enc; + gtk_tree_model_get(GTK_TREE_MODEL(store), iter, 0, &enc, -1); + return enc; +} + + +gboolean encodings_encoding_store_get_iter(GtkTreeStore *store, GtkTreeIter *iter, gint enc) +{ + if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), iter)) + { + do + { + if (encodings_encoding_store_get_encoding(store, iter) == enc) + return TRUE; + } + while (ui_tree_model_iter_any_next(GTK_TREE_MODEL(store), iter, TRUE)); + } + return FALSE; +} + + +void encodings_encoding_store_cell_data_func(GtkCellLayout *cell_layout, + GtkCellRenderer *cell, + GtkTreeModel *tree_model, + GtkTreeIter *iter, + gpointer data) +{ + gboolean sensitive = !gtk_tree_model_iter_has_child(tree_model, iter); + gchar *text; + + gtk_tree_model_get(tree_model, iter, 1, &text, -1); + g_object_set(cell, "sensitive", sensitive, "text", text, NULL); + g_free(text); +} + + /** * Tries to convert @a buffer into UTF-8 encoding from the encoding specified with @a charset. * If @a fast is not set, additional checks to validate the converted string are performed. Modified: src/encodings.h 9 files changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -80,6 +80,15 @@ void encodings_select_radio_item(const gchar *charset); void encodings_init(void); void encodings_finalize(void); +GtkTreeStore *encodings_encoding_store_new(gboolean has_detect); + +gint encodings_encoding_store_get_encoding(GtkTreeStore *store, GtkTreeIter *iter); + +gboolean encodings_encoding_store_get_iter(GtkTreeStore *store, GtkTreeIter *iter, gint enc); + +void encodings_encoding_store_cell_data_func(GtkCellLayout *cell_layout, GtkCellRenderer *cell, + GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data); + gchar *encodings_convert_to_utf8(const gchar *buffer, gssize size, gchar **used_encoding); /* Converts a string from the given charset to UTF-8. Modified: src/prefs.c 47 files changed, 26 insertions(+), 21 deletions(-) =================================================================== @@ -547,8 +547,7 @@ static void prefs_init_dialog(void) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), file_prefs.tab_order_beside); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "combo_new_encoding"); - /* luckily the index of the combo box items match the index of the encodings array */ - gtk_combo_box_set_active(GTK_COMBO_BOX(widget), file_prefs.default_new_encoding); + ui_encodings_combo_box_set_active_encoding(GTK_COMBO_BOX(widget), file_prefs.default_new_encoding); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_open_encoding"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), @@ -558,10 +557,10 @@ static void prefs_init_dialog(void) widget = ui_lookup_widget(ui_widgets.prefs_dialog, "combo_open_encoding"); if (file_prefs.default_open_encoding >= 0) { - gtk_combo_box_set_active(GTK_COMBO_BOX(widget), file_prefs.default_open_encoding); + ui_encodings_combo_box_set_active_encoding(GTK_COMBO_BOX(widget), file_prefs.default_open_encoding); } else - gtk_combo_box_set_active(GTK_COMBO_BOX(widget), GEANY_ENCODING_UTF_8); + ui_encodings_combo_box_set_active_encoding(GTK_COMBO_BOX(widget), GEANY_ENCODING_UTF_8); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "combo_eol"); if (file_prefs.default_eol_character >= 0 && file_prefs.default_eol_character < 3) @@ -1020,13 +1019,13 @@ on_prefs_dialog_response(GtkDialog *dialog, gint response, gpointer user_data) file_prefs.tab_order_beside = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "combo_new_encoding"); - file_prefs.default_new_encoding = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); + file_prefs.default_new_encoding = ui_encodings_combo_box_get_active_encoding(GTK_COMBO_BOX(widget)); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_open_encoding"); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) { widget = ui_lookup_widget(ui_widgets.prefs_dialog, "combo_open_encoding"); - file_prefs.default_open_encoding = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); + file_prefs.default_open_encoding = ui_encodings_combo_box_get_active_encoding(GTK_COMBO_BOX(widget)); } else file_prefs.default_open_encoding = -1; @@ -1663,22 +1662,34 @@ void prefs_show_dialog(void) { if (ui_widgets.prefs_dialog == NULL) { - GtkListStore *encoding_list, *eol_list; - GtkWidget *label, *widget; - guint i; - gchar *encoding_string; + GtkListStore *eol_list; + GtkWidget *label; ui_widgets.prefs_dialog = create_prefs_dialog(); gtk_widget_set_name(ui_widgets.prefs_dialog, "GeanyPrefsDialog"); gtk_window_set_transient_for(GTK_WINDOW(ui_widgets.prefs_dialog), GTK_WINDOW(main_widgets.window)); /* init the file encoding combo boxes */ - encoding_list = ui_builder_get_object("encoding_list"); - for (i = 0; i < GEANY_ENCODINGS_MAX; i++) { - encoding_string = encodings_to_string(&encodings[i]); - list_store_append_text(encoding_list, encoding_string); - g_free(encoding_string); + struct { + const gchar *combo, *renderer; + } names[] = { + { "combo_new_encoding", "combo_new_encoding_renderer" }, + { "combo_open_encoding", "combo_open_encoding_renderer" } + }; + guint i; + GtkTreeStore *encoding_list = encodings_encoding_store_new(FALSE); + + for (i = 0; i < G_N_ELEMENTS(names); i++) + { + GtkWidget *combo = ui_lookup_widget(ui_widgets.prefs_dialog, names[i].combo); + + gtk_cell_layout_set_cell_data_func(GTK_CELL_LAYOUT(combo), + ui_builder_get_object(names[i].renderer), + encodings_encoding_store_cell_data_func, NULL, NULL); + gtk_combo_box_set_model(GTK_COMBO_BOX(combo), GTK_TREE_MODEL(encoding_list)); + } + g_object_unref(encoding_list); } /* init the eol character combo box */ @@ -1687,12 +1698,6 @@ void prefs_show_dialog(void) list_store_append_text(eol_list, utils_get_eol_name(SC_EOL_CR)); list_store_append_text(eol_list, utils_get_eol_name(SC_EOL_LF)); - /* wet combo box wrap width after having filled the encoding to workaround - * GTK bug https://bugzilla.gnome.org/show_bug.cgi?id=722388 */ - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "combo_new_encoding"); - gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(widget), 3); - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "combo_open_encoding"); - gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(widget), 3); /* add manually GeanyWrapLabels because they can't be added with Glade */ /* page Tools */ Modified: src/search.c 17 files changed, 4 insertions(+), 13 deletions(-) =================================================================== @@ -853,8 +853,6 @@ static void create_fif_dialog(void) *check_recursive, *check_extra, *entry_extra, *check_regexp, *combo_files_mode; GtkWidget *dbox, *sbox, *lbox, *rbox, *hbox, *vbox, *ebox; GtkSizeGroup *size_group; - gchar *encoding_string; - guint i; fif_dlg.dialog = gtk_dialog_new_with_buttons( _("Find in Files"), GTK_WINDOW(main_widgets.window), GTK_DIALOG_DESTROY_WITH_PARENT, @@ -931,14 +929,7 @@ static void create_fif_dialog(void) label2 = gtk_label_new_with_mnemonic(_("E_ncoding:")); gtk_misc_set_alignment(GTK_MISC(label2), 0, 0.5); - e_combo = gtk_combo_box_text_new(); - for (i = 0; i < GEANY_ENCODINGS_MAX; i++) - { - encoding_string = encodings_to_string(&encodings[i]); - gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(e_combo), encoding_string); - g_free(encoding_string); - } - gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(e_combo), 3); + e_combo = ui_create_encodings_combo_box(FALSE, GEANY_ENCODING_UTF_8); gtk_label_set_mnemonic_widget(GTK_LABEL(label2), e_combo); fif_dlg.encoding_combo = e_combo; @@ -1118,7 +1109,7 @@ void search_show_find_in_files_dialog_full(const gchar *text, const gchar *dir) /* set the encoding of the current file */ if (doc != NULL) enc_idx = encodings_get_idx_from_charset(doc->encoding); - gtk_combo_box_set_active(GTK_COMBO_BOX(fif_dlg.encoding_combo), enc_idx); + ui_encodings_combo_box_set_active_encoding(GTK_COMBO_BOX(fif_dlg.encoding_combo), enc_idx); /* put the focus to the directory entry if it is empty */ if (utils_str_equal(gtk_entry_get_text(GTK_ENTRY(entry)), "")) @@ -1600,8 +1591,8 @@ on_find_in_files_dialog_response(GtkDialog *dialog, gint response, GtkWidget *dir_combo = fif_dlg.dir_combo; const gchar *utf8_dir = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(dir_combo)))); - GeanyEncodingIndex enc_idx = gtk_combo_box_get_active( - GTK_COMBO_BOX(fif_dlg.encoding_combo)); + GeanyEncodingIndex enc_idx = + ui_encodings_combo_box_get_active_encoding(GTK_COMBO_BOX(fif_dlg.encoding_combo)); if (G_UNLIKELY(EMPTY(utf8_dir))) ui_set_statusbar(FALSE, _("Invalid directory for find in files.")); Modified: src/symbols.c 45 files changed, 3 insertions(+), 42 deletions(-) =================================================================== @@ -570,45 +570,6 @@ static GdkPixbuf *get_tag_icon(const gchar *icon_name) } -/* finds the next iter at any level - * @param iter in/out, the current iter, will be changed to the next one - * @param down whether to try the child iter - * @return TRUE if there @p iter was set, or FALSE if there is no next iter */ -static gboolean next_iter(GtkTreeModel *model, GtkTreeIter *iter, gboolean down) -{ - GtkTreeIter guess; - GtkTreeIter copy = *iter; - - /* go down if the item has children */ - if (down && gtk_tree_model_iter_children(model, &guess, iter)) - *iter = guess; - /* or to the next item at the same level */ - else if (gtk_tree_model_iter_next(model, &copy)) - *iter = copy; - /* or to the next item at a parent level */ - else if (gtk_tree_model_iter_parent(model, &guess, iter)) - { - copy = guess; - while(TRUE) - { - if (gtk_tree_model_iter_next(model, &copy)) - { - *iter = copy; - return TRUE; - } - else if (gtk_tree_model_iter_parent(model, &copy, &guess)) - guess = copy; - else - return FALSE; - } - } - else - return FALSE; - - return TRUE; -} - - static gboolean find_toplevel_iter(GtkTreeStore *store, GtkTreeIter *iter, const gchar *title) { GtkTreeModel *model = GTK_TREE_MODEL(store); @@ -1314,7 +1275,7 @@ static gboolean tree_store_remove_row(GtkTreeStore *store, GtkTreeIter *iter) if (! cont && has_parent) { *iter = parent; - cont = next_iter(GTK_TREE_MODEL(store), iter, FALSE); + cont = ui_tree_model_iter_any_next(GTK_TREE_MODEL(store), iter, FALSE); } return cont; @@ -1494,7 +1455,7 @@ static void update_tree_tags(GeanyDocument *doc, GList **tags) gtk_tree_model_get(model, &iter, SYMBOLS_COLUMN_TAG, &tag, -1); if (! tag) /* most probably a toplevel, skip it */ - cont = next_iter(model, &iter, TRUE); + cont = ui_tree_model_iter_any_next(model, &iter, TRUE); else { GList *found_item; @@ -1527,7 +1488,7 @@ static void update_tree_tags(GeanyDocument *doc, GList **tags) tags_table_remove(tags_table, found); *tags = g_list_delete_link(*tags, found_item); - cont = next_iter(model, &iter, TRUE); + cont = ui_tree_model_iter_any_next(model, &iter, TRUE); } tm_tag_unref(tag); Modified: src/ui_utils.c 91 files changed, 91 insertions(+), 0 deletions(-) =================================================================== @@ -2807,3 +2807,94 @@ const gchar *ui_lookup_stock_label(const gchar *stock_id) g_warning("No stock id '%s'!", stock_id); return NULL; } + + +/* finds the next iter at any level + * @param iter in/out, the current iter, will be changed to the next one + * @param down whether to try the child iter + * @return TRUE if there @p iter was set, or FALSE if there is no next iter */ +gboolean ui_tree_model_iter_any_next(GtkTreeModel *model, GtkTreeIter *iter, gboolean down) +{ + GtkTreeIter guess; + GtkTreeIter copy = *iter; + + /* go down if the item has children */ + if (down && gtk_tree_model_iter_children(model, &guess, iter)) + *iter = guess; + /* or to the next item at the same level */ + else if (gtk_tree_model_iter_next(model, &copy)) + *iter = copy; + /* or to the next item at a parent level */ + else if (gtk_tree_model_iter_parent(model, &guess, iter)) + { + copy = guess; + while (TRUE) + { + if (gtk_tree_model_iter_next(model, &copy)) + { + *iter = copy; + return TRUE; + } + else if (gtk_tree_model_iter_parent(model, &copy, &guess)) + guess = copy; + else + return FALSE; + } + } + else + return FALSE; + + return TRUE; +} + + +GtkWidget *ui_create_encodings_combo_box(gboolean has_detect, gint default_enc) +{ + GtkCellRenderer *renderer; + GtkTreeIter iter; + GtkWidget *combo = gtk_combo_box_new(); + GtkTreeStore *store = encodings_encoding_store_new(has_detect); + + if (default_enc < 0 || default_enc >= GEANY_ENCODINGS_MAX) + default_enc = has_detect ? GEANY_ENCODINGS_MAX : GEANY_ENCODING_NONE; + + gtk_combo_box_set_model(GTK_COMBO_BOX(combo), GTK_TREE_MODEL(store)); + if (encodings_encoding_store_get_iter(store, &iter, default_enc)) + gtk_combo_box_set_active_iter(GTK_COMBO_BOX(combo), &iter); + renderer = gtk_cell_renderer_text_new(); + gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), renderer, TRUE); + gtk_cell_layout_set_cell_data_func(GTK_CELL_LAYOUT(combo), renderer, + encodings_encoding_store_cell_data_func, NULL, NULL); + + return combo; +} + + +gint ui_encodings_combo_box_get_active_encoding(GtkComboBox *combo) +{ + GtkTreeIter iter; + gint enc = GEANY_ENCODING_NONE; + + /* there should always be an active iter anyway, but we check just in case */ + if (gtk_combo_box_get_active_iter(combo, &iter)) + { + GtkTreeModel *model = gtk_combo_box_get_model(combo); + enc = encodings_encoding_store_get_encoding(GTK_TREE_STORE(model), &iter); + } + + return enc; +} + + +gboolean ui_encodings_combo_box_set_active_encoding(GtkComboBox *combo, gint enc) +{ + GtkTreeIter iter; + GtkTreeModel *model = gtk_combo_box_get_model(combo); + + if (encodings_encoding_store_get_iter(GTK_TREE_STORE(model), &iter, enc)) + { + gtk_combo_box_set_active_iter(combo, &iter); + return TRUE; + } + return FALSE; +} Modified: src/ui_utils.h 7 files changed, 7 insertions(+), 0 deletions(-) =================================================================== @@ -318,6 +318,7 @@ gboolean ui_tree_view_find_next(GtkTreeView *treeview, TVMatchCallback cb); gboolean ui_tree_view_find_previous(GtkTreeView *treeview, TVMatchCallback cb); +gboolean ui_tree_model_iter_any_next(GtkTreeModel *model, GtkTreeIter *iter, gboolean down); void ui_statusbar_showhide(gboolean state); @@ -341,6 +342,12 @@ GIcon *ui_get_mime_icon(const gchar *mime_type); void ui_focus_current_document(void); +GtkWidget *ui_create_encodings_combo_box(gboolean has_detect, gint default_enc); + +gint ui_encodings_combo_box_get_active_encoding(GtkComboBox *combo); + +gboolean ui_encodings_combo_box_set_active_encoding(GtkComboBox *combo, gint enc); + G_END_DECLS #endif -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 420891: Group filetypes in the Open dialog filetype combo box
by Colomban Wendling 15 Apr '14

15 Apr '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 15 Apr 2014 13:52:59 UTC Commit: 420891ae81b5bd470ba62c9579edd37e7c0e95bd https://github.com/geany/geany/commit/420891ae81b5bd470ba62c9579edd37e7c0e9… Log Message: ----------- Group filetypes in the Open dialog filetype combo box Display the filetypes in the Open dialog filetype combo box grouped, as they are in the filetypes menu. This makes it easier to select a filetype, because they are better sorted and follows the filetypes menu layout. Modified Paths: -------------- src/dialogs.c Modified: src/dialogs.c 125 files changed, 113 insertions(+), 12 deletions(-) =================================================================== @@ -80,13 +80,16 @@ filesel_state = { { 0, GEANY_ENCODINGS_MAX, /* default encoding is detect from file */ - 0, + GEANY_FILETYPES_NONE, /* default filetype is detect from extension */ FALSE, FALSE } }; +static gint filetype_combo_box_get_active_filetype(GtkComboBox *combo); + + /* gets the ID of the current file filter */ static guint file_chooser_get_filter_idx(GtkFileChooser *chooser) { @@ -134,11 +137,11 @@ static void open_file_dialog_handle_response(GtkWidget *dialog, gint response) filesel_state.open.more_options_visible = gtk_expander_get_expanded(GTK_EXPANDER(expander)); filesel_state.open.filter_idx = file_chooser_get_filter_idx(GTK_FILE_CHOOSER(dialog)); - filesel_state.open.filetype_idx = gtk_combo_box_get_active(GTK_COMBO_BOX(filetype_combo)); + filesel_state.open.filetype_idx = filetype_combo_box_get_active_filetype(GTK_COMBO_BOX(filetype_combo)); /* ignore detect from file item */ if (filesel_state.open.filetype_idx > 0) - ft = g_slist_nth_data(filetypes_by_title, (guint) filesel_state.open.filetype_idx); + ft = filetypes_index(filesel_state.open.filetype_idx); filesel_state.open.encoding_idx = ui_encodings_combo_box_get_active_encoding(GTK_COMBO_BOX(encoding_combo)); if (filesel_state.open.encoding_idx >= 0 && filesel_state.open.encoding_idx < GEANY_ENCODINGS_MAX) @@ -178,6 +181,111 @@ on_file_open_check_hidden_toggled(GtkToggleButton *togglebutton, GtkWidget *dial } +static void filetype_combo_cell_data_func(GtkCellLayout *cell_layout, GtkCellRenderer *cell, + GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data) +{ + gboolean sensitive = !gtk_tree_model_iter_has_child(tree_model, iter); + gchar *text; + + gtk_tree_model_get(tree_model, iter, 1, &text, -1); + g_object_set(cell, "sensitive", sensitive, "text", text, NULL); + g_free(text); +} + + +static GtkWidget *create_filetype_combo_box(void) +{ + GtkTreeStore *store; + GtkTreeIter iter_compiled, iter_script, iter_markup, iter_misc, iter_detect; + GtkTreeIter *iter_parent; + GtkWidget *combo; + GtkCellRenderer *renderer; + GSList *node; + + store = gtk_tree_store_new(2, G_TYPE_INT, G_TYPE_STRING); + + gtk_tree_store_insert_with_values(store, &iter_detect, NULL, -1, + 0, GEANY_FILETYPES_NONE, 1, _("Detect by file extension"), -1); + + gtk_tree_store_insert_with_values(store, &iter_compiled, NULL, -1, + 0, -1, 1, _("Programming Languages"), -1); + gtk_tree_store_insert_with_values(store, &iter_script, NULL, -1, + 0, -1, 1, _("Scripting Languages"), -1); + gtk_tree_store_insert_with_values(store, &iter_markup, NULL, -1, + 0, -1, 1, _("Markup Languages"), -1); + gtk_tree_store_insert_with_values(store, &iter_misc, NULL, -1, + 0, -1, 1, _("Miscellaneous"), -1); + + foreach_slist (node, filetypes_by_title) + { + GeanyFiletype *ft = node->data; + + if (ft->id == GEANY_FILETYPES_NONE) + continue; + + switch (ft->group) + { + case GEANY_FILETYPE_GROUP_COMPILED: iter_parent = &iter_compiled; break; + case GEANY_FILETYPE_GROUP_SCRIPT: iter_parent = &iter_script; break; + case GEANY_FILETYPE_GROUP_MARKUP: iter_parent = &iter_markup; break; + case GEANY_FILETYPE_GROUP_MISC: iter_parent = &iter_misc; break; + case GEANY_FILETYPE_GROUP_NONE: + default: iter_parent = NULL; + } + gtk_tree_store_insert_with_values(store, NULL, iter_parent, -1, + 0, (gint) ft->id, 1, ft->title, -1); + } + + combo = gtk_combo_box_new_with_model(GTK_TREE_MODEL(store)); + gtk_combo_box_set_active_iter(GTK_COMBO_BOX(combo), &iter_detect); + renderer = gtk_cell_renderer_text_new(); + gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), renderer, TRUE); + gtk_cell_layout_set_cell_data_func(GTK_CELL_LAYOUT(combo), renderer, + filetype_combo_cell_data_func, NULL, NULL); + + g_object_unref(store); + + return combo; +} + + +static gint filetype_combo_box_get_active_filetype(GtkComboBox *combo) +{ + gint id = 0; + GtkTreeIter iter; + + if (gtk_combo_box_get_active_iter(combo, &iter)) + { + GtkTreeModel *model = gtk_combo_box_get_model(combo); + gtk_tree_model_get(model, &iter, 0, &id, -1); + } + return id; +} + + +static gboolean filetype_combo_box_set_active_filetype(GtkComboBox *combo, const gint id) +{ + GtkTreeModel *model = gtk_combo_box_get_model(combo); + GtkTreeIter iter; + + if (gtk_tree_model_get_iter_first(model, &iter)) + { + do + { + gint row_id; + gtk_tree_model_get(model, &iter, 0, &row_id, -1); + if (id == row_id) + { + gtk_combo_box_set_active_iter(combo, &iter); + return TRUE; + } + } + while (ui_tree_model_iter_any_next(model, &iter, TRUE)); + } + return FALSE; +} + + static GtkWidget *add_file_open_extra_widget(GtkWidget *dialog) { GtkWidget *expander, *vbox, *table, *check_hidden; @@ -225,7 +333,7 @@ static GtkWidget *add_file_open_extra_widget(GtkWidget *dialog) (GtkAttachOptions) (0), 4, 5); /* the ebox is for the tooltip, because gtk_combo_box can't show tooltips */ filetype_ebox = gtk_event_box_new(); - filetype_combo = gtk_combo_box_text_new(); + filetype_combo = create_filetype_combo_box(); gtk_widget_set_tooltip_text(filetype_ebox, _("Explicitly defines a filetype for the file, if it would not be detected by filename extension.\nNote if you choose multiple files, they will all be opened with the chosen filetype.")); gtk_container_add(GTK_CONTAINER(filetype_ebox), filetype_combo); @@ -250,7 +358,6 @@ static GtkWidget *add_file_open_extra_widget(GtkWidget *dialog) static GtkWidget *create_open_file_dialog(void) { GtkWidget *dialog; - GtkWidget *filetype_combo; GtkWidget *viewbtn; GSList *node; @@ -278,9 +385,7 @@ static GtkWidget *create_open_file_dialog(void) /* add checkboxes and filename entry */ gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(dialog), add_file_open_extra_widget(dialog)); - filetype_combo = ui_lookup_widget(dialog, "filetype_combo"); - gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(filetype_combo), _("Detect by file extension")); /* add FileFilters(start with "All Files") */ gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filetypes_create_file_filter(filetypes[GEANY_FILETYPES_NONE])); @@ -293,11 +398,8 @@ static GtkWidget *create_open_file_dialog(void) if (G_UNLIKELY(ft->id == GEANY_FILETYPES_NONE)) continue; - gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(filetype_combo), ft->title); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filetypes_create_file_filter(ft)); } - gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(filetype_combo), 3); - gtk_combo_box_set_active(GTK_COMBO_BOX(filetype_combo), 0); g_signal_connect(dialog, "notify::show-hidden", G_CALLBACK(on_file_open_show_hidden_notify), NULL); @@ -318,18 +420,17 @@ static void open_file_dialog_apply_settings(GtkWidget *dialog) if (! initialized) { filesel_state.open.filter_idx = file_chooser_get_filter_idx(GTK_FILE_CHOOSER(dialog)); - filesel_state.open.filetype_idx = gtk_combo_box_get_active(GTK_COMBO_BOX(filetype_combo)); initialized = TRUE; } else { file_chooser_set_filter_idx(GTK_FILE_CHOOSER(dialog), filesel_state.open.filter_idx); - gtk_combo_box_set_active(GTK_COMBO_BOX(filetype_combo), filesel_state.open.filetype_idx); } gtk_expander_set_expanded(GTK_EXPANDER(expander), filesel_state.open.more_options_visible); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_hidden), filesel_state.open.show_hidden); ui_encodings_combo_box_set_active_encoding(GTK_COMBO_BOX(encoding_combo), filesel_state.open.encoding_idx); + filetype_combo_box_set_active_filetype(GTK_COMBO_BOX(filetype_combo), filesel_state.open.filetype_idx); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 8c5e19: Unify encoding combo boxes
by Colomban Wendling 15 Apr '14

15 Apr '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 15 Apr 2014 13:51:49 UTC Commit: 8c5e198cf12c619596bae2b5976f52c7e52bad80 https://github.com/geany/geany/commit/8c5e198cf12c619596bae2b5976f52c7e52ba… Log Message: ----------- Unify encoding combo boxes Make all encoding combo box display a list with encodings grouped by categories into sub-menus, making it easier to find the appropriate encoding than in a big single-level list. This is what was used in the Open dialog, but not in the Preferences dialog or the Find in Files dialog. This also makes the encoding combo boxes behave more like the encoding menus. Modified Paths: -------------- data/geany.glade src/dialogs.c src/encodings.c src/encodings.h src/prefs.c src/search.c src/symbols.c src/ui_utils.c src/ui_utils.h Modified: data/geany.glade 18 files changed, 2 insertions(+), 16 deletions(-) =================================================================== @@ -433,12 +433,6 @@ </object> </child> </object> - <object class="GtkListStore" id="encoding_list"> - <columns> -  - <column type="gchararray"/> - </columns> - </object> <object class="GtkListStore" id="eol_list"> <columns>  @@ -4368,12 +4362,8 @@ <object class="GtkComboBox" id="combo_new_encoding"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="model">encoding_list</property> <child> - <object class="GtkCellRendererText" id="cellrenderertext6"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> + <object class="GtkCellRendererText" id="combo_new_encoding_renderer"/> </child> </object> </child> @@ -4434,12 +4424,8 @@ <object class="GtkComboBox" id="combo_open_encoding"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="model">encoding_list</property> <child> - <object class="GtkCellRendererText" id="cellrenderertext7"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> + <object class="GtkCellRendererText" id="combo_open_encoding_renderer"/> </child> </object> </child> Modified: src/dialogs.c 117 files changed, 5 insertions(+), 112 deletions(-) =================================================================== @@ -125,8 +125,6 @@ static void open_file_dialog_handle_response(GtkWidget *dialog, gint response) if (response == GTK_RESPONSE_ACCEPT || response == GEANY_RESPONSE_VIEW) { GSList *filelist; - GtkTreeModel *encoding_model; - GtkTreeIter encoding_iter; GeanyFiletype *ft = NULL; const gchar *charset = NULL; GtkWidget *expander = ui_lookup_widget(dialog, "more_options_expander"); @@ -142,9 +140,7 @@ static void open_file_dialog_handle_response(GtkWidget *dialog, gint response) if (filesel_state.open.filetype_idx > 0) ft = g_slist_nth_data(filetypes_by_title, (guint) filesel_state.open.filetype_idx); - encoding_model = gtk_combo_box_get_model(GTK_COMBO_BOX(encoding_combo)); - gtk_combo_box_get_active_iter(GTK_COMBO_BOX(encoding_combo), &encoding_iter); - gtk_tree_model_get(encoding_model, &encoding_iter, 0, &filesel_state.open.encoding_idx, -1); + filesel_state.open.encoding_idx = ui_encodings_combo_box_get_active_encoding(GTK_COMBO_BOX(encoding_combo)); if (filesel_state.open.encoding_idx >= 0 && filesel_state.open.encoding_idx < GEANY_ENCODINGS_MAX) charset = encodings[filesel_state.open.encoding_idx].charset; @@ -182,97 +178,6 @@ on_file_open_check_hidden_toggled(GtkToggleButton *togglebutton, GtkWidget *dial } -static gint encoding_combo_store_sort_func(GtkTreeModel *model, - GtkTreeIter *a, - GtkTreeIter *b, - gpointer data) -{ - gboolean a_has_child = gtk_tree_model_iter_has_child(model, a); - gboolean b_has_child = gtk_tree_model_iter_has_child(model, b); - gchar *a_string; - gchar *b_string; - gint cmp_res; - - if (a_has_child != b_has_child) - return a_has_child ? -1 : 1; - - gtk_tree_model_get(model, a, 1, &a_string, -1); - gtk_tree_model_get(model, b, 1, &b_string, -1); - cmp_res = strcmp(a_string, b_string); - g_free(a_string); - g_free(b_string); - return cmp_res; -} - - -static GtkTreeStore *create_encoding_combo_store(GtkTreeIter *iter_detect) -{ - GtkTreeStore *store; - GtkTreeIter iter_current, iter_westeuro, iter_easteuro, iter_eastasian, iter_asian, - iter_utf8, iter_middleeast; - GtkTreeIter *iter_parent; - gchar *encoding_string; - gint i; - - store = gtk_tree_store_new(2, G_TYPE_INT, G_TYPE_STRING); - - gtk_tree_store_append(store, iter_detect, NULL); - gtk_tree_store_set(store, iter_detect, 0, GEANY_ENCODINGS_MAX, 1, _("Detect from file"), -1); - - gtk_tree_store_append(store, &iter_westeuro, NULL); - gtk_tree_store_set(store, &iter_westeuro, 0, -1, 1, _("West European"), -1); - gtk_tree_store_append(store, &iter_easteuro, NULL); - gtk_tree_store_set(store, &iter_easteuro, 0, -1, 1, _("East European"), -1); - gtk_tree_store_append(store, &iter_eastasian, NULL); - gtk_tree_store_set(store, &iter_eastasian, 0, -1, 1, _("East Asian"), -1); - gtk_tree_store_append(store, &iter_asian, NULL); - gtk_tree_store_set(store, &iter_asian, 0, -1, 1, _("SE & SW Asian"), -1); - gtk_tree_store_append(store, &iter_middleeast, NULL); - gtk_tree_store_set(store, &iter_middleeast, 0, -1, 1, _("Middle Eastern"), -1); - gtk_tree_store_append(store, &iter_utf8, NULL); - gtk_tree_store_set(store, &iter_utf8, 0, -1, 1, _("Unicode"), -1); - - for (i = 0; i < GEANY_ENCODINGS_MAX; i++) - { - switch (encodings[i].group) - { - case WESTEUROPEAN: iter_parent = &iter_westeuro; break; - case EASTEUROPEAN: iter_parent = &iter_easteuro; break; - case EASTASIAN: iter_parent = &iter_eastasian; break; - case ASIAN: iter_parent = &iter_asian; break; - case MIDDLEEASTERN: iter_parent = &iter_middleeast; break; - case UNICODE: iter_parent = &iter_utf8; break; - case NONE: - default: iter_parent = NULL; - } - gtk_tree_store_append(store, &iter_current, iter_parent); - encoding_string = encodings_to_string(&encodings[i]); - gtk_tree_store_set(store, &iter_current, 0, i, 1, encoding_string, -1); - g_free(encoding_string); - /* restore the saved state */ - if (i == filesel_state.open.encoding_idx) - *iter_detect = iter_current; - } - - gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(store), 1, GTK_SORT_ASCENDING); - gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(store), 1, encoding_combo_store_sort_func, NULL, NULL); - - return store; -} - - -static void encoding_combo_cell_data_func(GtkCellLayout *cell_layout, - GtkCellRenderer *cell, - GtkTreeModel *tree_model, - GtkTreeIter *iter, - gpointer data) -{ - gboolean sensitive = !gtk_tree_model_iter_has_child(tree_model, iter); - - g_object_set(cell, "sensitive", sensitive, NULL); -} - - static GtkWidget *add_file_open_extra_widget(GtkWidget *dialog) { GtkWidget *expander, *vbox, *table, *check_hidden; @@ -304,7 +209,7 @@ static GtkWidget *add_file_open_extra_widget(GtkWidget *dialog) (GtkAttachOptions) (0), 4, 5); /* the ebox is for the tooltip, because gtk_combo_box can't show tooltips */ encoding_ebox = gtk_event_box_new(); - encoding_combo = gtk_combo_box_new(); + encoding_combo = ui_create_encodings_combo_box(TRUE, GEANY_ENCODINGS_MAX); gtk_widget_set_tooltip_text(encoding_ebox, _("Explicitly defines an encoding for the file, if it would not be detected. This is useful when you know that the encoding of a file cannot be detected correctly by Geany.\nNote if you choose multiple files, they will all be opened with the chosen encoding.")); gtk_container_add(GTK_CONTAINER(encoding_ebox), encoding_combo); @@ -345,10 +250,8 @@ static GtkWidget *add_file_open_extra_widget(GtkWidget *dialog) static GtkWidget *create_open_file_dialog(void) { GtkWidget *dialog; - GtkWidget *filetype_combo, *encoding_combo; + GtkWidget *filetype_combo; GtkWidget *viewbtn; - GtkCellRenderer *encoding_renderer; - GtkTreeIter encoding_iter; GSList *node; dialog = gtk_file_chooser_dialog_new(_("Open File"), GTK_WINDOW(main_widgets.window), @@ -396,17 +299,6 @@ static GtkWidget *create_open_file_dialog(void) gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(filetype_combo), 3); gtk_combo_box_set_active(GTK_COMBO_BOX(filetype_combo), 0); - /* fill encoding combo box */ - encoding_combo = ui_lookup_widget(dialog, "encoding_combo"); - gtk_combo_box_set_model(GTK_COMBO_BOX(encoding_combo), GTK_TREE_MODEL( - create_encoding_combo_store(&encoding_iter))); - gtk_combo_box_set_active_iter(GTK_COMBO_BOX(encoding_combo), &encoding_iter); - encoding_renderer = gtk_cell_renderer_text_new(); - gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(encoding_combo), encoding_renderer, TRUE); - gtk_cell_layout_add_attribute(GTK_CELL_LAYOUT(encoding_combo), encoding_renderer, "text", 1); - gtk_cell_layout_set_cell_data_func(GTK_CELL_LAYOUT(encoding_combo), encoding_renderer, - encoding_combo_cell_data_func, NULL, NULL); - g_signal_connect(dialog, "notify::show-hidden", G_CALLBACK(on_file_open_show_hidden_notify), NULL); @@ -419,6 +311,7 @@ static void open_file_dialog_apply_settings(GtkWidget *dialog) static gboolean initialized = FALSE; GtkWidget *check_hidden = ui_lookup_widget(dialog, "check_hidden"); GtkWidget *filetype_combo = ui_lookup_widget(dialog, "filetype_combo"); + GtkWidget *encoding_combo = ui_lookup_widget(dialog, "encoding_combo"); GtkWidget *expander = ui_lookup_widget(dialog, "more_options_expander"); /* we can't know the initial position of combo boxes, so retreive it the first time */ @@ -436,7 +329,7 @@ static void open_file_dialog_apply_settings(GtkWidget *dialog) } gtk_expander_set_expanded(GTK_EXPANDER(expander), filesel_state.open.more_options_visible); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_hidden), filesel_state.open.show_hidden); - /* encoding combo is restored at creating time, see create_encoding_combo_store() */ + ui_encodings_combo_box_set_active_encoding(GTK_COMBO_BOX(encoding_combo), filesel_state.open.encoding_idx); } Modified: src/encodings.c 117 files changed, 117 insertions(+), 0 deletions(-) =================================================================== @@ -497,6 +497,123 @@ void encodings_init(void) } +static gint encoding_combo_store_sort_func(GtkTreeModel *model, + GtkTreeIter *a, + GtkTreeIter *b, + gpointer data) +{ + gboolean a_has_child = gtk_tree_model_iter_has_child(model, a); + gboolean b_has_child = gtk_tree_model_iter_has_child(model, b); + gchar *a_string; + gchar *b_string; + gint cmp_res; + + if (a_has_child != b_has_child) + return a_has_child ? -1 : 1; + + gtk_tree_model_get(model, a, 1, &a_string, -1); + gtk_tree_model_get(model, b, 1, &b_string, -1); + cmp_res = strcmp(a_string, b_string); + g_free(a_string); + g_free(b_string); + return cmp_res; +} + + +GtkTreeStore *encodings_encoding_store_new(gboolean has_detect) +{ + GtkTreeStore *store; + GtkTreeIter iter_current, iter_westeuro, iter_easteuro, iter_eastasian, + iter_asian, iter_utf8, iter_middleeast; + GtkTreeIter *iter_parent; + gchar *encoding_string; + gint i; + + store = gtk_tree_store_new(2, G_TYPE_INT, G_TYPE_STRING); + + if (has_detect) + { + gtk_tree_store_append(store, &iter_current, NULL); + gtk_tree_store_set(store, &iter_current, 0, GEANY_ENCODINGS_MAX, 1, _("Detect from file"), -1); + } + + gtk_tree_store_append(store, &iter_westeuro, NULL); + gtk_tree_store_set(store, &iter_westeuro, 0, -1, 1, _("West European"), -1); + gtk_tree_store_append(store, &iter_easteuro, NULL); + gtk_tree_store_set(store, &iter_easteuro, 0, -1, 1, _("East European"), -1); + gtk_tree_store_append(store, &iter_eastasian, NULL); + gtk_tree_store_set(store, &iter_eastasian, 0, -1, 1, _("East Asian"), -1); + gtk_tree_store_append(store, &iter_asian, NULL); + gtk_tree_store_set(store, &iter_asian, 0, -1, 1, _("SE & SW Asian"), -1); + gtk_tree_store_append(store, &iter_middleeast, NULL); + gtk_tree_store_set(store, &iter_middleeast, 0, -1, 1, _("Middle Eastern"), -1); + gtk_tree_store_append(store, &iter_utf8, NULL); + gtk_tree_store_set(store, &iter_utf8, 0, -1, 1, _("Unicode"), -1); + + for (i = 0; i < GEANY_ENCODINGS_MAX; i++) + { + switch (encodings[i].group) + { + case WESTEUROPEAN: iter_parent = &iter_westeuro; break; + case EASTEUROPEAN: iter_parent = &iter_easteuro; break; + case EASTASIAN: iter_parent = &iter_eastasian; break; + case ASIAN: iter_parent = &iter_asian; break; + case MIDDLEEASTERN: iter_parent = &iter_middleeast; break; + case UNICODE: iter_parent = &iter_utf8; break; + case NONE: + default: iter_parent = NULL; + } + gtk_tree_store_append(store, &iter_current, iter_parent); + encoding_string = encodings_to_string(&encodings[i]); + gtk_tree_store_set(store, &iter_current, 0, i, 1, encoding_string, -1); + g_free(encoding_string); + } + + gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(store), 1, GTK_SORT_ASCENDING); + gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(store), 1, encoding_combo_store_sort_func, NULL, NULL); + + return store; +} + + +gint encodings_encoding_store_get_encoding(GtkTreeStore *store, GtkTreeIter *iter) +{ + gint enc; + gtk_tree_model_get(GTK_TREE_MODEL(store), iter, 0, &enc, -1); + return enc; +} + + +gboolean encodings_encoding_store_get_iter(GtkTreeStore *store, GtkTreeIter *iter, gint enc) +{ + if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), iter)) + { + do + { + if (encodings_encoding_store_get_encoding(store, iter) == enc) + return TRUE; + } + while (ui_tree_model_iter_any_next(GTK_TREE_MODEL(store), iter, TRUE)); + } + return FALSE; +} + + +void encodings_encoding_store_cell_data_func(GtkCellLayout *cell_layout, + GtkCellRenderer *cell, + GtkTreeModel *tree_model, + GtkTreeIter *iter, + gpointer data) +{ + gboolean sensitive = !gtk_tree_model_iter_has_child(tree_model, iter); + gchar *text; + + gtk_tree_model_get(tree_model, iter, 1, &text, -1); + g_object_set(cell, "sensitive", sensitive, "text", text, NULL); + g_free(text); +} + + /** * Tries to convert @a buffer into UTF-8 encoding from the encoding specified with @a charset. * If @a fast is not set, additional checks to validate the converted string are performed. Modified: src/encodings.h 9 files changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -80,6 +80,15 @@ void encodings_select_radio_item(const gchar *charset); void encodings_init(void); void encodings_finalize(void); +GtkTreeStore *encodings_encoding_store_new(gboolean has_detect); + +gint encodings_encoding_store_get_encoding(GtkTreeStore *store, GtkTreeIter *iter); + +gboolean encodings_encoding_store_get_iter(GtkTreeStore *store, GtkTreeIter *iter, gint enc); + +void encodings_encoding_store_cell_data_func(GtkCellLayout *cell_layout, GtkCellRenderer *cell, + GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data); + gchar *encodings_convert_to_utf8(const gchar *buffer, gssize size, gchar **used_encoding); /* Converts a string from the given charset to UTF-8. Modified: src/prefs.c 47 files changed, 26 insertions(+), 21 deletions(-) =================================================================== @@ -547,8 +547,7 @@ static void prefs_init_dialog(void) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), file_prefs.tab_order_beside); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "combo_new_encoding"); - /* luckily the index of the combo box items match the index of the encodings array */ - gtk_combo_box_set_active(GTK_COMBO_BOX(widget), file_prefs.default_new_encoding); + ui_encodings_combo_box_set_active_encoding(GTK_COMBO_BOX(widget), file_prefs.default_new_encoding); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_open_encoding"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), @@ -558,10 +557,10 @@ static void prefs_init_dialog(void) widget = ui_lookup_widget(ui_widgets.prefs_dialog, "combo_open_encoding"); if (file_prefs.default_open_encoding >= 0) { - gtk_combo_box_set_active(GTK_COMBO_BOX(widget), file_prefs.default_open_encoding); + ui_encodings_combo_box_set_active_encoding(GTK_COMBO_BOX(widget), file_prefs.default_open_encoding); } else - gtk_combo_box_set_active(GTK_COMBO_BOX(widget), GEANY_ENCODING_UTF_8); + ui_encodings_combo_box_set_active_encoding(GTK_COMBO_BOX(widget), GEANY_ENCODING_UTF_8); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "combo_eol"); if (file_prefs.default_eol_character >= 0 && file_prefs.default_eol_character < 3) @@ -1020,13 +1019,13 @@ on_prefs_dialog_response(GtkDialog *dialog, gint response, gpointer user_data) file_prefs.tab_order_beside = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "combo_new_encoding"); - file_prefs.default_new_encoding = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); + file_prefs.default_new_encoding = ui_encodings_combo_box_get_active_encoding(GTK_COMBO_BOX(widget)); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_open_encoding"); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) { widget = ui_lookup_widget(ui_widgets.prefs_dialog, "combo_open_encoding"); - file_prefs.default_open_encoding = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); + file_prefs.default_open_encoding = ui_encodings_combo_box_get_active_encoding(GTK_COMBO_BOX(widget)); } else file_prefs.default_open_encoding = -1; @@ -1663,22 +1662,34 @@ void prefs_show_dialog(void) { if (ui_widgets.prefs_dialog == NULL) { - GtkListStore *encoding_list, *eol_list; - GtkWidget *label, *widget; - guint i; - gchar *encoding_string; + GtkListStore *eol_list; + GtkWidget *label; ui_widgets.prefs_dialog = create_prefs_dialog(); gtk_widget_set_name(ui_widgets.prefs_dialog, "GeanyPrefsDialog"); gtk_window_set_transient_for(GTK_WINDOW(ui_widgets.prefs_dialog), GTK_WINDOW(main_widgets.window)); /* init the file encoding combo boxes */ - encoding_list = ui_builder_get_object("encoding_list"); - for (i = 0; i < GEANY_ENCODINGS_MAX; i++) { - encoding_string = encodings_to_string(&encodings[i]); - list_store_append_text(encoding_list, encoding_string); - g_free(encoding_string); + struct { + const gchar *combo, *renderer; + } names[] = { + { "combo_new_encoding", "combo_new_encoding_renderer" }, + { "combo_open_encoding", "combo_open_encoding_renderer" } + }; + guint i; + GtkTreeStore *encoding_list = encodings_encoding_store_new(FALSE); + + for (i = 0; i < G_N_ELEMENTS(names); i++) + { + GtkWidget *combo = ui_lookup_widget(ui_widgets.prefs_dialog, names[i].combo); + + gtk_cell_layout_set_cell_data_func(GTK_CELL_LAYOUT(combo), + ui_builder_get_object(names[i].renderer), + encodings_encoding_store_cell_data_func, NULL, NULL); + gtk_combo_box_set_model(GTK_COMBO_BOX(combo), GTK_TREE_MODEL(encoding_list)); + } + g_object_unref(encoding_list); } /* init the eol character combo box */ @@ -1687,12 +1698,6 @@ void prefs_show_dialog(void) list_store_append_text(eol_list, utils_get_eol_name(SC_EOL_CR)); list_store_append_text(eol_list, utils_get_eol_name(SC_EOL_LF)); - /* wet combo box wrap width after having filled the encoding to workaround - * GTK bug https://bugzilla.gnome.org/show_bug.cgi?id=722388 */ - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "combo_new_encoding"); - gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(widget), 3); - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "combo_open_encoding"); - gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(widget), 3); /* add manually GeanyWrapLabels because they can't be added with Glade */ /* page Tools */ Modified: src/search.c 17 files changed, 4 insertions(+), 13 deletions(-) =================================================================== @@ -853,8 +853,6 @@ static void create_fif_dialog(void) *check_recursive, *check_extra, *entry_extra, *check_regexp, *combo_files_mode; GtkWidget *dbox, *sbox, *lbox, *rbox, *hbox, *vbox, *ebox; GtkSizeGroup *size_group; - gchar *encoding_string; - guint i; fif_dlg.dialog = gtk_dialog_new_with_buttons( _("Find in Files"), GTK_WINDOW(main_widgets.window), GTK_DIALOG_DESTROY_WITH_PARENT, @@ -931,14 +929,7 @@ static void create_fif_dialog(void) label2 = gtk_label_new_with_mnemonic(_("E_ncoding:")); gtk_misc_set_alignment(GTK_MISC(label2), 0, 0.5); - e_combo = gtk_combo_box_text_new(); - for (i = 0; i < GEANY_ENCODINGS_MAX; i++) - { - encoding_string = encodings_to_string(&encodings[i]); - gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(e_combo), encoding_string); - g_free(encoding_string); - } - gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(e_combo), 3); + e_combo = ui_create_encodings_combo_box(FALSE, GEANY_ENCODING_UTF_8); gtk_label_set_mnemonic_widget(GTK_LABEL(label2), e_combo); fif_dlg.encoding_combo = e_combo; @@ -1118,7 +1109,7 @@ void search_show_find_in_files_dialog_full(const gchar *text, const gchar *dir) /* set the encoding of the current file */ if (doc != NULL) enc_idx = encodings_get_idx_from_charset(doc->encoding); - gtk_combo_box_set_active(GTK_COMBO_BOX(fif_dlg.encoding_combo), enc_idx); + ui_encodings_combo_box_set_active_encoding(GTK_COMBO_BOX(fif_dlg.encoding_combo), enc_idx); /* put the focus to the directory entry if it is empty */ if (utils_str_equal(gtk_entry_get_text(GTK_ENTRY(entry)), "")) @@ -1600,8 +1591,8 @@ on_find_in_files_dialog_response(GtkDialog *dialog, gint response, GtkWidget *dir_combo = fif_dlg.dir_combo; const gchar *utf8_dir = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(dir_combo)))); - GeanyEncodingIndex enc_idx = gtk_combo_box_get_active( - GTK_COMBO_BOX(fif_dlg.encoding_combo)); + GeanyEncodingIndex enc_idx = + ui_encodings_combo_box_get_active_encoding(GTK_COMBO_BOX(fif_dlg.encoding_combo)); if (G_UNLIKELY(EMPTY(utf8_dir))) ui_set_statusbar(FALSE, _("Invalid directory for find in files.")); Modified: src/symbols.c 45 files changed, 3 insertions(+), 42 deletions(-) =================================================================== @@ -568,45 +568,6 @@ static GdkPixbuf *get_tag_icon(const gchar *icon_name) } -/* finds the next iter at any level - * @param iter in/out, the current iter, will be changed to the next one - * @param down whether to try the child iter - * @return TRUE if there @p iter was set, or FALSE if there is no next iter */ -static gboolean next_iter(GtkTreeModel *model, GtkTreeIter *iter, gboolean down) -{ - GtkTreeIter guess; - GtkTreeIter copy = *iter; - - /* go down if the item has children */ - if (down && gtk_tree_model_iter_children(model, &guess, iter)) - *iter = guess; - /* or to the next item at the same level */ - else if (gtk_tree_model_iter_next(model, &copy)) - *iter = copy; - /* or to the next item at a parent level */ - else if (gtk_tree_model_iter_parent(model, &guess, iter)) - { - copy = guess; - while(TRUE) - { - if (gtk_tree_model_iter_next(model, &copy)) - { - *iter = copy; - return TRUE; - } - else if (gtk_tree_model_iter_parent(model, &copy, &guess)) - guess = copy; - else - return FALSE; - } - } - else - return FALSE; - - return TRUE; -} - - static gboolean find_toplevel_iter(GtkTreeStore *store, GtkTreeIter *iter, const gchar *title) { GtkTreeModel *model = GTK_TREE_MODEL(store); @@ -1304,7 +1265,7 @@ static gboolean tree_store_remove_row(GtkTreeStore *store, GtkTreeIter *iter) if (! cont && has_parent) { *iter = parent; - cont = next_iter(GTK_TREE_MODEL(store), iter, FALSE); + cont = ui_tree_model_iter_any_next(GTK_TREE_MODEL(store), iter, FALSE); } return cont; @@ -1484,7 +1445,7 @@ static void update_tree_tags(GeanyDocument *doc, GList **tags) gtk_tree_model_get(model, &iter, SYMBOLS_COLUMN_TAG, &tag, -1); if (! tag) /* most probably a toplevel, skip it */ - cont = next_iter(model, &iter, TRUE); + cont = ui_tree_model_iter_any_next(model, &iter, TRUE); else { GList *found_item; @@ -1517,7 +1478,7 @@ static void update_tree_tags(GeanyDocument *doc, GList **tags) tags_table_remove(tags_table, found); *tags = g_list_delete_link(*tags, found_item); - cont = next_iter(model, &iter, TRUE); + cont = ui_tree_model_iter_any_next(model, &iter, TRUE); } tm_tag_unref(tag); Modified: src/ui_utils.c 91 files changed, 91 insertions(+), 0 deletions(-) =================================================================== @@ -2768,3 +2768,94 @@ const gchar *ui_lookup_stock_label(const gchar *stock_id) g_warning("No stock id '%s'!", stock_id); return NULL; } + + +/* finds the next iter at any level + * @param iter in/out, the current iter, will be changed to the next one + * @param down whether to try the child iter + * @return TRUE if there @p iter was set, or FALSE if there is no next iter */ +gboolean ui_tree_model_iter_any_next(GtkTreeModel *model, GtkTreeIter *iter, gboolean down) +{ + GtkTreeIter guess; + GtkTreeIter copy = *iter; + + /* go down if the item has children */ + if (down && gtk_tree_model_iter_children(model, &guess, iter)) + *iter = guess; + /* or to the next item at the same level */ + else if (gtk_tree_model_iter_next(model, &copy)) + *iter = copy; + /* or to the next item at a parent level */ + else if (gtk_tree_model_iter_parent(model, &guess, iter)) + { + copy = guess; + while (TRUE) + { + if (gtk_tree_model_iter_next(model, &copy)) + { + *iter = copy; + return TRUE; + } + else if (gtk_tree_model_iter_parent(model, &copy, &guess)) + guess = copy; + else + return FALSE; + } + } + else + return FALSE; + + return TRUE; +} + + +GtkWidget *ui_create_encodings_combo_box(gboolean has_detect, gint default_enc) +{ + GtkCellRenderer *renderer; + GtkTreeIter iter; + GtkWidget *combo = gtk_combo_box_new(); + GtkTreeStore *store = encodings_encoding_store_new(has_detect); + + if (default_enc < 0 || default_enc >= GEANY_ENCODINGS_MAX) + default_enc = has_detect ? GEANY_ENCODINGS_MAX : GEANY_ENCODING_NONE; + + gtk_combo_box_set_model(GTK_COMBO_BOX(combo), GTK_TREE_MODEL(store)); + if (encodings_encoding_store_get_iter(store, &iter, default_enc)) + gtk_combo_box_set_active_iter(GTK_COMBO_BOX(combo), &iter); + renderer = gtk_cell_renderer_text_new(); + gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), renderer, TRUE); + gtk_cell_layout_set_cell_data_func(GTK_CELL_LAYOUT(combo), renderer, + encodings_encoding_store_cell_data_func, NULL, NULL); + + return combo; +} + + +gint ui_encodings_combo_box_get_active_encoding(GtkComboBox *combo) +{ + GtkTreeIter iter; + gint enc = GEANY_ENCODING_NONE; + + /* there should always be an active iter anyway, but we check just in case */ + if (gtk_combo_box_get_active_iter(combo, &iter)) + { + GtkTreeModel *model = gtk_combo_box_get_model(combo); + enc = encodings_encoding_store_get_encoding(GTK_TREE_STORE(model), &iter); + } + + return enc; +} + + +gboolean ui_encodings_combo_box_set_active_encoding(GtkComboBox *combo, gint enc) +{ + GtkTreeIter iter; + GtkTreeModel *model = gtk_combo_box_get_model(combo); + + if (encodings_encoding_store_get_iter(GTK_TREE_STORE(model), &iter, enc)) + { + gtk_combo_box_set_active_iter(combo, &iter); + return TRUE; + } + return FALSE; +} Modified: src/ui_utils.h 7 files changed, 7 insertions(+), 0 deletions(-) =================================================================== @@ -315,6 +315,7 @@ gboolean ui_tree_view_find_next(GtkTreeView *treeview, TVMatchCallback cb); gboolean ui_tree_view_find_previous(GtkTreeView *treeview, TVMatchCallback cb); +gboolean ui_tree_model_iter_any_next(GtkTreeModel *model, GtkTreeIter *iter, gboolean down); void ui_statusbar_showhide(gboolean state); @@ -338,6 +339,12 @@ GdkPixbuf *ui_get_mime_icon(const gchar *mime_type, GtkIconSize size); void ui_focus_current_document(void); +GtkWidget *ui_create_encodings_combo_box(gboolean has_detect, gint default_enc); + +gint ui_encodings_combo_box_get_active_encoding(GtkComboBox *combo); + +gboolean ui_encodings_combo_box_set_active_encoding(GtkComboBox *combo, gint enc); + G_END_DECLS #endif -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 15a236: Revision bump
by Colomban Wendling 15 Apr '14

15 Apr '14

Branch: refs/heads/1.24 Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 15 Apr 2014 12:59:07 UTC Commit: 15a2366e361057b26f91c51be8e0dccdf165586e https://github.com/geany/geany/commit/15a2366e361057b26f91c51be8e0dccdf1655… Log Message: ----------- Revision bump Modified Paths: -------------- NEWS configure.ac doc/geany.txt geany.exe.manifest geany.nsi geany_private.rc win32-config.h wscript Modified: NEWS 3 files changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,6 @@ +Geany 1.24.1 (unreleased) + + Geany 1.24 (April 13, 2014) General Modified: configure.ac 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.60]) -AC_INIT([Geany], [1.24], +AC_INIT([Geany], [1.24.1], [https://sourceforge.net/tracker/?group_id=153444&atid=787791]) AC_CONFIG_SRCDIR([src/geany.h]) AC_CONFIG_AUX_DIR([build-aux]) Modified: doc/geany.txt 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,4 @@ -.. |(version)| replace:: 1.24 +.. |(version)| replace:: 1.24.1 .. -*- reStructuredText -*- ======= Modified: geany.exe.manifest 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity - version="1.24.0.0" + version="1.24.1.0" processorArchitecture="X86" name="Geany" type="win32" /> Modified: geany.nsi 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -32,8 +32,8 @@ RequestExecutionLevel highest ; set execution level for Windows Vista ; helper defines ; ;;;;;;;;;;;;;;;;;;; !define PRODUCT_NAME "Geany" -!define PRODUCT_VERSION "1.24" -!define PRODUCT_VERSION_ID "1.24.0.0" +!define PRODUCT_VERSION "1.24.1" +!define PRODUCT_VERSION_ID "1.24.1.0" !define PRODUCT_PUBLISHER "The Geany developer team" !define PRODUCT_WEB_SITE "http://www.geany.org/" !define PRODUCT_DIR_REGKEY "Software\Geany" Modified: geany_private.rc 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,8 @@ #include <windows.h> // include for version info constants -#define VER_FILEVERSION 1,24,0,0 -#define VER_FILEVERSION_STR "1.24" +#define VER_FILEVERSION 1,24,1,0 +#define VER_FILEVERSION_STR "1.24.1" #define APP_MANIFEST 1 A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../icons/geany.ico" Modified: win32-config.h 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -311,7 +311,7 @@ /* #undef volatile */ /* Version number of package */ -#define VERSION "1.24" +#define VERSION "1.24.1" #define REVISION "-1" Modified: wscript 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -51,7 +51,7 @@ from waflib.Tools.compiler_cxx import cxx_compiler APPNAME = 'geany' -VERSION = '1.24' +VERSION = '1.24.1' LINGUAS_FILE = 'po/LINGUAS' MINIMUM_GTK_VERSION = '2.16.0' MINIMUM_GTK3_VERSION = '3.0.0' -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 64bc67: Distribute `geany.gtkrc` and `geany.css` files
by Matthew Brush 15 Apr '14

15 Apr '14

Branch: refs/heads/1.24 Author: Matthew Brush <matt(a)geany.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 15 Apr 2014 12:59:07 UTC Commit: 64bc67916d9d27c7e4ddb0d0a399cbf157a135cc https://github.com/geany/geany/commit/64bc67916d9d27c7e4ddb0d0a399cbf157a13… Log Message: ----------- Distribute `geany.gtkrc` and `geany.css` files Maybe they aren't dist'ed if they are in Automake conditional? This probably makes both GTK2 and GTK3 files installed unconditionally. Modified Paths: -------------- Makefile.am Modified: Makefile.am 10 files changed, 3 insertions(+), 7 deletions(-) =================================================================== @@ -25,13 +25,9 @@ SYS_DATA_FILES = \ $(srcdir)/data/templates/* \ $(srcdir)/data/templates/files/* \ $(srcdir)/data/colorschemes/* \ - $(top_srcdir)/data/geany.glade - -if GTK3 - $(top_srcdir)/data/geany.css -else - $(top_srcdir)/data/geany.gtkrc -endif + $(top_srcdir)/data/geany.glade \ + data/geany.css \ + data/geany.gtkrc EXTRA_DIST = \ autogen.sh \ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] a851f8: Update NEWS
by Colomban Wendling 15 Apr '14

15 Apr '14

Branch: refs/heads/1.24 Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 15 Apr 2014 12:59:07 UTC Commit: a851f87a62a970c380469ba7daf707df249d017b https://github.com/geany/geany/commit/a851f87a62a970c380469ba7daf707df249d0… Log Message: ----------- Update NEWS Modified Paths: -------------- NEWS Modified: NEWS 3 files changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -1,5 +1,8 @@ Geany 1.24.1 (unreleased) + General + * Fix distribution of custom GTK style files (#1037). + Geany 1.24 (April 13, 2014) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 15a236: Revision bump
by Colomban Wendling 15 Apr '14

15 Apr '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 15 Apr 2014 12:59:07 UTC Commit: 15a2366e361057b26f91c51be8e0dccdf165586e https://github.com/geany/geany/commit/15a2366e361057b26f91c51be8e0dccdf1655… Log Message: ----------- Revision bump Modified Paths: -------------- NEWS configure.ac doc/geany.txt geany.exe.manifest geany.nsi geany_private.rc win32-config.h wscript Modified: NEWS 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,6 @@ +Geany 1.24.1 (unreleased) + + Geany 1.24 (April 13, 2014) General Modified: configure.ac 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.60]) -AC_INIT([Geany], [1.24], +AC_INIT([Geany], [1.24.1], [https://sourceforge.net/tracker/?group_id=153444&atid=787791]) AC_CONFIG_SRCDIR([src/geany.h]) AC_CONFIG_AUX_DIR([build-aux]) Modified: doc/geany.txt 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,4 @@ -.. |(version)| replace:: 1.24 +.. |(version)| replace:: 1.24.1 .. -*- reStructuredText -*- ======= Modified: geany.exe.manifest 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity - version="1.24.0.0" + version="1.24.1.0" processorArchitecture="X86" name="Geany" type="win32" /> Modified: geany.nsi 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -32,8 +32,8 @@ RequestExecutionLevel highest ; set execution level for Windows Vista ; helper defines ; ;;;;;;;;;;;;;;;;;;; !define PRODUCT_NAME "Geany" -!define PRODUCT_VERSION "1.24" -!define PRODUCT_VERSION_ID "1.24.0.0" +!define PRODUCT_VERSION "1.24.1" +!define PRODUCT_VERSION_ID "1.24.1.0" !define PRODUCT_PUBLISHER "The Geany developer team" !define PRODUCT_WEB_SITE "http://www.geany.org/" !define PRODUCT_DIR_REGKEY "Software\Geany" Modified: geany_private.rc 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,8 @@ #include <windows.h> // include for version info constants -#define VER_FILEVERSION 1,24,0,0 -#define VER_FILEVERSION_STR "1.24" +#define VER_FILEVERSION 1,24,1,0 +#define VER_FILEVERSION_STR "1.24.1" #define APP_MANIFEST 1 A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../icons/geany.ico" Modified: win32-config.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -311,7 +311,7 @@ /* #undef volatile */ /* Version number of package */ -#define VERSION "1.24" +#define VERSION "1.24.1" #define REVISION "-1" Modified: wscript 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -51,7 +51,7 @@ from waflib.Tools.compiler_cxx import cxx_compiler APPNAME = 'geany' -VERSION = '1.24' +VERSION = '1.24.1' LINGUAS_FILE = 'po/LINGUAS' MINIMUM_GTK_VERSION = '2.16.0' MINIMUM_GTK3_VERSION = '3.0.0' -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
16
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2014