SF.net SVN: geany:[3340] trunk
eht16 at users.sourceforge.net
eht16 at xxxxx
Sun Dec 7 19:12:09 UTC 2008
Revision: 3340
http://geany.svn.sourceforge.net/geany/?rev=3340&view=rev
Author: eht16
Date: 2008-12-07 19:12:08 +0000 (Sun, 07 Dec 2008)
Log Message:
-----------
Add Line number and Markers margin settings to the prefs dialog.
Add View->Editor submenu and group there the Line numbers, Markers margin, Show white space, Show line endings and Show indentation guides settings.
Modified Paths:
--------------
trunk/ChangeLog
trunk/geany.glade
trunk/src/callbacks.c
trunk/src/callbacks.h
trunk/src/editor.c
trunk/src/interface.c
trunk/src/main.c
trunk/src/prefs.c
trunk/src/ui_utils.c
trunk/src/ui_utils.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-12-07 19:11:36 UTC (rev 3339)
+++ trunk/ChangeLog 2008-12-07 19:12:08 UTC (rev 3340)
@@ -6,6 +6,13 @@
Add a setting for the VTE to enable/disable a blinking cursor.
This is useful for future VTE versions where the cursor blinks
by default which might be not be desirable.
+ * geany.glade, src/callbacks.c, src/callbacks.h, src/editor.c,
+ src/interface.c, src/main.c, src/prefs.c, src/ui_utils.c,
+ src/ui_utils.h:
+ Add Line number and Markers margin settings to the prefs dialog.
+ Add View->Editor submenu and group there the Line numbers,
+ Markers margin, Show white space, Show line endings and Show
+ indentation guides settings.
2008-12-06 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/geany.glade
===================================================================
--- trunk/geany.glade 2008-12-07 19:11:36 UTC (rev 3339)
+++ trunk/geany.glade 2008-12-07 19:12:08 UTC (rev 3340)
@@ -58,7 +58,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image2652">
+ <widget class="GtkImage" id="image2690">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
@@ -148,7 +148,7 @@
<signal name="activate" handler="on_save_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image2653">
+ <widget class="GtkImage" id="image2691">
<property name="visible">True</property>
<property name="stock">gtk-save</property>
<property name="icon_size">1</property>
@@ -169,7 +169,7 @@
<signal name="activate" handler="on_toolbutton_reload_clicked" last_modification_time="Mon, 01 Sep 2008 16:57:06 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image2654">
+ <widget class="GtkImage" id="image2692">
<property name="visible">True</property>
<property name="stock">gtk-revert-to-saved</property>
<property name="icon_size">1</property>
@@ -189,7 +189,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image2655">
+ <widget class="GtkImage" id="image2693">
<property name="visible">True</property>
<property name="stock">gtk-revert-to-saved</property>
<property name="icon_size">1</property>
@@ -277,7 +277,7 @@
<signal name="activate" handler="on_close_other_documents1_activate" last_modification_time="Fri, 27 Jun 2008 15:19:28 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image2656">
+ <widget class="GtkImage" id="image2694">
<property name="visible">True</property>
<property name="stock">gtk-close</property>
<property name="icon_size">1</property>
@@ -299,7 +299,7 @@
<signal name="activate" handler="on_close_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image2657">
+ <widget class="GtkImage" id="image2695">
<property name="visible">True</property>
<property name="stock">gtk-close</property>
<property name="icon_size">1</property>
@@ -498,7 +498,7 @@
<signal name="activate" handler="on_menu_increase_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:28:54 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image2658">
+ <widget class="GtkImage" id="image2696">
<property name="visible">True</property>
<property name="stock">gtk-indent</property>
<property name="icon_size">1</property>
@@ -519,7 +519,7 @@
<signal name="activate" handler="on_menu_decrease_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:28:54 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image2659">
+ <widget class="GtkImage" id="image2697">
<property name="visible">True</property>
<property name="stock">gtk-unindent</property>
<property name="icon_size">1</property>
@@ -575,7 +575,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image2660">
+ <widget class="GtkImage" id="image2698">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
@@ -660,7 +660,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image2661">
+ <widget class="GtkImage" id="image2699">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
@@ -692,7 +692,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image2662">
+ <widget class="GtkImage" id="image2700">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
@@ -790,7 +790,7 @@
<signal name="activate" handler="on_replace1_activate" last_modification_time="Sun, 23 Oct 2005 13:22:36 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image2663">
+ <widget class="GtkImage" id="image2701">
<property name="visible">True</property>
<property name="stock">gtk-find-and-replace</property>
<property name="icon_size">1</property>
@@ -865,7 +865,7 @@
<signal name="activate" handler="on_go_to_line_activate" last_modification_time="Sat, 06 Dec 2008 17:41:21 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image2664">
+ <widget class="GtkImage" id="image2702">
<property name="visible">True</property>
<property name="stock">gtk-jump-to</property>
<property name="icon_size">1</property>
@@ -900,7 +900,7 @@
<signal name="activate" handler="on_change_font1_activate" last_modification_time="Fri, 22 Apr 2005 18:58:45 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image2665">
+ <widget class="GtkImage" id="image2703">
<property name="visible">True</property>
<property name="stock">gtk-select-font</property>
<property name="icon_size">1</property>
@@ -971,24 +971,67 @@
</child>
<child>
- <widget class="GtkCheckMenuItem" id="menu_markers_margin1">
+ <widget class="GtkMenuItem" id="menu_view_editor1">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Shows or hides the small margin right of the line numbers, which is used to mark lines.</property>
- <property name="label" translatable="yes">Show _Markers Margin</property>
+ <property name="label" translatable="yes">Editor</property>
<property name="use_underline">True</property>
- <property name="active">True</property>
- <signal name="toggled" handler="on_markers_margin1_toggled" last_modification_time="Tue, 10 May 2005 18:34:36 GMT"/>
- </widget>
- </child>
- <child>
- <widget class="GtkCheckMenuItem" id="menu_linenumber_margin1">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Shows or hides the Line Number margin.</property>
- <property name="label" translatable="yes">Show _Line Numbers</property>
- <property name="use_underline">True</property>
- <property name="active">True</property>
- <signal name="toggled" handler="on_show_line_numbers1_toggled" last_modification_time="Mon, 13 Feb 2006 20:22:48 GMT"/>
+ <child>
+ <widget class="GtkMenu" id="menu_view_editor1_menu">
+
+ <child>
+ <widget class="GtkCheckMenuItem" id="menu_markers_margin1">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Shows or hides the small margin right of the line numbers, which is used to mark lines.</property>
+ <property name="label" translatable="yes">Show _Markers Margin</property>
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <signal name="toggled" handler="on_markers_margin1_toggled" last_modification_time="Tue, 10 May 2005 18:34:36 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkCheckMenuItem" id="menu_linenumber_margin1">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Shows or hides the Line Number margin.</property>
+ <property name="label" translatable="yes">Show _Line Numbers</property>
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <signal name="toggled" handler="on_show_line_numbers1_toggled" last_modification_time="Mon, 13 Feb 2006 20:22:48 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkCheckMenuItem" id="menu_show_white_space1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Show _White Space</property>
+ <property name="use_underline">True</property>
+ <property name="active">False</property>
+ <signal name="toggled" handler="on_menu_show_white_space1_toggled" last_modification_time="Sun, 07 Dec 2008 11:56:59 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkCheckMenuItem" id="menu_show_line_endings1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Show Line _Endings</property>
+ <property name="use_underline">True</property>
+ <property name="active">False</property>
+ <signal name="toggled" handler="on_menu_show_line_endings1_toggled" last_modification_time="Sun, 07 Dec 2008 11:56:51 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkCheckMenuItem" id="menu_show_indentation_guides1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Show _Indentation Guides</property>
+ <property name="use_underline">True</property>
+ <property name="active">False</property>
+ <signal name="toggled" handler="on_menu_show_indentation_guides1_toggled" last_modification_time="Sun, 07 Dec 2008 11:56:43 GMT"/>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
</child>
@@ -1340,7 +1383,7 @@
<signal name="activate" handler="on_project_new1_activate" last_modification_time="Thu, 18 Jan 2007 22:16:24 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image2666">
+ <widget class="GtkImage" id="image2704">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
@@ -1361,7 +1404,7 @@
<signal name="activate" handler="on_project_open1_activate" last_modification_time="Mon, 15 Jan 2007 17:34:17 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image2667">
+ <widget class="GtkImage" id="image2705">
<property name="visible">True</property>
<property name="stock">gtk-open</property>
<property name="icon_size">1</property>
@@ -1382,7 +1425,7 @@
<signal name="activate" handler="on_project_close1_activate" last_modification_time="Mon, 15 Jan 2007 17:34:17 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image2668">
+ <widget class="GtkImage" id="image2706">
<property name="visible">True</property>
<property name="stock">gtk-close</property>
<property name="icon_size">1</property>
@@ -1440,7 +1483,7 @@
<signal name="activate" handler="on_show_color_chooser1_activate" last_modification_time="Wed, 22 Jun 2005 18:10:21 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image2669">
+ <widget class="GtkImage" id="image2707">
<property name="visible">True</property>
<property name="stock">gtk-select-color</property>
<property name="icon_size">1</property>
@@ -1482,7 +1525,7 @@
<signal name="activate" handler="on_menu_reload_configuration1_activate" last_modification_time="Mon, 30 Jun 2008 16:19:40 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image2670">
+ <widget class="GtkImage" id="image2708">
<property name="visible">True</property>
<property name="stock">gtk-refresh</property>
<property name="icon_size">1</property>
@@ -1516,7 +1559,7 @@
<signal name="activate" handler="on_help1_activate" last_modification_time="Sun, 24 Jul 2005 15:23:11 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image2671">
+ <widget class="GtkImage" id="image2709">
<property name="visible">True</property>
<property name="stock">gtk-help</property>
<property name="icon_size">1</property>
@@ -5945,6 +5988,46 @@
</child>
<child>
+ <widget class="GtkCheckButton" id="check_line_numbers">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Show the line ending character.</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Show line numbers</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkCheckButton" id="check_markers_margin">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Show the line ending character.</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Show markers margin</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkCheckButton" id="check_scroll_stop_at_last_line">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Whether to stop scrolling one page past the last line of a document.</property>
Modified: trunk/src/callbacks.c
===================================================================
--- trunk/src/callbacks.c 2008-12-07 19:11:36 UTC (rev 3339)
+++ trunk/src/callbacks.c 2008-12-07 19:12:08 UTC (rev 3340)
@@ -931,8 +931,11 @@
on_markers_margin1_toggled (GtkCheckMenuItem *checkmenuitem,
gpointer user_data)
{
- editor_prefs.show_markers_margin = (editor_prefs.show_markers_margin) ? FALSE : TRUE;
- ui_show_markers_margin();
+ if (ignore_callback)
+ return;
+
+ editor_prefs.show_markers_margin = ! editor_prefs.show_markers_margin;
+ ui_toggle_editor_features(GEANY_EDITOR_SHOW_MARKERS_MARGIN);
}
@@ -940,12 +943,51 @@
on_show_line_numbers1_toggled (GtkCheckMenuItem *checkmenuitem,
gpointer user_data)
{
- editor_prefs.show_linenumber_margin = (editor_prefs.show_linenumber_margin) ? FALSE : TRUE;
- ui_show_linenumber_margin();
+ if (ignore_callback)
+ return;
+
+ editor_prefs.show_linenumber_margin = ! editor_prefs.show_linenumber_margin;
+ ui_toggle_editor_features(GEANY_EDITOR_SHOW_LINE_NUMBERS);
}
void
+on_menu_show_white_space1_toggled (GtkCheckMenuItem *checkmenuitem,
+ gpointer user_data)
+{
+ if (ignore_callback)
+ return;
+
+ editor_prefs.show_white_space = ! editor_prefs.show_white_space;
+ ui_toggle_editor_features(GEANY_EDITOR_SHOW_WHITE_SPACE);
+}
+
+
+void
+on_menu_show_line_endings1_toggled (GtkCheckMenuItem *checkmenuitem,
+ gpointer user_data)
+{
+ if (ignore_callback)
+ return;
+
+ editor_prefs.show_line_endings = ! editor_prefs.show_line_endings;
+ ui_toggle_editor_features(GEANY_EDITOR_SHOW_LINE_ENDINGS);
+}
+
+
+void
+on_menu_show_indentation_guides1_toggled (GtkCheckMenuItem *checkmenuitem,
+ gpointer user_data)
+{
+ if (ignore_callback)
+ return;
+
+ editor_prefs.show_indent_guide = ! editor_prefs.show_indent_guide;
+ ui_toggle_editor_features(GEANY_EDITOR_SHOW_INDENTATION_GUIDES);
+}
+
+
+void
on_line_wrapping1_toggled (GtkCheckMenuItem *checkmenuitem,
gpointer user_data)
{
Modified: trunk/src/callbacks.h
===================================================================
--- trunk/src/callbacks.h 2008-12-07 19:11:36 UTC (rev 3339)
+++ trunk/src/callbacks.h 2008-12-07 19:12:08 UTC (rev 3340)
@@ -596,3 +596,16 @@
void
on_debug_messages1_activate (GtkMenuItem *menuitem,
gpointer user_data);
+
+void
+on_menu_show_white_space1_toggled (GtkCheckMenuItem *checkmenuitem,
+ gpointer user_data);
+
+void
+on_menu_show_line_endings1_toggled (GtkCheckMenuItem *checkmenuitem,
+ gpointer user_data);
+
+void
+on_menu_show_indentation_guides1_toggled
+ (GtkCheckMenuItem *checkmenuitem,
+ gpointer user_data);
Modified: trunk/src/editor.c
===================================================================
--- trunk/src/editor.c 2008-12-07 19:11:36 UTC (rev 3339)
+++ trunk/src/editor.c 2008-12-07 19:12:08 UTC (rev 3340)
@@ -4194,6 +4194,8 @@
sci_set_visible_white_spaces(sci, editor_prefs.show_white_space);
sci_set_visible_eols(sci, editor_prefs.show_line_endings);
+ sci_set_symbol_margin(sci, editor_prefs.show_markers_margin);
+ sci_set_line_numbers(sci, editor_prefs.show_linenumber_margin, 0);
sci_set_folding_margin_visible(sci, editor_prefs.folding);
Modified: trunk/src/interface.c
===================================================================
--- trunk/src/interface.c 2008-12-07 19:11:36 UTC (rev 3339)
+++ trunk/src/interface.c 2008-12-07 19:12:08 UTC (rev 3340)
@@ -37,7 +37,7 @@
GtkWidget *file1_menu;
GtkWidget *menu_new1;
GtkWidget *menu_new_with_template1;
- GtkWidget *image2652;
+ GtkWidget *image2690;
GtkWidget *menu_new_with_template1_menu;
GtkWidget *invisible2;
GtkWidget *separator12;
@@ -48,11 +48,11 @@
GtkWidget *menu_save1;
GtkWidget *menu_save_as1;
GtkWidget *menu_save_all1;
- GtkWidget *image2653;
+ GtkWidget *image2691;
GtkWidget *menu_reload1;
- GtkWidget *image2654;
+ GtkWidget *image2692;
GtkWidget *menu_reload_as1;
- GtkWidget *image2655;
+ GtkWidget *image2693;
GtkWidget *menu_reload_as1_menu;
GtkWidget *invisible7;
GtkWidget *separator21;
@@ -63,9 +63,9 @@
GtkWidget *separator14;
GtkWidget *menu_close1;
GtkWidget *close_other_documents1;
- GtkWidget *image2656;
+ GtkWidget *image2694;
GtkWidget *menu_close_all1;
- GtkWidget *image2657;
+ GtkWidget *image2695;
GtkWidget *menu_separatormenuitem1;
GtkWidget *menu_quit1;
GtkWidget *edit1;
@@ -90,16 +90,16 @@
GtkWidget *menu_duplicate_line1;
GtkWidget *separator29;
GtkWidget *menu_increase_indent1;
- GtkWidget *image2658;
+ GtkWidget *image2696;
GtkWidget *menu_decrease_indent1;
- GtkWidget *image2659;
+ GtkWidget *image2697;
GtkWidget *separator37;
GtkWidget *send_selection_to2;
GtkWidget *send_selection_to2_menu;
GtkWidget *invisible13;
GtkWidget *separator18;
GtkWidget *add_comments1;
- GtkWidget *image2660;
+ GtkWidget *image2698;
GtkWidget *add_comments1_menu;
GtkWidget *menu_add_changelog_entry1;
GtkWidget *insert_file_header1;
@@ -108,11 +108,11 @@
GtkWidget *insert_gpl_notice2;
GtkWidget *insert_bsd_license_notice2;
GtkWidget *insert_date1;
- GtkWidget *image2661;
+ GtkWidget *image2699;
GtkWidget *insert_date1_menu;
GtkWidget *invisible8;
GtkWidget *insert_include2;
- GtkWidget *image2662;
+ GtkWidget *image2700;
GtkWidget *insert_include2_menu;
GtkWidget *invisible4;
GtkWidget *separator9;
@@ -124,7 +124,7 @@
GtkWidget *find_previous1;
GtkWidget *find_in_files1;
GtkWidget *replace1;
- GtkWidget *image2663;
+ GtkWidget *image2701;
GtkWidget *separator33;
GtkWidget *find_nextsel1;
GtkWidget *find_prevsel1;
@@ -133,19 +133,24 @@
GtkWidget *previous_message1;
GtkWidget *separator32;
GtkWidget *go_to_line1;
- GtkWidget *image2664;
+ GtkWidget *image2702;
GtkWidget *menu_view1;
GtkWidget *menu_view1_menu;
GtkWidget *menu_change_font1;
- GtkWidget *image2665;
+ GtkWidget *image2703;
GtkWidget *menu_separator4;
GtkWidget *menu_toggle_all_additional_widgets1;
GtkWidget *menu_fullscreen1;
GtkWidget *menu_show_messages_window1;
GtkWidget *menu_show_toolbar1;
GtkWidget *menu_show_sidebar1;
+ GtkWidget *menu_view_editor1;
+ GtkWidget *menu_view_editor1_menu;
GtkWidget *menu_markers_margin1;
GtkWidget *menu_linenumber_margin1;
+ GtkWidget *menu_show_white_space1;
+ GtkWidget *menu_show_line_endings1;
+ GtkWidget *menu_show_indentation_guides1;
GtkWidget *menu_separator5;
GtkWidget *menu_zoom_in1;
GtkWidget *menu_zoom_out1;
@@ -190,26 +195,26 @@
GtkWidget *menu_project1;
GtkWidget *menu_project1_menu;
GtkWidget *project_new1;
- GtkWidget *image2666;
+ GtkWidget *image2704;
GtkWidget *project_open1;
- GtkWidget *image2667;
+ GtkWidget *image2705;
GtkWidget *project_close1;
- GtkWidget *image2668;
+ GtkWidget *image2706;
GtkWidget *separator34;
GtkWidget *project_properties1;
GtkWidget *menu_build1;
GtkWidget *tools1;
GtkWidget *tools1_menu;
GtkWidget *menu_choose_color1;
- GtkWidget *image2669;
+ GtkWidget *image2707;
GtkWidget *menu_count_words1;
GtkWidget *load_tags1;
GtkWidget *menu_reload_configuration1;
- GtkWidget *image2670;
+ GtkWidget *image2708;
GtkWidget *menu_help1;
GtkWidget *menu_help1_menu;
GtkWidget *help1;
- GtkWidget *image2671;
+ GtkWidget *image2709;
GtkWidget *website1;
GtkWidget *keyboard_shortcuts1;
GtkWidget *debug_messages1;
@@ -275,9 +280,9 @@
gtk_widget_show (menu_new_with_template1);
gtk_container_add (GTK_CONTAINER (file1_menu), menu_new_with_template1);
- image2652 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2652);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image2652);
+ image2690 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image2690);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image2690);
menu_new_with_template1_menu = gtk_menu_new ();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_new_with_template1), menu_new_with_template1_menu);
@@ -320,25 +325,25 @@
gtk_container_add (GTK_CONTAINER (file1_menu), menu_save_all1);
gtk_tooltips_set_tip (tooltips, menu_save_all1, _("Saves all open files"), NULL);
- image2653 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2653);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image2653);
+ image2691 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image2691);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image2691);
menu_reload1 = gtk_image_menu_item_new_with_mnemonic (_("_Reload"));
gtk_widget_show (menu_reload1);
gtk_container_add (GTK_CONTAINER (file1_menu), menu_reload1);
- image2654 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2654);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image2654);
+ image2692 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image2692);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image2692);
menu_reload_as1 = gtk_image_menu_item_new_with_mnemonic (_("R_eload As"));
gtk_widget_show (menu_reload_as1);
gtk_container_add (GTK_CONTAINER (file1_menu), menu_reload_as1);
- image2655 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2655);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image2655);
+ image2693 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image2693);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image2693);
menu_reload_as1_menu = gtk_menu_new ();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_reload_as1), menu_reload_as1_menu);
@@ -382,18 +387,18 @@
gtk_widget_show (close_other_documents1);
gtk_container_add (GTK_CONTAINER (file1_menu), close_other_documents1);
- image2656 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2656);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (close_other_documents1), image2656);
+ image2694 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image2694);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (close_other_documents1), image2694);
menu_close_all1 = gtk_image_menu_item_new_with_mnemonic (_("C_lose All"));
gtk_widget_show (menu_close_all1);
gtk_container_add (GTK_CONTAINER (file1_menu), menu_close_all1);
gtk_tooltips_set_tip (tooltips, menu_close_all1, _("Closes all open files"), NULL);
- image2657 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2657);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image2657);
+ image2695 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image2695);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image2695);
menu_separatormenuitem1 = gtk_separator_menu_item_new ();
gtk_widget_show (menu_separatormenuitem1);
@@ -497,17 +502,17 @@
gtk_widget_show (menu_increase_indent1);
gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_increase_indent1);
- image2658 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2658);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image2658);
+ image2696 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image2696);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image2696);
menu_decrease_indent1 = gtk_image_menu_item_new_with_mnemonic (_("_Decrease Indent"));
gtk_widget_show (menu_decrease_indent1);
gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_decrease_indent1);
- image2659 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2659);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image2659);
+ image2697 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image2697);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image2697);
separator37 = gtk_separator_menu_item_new ();
gtk_widget_show (separator37);
@@ -533,9 +538,9 @@
gtk_widget_show (add_comments1);
gtk_container_add (GTK_CONTAINER (edit1_menu), add_comments1);
- image2660 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2660);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image2660);
+ image2698 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image2698);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image2698);
add_comments1_menu = gtk_menu_new ();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (add_comments1), add_comments1_menu);
@@ -574,9 +579,9 @@
gtk_widget_show (insert_date1);
gtk_container_add (GTK_CONTAINER (edit1_menu), insert_date1);
- image2661 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2661);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image2661);
+ image2699 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image2699);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image2699);
insert_date1_menu = gtk_menu_new ();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_date1), insert_date1_menu);
@@ -588,9 +593,9 @@
gtk_widget_show (insert_include2);
gtk_container_add (GTK_CONTAINER (edit1_menu), insert_include2);
- image2662 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2662);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image2662);
+ image2700 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image2700);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image2700);
insert_include2_menu = gtk_menu_new ();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include2), insert_include2_menu);
@@ -634,9 +639,9 @@
gtk_widget_show (replace1);
gtk_container_add (GTK_CONTAINER (search1_menu), replace1);
- image2663 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2663);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image2663);
+ image2701 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image2701);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image2701);
separator33 = gtk_separator_menu_item_new ();
gtk_widget_show (separator33);
@@ -673,9 +678,9 @@
gtk_widget_show (go_to_line1);
gtk_container_add (GTK_CONTAINER (search1_menu), go_to_line1);
- image2664 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2664);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image2664);
+ image2702 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image2702);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image2702);
menu_view1 = gtk_menu_item_new_with_mnemonic (_("_View"));
gtk_widget_show (menu_view1);
@@ -689,9 +694,9 @@
gtk_container_add (GTK_CONTAINER (menu_view1_menu), menu_change_font1);
gtk_tooltips_set_tip (tooltips, menu_change_font1, _("Change the default font"), NULL);
- image2665 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2665);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image2665);
+ image2703 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image2703);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image2703);
menu_separator4 = gtk_separator_menu_item_new ();
gtk_widget_show (menu_separator4);
@@ -723,18 +728,37 @@
gtk_container_add (GTK_CONTAINER (menu_view1_menu), menu_show_sidebar1);
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_show_sidebar1), TRUE);
+ menu_view_editor1 = gtk_menu_item_new_with_mnemonic (_("Editor"));
+ gtk_widget_show (menu_view_editor1);
+ gtk_container_add (GTK_CONTAINER (menu_view1_menu), menu_view_editor1);
+
+ menu_view_editor1_menu = gtk_menu_new ();
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_view_editor1), menu_view_editor1_menu);
+
menu_markers_margin1 = gtk_check_menu_item_new_with_mnemonic (_("Show _Markers Margin"));
gtk_widget_show (menu_markers_margin1);
- gtk_container_add (GTK_CONTAINER (menu_view1_menu), menu_markers_margin1);
+ gtk_container_add (GTK_CONTAINER (menu_view_editor1_menu), menu_markers_margin1);
gtk_tooltips_set_tip (tooltips, menu_markers_margin1, _("Shows or hides the small margin right of the line numbers, which is used to mark lines."), NULL);
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_markers_margin1), TRUE);
menu_linenumber_margin1 = gtk_check_menu_item_new_with_mnemonic (_("Show _Line Numbers"));
gtk_widget_show (menu_linenumber_margin1);
- gtk_container_add (GTK_CONTAINER (menu_view1_menu), menu_linenumber_margin1);
+ gtk_container_add (GTK_CONTAINER (menu_view_editor1_menu), menu_linenumber_margin1);
gtk_tooltips_set_tip (tooltips, menu_linenumber_margin1, _("Shows or hides the Line Number margin."), NULL);
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_linenumber_margin1), TRUE);
+ menu_show_white_space1 = gtk_check_menu_item_new_with_mnemonic (_("Show _White Space"));
+ gtk_widget_show (menu_show_white_space1);
+ gtk_container_add (GTK_CONTAINER (menu_view_editor1_menu), menu_show_white_space1);
+
+ menu_show_line_endings1 = gtk_check_menu_item_new_with_mnemonic (_("Show Line _Endings"));
+ gtk_widget_show (menu_show_line_endings1);
+ gtk_container_add (GTK_CONTAINER (menu_view_editor1_menu), menu_show_line_endings1);
+
+ menu_show_indentation_guides1 = gtk_check_menu_item_new_with_mnemonic (_("Show _Indentation Guides"));
+ gtk_widget_show (menu_show_indentation_guides1);
+ gtk_container_add (GTK_CONTAINER (menu_view_editor1_menu), menu_show_indentation_guides1);
+
menu_separator5 = gtk_separator_menu_item_new ();
gtk_widget_show (menu_separator5);
gtk_container_add (GTK_CONTAINER (menu_view1_menu), menu_separator5);
@@ -922,25 +946,25 @@
gtk_widget_show (project_new1);
gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_new1);
- image2666 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2666);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image2666);
+ image2704 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image2704);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image2704);
project_open1 = gtk_image_menu_item_new_with_mnemonic (_("_Open"));
gtk_widget_show (project_open1);
gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_open1);
- image2667 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2667);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image2667);
+ image2705 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image2705);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image2705);
project_close1 = gtk_image_menu_item_new_with_mnemonic (_("_Close"));
gtk_widget_show (project_close1);
gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_close1);
- image2668 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2668);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image2668);
+ image2706 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image2706);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image2706);
separator34 = gtk_separator_menu_item_new ();
gtk_widget_show (separator34);
@@ -967,9 +991,9 @@
gtk_container_add (GTK_CONTAINER (tools1_menu), menu_choose_color1);
gtk_tooltips_set_tip (tooltips, menu_choose_color1, _("Open a color chooser dialog, to interactively pick colors from a palette."), NULL);
- image2669 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2669);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image2669);
+ image2707 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image2707);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image2707);
menu_count_words1 = gtk_menu_item_new_with_mnemonic (_("_Word Count"));
gtk_widget_show (menu_count_words1);
@@ -986,9 +1010,9 @@
gtk_container_add (GTK_CONTAINER (tools1_menu), menu_reload_configuration1);
gtk_tooltips_set_tip (tooltips, menu_reload_configuration1, _("Reload configuration data like snippets, templates and filetype extensions."), NULL);
- image2670 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2670);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_configuration1), image2670);
+ image2708 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image2708);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_configuration1), image2708);
menu_help1 = gtk_menu_item_new_with_mnemonic (_("_Help"));
gtk_widget_show (menu_help1);
@@ -1001,9 +1025,9 @@
gtk_widget_show (help1);
gtk_container_add (GTK_CONTAINER (menu_help1_menu), help1);
- image2671 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image2671);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image2671);
+ image2709 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image2709);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image2709);
website1 = gtk_menu_item_new_with_mnemonic (_("_Website"));
gtk_widget_show (website1);
@@ -1326,6 +1350,15 @@
g_signal_connect ((gpointer) menu_linenumber_margin1, "toggled",
G_CALLBACK (on_show_line_numbers1_toggled),
NULL);
+ g_signal_connect ((gpointer) menu_show_white_space1, "toggled",
+ G_CALLBACK (on_menu_show_white_space1_toggled),
+ NULL);
+ g_signal_connect ((gpointer) menu_show_line_endings1, "toggled",
+ G_CALLBACK (on_menu_show_line_endings1_toggled),
+ NULL);
+ g_signal_connect ((gpointer) menu_show_indentation_guides1, "toggled",
+ G_CALLBACK (on_menu_show_indentation_guides1_toggled),
+ NULL);
g_signal_connect ((gpointer) menu_zoom_in1, "activate",
G_CALLBACK (on_zoom_in1_activate),
NULL);
@@ -1459,7 +1492,7 @@
GLADE_HOOKUP_OBJECT (window1, file1_menu, "file1_menu");
GLADE_HOOKUP_OBJECT (window1, menu_new1, "menu_new1");
GLADE_HOOKUP_OBJECT (window1, menu_new_with_template1, "menu_new_with_template1");
- GLADE_HOOKUP_OBJECT (window1, image2652, "image2652");
+ GLADE_HOOKUP_OBJECT (window1, image2690, "image2690");
GLADE_HOOKUP_OBJECT (window1, menu_new_with_template1_menu, "menu_new_with_template1_menu");
GLADE_HOOKUP_OBJECT (window1, invisible2, "invisible2");
GLADE_HOOKUP_OBJECT (window1, separator12, "separator12");
@@ -1470,11 +1503,11 @@
GLADE_HOOKUP_OBJECT (window1, menu_save1, "menu_save1");
GLADE_HOOKUP_OBJECT (window1, menu_save_as1, "menu_save_as1");
GLADE_HOOKUP_OBJECT (window1, menu_save_all1, "menu_save_all1");
- GLADE_HOOKUP_OBJECT (window1, image2653, "image2653");
+ GLADE_HOOKUP_OBJECT (window1, image2691, "image2691");
GLADE_HOOKUP_OBJECT (window1, menu_reload1, "menu_reload1");
- GLADE_HOOKUP_OBJECT (window1, image2654, "image2654");
+ GLADE_HOOKUP_OBJECT (window1, image2692, "image2692");
GLADE_HOOKUP_OBJECT (window1, menu_reload_as1, "menu_reload_as1");
- GLADE_HOOKUP_OBJECT (window1, image2655, "image2655");
+ GLADE_HOOKUP_OBJECT (window1, image2693, "image2693");
GLADE_HOOKUP_OBJECT (window1, menu_reload_as1_menu, "menu_reload_as1_menu");
GLADE_HOOKUP_OBJECT (window1, invisible7, "invisible7");
GLADE_HOOKUP_OBJECT (window1, separator21, "separator21");
@@ -1485,9 +1518,9 @@
GLADE_HOOKUP_OBJECT (window1, separator14, "separator14");
GLADE_HOOKUP_OBJECT (window1, menu_close1, "menu_close1");
GLADE_HOOKUP_OBJECT (window1, close_other_documents1, "close_other_documents1");
- GLADE_HOOKUP_OBJECT (window1, image2656, "image2656");
+ GLADE_HOOKUP_OBJECT (window1, image2694, "image2694");
GLADE_HOOKUP_OBJECT (window1, menu_close_all1, "menu_close_all1");
- GLADE_HOOKUP_OBJECT (window1, image2657, "image2657");
+ GLADE_HOOKUP_OBJECT (window1, image2695, "image2695");
GLADE_HOOKUP_OBJECT (window1, menu_separatormenuitem1, "menu_separatormenuitem1");
GLADE_HOOKUP_OBJECT (window1, menu_quit1, "menu_quit1");
GLADE_HOOKUP_OBJECT (window1, edit1, "edit1");
@@ -1512,16 +1545,16 @@
GLADE_HOOKUP_OBJECT (window1, menu_duplicate_line1, "menu_duplicate_line1");
GLADE_HOOKUP_OBJECT (window1, separator29, "separator29");
GLADE_HOOKUP_OBJECT (window1, menu_increase_indent1, "menu_increase_indent1");
- GLADE_HOOKUP_OBJECT (window1, image2658, "image2658");
+ GLADE_HOOKUP_OBJECT (window1, image2696, "image2696");
GLADE_HOOKUP_OBJECT (window1, menu_decrease_indent1, "menu_decrease_indent1");
- GLADE_HOOKUP_OBJECT (window1, image2659, "image2659");
+ GLADE_HOOKUP_OBJECT (window1, image2697, "image2697");
GLADE_HOOKUP_OBJECT (window1, separator37, "separator37");
GLADE_HOOKUP_OBJECT (window1, send_selection_to2, "send_selection_to2");
GLADE_HOOKUP_OBJECT (window1, send_selection_to2_menu, "send_selection_to2_menu");
GLADE_HOOKUP_OBJECT (window1, invisible13, "invisible13");
GLADE_HOOKUP_OBJECT (window1, separator18, "separator18");
GLADE_HOOKUP_OBJECT (window1, add_comments1, "add_comments1");
- GLADE_HOOKUP_OBJECT (window1, image2660, "image2660");
+ GLADE_HOOKUP_OBJECT (window1, image2698, "image2698");
GLADE_HOOKUP_OBJECT (window1, add_comments1_menu, "add_comments1_menu");
GLADE_HOOKUP_OBJECT (window1, menu_add_changelog_entry1, "menu_add_changelog_entry1");
GLADE_HOOKUP_OBJECT (window1, insert_file_header1, "insert_file_header1");
@@ -1530,11 +1563,11 @@
GLADE_HOOKUP_OBJECT (window1, insert_gpl_notice2, "insert_gpl_notice2");
GLADE_HOOKUP_OBJECT (window1, insert_bsd_license_notice2, "insert_bsd_license_notice2");
GLADE_HOOKUP_OBJECT (window1, insert_date1, "insert_date1");
- GLADE_HOOKUP_OBJECT (window1, image2661, "image2661");
+ GLADE_HOOKUP_OBJECT (window1, image2699, "image2699");
GLADE_HOOKUP_OBJECT (window1, insert_date1_menu, "insert_date1_menu");
GLADE_HOOKUP_OBJECT (window1, invisible8, "invisible8");
GLADE_HOOKUP_OBJECT (window1, insert_include2, "insert_include2");
- GLADE_HOOKUP_OBJECT (window1, image2662, "image2662");
+ GLADE_HOOKUP_OBJECT (window1, image2700, "image2700");
GLADE_HOOKUP_OBJECT (window1, insert_include2_menu, "insert_include2_menu");
GLADE_HOOKUP_OBJECT (window1, invisible4, "invisible4");
GLADE_HOOKUP_OBJECT (window1, separator9, "separator9");
@@ -1546,7 +1579,7 @@
GLADE_HOOKUP_OBJECT (window1, find_previous1, "find_previous1");
GLADE_HOOKUP_OBJECT (window1, find_in_files1, "find_in_files1");
GLADE_HOOKUP_OBJECT (window1, replace1, "replace1");
- GLADE_HOOKUP_OBJECT (window1, image2663, "image2663");
+ GLADE_HOOKUP_OBJECT (window1, image2701, "image2701");
GLADE_HOOKUP_OBJECT (window1, separator33, "separator33");
GLADE_HOOKUP_OBJECT (window1, find_nextsel1, "find_nextsel1");
GLADE_HOOKUP_OBJECT (window1, find_prevsel1, "find_prevsel1");
@@ -1555,19 +1588,24 @@
GLADE_HOOKUP_OBJECT (window1, previous_message1, "previous_message1");
GLADE_HOOKUP_OBJECT (window1, separator32, "separator32");
GLADE_HOOKUP_OBJECT (window1, go_to_line1, "go_to_line1");
- GLADE_HOOKUP_OBJECT (window1, image2664, "image2664");
+ GLADE_HOOKUP_OBJECT (window1, image2702, "image2702");
GLADE_HOOKUP_OBJECT (window1, menu_view1, "menu_view1");
GLADE_HOOKUP_OBJECT (window1, menu_view1_menu, "menu_view1_menu");
GLADE_HOOKUP_OBJECT (window1, menu_change_font1, "menu_change_font1");
- GLADE_HOOKUP_OBJECT (window1, image2665, "image2665");
+ GLADE_HOOKUP_OBJECT (window1, image2703, "image2703");
GLADE_HOOKUP_OBJECT (window1, menu_separator4, "menu_separator4");
GLADE_HOOKUP_OBJECT (window1, menu_toggle_all_additional_widgets1, "menu_toggle_all_additional_widgets1");
GLADE_HOOKUP_OBJECT (window1, menu_fullscreen1, "menu_fullscreen1");
GLADE_HOOKUP_OBJECT (window1, menu_show_messages_window1, "menu_show_messages_window1");
GLADE_HOOKUP_OBJECT (window1, menu_show_toolbar1, "menu_show_toolbar1");
GLADE_HOOKUP_OBJECT (window1, menu_show_sidebar1, "menu_show_sidebar1");
+ GLADE_HOOKUP_OBJECT (window1, menu_view_editor1, "menu_view_editor1");
+ GLADE_HOOKUP_OBJECT (window1, menu_view_editor1_menu, "menu_view_editor1_menu");
GLADE_HOOKUP_OBJECT (window1, menu_markers_margin1, "menu_markers_margin1");
GLADE_HOOKUP_OBJECT (window1, menu_linenumber_margin1, "menu_linenumber_margin1");
+ GLADE_HOOKUP_OBJECT (window1, menu_show_white_space1, "menu_show_white_space1");
+ GLADE_HOOKUP_OBJECT (window1, menu_show_line_endings1, "menu_show_line_endings1");
+ GLADE_HOOKUP_OBJECT (window1, menu_show_indentation_guides1, "menu_show_indentation_guides1");
GLADE_HOOKUP_OBJECT (window1, menu_separator5, "menu_separator5");
GLADE_HOOKUP_OBJECT (window1, menu_zoom_in1, "menu_zoom_in1");
GLADE_HOOKUP_OBJECT (window1, menu_zoom_out1, "menu_zoom_out1");
@@ -1610,26 +1648,26 @@
GLADE_HOOKUP_OBJECT (window1, menu_project1, "menu_project1");
GLADE_HOOKUP_OBJECT (window1, menu_project1_menu, "menu_project1_menu");
GLADE_HOOKUP_OBJECT (window1, project_new1, "project_new1");
- GLADE_HOOKUP_OBJECT (window1, image2666, "image2666");
+ GLADE_HOOKUP_OBJECT (window1, image2704, "image2704");
GLADE_HOOKUP_OBJECT (window1, project_open1, "project_open1");
- GLADE_HOOKUP_OBJECT (window1, image2667, "image2667");
+ GLADE_HOOKUP_OBJECT (window1, image2705, "image2705");
GLADE_HOOKUP_OBJECT (window1, project_close1, "project_close1");
- GLADE_HOOKUP_OBJECT (window1, image2668, "image2668");
+ GLADE_HOOKUP_OBJECT (window1, image2706, "image2706");
GLADE_HOOKUP_OBJECT (window1, separator34, "separator34");
GLADE_HOOKUP_OBJECT (window1, project_properties1, "project_properties1");
GLADE_HOOKUP_OBJECT (window1, menu_build1, "menu_build1");
GLADE_HOOKUP_OBJECT (window1, tools1, "tools1");
GLADE_HOOKUP_OBJECT (window1, tools1_menu, "tools1_menu");
GLADE_HOOKUP_OBJECT (window1, menu_choose_color1, "menu_choose_color1");
- GLADE_HOOKUP_OBJECT (window1, image2669, "image2669");
+ GLADE_HOOKUP_OBJECT (window1, image2707, "image2707");
GLADE_HOOKUP_OBJECT (window1, menu_count_words1, "menu_count_words1");
GLADE_HOOKUP_OBJECT (window1, load_tags1, "load_tags1");
GLADE_HOOKUP_OBJECT (window1, menu_reload_configuration1, "menu_reload_configuration1");
- GLADE_HOOKUP_OBJECT (window1, image2670, "image2670");
+ GLADE_HOOKUP_OBJECT (window1, image2708, "image2708");
GLADE_HOOKUP_OBJECT (window1, menu_help1, "menu_help1");
GLADE_HOOKUP_OBJECT (window1, menu_help1_menu, "menu_help1_menu");
GLADE_HOOKUP_OBJECT (window1, help1, "help1");
- GLADE_HOOKUP_OBJECT (window1, image2671, "image2671");
+ GLADE_HOOKUP_OBJECT (window1, image2709, "image2709");
GLADE_HOOKUP_OBJECT (window1, website1, "website1");
GLADE_HOOKUP_OBJECT (window1, keyboard_shortcuts1, "keyboard_shortcuts1");
GLADE_HOOKUP_OBJECT (window1, debug_messages1, "debug_messages1");
@@ -2419,6 +2457,8 @@
GtkWidget *check_indent;
GtkWidget *check_white_space;
GtkWidget *check_line_end;
+ GtkWidget *check_line_numbers;
+ GtkWidget *check_markers_margin;
GtkWidget *check_scroll_stop_at_last_line;
GtkWidget *label102;
GtkWidget *frame8;
@@ -3589,6 +3629,16 @@
gtk_box_pack_start (GTK_BOX (vbox12), check_line_end, FALSE, FALSE, 0);
gtk_tooltips_set_tip (tooltips, check_line_end, _("Show the line ending character."), NULL);
+ check_line_numbers = gtk_check_button_new_with_mnemonic (_("Show line numbers"));
+ gtk_widget_show (check_line_numbers);
+ gtk_box_pack_start (GTK_BOX (vbox12), check_line_numbers, FALSE, FALSE, 0);
+ gtk_tooltips_set_tip (tooltips, check_line_numbers, _("Show the line ending character."), NULL);
+
+ check_markers_margin = gtk_check_button_new_with_mnemonic (_("Show markers margin"));
+ gtk_widget_show (check_markers_margin);
+ gtk_box_pack_start (GTK_BOX (vbox12), check_markers_margin, FALSE, FALSE, 0);
+ gtk_tooltips_set_tip (tooltips, check_markers_margin, _("Show the line ending character."), NULL);
+
check_scroll_stop_at_last_line = gtk_check_button_new_with_mnemonic (_("Stop scrolling at last line"));
gtk_widget_show (check_scroll_stop_at_last_line);
gtk_box_pack_start (GTK_BOX (vbox12), check_scroll_stop_at_last_line, FALSE, FALSE, 0);
@@ -4629,6 +4679,8 @@
GLADE_HOOKUP_OBJECT (prefs_dialog, check_indent, "check_indent");
GLADE_HOOKUP_OBJECT (prefs_dialog, check_white_space, "check_white_space");
GLADE_HOOKUP_OBJECT (prefs_dialog, check_line_end, "check_line_end");
+ GLADE_HOOKUP_OBJECT (prefs_dialog, check_line_numbers, "check_line_numbers");
+ GLADE_HOOKUP_OBJECT (prefs_dialog, check_markers_margin, "check_markers_margin");
GLADE_HOOKUP_OBJECT (prefs_dialog, check_scroll_stop_at_last_line, "check_scroll_stop_at_last_line");
GLADE_HOOKUP_OBJECT (prefs_dialog, label102, "label102");
GLADE_HOOKUP_OBJECT (prefs_dialog, frame8, "frame8");
Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c 2008-12-07 19:11:36 UTC (rev 3339)
+++ trunk/src/main.c 2008-12-07 19:12:08 UTC (rev 3340)
@@ -210,17 +210,7 @@
}
gtk_toolbar_set_icon_size(GTK_TOOLBAR(main_widgets.toolbar), toolbar_prefs.icon_size);
- /* line number and markers margin are by default enabled */
- if (! editor_prefs.show_markers_margin)
- {
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(lookup_widget(main_widgets.window, "menu_markers_margin1")), FALSE);
- editor_prefs.show_markers_margin = FALSE;
- }
- if (! editor_prefs.show_linenumber_margin)
- {
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(lookup_widget(main_widgets.window, "menu_linenumber_margin1")), FALSE);
- editor_prefs.show_linenumber_margin = FALSE;
- }
+ ui_update_view_editor_menu_items();
/* interprets the saved window geometry */
if (prefs.save_winpos && ui_prefs.geometry[0] != -1)
Modified: trunk/src/prefs.c
===================================================================
--- trunk/src/prefs.c 2008-12-07 19:11:36 UTC (rev 3339)
+++ trunk/src/prefs.c 2008-12-07 19:12:08 UTC (rev 3340)
@@ -523,6 +523,12 @@
widget = lookup_widget(ui_widgets.prefs_dialog, "check_line_end");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.show_line_endings);
+ widget = lookup_widget(ui_widgets.prefs_dialog, "check_line_numbers");
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.show_linenumber_margin);
+
+ widget = lookup_widget(ui_widgets.prefs_dialog, "check_markers_margin");
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.show_markers_margin);
+
widget = lookup_widget(ui_widgets.prefs_dialog, "check_scroll_stop_at_last_line");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.scroll_stop_at_last_line);
@@ -915,6 +921,12 @@
widget = lookup_widget(ui_widgets.prefs_dialog, "check_line_end");
editor_prefs.show_line_endings = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+ widget = lookup_widget(ui_widgets.prefs_dialog, "check_line_numbers");
+ editor_prefs.show_linenumber_margin = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+
+ widget = lookup_widget(ui_widgets.prefs_dialog, "check_markers_margin");
+ editor_prefs.show_markers_margin = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+
widget = lookup_widget(ui_widgets.prefs_dialog, "check_scroll_stop_at_last_line");
editor_prefs.scroll_stop_at_last_line = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
@@ -1122,6 +1134,7 @@
}
}
ui_document_show_hide(NULL);
+ ui_update_view_editor_menu_items();
/* store all settings */
configuration_save();
Modified: trunk/src/ui_utils.c
===================================================================
--- trunk/src/ui_utils.c 2008-12-07 19:11:36 UTC (rev 3339)
+++ trunk/src/ui_utils.c 2008-12-07 19:12:08 UTC (rev 3340)
@@ -628,11 +628,10 @@
add_doc_widget("preferences2");
add_doc_widget("menu_reload1");
add_doc_widget("menu_document1");
- add_doc_widget("menu_markers_margin1");
- add_doc_widget("menu_linenumber_margin1");
add_doc_widget("menu_choose_color1");
add_doc_widget("menu_zoom_in1");
add_doc_widget("menu_zoom_out1");
+ add_doc_widget("menu_view_editor1");
add_doc_widget("normal_size1");
add_doc_widget("treeview6");
add_doc_widget("print1");
@@ -1056,7 +1055,7 @@
}
-void ui_show_markers_margin(void)
+void ui_toggle_editor_features(GeanyUIEditorFeatures feature)
{
gint i, max = gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook));
GeanyDocument *doc;
@@ -1064,21 +1063,38 @@
for(i = 0; i < max; i++)
{
doc = document_get_from_page(i);
- sci_set_symbol_margin(doc->editor->sci, editor_prefs.show_markers_margin);
+
+ switch (feature)
+ {
+ case GEANY_EDITOR_SHOW_MARKERS_MARGIN:
+ sci_set_symbol_margin(doc->editor->sci, editor_prefs.show_markers_margin);
+ break;
+ case GEANY_EDITOR_SHOW_LINE_NUMBERS:
+ sci_set_line_numbers(doc->editor->sci, editor_prefs.show_linenumber_margin, 0);
+ break;
+ case GEANY_EDITOR_SHOW_WHITE_SPACE:
+ sci_set_visible_white_spaces(doc->editor->sci, editor_prefs.show_white_space);
+ break;
+ case GEANY_EDITOR_SHOW_LINE_ENDINGS:
+ sci_set_visible_eols(doc->editor->sci, editor_prefs.show_line_endings);
+ break;
+ case GEANY_EDITOR_SHOW_INDENTATION_GUIDES:
+ editor_set_indentation_guides(doc->editor);
+ break;
+ }
}
}
-void ui_show_linenumber_margin(void)
+void ui_update_view_editor_menu_items(void)
{
- gint i, max = gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook));
- GeanyDocument *doc;
-
- for(i = 0; i < max; i++)
- {
- doc = document_get_from_page(i);
- sci_set_line_numbers(doc->editor->sci, editor_prefs.show_linenumber_margin, 0);
- }
+ ignore_callback = TRUE;
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(lookup_widget(main_widgets.window, "menu_markers_margin1")), editor_prefs.show_markers_margin);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(lookup_widget(main_widgets.window, "menu_linenumber_margin1")), editor_prefs.show_linenumber_margin);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(lookup_widget(main_widgets.window, "menu_show_white_space1")), editor_prefs.show_white_space);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(lookup_widget(main_widgets.window, "menu_show_line_endings1")), editor_prefs.show_line_endings);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(lookup_widget(main_widgets.window, "menu_show_indentation_guides1")), editor_prefs.show_indent_guide);
+ ignore_callback = FALSE;
}
Modified: trunk/src/ui_utils.h
===================================================================
--- trunk/src/ui_utils.h 2008-12-07 19:11:36 UTC (rev 3339)
+++ trunk/src/ui_utils.h 2008-12-07 19:12:08 UTC (rev 3340)
@@ -115,6 +115,17 @@
GeanyAutoSeparator;
+typedef enum
+{
+ GEANY_EDITOR_SHOW_MARKERS_MARGIN,
+ GEANY_EDITOR_SHOW_LINE_NUMBERS,
+ GEANY_EDITOR_SHOW_WHITE_SPACE,
+ GEANY_EDITOR_SHOW_INDENTATION_GUIDES,
+ GEANY_EDITOR_SHOW_LINE_ENDINGS
+}
+GeanyUIEditorFeatures;
+
+
void ui_widget_show_hide(GtkWidget *widget, gboolean show);
void ui_widget_modify_font_from_string(GtkWidget *wid, const gchar *str);
@@ -212,11 +223,6 @@
void ui_add_recent_file(const gchar *utf8_filename);
-void ui_show_markers_margin(void);
-
-void ui_show_linenumber_margin(void);
-
-
void ui_update_tab_status(GeanyDocument *doc);
@@ -231,4 +237,8 @@
void ui_add_document_sensitive(GtkWidget *widget);
+void ui_toggle_editor_features(GeanyUIEditorFeatures feature);
+
+void ui_update_view_editor_menu_items(void);
+
#endif
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