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

Merge branch 'master' of https://github.com/geany/geany

Browse Source
This commit is contained in:
Lex 2013-02-21 13:05:54 +11:00
commit 7d6ad6d50f
4 changed files with 20 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
data/geany.glade
View File

@ -99,7 +99,6 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
<signal name="activate" handler="on_undo1_activate" swapped="no"/>
</object>
</child>
@ -111,7 +110,6 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
<signal name="activate" handler="on_redo1_activate" swapped="no"/>
</object>
</child>
@ -129,7 +127,6 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
<signal name="activate" handler="on_cut1_activate" swapped="no"/>
</object>
</child>
@ -141,7 +138,6 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
<signal name="activate" handler="on_copy1_activate" swapped="no"/>
</object>
</child>
@ -153,7 +149,6 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
<signal name="activate" handler="on_paste1_activate" swapped="no"/>
</object>
</child>
@ -165,7 +160,6 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
<signal name="activate" handler="on_delete1_activate" swapped="no"/>
</object>
</child>
@ -183,7 +177,6 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
<signal name="activate" handler="on_menu_select_all1_activate" swapped="no"/>
</object>
</child>
@ -7333,7 +7326,6 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
<signal name="activate" handler="on_new1_activate" swapped="no"/>
</object>
</child>
@ -7362,7 +7354,6 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
<signal name="activate" handler="on_open1_activate" swapped="no"/>
</object>
</child>
@ -7399,7 +7390,6 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
<signal name="activate" handler="on_save1_activate" swapped="no"/>
</object>
</child>
@ -7411,7 +7401,6 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
<signal name="activate" handler="on_save_as1_activate" swapped="no"/>
</object>
</child>
@ -7477,7 +7466,6 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
<signal name="activate" handler="on_file_properties_activate" swapped="no"/>
</object>
</child>
@ -7505,7 +7493,6 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
<signal name="activate" handler="on_print1_activate" swapped="no"/>
</object>
</child>
@ -7523,7 +7510,6 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
<signal name="activate" handler="on_close1_activate" swapped="no"/>
</object>
</child>
@ -7565,7 +7551,6 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
<signal name="activate" handler="on_quit1_activate" swapped="no"/>
</object>
</child>
@ -7592,7 +7577,6 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
<signal name="activate" handler="on_undo1_activate" swapped="no"/>
</object>
</child>
@ -7604,7 +7588,6 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
<signal name="activate" handler="on_redo1_activate" swapped="no"/>
</object>
</child>
@ -7622,7 +7605,6 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
<signal name="activate" handler="on_cut1_activate" swapped="no"/>
</object>
</child>
@ -7634,7 +7616,6 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
<signal name="activate" handler="on_copy1_activate" swapped="no"/>
</object>
</child>
@ -7646,7 +7627,6 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
<signal name="activate" handler="on_paste1_activate" swapped="no"/>
</object>
</child>
@ -7658,7 +7638,6 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
<signal name="activate" handler="on_delete1_activate" swapped="no"/>
</object>
</child>
@ -7676,7 +7655,6 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
<signal name="activate" handler="on_menu_select_all1_activate" swapped="no"/>
</object>
</child>
@ -8149,7 +8127,6 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
<signal name="activate" handler="on_find1_activate" swapped="no"/>
</object>
</child>
@ -8563,7 +8540,6 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
<signal name="activate" handler="on_zoom_in1_activate" swapped="no"/>
</object>
</child>
@ -8575,7 +8551,6 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
<signal name="activate" handler="on_zoom_out1_activate" swapped="no"/>
</object>
</child>
@ -8587,7 +8562,6 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
<signal name="activate" handler="on_normal_size1_activate" swapped="no"/>
</object>
</child>
@ -9130,7 +9104,6 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
<signal name="activate" handler="on_project_properties1_activate" swapped="no"/>
</object>
</child>
@ -9325,7 +9298,6 @@
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
<signal name="activate" handler="on_info1_activate" swapped="no"/>
</object>
</child>

10
doc/geany.txt
View File

@ -3204,14 +3204,6 @@ want to assign to the action and it will be saved when you press OK.
You can define only one key combination for each action and each key
combination can only be defined for one action.
Some of the default key combinations are common across many
applications, for example *Ctrl-N* for New and *Ctrl-O* for Open.
Because they are so common it is not advisable to change these, but
you can add other key combinations for these actions. For example
*Ctrl-O* is set to execute menu_open by default, but you can also
define *Alt-O*, so that the file open dialog is shown by pressing
either *Ctrl-O* or *Alt-O*.
The following tables list all customizable keyboard shortcuts, those
which are common to many applications are marked with (C) after the
shortcut.
@ -3243,6 +3235,8 @@ Reload file Ctrl-R (C) Reloads the current fi
will be lost.
Print Ctrl-P (C) Prints the current file.
Quit Ctrl-Q (C) Quits Geany.
=============================== ========================= ==================================================

23
src/keybindings.c
View File

