Added comment toggle functionality to easily comment and uncomment a line with…

Added comment toggle functionality to easily comment and uncomment a line with one shortcut (default Ctrl+B) (closes #1552184).


git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@808 ea778897-0a13-0410-b9d1-a72fbfd435f5

ChangeLog

+2006-09-10  Enrico Tröger  <enrico.troeger@uvena.de>
+
+ * src/sci_cb.c, src/keybindings.c, src/callbacks.c:
+   Added comment toggle functionality to easily comment and uncomment a
+   line with one shortcut (default Ctrl+B) (closes #1552184).
+
+
 2006-09-09  Nick Treleaven  <nick.treleaven@btinternet.com>
 
  * src/document.c, src/ui_utils.c:

src/callbacks.c

@@ -2455,7 +2455,7 @@ on_menu_comment_line1_activate         (GtkMenuItem     *menuitem,
 {
 	gint idx = document_get_cur_idx();
 	if (idx == -1 || ! doc_list[idx].is_valid) return;
-	sci_cb_do_comment(idx);
+	sci_cb_do_comment(idx, -1);
 }
 
 
@@ -2465,7 +2465,7 @@ on_menu_uncomment_line1_activate       (GtkMenuItem     *menuitem,
 {
 	gint idx = document_get_cur_idx();
 	if (idx == -1 || ! doc_list[idx].is_valid) return;
-	sci_cb_do_uncomment(idx);
+	sci_cb_do_uncomment(idx, -1);
 }
 
 

src/keybindings.c

@@ -87,6 +87,7 @@ static void cb_func_switch_tabright(void);
 static void cb_func_toggle_sidebar(void);
 static void cb_func_edit_duplicateline(void);
 static void cb_func_edit_commentline(void);
+static void cb_func_edit_commentlinetoggle(void);
 static void cb_func_edit_uncommentline(void);
 static void cb_func_edit_increaseindent(void);
 static void cb_func_edit_decreaseindent(void);
@@ -197,6 +198,8 @@ void keybindings_init(void)
 		GDK_Page_Down, GDK_CONTROL_MASK, "switch_tabright", _("Switch to right document"));
 	keys[GEANY_KEYS_EDIT_DUPLICATELINE] = fill(cb_func_edit_duplicateline,
 		GDK_g, GDK_CONTROL_MASK, "edit_duplicateline", _("Duplicate line or selection"));
+	keys[GEANY_KEYS_EDIT_COMMENTLINETOGGLE] = fill(cb_func_edit_commentlinetoggle,
+		GDK_b, GDK_CONTROL_MASK, "edit_commentlinetoggle", _("Toggle line commentation"));
 	keys[GEANY_KEYS_EDIT_COMMENTLINE] = fill(cb_func_edit_commentline,
 		GDK_d, GDK_CONTROL_MASK, "edit_commentline", _("Comment line"));
 	keys[GEANY_KEYS_EDIT_UNCOMMENTLINE] = fill(cb_func_edit_uncommentline,
@@ -716,6 +719,13 @@ static void cb_func_edit_duplicateline(void)
 	on_menu_duplicate_line1_activate(NULL, NULL);
 }
 
+static void cb_func_edit_commentlinetoggle(void)
+{
+	gint idx = document_get_cur_idx();
+	if (idx == -1 || ! doc_list[idx].is_valid) return;
+	sci_cb_do_comment_toggle(idx);
+}
+
 static void cb_func_edit_commentline(void)
 {
 	on_menu_comment_line1_activate(NULL, NULL);

src/keybindings.h

@@ -83,6 +83,7 @@ enum
 	GEANY_KEYS_SWITCH_TABLEFT,
 	GEANY_KEYS_SWITCH_TABRIGHT,
 	GEANY_KEYS_EDIT_DUPLICATELINE,
+	GEANY_KEYS_EDIT_COMMENTLINETOGGLE,
 	GEANY_KEYS_EDIT_COMMENTLINE,
 	GEANY_KEYS_EDIT_UNCOMMENTLINE,
 	GEANY_KEYS_EDIT_INCREASEINDENT,

src/sci_cb.h

@@ -69,9 +69,11 @@ void sci_cb_find_current_word(ScintillaObject *sci, gint pos, gchar *word, size_
 
 gboolean sci_cb_show_calltip(gint idx, gint pos);
 
-void sci_cb_do_comment(gint idx);
+void sci_cb_do_comment_toggle(gint idx);
 
-void sci_cb_do_uncomment(gint idx);
+void sci_cb_do_comment(gint idx, gint line);
+
+void sci_cb_do_uncomment(gint idx, gint line);
 
 void sci_cb_highlight_braces(ScintillaObject *sci, gint cur_pos);