Commits April 2012

commits@lists.geany.org

1 participants
44 discussions

[geany/geany] 890667: Adding some more meta information to Norvegian translation
by Frank Lanitz 12 Apr '12

12 Apr '12

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Wed, 11 Apr 2012 19:58:45 Commit: 890667db5ac473f4a40e8fd73591a7867bcff874 https://github.com/geany/geany/commit/890667db5ac473f4a40e8fd73591a7867bcff… Log Message: ----------- Adding some more meta information to Norvegian translation Modified Paths: -------------- po/nn.po Modified: po/nn.po 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1,11 +1,11 @@ -# Norwegian Nynorsk translations for PACKAGE package. +# Norwegian Nynorsk translations for Geany package. # Copyright (C) 2012 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Håkon Vågsether <hauk142(a)gmail.com>, 2012. # msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: geany 1.22\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-02-08 04:39+0000\n" "PO-Revision-Date: 2012-02-08 22:39+0100\n" @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] bdf71f: Added Norwegian Nynorsk translation
by Håkon Vågsether 12 Apr '12

12 Apr '12

Branch: refs/heads/master Author: Håkon Vågsether <hauk142(a)gmail.com> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Wed, 11 Apr 2012 19:57:18 Commit: bdf71ff58687684e574122b1b2a7d70589d54878 https://github.com/geany/geany/commit/bdf71ff58687684e574122b1b2a7d70589d54… Log Message: ----------- Added Norwegian Nynorsk translation Modified Paths: -------------- po/nn.po Modified: po/nn.po 5357 files changed, 5357 insertions(+), 0 deletions(-) =================================================================== No diff available, check online @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 78432b: Find in files: split extra options like a shell would do
by Colomban Wendling 10 Apr '12

10 Apr '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 10 Apr 2012 02:21:59 Commit: 78432b5806f492843af3eaf9a696e600fc4aad06 https://github.com/geany/geany/commit/78432b5806f492843af3eaf9a696e600fc4aa… Log Message: ----------- Find in files: split extra options like a shell would do Don't simply split the the extra options string on spaces to build the grep argument list but rather split it in a shell-style fashion. This is probably more intuitive for most users, is more consistent with e.g. custom commands, and allows for spaces in an option or its argument. Closes #3516263. Modified Paths: -------------- NEWS src/search.c Modified: NEWS 4 files changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -3,6 +3,10 @@ Geany 1.22 (unreleased) Editor * Update Scintilla to version 2.29. + Search + * Extra options passed to grep through Find in Files now follows a + real shell-style syntax (#3516263). + Geany 0.21 (October 2, 2011) Modified: src/search.c 13 files changed, 9 insertions(+), 4 deletions(-) =================================================================== @@ -1551,7 +1551,7 @@ static void replace_in_session(GeanyDocument *doc, gchar **argv_prefix, **argv, **opts_argv; gchar *command_grep; gchar *search_text = NULL; - guint opts_argv_len, i; + gint opts_argv_len, i; GPid child_pid; gint stdout_fd; gint stderr_fd; @@ -1569,6 +1569,14 @@ static void replace_in_session(GeanyDocument *doc, return FALSE; } + if (! g_shell_parse_argv(opts, &opts_argv_len, &opts_argv, &error)) + { + ui_set_statusbar(TRUE, _("Cannot parse extra options: %s"), error->message); + g_error_free(error); + g_free(command_grep); + return FALSE; + } + /* convert the search text in the preferred encoding (if the text is not valid UTF-8. assume * it is already in the preferred encoding) */ utf8_text_len = strlen(utf8_search_text); @@ -1579,9 +1587,6 @@ static void replace_in_session(GeanyDocument *doc, if (search_text == NULL) search_text = g_strdup(utf8_search_text); - opts_argv = g_strsplit(opts, " ", -1); - opts_argv_len = g_strv_length(opts_argv); - /* set grep command and options */ argv_prefix = g_new0(gchar*, 1 + opts_argv_len + 3 + 1); /* last +1 for recursive arg */ @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 728eeb: Remove unnecessary fields from StashTreeValue
by Nick Treleaven 07 Apr '12