@ -248,14 +248,14 @@ static void init_default_kb(void)
group = keybindings_get_core_group(GEANY_KEY_GROUP_FILE);
add_kb(group, GEANY_KEYS_FILE_NEW, NULL,
GDK_n, GDK_CONTROL_MASK, "menu_new", _("New"), NULL);
GDK_n, GDK_CONTROL_MASK, "menu_new", _("New"), "menu_new1");
add_kb(group, GEANY_KEYS_FILE_OPEN, NULL,
GDK_o, GDK_CONTROL_MASK, "menu_open", _("Open"), NULL);
GDK_o, GDK_CONTROL_MASK, "menu_open", _("Open"), "menu_open1");
add_kb(group, GEANY_KEYS_FILE_OPENSELECTED, NULL,
GDK_o, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "menu_open_selected",
_("Open selected file"), "menu_open_selected_file1");
add_kb(group, GEANY_KEYS_FILE_SAVE, NULL,
GDK_s, GDK_CONTROL_MASK, "menu_save", _("Save"), NULL);
GDK_s, GDK_CONTROL_MASK, "menu_save", _("Save"), "menu_save1");
add_kb(group, GEANY_KEYS_FILE_SAVEAS, NULL,
0, 0, "menu_saveas", _("Save as"), "menu_save_as1");
add_kb(group, GEANY_KEYS_FILE_SAVEALL, NULL,
@ -272,6 +272,8 @@ static void init_default_kb(void)
GDK_r, GDK_CONTROL_MASK, "menu_reloadfile", _("Reload file"), "menu_reload1");
add_kb(group, GEANY_KEYS_FILE_OPENLASTTAB, NULL,
0, 0, "file_openlasttab", _("Re-open last closed tab"), NULL);
add_kb(group, GEANY_KEYS_FILE_QUIT, NULL,
GDK_q, GDK_CONTROL_MASK, "menu_quit", _("Quit"), "menu_quit1");
group = keybindings_get_core_group(GEANY_KEY_GROUP_PROJECT);
@ -335,11 +337,11 @@ static void init_default_kb(void)
group = keybindings_get_core_group(GEANY_KEY_GROUP_CLIPBOARD);
add_kb(group, GEANY_KEYS_CLIPBOARD_CUT, NULL,
GDK_x, GDK_CONTROL_MASK, "menu_cut", _("Cut"), NULL);
GDK_x, GDK_CONTROL_MASK, "menu_cut", _("Cut"), "menu_cut1");
add_kb(group, GEANY_KEYS_CLIPBOARD_COPY, NULL,
GDK_c, GDK_CONTROL_MASK, "menu_copy", _("Copy"), NULL);
GDK_c, GDK_CONTROL_MASK, "menu_copy", _("Copy"), "menu_copy1");
add_kb(group, GEANY_KEYS_CLIPBOARD_PASTE, NULL,
GDK_v, GDK_CONTROL_MASK, "menu_paste", _("Paste"), NULL);
GDK_v, GDK_CONTROL_MASK, "menu_paste", _("Paste"), "menu_paste1");
add_kb(group, GEANY_KEYS_CLIPBOARD_COPYLINE, NULL,
GDK_c, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "edit_copyline", _("_Copy Current Line(s)"),
"copy_current_lines1");
@ -729,6 +731,7 @@ static void add_menu_accel(GeanyKeyGroup *group, guint kb_id, GtkWidget *menuite
add_menu_accel(group, kb_id, ui_lookup_widget(main_widgets.editor_menu, G_STRINGIFY(wid)))
/* set the menu item accelerator shortcuts (just for visibility, they are handled anyway) */
/* FIXME: update those during runtime */
static void add_popup_menu_accels(void)
{
GeanyKeyGroup *group;
@ -738,6 +741,11 @@ static void add_popup_menu_accels(void)
GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_EDITOR_REDO, redo1);
GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_EDITOR_CONTEXTACTION, context_action1);
group = keybindings_get_core_group(GEANY_KEY_GROUP_CLIPBOARD);
GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_CLIPBOARD_CUT, cut1);
GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_CLIPBOARD_COPY, copy1);
GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_CLIPBOARD_PASTE, paste1);
group = keybindings_get_core_group(GEANY_KEY_GROUP_SELECT);
GEANY_ADD_POPUP_ACCEL(GEANY_KEYS_SELECT_ALL, menu_select_all2);
@ -1329,6 +1337,9 @@ static gboolean cb_func_file_action(guint key_id)
case GEANY_KEYS_FILE_PRINT:
on_print1_activate(NULL, NULL);
break;
case GEANY_KEYS_FILE_QUIT:
on_quit1_activate(NULL, NULL);
break;
}
return TRUE;
}

1
src/keybindings.h
View File

@ -247,6 +247,7 @@ enum GeanyKeyBindingID
GEANY_KEYS_FORMAT_JOINLINES, /**< Keybinding. */
GEANY_KEYS_GOTO_LINESTARTVISUAL, /**< Keybinding. */
GEANY_KEYS_DOCUMENT_CLONE, /**< Keybinding. */
GEANY_KEYS_FILE_QUIT, /**< Keybinding. */
GEANY_KEYS_COUNT /* must not be used by plugins */
};