SF.net SVN: geany: [2322] branches/plugin-keybindings
ntrel at users.sourceforge.net
ntrel at xxxxx
Mon Mar 10 17:30:30 UTC 2008
Revision: 2322
http://geany.svn.sourceforge.net/geany/?rev=2322&view=rev
Author: ntrel
Date: 2008-03-10 10:30:27 -0700 (Mon, 10 Mar 2008)
Log Message:
-----------
Move snippet completion keybindings into Editing group.
Modified Paths:
--------------
branches/plugin-keybindings/ChangeLog
branches/plugin-keybindings/src/keybindings.c
branches/plugin-keybindings/src/keybindings.h
Modified: branches/plugin-keybindings/ChangeLog
===================================================================
--- branches/plugin-keybindings/ChangeLog 2008-03-10 13:54:47 UTC (rev 2321)
+++ branches/plugin-keybindings/ChangeLog 2008-03-10 17:30:27 UTC (rev 2322)
@@ -15,6 +15,8 @@
Load keybindings keyfile after plugins have loaded at startup, so
their shortcuts are also loaded. Still to do: loading individual
plugin keybindings after startup.
+ * src/keybindings.c, src/keybindings.h:
+ Move snippet completion keybindings into Editing group.
2008-03-07 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: branches/plugin-keybindings/src/keybindings.c
===================================================================
--- branches/plugin-keybindings/src/keybindings.c 2008-03-10 13:54:47 UTC (rev 2321)
+++ branches/plugin-keybindings/src/keybindings.c 2008-03-10 17:30:27 UTC (rev 2322)
@@ -385,6 +385,10 @@
GDK_Down, GDK_MOD1_MASK, "edit_scrolllinedown", _("Scroll down the view by one line"), NULL);
keybindings_set_item(group, GEANY_KEYS_EDIT_INSERTALTWHITESPACE, cb_func_editing,
0, 0, "edit_insertwhitespace", _("Insert alternative whitespace"), NULL);
+ keybindings_set_item(group, GEANY_KEYS_EDIT_COMPLETESNIPPET, NULL, /* handled specially in check_snippet_completion() */
+ GDK_Tab, 0, "edit_completesnippet", _("Complete snippet"), NULL);
+ keybindings_set_item(group, GEANY_KEYS_EDIT_SUPPRESSSNIPPETCOMPLETION, cb_func_editing,
+ 0, 0, "edit_suppresssnippetcompletion", _("Suppress snippet completion"), NULL);
/* popup menu editing commands */
keybindings_set_item(group, GEANY_KEYS_POPUP_FINDUSAGE, cb_func_current_word,
@@ -400,10 +404,6 @@
GDK_space, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "edit_calltip", _("Show calltip"), NULL);
keybindings_set_item(group, GEANY_KEYS_EDIT_MACROLIST, cb_func_tags,
GDK_Return, GDK_CONTROL_MASK, "edit_macrolist", _("Show macro list"), NULL);
- keybindings_set_item(group, GEANY_KEYS_EDIT_COMPLETESNIPPET, NULL, /* has special callback */
- GDK_Tab, 0, "edit_completesnippet", _("Complete snippet"), NULL);
- keybindings_set_item(group, GEANY_KEYS_EDIT_SUPPRESSSNIPPETCOMPLETION, cb_func_tags,
- 0, 0, "edit_suppresssnippetcompletion", _("Suppress snippet completion"), NULL);
keybindings_set_item(group, GEANY_KEYS_POPUP_GOTOTAGDEFINITION, cb_func_current_word,
0, 0, "popup_gototagdefinition", _("Go to Tag Definition"), NULL);
keybindings_set_item(group, GEANY_KEYS_POPUP_GOTOTAGDECLARATION, cb_func_current_word,
@@ -792,7 +792,7 @@
* return FALSE if no completion occurs, so the tab or space is handled normally. */
static gboolean check_snippet_completion(guint keyval, guint state)
{
- KeyBinding *kb = keybindings_lookup_item(GEANY_KEYGROUP_TAGS,
+ KeyBinding *kb = keybindings_lookup_item(GEANY_KEYGROUP_EDITING,
GEANY_KEYS_EDIT_COMPLETESNIPPET);
if (kb->key == keyval && kb->mods == state)
@@ -1461,6 +1461,24 @@
if (ui_prefs.custom_commands && g_strv_length(ui_prefs.custom_commands) > 2)
tools_execute_custom_command(idx, ui_prefs.custom_commands[2]);
break;
+ case GEANY_KEYS_EDIT_SUPPRESSSNIPPETCOMPLETION:
+ {
+ KeyBinding *kb = keybindings_lookup_item(GEANY_KEYGROUP_EDITING,
+ GEANY_KEYS_EDIT_COMPLETESNIPPET);
+
+ switch (kb->key)
+ {
+ case GDK_space:
+ sci_add_text(doc_list[idx].sci, " ");
+ break;
+ case GDK_Tab:
+ sci_cmd(doc_list[idx].sci, SCI_TAB);
+ break;
+ default:
+ break;
+ }
+ break;
+ }
}
}
@@ -1485,24 +1503,6 @@
case GEANY_KEYS_EDIT_MACROLIST:
editor_show_macro_list(doc_list[idx].sci);
break;
- case GEANY_KEYS_EDIT_SUPPRESSSNIPPETCOMPLETION:
- {
- KeyBinding *kb = keybindings_lookup_item(GEANY_KEYGROUP_TAGS,
- GEANY_KEYS_EDIT_COMPLETESNIPPET);
-
- switch (kb->key)
- {
- case GDK_space:
- sci_add_text(doc_list[idx].sci, " ");
- break;
- case GDK_Tab:
- sci_cmd(doc_list[idx].sci, SCI_TAB);
- break;
- default:
- break;
- }
- break;
- }
}
}
Modified: branches/plugin-keybindings/src/keybindings.h
===================================================================
--- branches/plugin-keybindings/src/keybindings.h 2008-03-10 13:54:47 UTC (rev 2321)
+++ branches/plugin-keybindings/src/keybindings.h 2008-03-10 17:30:27 UTC (rev 2322)
@@ -66,7 +66,7 @@
extern GPtrArray *keybinding_groups; /* array of KeyBindingGroup pointers */
-/* Plugin API enums - append only to maintain plugin ABI */
+/** Keybinding group IDs */
enum
{
GEANY_KEYGROUP_FILE,
@@ -85,6 +85,7 @@
GEANY_KEYGROUP_COUNT
};
+/** File group keybinding command IDs */
enum
{
GEANY_KEYS_MENU_NEW,
@@ -101,6 +102,7 @@
GEANY_KEYS_FILE_COUNT
};
+/** Edit group keybinding command IDs */
enum
{
GEANY_KEYS_MENU_UNDO,
@@ -114,6 +116,7 @@
GEANY_KEYS_EDIT_COUNT
};
+/** Search group keybinding command IDs */
enum
{
GEANY_KEYS_MENU_FIND,
@@ -128,6 +131,7 @@
GEANY_KEYS_SEARCH_COUNT
};
+/** View group keybinding command IDs */
enum
{
GEANY_KEYS_MENU_TOGGLEALL,
@@ -139,6 +143,7 @@
GEANY_KEYS_VIEW_COUNT
};
+/** Document group keybinding command IDs */
enum
{
GEANY_KEYS_MENU_REPLACETABS,
@@ -148,6 +153,7 @@
GEANY_KEYS_DOCUMENT_COUNT
};
+/** Build group keybinding command IDs */
enum
{
GEANY_KEYS_BUILD_COMPILE,
@@ -162,18 +168,21 @@
GEANY_KEYS_BUILD_COUNT
};
+/** Tools group keybinding command IDs */
enum
{
GEANY_KEYS_MENU_OPENCOLORCHOOSER,
GEANY_KEYS_TOOLS_COUNT
};
+/** Help group keybinding command IDs */
enum
{
GEANY_KEYS_MENU_HELP,
GEANY_KEYS_HELP_COUNT
};
+/** Focus group keybinding command IDs */
enum
{
GEANY_KEYS_SWITCH_EDITOR,
@@ -183,6 +192,7 @@
GEANY_KEYS_FOCUS_COUNT
};
+/** Notebook tab group keybinding command IDs */
enum
{
GEANY_KEYS_SWITCH_TABLEFT,
@@ -195,6 +205,7 @@
GEANY_KEYS_NOTEBOOK_COUNT
};
+/** Editing group keybinding command IDs */
enum
{
GEANY_KEYS_EDIT_TOGGLECASE,
@@ -225,23 +236,25 @@
GEANY_KEYS_EDIT_SCROLLLINEUP,
GEANY_KEYS_EDIT_SCROLLLINEDOWN,
GEANY_KEYS_EDIT_INSERTALTWHITESPACE,
+ GEANY_KEYS_EDIT_COMPLETESNIPPET,
+ GEANY_KEYS_EDIT_SUPPRESSSNIPPETCOMPLETION,
GEANY_KEYS_POPUP_FINDUSAGE,
GEANY_KEYS_POPUP_CONTEXTACTION,
GEANY_KEYS_EDITING_COUNT
};
+/** Tags group keybinding command IDs */
enum
{
GEANY_KEYS_EDIT_AUTOCOMPLETE,
GEANY_KEYS_EDIT_CALLTIP,
GEANY_KEYS_EDIT_MACROLIST,
- GEANY_KEYS_EDIT_COMPLETESNIPPET,
- GEANY_KEYS_EDIT_SUPPRESSSNIPPETCOMPLETION,
GEANY_KEYS_POPUP_GOTOTAGDEFINITION,
GEANY_KEYS_POPUP_GOTOTAGDECLARATION,
GEANY_KEYS_TAGS_COUNT
};
+/** Other group keybinding command IDs */
enum
{
GEANY_KEYS_NAV_FORWARD,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Commits
mailing list