07 Apr '12

Branch: refs/heads/master Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Sat, 07 Apr 2012 17:21:51 Commit: 728eeb854be9090595c16ce94918adeee23397fb https://github.com/geany/geany/commit/728eeb854be9090595c16ce94918adeee2339… Log Message: ----------- Remove unnecessary fields from StashTreeValue Modified Paths: -------------- src/stash.c Modified: src/stash.c 20 files changed, 10 insertions(+), 10 deletions(-) =================================================================== @@ -926,8 +926,6 @@ enum struct StashTreeValue { - GType setting_type; - const gchar *key_name; const gchar *group_name; StashPref *pref; union @@ -945,16 +943,18 @@ static void stash_tree_renderer_set_data(GtkCellLayout *cell_layout, GtkCellRend { GType cell_type = GPOINTER_TO_SIZE(user_data); StashTreeValue *value; + StashPref *pref; gboolean matches_type; gtk_tree_model_get(model, iter, STASH_TREE_VALUE, &value, -1); - matches_type = value->setting_type == cell_type; + pref = value->pref; + matches_type = pref->setting_type == cell_type; g_object_set(cell, "visible", matches_type, "sensitive", matches_type, cell_type == G_TYPE_BOOLEAN ? "activatable" : "editable", matches_type, NULL); if (matches_type) { - switch (value->setting_type) + switch (pref->setting_type) { case G_TYPE_BOOLEAN: g_object_set(cell, "active", value->data.tree_int, NULL); @@ -979,12 +979,14 @@ static void stash_tree_renderer_edited(gchar *path_str, gchar *new_text, GtkTree GtkTreePath *path; GtkTreeIter iter; StashTreeValue *value; + StashPref *pref; path = gtk_tree_path_new_from_string(path_str); gtk_tree_model_get_iter(model, &iter, path); gtk_tree_model_get(model, &iter, STASH_TREE_VALUE, &value, -1); + pref = value->pref; - switch (value->setting_type) + switch (pref->setting_type) { case G_TYPE_BOOLEAN: value->data.tree_int = !value->data.tree_int; @@ -1022,7 +1024,7 @@ static gboolean stash_tree_discard_value(GtkTreeModel *model, GtkTreePath *path, StashTreeValue *value; gtk_tree_model_get(model, iter, STASH_TREE_VALUE, &value, -1); - if (value->setting_type == G_TYPE_STRING) + if (value->pref->setting_type == G_TYPE_STRING) g_free(value->data.tree_string); g_free(value); @@ -1045,13 +1047,11 @@ static void stash_tree_append_pref(StashGroup *group, StashPref *entry, GtkListS value = g_new0(StashTreeValue, 1); - value->setting_type = entry->setting_type; - value->key_name = entry->key_name; value->group_name = group->name; value->pref = entry; gtk_list_store_append(store, &iter); - gtk_list_store_set(store, &iter, STASH_TREE_NAME, value->key_name, + gtk_list_store_set(store, &iter, STASH_TREE_NAME, entry->key_name, STASH_TREE_VALUE, value, -1); } @@ -1167,7 +1167,7 @@ static void stash_tree_update_pref(StashTreeValue *value, StashPref *entry) } default: g_warning("Unhandled type for %s::%s in %s()!", value->group_name, - value->key_name, G_STRFUNC); + entry->key_name, G_STRFUNC); } } @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 9f06d4: Use union for StashTreeValue instead of void*
by Nick Treleaven 07 Apr '12

07 Apr '12

Branch: refs/heads/master Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Sat, 07 Apr 2012 17:09:28 Commit: 9f06d49f6f43aa54d00f7815a12bc8320dee8cfc https://github.com/geany/geany/commit/9f06d49f6f43aa54d00f7815a12bc8320dee8… Log Message: ----------- Use union for StashTreeValue instead of void* This avoids many casts. Modified Paths: -------------- src/stash.c Modified: src/stash.c 42 files changed, 19 insertions(+), 23 deletions(-) =================================================================== @@ -927,10 +927,14 @@ enum struct StashTreeValue { GType setting_type; - gpointer setting; const gchar *key_name; const gchar *group_name; StashPref *pref; + union + { + gchararray tree_string; + gint tree_int; + } data; }; typedef struct StashTreeValue StashTreeValue; @@ -953,17 +957,17 @@ static void stash_tree_renderer_set_data(GtkCellLayout *cell_layout, GtkCellRend switch (value->setting_type) { case G_TYPE_BOOLEAN: - g_object_set(cell, "active", GPOINTER_TO_INT(value->setting), NULL); + g_object_set(cell, "active", value->data.tree_int, NULL); break; case G_TYPE_INT: { - gchar *text = g_strdup_printf("%d", GPOINTER_TO_INT(value->setting)); + gchar *text = g_strdup_printf("%d", value->data.tree_int); g_object_set(cell, "text", text, NULL); g_free(text); break; } case G_TYPE_STRING: - g_object_set(cell, "text", (gchararray) value->setting, NULL); + g_object_set(cell, "text", value->data.tree_string, NULL); break; } } @@ -983,14 +987,13 @@ static void stash_tree_renderer_edited(gchar *path_str, gchar *new_text, GtkTree switch (value->setting_type) { case G_TYPE_BOOLEAN: - value->setting = GINT_TO_POINTER(!GPOINTER_TO_INT(value->setting)); + value->data.tree_int = !value->data.tree_int; break; case G_TYPE_INT: - value->setting = GINT_TO_POINTER(atoi(new_text)); + value->data.tree_int = atoi(new_text); break; case G_TYPE_STRING: - g_free(value->setting); - value->setting = g_strdup(new_text); + SETPTR(value->data.tree_string, g_strdup(new_text)); break; } @@ -1020,7 +1023,7 @@ static gboolean stash_tree_discard_value(GtkTreeModel *model, GtkTreePath *path, gtk_tree_model_get(model, iter, STASH_TREE_VALUE, &value, -1); if (value->setting_type == G_TYPE_STRING) - g_free(value->setting); + g_free(value->data.tree_string); g_free(value); return FALSE; @@ -1040,10 +1043,9 @@ static void stash_tree_append_pref(StashGroup *group, StashPref *entry, GtkListS GtkTreeIter iter; StashTreeValue *value; - value = g_new(StashTreeValue, 1); + value = g_new0(StashTreeValue, 1); value->setting_type = entry->setting_type; - value->setting = NULL; value->key_name = entry->key_name; value->group_name = group->name; value->pref = entry; @@ -1132,17 +1134,14 @@ static void stash_tree_display_pref(StashTreeValue *value, StashPref *entry) switch (entry->setting_type) { case G_TYPE_BOOLEAN: - value->setting = GINT_TO_POINTER(*(gboolean *) entry->setting); + value->data.tree_int = *(gboolean *) entry->setting; break; case G_TYPE_INT: - value->setting = GINT_TO_POINTER(*(gint *) entry->setting); + value->data.tree_int = *(gint *) entry->setting; break; case G_TYPE_STRING: - { - g_free(value->setting); - value->setting = g_strdup(*(gchararray *) entry->setting); + SETPTR(value->data.tree_string, g_strdup(*(gchararray *) entry->setting)); break; - } default: g_warning("Unhandled type for %s::%s in %s()!", value->group_name, entry->key_name, G_STRFUNC); @@ -1152,21 +1151,18 @@ static void stash_tree_display_pref(StashTreeValue *value, StashPref *entry) static void stash_tree_update_pref(StashTreeValue *value, StashPref *entry) { - gpointer *setting = value->setting; - switch (entry->setting_type) { case G_TYPE_BOOLEAN: - *(gboolean *) entry->setting = GPOINTER_TO_INT(setting); + *(gboolean *) entry->setting = value->data.tree_int; break; case G_TYPE_INT: - *(gint *) entry->setting = GPOINTER_TO_INT(setting); + *(gint *) entry->setting = value->data.tree_int; break; case G_TYPE_STRING: { gchararray *text = entry->setting; - g_free(*text); - *text = g_strdup((gchararray) setting); + SETPTR(*text, g_strdup(value->data.tree_string)); break; } default: @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 4509dd: Use union for StashPref extra fields that depend on widget_type
by Nick Treleaven 06 Apr '12

06 Apr '12

Branch: refs/heads/master Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Fri, 06 Apr 2012 16:46:02 Commit: 4509dd6457948838eab37e4fc61d5823a55e22e1 https://github.com/geany/geany/commit/4509dd6457948838eab37e4fc61d5823a55e2… Log Message: ----------- Use union for StashPref extra fields that depend on widget_type This should make the code clearer vs. using a void*. Modified Paths: -------------- src/stash.c Modified: src/stash.c 29 files changed, 14 insertions(+), 15 deletions(-) =================================================================== @@ -94,7 +94,11 @@ struct StashPref gpointer default_value; /* Default value, e.g. (gpointer)1 */ GType widget_type; /* e.g. GTK_TYPE_TOGGLE_BUTTON */ StashWidgetID widget_id; /* (GtkWidget*) or (gchar*) */ - gpointer fields; /* extra fields */ + union + { + struct EnumWidget *radio_buttons; + const gchar *property_name; + } extra; /* extra fields depending on widget_type */ }; typedef struct StashPref StashPref; @@ -369,11 +373,7 @@ void stash_group_free(StashGroup *group) { if (entry->widget_type == GTK_TYPE_RADIO_BUTTON) { - g_free(entry->fields); - } - else if (entry->widget_type != G_TYPE_PARAM) - { - g_assert(entry->fields == NULL); /* to prevent memory leaks, must handle fields above */ + g_free(entry->extra.radio_buttons); } g_slice_free(StashPref, entry); } @@ -403,7 +403,7 @@ void stash_group_set_use_defaults(StashGroup *group, gboolean use_defaults) add_pref(StashGroup *group, GType type, gpointer setting, const gchar *key_name, gpointer default_value) { - StashPref init = {type, setting, key_name, default_value, G_TYPE_NONE, NULL, NULL}; + StashPref init = {type, setting, key_name, default_value, G_TYPE_NONE, NULL, {NULL}}; StashPref *entry = g_slice_new(StashPref); *entry = init; @@ -615,11 +615,10 @@ static void handle_radio_button(GtkWidget *widget, gint enum_id, gboolean *setti } -static void handle_radio_buttons(GtkWidget *owner, EnumWidget *fields, - gboolean *setting, +static void handle_radio_buttons(GtkWidget *owner, StashPref *entry, PrefAction action) { - EnumWidget *field = fields; + EnumWidget *field = entry->extra.radio_buttons; gsize count = 0; GtkWidget *widget = NULL; @@ -631,7 +630,7 @@ static void handle_radio_buttons(GtkWidget *owner, EnumWidget *fields, continue; count++; - handle_radio_button(widget, field->enum_id, setting, action); + handle_radio_button(widget, field->enum_id, entry->setting, action); field++; if (!field->widget_id) break; @@ -645,7 +644,7 @@ static void handle_widget_property(GtkWidget *widget, StashPref *entry, PrefAction action) { GObject *object = G_OBJECT(widget); - const gchar *name = entry->fields; + const gchar *name = entry->extra.property_name; switch (action) { @@ -679,7 +678,7 @@ static void pref_action(PrefAction action, StashGroup *group, GtkWidget *owner) /* radio buttons have several widgets */ if (entry->widget_type == GTK_TYPE_RADIO_BUTTON) { - handle_radio_buttons(owner, entry->fields, entry->setting, action); + handle_radio_buttons(owner, entry, action); continue; } @@ -801,7 +800,7 @@ void stash_group_add_radio_buttons(StashGroup *group, gint *setting, va_end(args); array = g_new0(EnumWidget, count + 1); - entry->fields = array; + entry->extra.radio_buttons = array; va_start(args, enum_id); foreach_c_array(item, array, count) @@ -913,7 +912,7 @@ void stash_group_add_widget_property(StashGroup *group, gpointer setting, type = object_get_property_type(G_OBJECT(widget_id), property_name); add_widget_pref(group, type, setting, key_name, default_value, - G_TYPE_PARAM, widget_id)->fields = (gchar*)property_name; + G_TYPE_PARAM, widget_id)->extra.property_name = property_name; } @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] f2d33b: Add stash_group_free_settings() function to API
by Dimitar Zhekov 06 Apr '12

06 Apr '12

Branch: refs/heads/master Author: Dimitar Zhekov <dimitar.zhekov(a)gmail.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Fri, 06 Apr 2012 13:04:01 Commit: f2d33bc16ea8c8c6ef5f8f5cd6aee77ec63f2129 https://github.com/geany/geany/commit/f2d33bc16ea8c8c6ef5f8f5cd6aee77ec63f2… Log Message: ----------- Add stash_group_free_settings() function to API Frees the memory allocated for setting values in a group. Modified Paths: -------------- plugins/geanyfunctions.h src/plugindata.h src/plugins.c src/stash.c src/stash.h Modified: plugins/geanyfunctions.h 2 files changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -418,6 +418,8 @@ geany_functions->p_stash->stash_group_display #define stash_group_update \ geany_functions->p_stash->stash_group_update +#define stash_group_free_settings \ + geany_functions->p_stash->stash_group_free_settings #define symbols_get_context_separator \ geany_functions->p_symbols->symbols_get_context_separator #define build_activate_menu_item \ Modified: src/plugindata.h 5 files changed, 3 insertions(+), 2 deletions(-) =================================================================== @@ -55,7 +55,7 @@ * @warning You should not test for values below 200 as previously * @c GEANY_API_VERSION was defined as an enum value, not a macro. */ -#define GEANY_API_VERSION 214 +#define GEANY_API_VERSION 215 /** The Application Binary Interface (ABI) version, incremented whenever * existing fields in the plugin data types have to be changed or reordered. @@ -701,6 +701,7 @@ const gchar *property_name, GType type); void (*stash_group_display)(struct StashGroup *group, GtkWidget *owner); void (*stash_group_update)(struct StashGroup *group, GtkWidget *owner); + void (*stash_group_free_settings)(struct StashGroup *group); } StashFuncs; @@ -716,7 +717,7 @@ typedef struct BuildFuncs { void (*build_activate_menu_item)(const GeanyBuildGroup grp, const guint cmd); - const gchar *(*build_get_current_menu_item)(const GeanyBuildGroup grp, const guint cmd, + const gchar *(*build_get_current_menu_item)(const GeanyBuildGroup grp, const guint cmd, const GeanyBuildCmdEntries field); void (*build_remove_menu_item)(const GeanyBuildSource src, const GeanyBuildGroup grp, const gint cmd); Modified: src/plugins.c 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -346,7 +346,8 @@ &stash_group_add_entry, &stash_group_add_widget_property, &stash_group_display, - &stash_group_update + &stash_group_update, + &stash_group_free_settings }; static SymbolsFuncs symbols_funcs = { Modified: src/stash.c 23 files changed, 23 insertions(+), 0 deletions(-) =================================================================== @@ -335,6 +335,29 @@ gint stash_group_save_to_file(StashGroup *group, const gchar *filename, } +/** Frees the memory allocated for setting values in a group. + * Useful e.g. to avoid freeing strings individually. + * @note This is *not* called by stash_group_free(). + * @param group . */ +void stash_group_free_settings(StashGroup *group) +{ + StashPref *entry; + guint i; + + foreach_ptr_array(entry, i, group->entries) + { + if (entry->setting_type == G_TYPE_STRING) + g_free(*(gchararray *) entry->setting); + else if (entry->setting_type == G_TYPE_STRV) + g_strfreev(*(gchararray **) entry->setting); + else + continue; + + *(gpointer**) entry->setting = NULL; + } +} + + /** Frees a group. * @param group . */ void stash_group_free(StashGroup *group) Modified: src/stash.h 2 files changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -60,6 +60,8 @@ void stash_group_add_string_vector(StashGroup *group, gchar ***setting, gint stash_group_save_to_file(StashGroup *group, const gchar *filename, GKeyFileFlags flags); +void stash_group_free_settings(StashGroup *group); + void stash_group_free(StashGroup *group); @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] c7b3a0: Update bold flag after editing shortcut
by Nick Treleaven 04 Apr '12

04 Apr '12

Branch: refs/heads/master Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Wed, 04 Apr 2012 12:43:43 Commit: c7b3a09f05b32078f827b05fc0070345f9f7c33c https://github.com/geany/geany/commit/c7b3a09f05b32078f827b05fc0070345f9f7c… Log Message: ----------- Update bold flag after editing shortcut Modified Paths: -------------- src/prefs.c Modified: src/prefs.c 38 files changed, 28 insertions(+), 10 deletions(-) =================================================================== @@ -80,6 +80,7 @@ static GtkTreeView *various_treeview = NULL; +static GeanyKeyBinding *kb_index(guint gidx, guint kid); static void kb_cell_edited_cb(GtkCellRendererText *cellrenderertext, gchar *path, gchar *new_text, gpointer user_data); static gboolean kb_grab_key_dialog_key_press_cb(GtkWidget *dialog, GdkEventKey *event, gpointer user_data); static void kb_grab_key_dialog_response_cb(GtkWidget *dialog, gint response, gpointer user_data); @@ -311,11 +312,33 @@ static void kb_init_tree(void) } +static void kb_set_shortcut(GtkTreeStore *store, GtkTreeIter *iter, + guint key, GdkModifierType mods) +{ + gchar *key_string = gtk_accelerator_name(key, mods); + GtkTreeIter parent; + guint kid, gid; + GeanyKeyBinding *kb; + gboolean bold; + + gtk_tree_store_set(store, iter, KB_TREE_SHORTCUT, key_string, -1); + g_free(key_string); + + gtk_tree_model_get(GTK_TREE_MODEL(store), iter, KB_TREE_INDEX, &kid, -1); + gtk_tree_model_iter_parent(GTK_TREE_MODEL(store), &parent, iter); + gtk_tree_model_get(GTK_TREE_MODEL(store), &parent, KB_TREE_INDEX, &gid, -1); + kb = kb_index(gid, kid); + bold = key != kb->default_key || mods != kb->default_mods; + gtk_tree_store_set(store, iter, KB_TREE_WEIGHT, + bold ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL, -1); +} + + static void kb_init(void) { GtkTreeIter parent, iter; gsize g, i; - gchar *key_string, *label; + gchar *label; GeanyKeyGroup *group; GeanyKeyBinding *kb; @@ -331,14 +354,10 @@ static void kb_init(void) foreach_ptr_array(kb, i, group->key_items) { label = keybindings_get_label(kb); - key_string = gtk_accelerator_name(kb->key, kb->mods); gtk_tree_store_append(store, &iter, &parent); gtk_tree_store_set(store, &iter, KB_TREE_ACTION, label, - KB_TREE_SHORTCUT, key_string, KB_TREE_EDITABLE, TRUE, - KB_TREE_INDEX, kb->id, -1); - if (kb->key != kb->default_key || kb->mods != kb->default_mods) - gtk_tree_store_set(store, &iter, KB_TREE_WEIGHT, PANGO_WEIGHT_BOLD, -1); - g_free(key_string); + KB_TREE_EDITABLE, TRUE, KB_TREE_INDEX, kb->id, -1); + kb_set_shortcut(store, &iter, kb->key, kb->mods); g_free(label); } } @@ -1332,7 +1351,7 @@ static void kb_change_iter_shortcut(GtkTreeIter *iter, const gchar *new_text) /* set the values here, because of the above check, setting it in * gtk_accelerator_parse would return a wrong key combination if it is duplicate */ - gtk_tree_store_set(store, iter, KB_TREE_SHORTCUT, new_text, -1); + kb_set_shortcut(store, iter, lkey, lmods); edited = TRUE; } @@ -1420,7 +1439,6 @@ static gboolean kb_find_duplicate(GtkWidget *parent, GtkTreeIter *old_iter, continue; do /* foreach children */ { - gtk_tree_model_get(model, &iter, KB_TREE_SHORTCUT, &kb_str, -1); if (! kb_str) continue; @@ -1446,7 +1464,7 @@ static gboolean kb_find_duplicate(GtkWidget *parent, GtkTreeIter *old_iter, if (ret == GTK_RESPONSE_YES) { - gtk_tree_store_set(store, &iter, KB_TREE_SHORTCUT, NULL, -1); /* clear shortcut */ + kb_set_shortcut(store, &iter, 0, 0); /* clear shortcut */ /* carry on looking for other duplicates if overriding */ continue; } @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 6286b2: Fix always showing Save All keybinding as overridden
by Nick Treleaven 04 Apr '12

04 Apr '12

1 0

[geany/geany] 9e418d: Show overridden keybindings in bold for prefs dialog tree
by Nick Treleaven 04 Apr '12

04 Apr '12

Branch: refs/heads/master Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Wed, 04 Apr 2012 12:43:39 Commit: 9e418d7aafeb1aa482255c723a095f2f92572c69 https://github.com/geany/geany/commit/9e418d7aafeb1aa482255c723a095f2f92572… Log Message: ----------- Show overridden keybindings in bold for prefs dialog tree Modified Paths: -------------- src/keybindings.c src/keybindings.h src/prefs.c Modified: src/keybindings.c 2 files changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -167,6 +167,8 @@ } kb->key = key; kb->mods = mod; + kb->default_key = key; + kb->default_mods = mod; kb->callback = callback; kb->menu_item = menu_item; kb->id = key_id; Modified: src/keybindings.h 2 files changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -42,6 +42,8 @@ GeanyKeyCallback callback; GtkWidget *menu_item; /**< Optional widget to set an accelerator for, or @c NULL */ guint id; + guint default_key; + GdkModifierType default_mods; } GeanyKeyBinding; Modified: src/prefs.c 18 files changed, 13 insertions(+), 5 deletions(-) =================================================================== @@ -140,7 +140,9 @@ enum KB_TREE_ACTION, KB_TREE_SHORTCUT, KB_TREE_INDEX, - KB_TREE_EDITABLE + KB_TREE_EDITABLE, + KB_TREE_WEIGHT, + KB_TREE_COLUMNS }; @@ -279,17 +281,20 @@ static void kb_init_tree(void) tree = GTK_TREE_VIEW(ui_lookup_widget(ui_widgets.prefs_dialog, "treeview7")); - store = gtk_tree_store_new(4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN); + store = gtk_tree_store_new(KB_TREE_COLUMNS, + G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN, G_TYPE_INT); gtk_tree_view_set_model(GTK_TREE_VIEW(tree), GTK_TREE_MODEL(store)); g_object_unref(store); renderer = gtk_cell_renderer_text_new(); - column = gtk_tree_view_column_new_with_attributes(_("Action"), renderer, "text", KB_TREE_ACTION, NULL); + column = gtk_tree_view_column_new_with_attributes(_("Action"), renderer, + "text", KB_TREE_ACTION, "weight", KB_TREE_WEIGHT, NULL); gtk_tree_view_append_column(GTK_TREE_VIEW(tree), column); renderer = gtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes(_("Shortcut"), renderer, - "text", KB_TREE_SHORTCUT, "editable", KB_TREE_EDITABLE, NULL); + "text", KB_TREE_SHORTCUT, "editable", KB_TREE_EDITABLE, + "weight", KB_TREE_WEIGHT, NULL); gtk_tree_view_append_column(GTK_TREE_VIEW(tree), column); /* set policy settings for the scrolled window around the treeview again, because glade @@ -329,7 +334,10 @@ static void kb_init(void) key_string = gtk_accelerator_name(kb->key, kb->mods); gtk_tree_store_append(store, &iter, &parent); gtk_tree_store_set(store, &iter, KB_TREE_ACTION, label, - KB_TREE_SHORTCUT, key_string, KB_TREE_EDITABLE, TRUE, KB_TREE_INDEX, kb->id, -1); + KB_TREE_SHORTCUT, key_string, KB_TREE_EDITABLE, TRUE, + KB_TREE_INDEX, kb->id, -1); + if (kb->key != kb->default_key || kb->mods != kb->default_mods) + gtk_tree_store_set(store, &iter, KB_TREE_WEIGHT, PANGO_WEIGHT_BOLD, -1); g_free(key_string); g_free(label); } @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2012