From 05cbc77babc463c478bf1749ce9d1a42fde10af8 Mon Sep 17 00:00:00 2001 From: Nick Treleaven Date: Tue, 12 Jun 2007 15:16:17 +0000 Subject: [PATCH] Rename some menubar widget names. Use indentation spelling in variable names. git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@1611 ea778897-0a13-0410-b9d1-a72fbfd435f5 --- ChangeLog | 10 ++ geany.glade | 46 ++++---- src/callbacks.c | 4 +- src/callbacks.h | 2 +- src/document.c | 8 +- src/document.h | 2 +- src/editor.c | 22 ++-- src/editor.h | 6 +- src/interface.c | 276 +++++++++++++++++++++++----------------------- src/keyfile.c | 4 +- src/main.c | 6 +- src/prefs.c | 4 +- src/sciwrappers.c | 2 +- src/sciwrappers.h | 2 +- src/ui_utils.c | 11 +- 15 files changed, 207 insertions(+), 198 deletions(-) diff --git a/ChangeLog b/ChangeLog index b6a414b7..fd6bc7dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2007-06-12 Nick Treleaven + + * src/interface.c, src/sciwrappers.c, src/sciwrappers.h, src/prefs.c, + src/callbacks.c, src/callbacks.h, src/keyfile.c, src/document.c, + src/document.h, src/main.c, src/editor.c, src/editor.h, + src/ui_utils.c, geany.glade: + Rename some menubar widget names. + Use indentation spelling in variable names. + + 2007-06-11 Enrico Tröger * geany.glade, src/callbacks.c, src/callbacks.h, src/document.c, diff --git a/geany.glade b/geany.glade index 5aa51042..84177bea 100644 --- a/geany.glade +++ b/geany.glade @@ -40,7 +40,7 @@ - + @@ -58,7 +58,7 @@ True - + True gtk-new 1 @@ -148,7 +148,7 @@ - + True gtk-save 1 @@ -169,7 +169,7 @@ - + True gtk-revert-to-saved 1 @@ -189,7 +189,7 @@ True - + True gtk-revert-to-saved 1 @@ -285,7 +285,7 @@ - + True gtk-close 1 @@ -493,7 +493,7 @@ - + True gtk-indent 1 @@ -514,7 +514,7 @@ - + True gtk-unindent 1 @@ -570,7 +570,7 @@ True - + True gtk-add 1 @@ -602,7 +602,7 @@ True - + True gtk-add 1 @@ -687,7 +687,7 @@ True - + True gtk-add 1 @@ -784,7 +784,7 @@ - + True gtk-find-and-replace 1 @@ -850,7 +850,7 @@ - + True gtk-jump-to 1 @@ -868,7 +868,7 @@ - + True _View True @@ -885,7 +885,7 @@ - + True gtk-select-font 1 @@ -1015,7 +1015,7 @@ - + True _Document True @@ -1035,12 +1035,12 @@ - + True _Use Auto-indentation True True - + @@ -1245,7 +1245,7 @@ - + True gtk-new 1 @@ -1266,7 +1266,7 @@ - + True gtk-open 1 @@ -1287,7 +1287,7 @@ - + True gtk-close 1 @@ -1345,7 +1345,7 @@ - + True gtk-select-color 1 @@ -1382,7 +1382,7 @@ - + True _Help True diff --git a/src/callbacks.c b/src/callbacks.c index 96cc3789..c30ef867 100644 --- a/src/callbacks.c +++ b/src/callbacks.c @@ -1138,14 +1138,14 @@ on_set_file_readonly1_toggled (GtkCheckMenuItem *checkmenuitem, void -on_use_auto_indention1_toggled (GtkCheckMenuItem *checkmenuitem, +on_use_auto_indentation1_toggled (GtkCheckMenuItem *checkmenuitem, gpointer user_data) { if (! app->ignore_callback) { gint idx = document_get_cur_idx(); if (idx == -1 || ! doc_list[idx].is_valid) return; - doc_list[idx].use_auto_indention = ! doc_list[idx].use_auto_indention; + doc_list[idx].auto_indent = ! doc_list[idx].auto_indent; } } diff --git a/src/callbacks.h b/src/callbacks.h index b1a4e8af..ba4718b5 100644 --- a/src/callbacks.h +++ b/src/callbacks.h @@ -439,7 +439,7 @@ on_show_line_numbers1_toggled (GtkCheckMenuItem *checkmenuitem, gpointer user_data); void -on_use_auto_indention1_toggled (GtkCheckMenuItem *checkmenuitem, +on_use_auto_indentation1_toggled (GtkCheckMenuItem *checkmenuitem, gpointer user_data); diff --git a/src/document.c b/src/document.c index f3aa8377..86beb324 100644 --- a/src/document.c +++ b/src/document.c @@ -209,13 +209,13 @@ void document_apply_update_prefs(gint idx) sci_set_autoc_max_height(sci, app->autocompletion_max_height); - sci_set_indentionguides(sci, editor_prefs.show_indent_guide); + sci_set_indentation_guides(sci, editor_prefs.show_indent_guide); sci_set_visible_white_spaces(sci, editor_prefs.show_white_space); sci_set_visible_eols(sci, editor_prefs.show_line_endings); sci_set_folding_margin_visible(sci, editor_prefs.folding); - doc_list[idx].use_auto_indention = (editor_prefs.indention_mode != INDENT_NONE); + doc_list[idx].auto_indent = (editor_prefs.indent_mode != INDENT_NONE); } @@ -225,7 +225,7 @@ static void init_doc_struct(document *new_doc) { new_doc->is_valid = FALSE; new_doc->has_tags = FALSE; - new_doc->use_auto_indention = (editor_prefs.indention_mode != INDENT_NONE); + new_doc->auto_indent = (editor_prefs.indent_mode != INDENT_NONE); new_doc->line_breaking = editor_prefs.line_breaking; new_doc->readonly = FALSE; new_doc->tag_store = NULL; @@ -341,7 +341,7 @@ static gint document_create_new_sci(const gchar *filename) this->last_check = time(NULL); this->readonly = FALSE; this->line_breaking = editor_prefs.line_breaking; - this->use_auto_indention = (editor_prefs.indention_mode != INDENT_NONE); + this->auto_indent = (editor_prefs.indent_mode != INDENT_NONE); this->has_tags = FALSE; treeviews_openfiles_add(new_idx); // sets this->iter diff --git a/src/document.h b/src/document.h index cc8c1a0e..fcbaf8dd 100644 --- a/src/document.h +++ b/src/document.h @@ -63,7 +63,7 @@ typedef struct document gboolean readonly; gboolean changed; gboolean line_breaking; - gboolean use_auto_indention; + gboolean auto_indent; gfloat scroll_percent; // % to scroll view by on paint, if positive. time_t last_check; // to remember the last disk check time_t mtime; diff --git a/src/editor.c b/src/editor.c index 92e1c402..22abce80 100644 --- a/src/editor.c +++ b/src/editor.c @@ -232,8 +232,8 @@ static void on_char_added(gint idx, SCNotification *nt) } case '}': { // closing bracket handling - if (doc_list[idx].use_auto_indention && - editor_prefs.indention_mode == INDENT_ADVANCED) + if (doc_list[idx].auto_indent && + editor_prefs.indent_mode == INDENT_ADVANCED) editor_close_block(idx, pos - 1); break; } @@ -401,12 +401,12 @@ static void on_new_line_added(ScintillaObject *sci, gint idx) gint pos = sci_get_current_position(sci); // simple indentation - if (doc_list[idx].use_auto_indention) + if (doc_list[idx].auto_indent) { get_indent(sci, pos, FALSE); sci_add_text(sci, indent); - if (editor_prefs.indention_mode == INDENT_ADVANCED) + if (editor_prefs.indent_mode == INDENT_ADVANCED) { // add extra indentation for Python after colon if (FILETYPE_ID(doc_list[idx].file_type) == GEANY_FILETYPES_PYTHON && @@ -489,7 +489,7 @@ static void get_indent(ScintillaObject *sci, gint pos, gboolean use_this_line) { if (linebuf[i] == ' ' || linebuf[i] == '\t') // simple indentation indent[j++] = linebuf[i]; - else if (editor_prefs.indention_mode != INDENT_ADVANCED) + else if (editor_prefs.indent_mode != INDENT_ADVANCED) break; else if (use_this_line) break; @@ -580,7 +580,7 @@ static gint brace_match(ScintillaObject *sci, gint pos) } -/* Called after typing '}', if pref_editor_indention_mode is INDENT_ADVANCED. */ +/* Called after typing '}', if editor_prefs.indent_mode is INDENT_ADVANCED. */ void editor_close_block(gint idx, gint pos) { gint x = 0, cnt = 0; @@ -1063,8 +1063,8 @@ void editor_auto_latex(gint idx, gint pos) } } - // get the indention - if (doc_list[idx].use_auto_indention) get_indent(sci, pos, TRUE); + // get the indentation + if (doc_list[idx].auto_indent) get_indent(sci, pos, TRUE); eol = g_strconcat(utils_get_eol_char(idx), indent, NULL); construct = g_strdup_printf("%s\\end%s{%s}", eol, full_cmd, env); @@ -1278,7 +1278,7 @@ gboolean editor_auto_forif(gint idx, gint pos) } // get the indentation - if (doc_list[idx].use_auto_indention) get_indent(sci, pos, TRUE); + if (doc_list[idx].auto_indent) get_indent(sci, pos, TRUE); eol = g_strconcat(utils_get_eol_char(idx), indent, NULL); // get the whitespace for additional indentation @@ -2232,9 +2232,9 @@ void editor_insert_multiline_comment(gint idx) line = sci_get_line_from_position(doc_list[idx].sci, editor_info.click_pos); pos = sci_get_position_from_line(doc_list[idx].sci, line); - // use the indentation on the current line but only when comment indention is used + // use the indent on the current line but only when comment indentation is used // and we don't have multi line comment characters - if (doc_list[idx].use_auto_indention && ! have_multiline_comment && + if (doc_list[idx].auto_indent && ! have_multiline_comment && doc_list[idx].file_type->comment_use_indent) { get_indent(doc_list[idx].sci, editor_info.click_pos, TRUE); diff --git a/src/editor.h b/src/editor.h index df070f7c..6de8d77b 100644 --- a/src/editor.h +++ b/src/editor.h @@ -34,19 +34,19 @@ #define SSM(s, m, w, l) scintilla_send_message(s, m, w, l) -enum +typedef enum { INDENT_NONE = 0, INDENT_BASIC, INDENT_ADVANCED -}; +} IndentMode; /* These are the default prefs when creating a new editor window. * Some of these can be overridden per document. */ typedef struct { gboolean line_breaking; - gint indention_mode; + IndentMode indent_mode; gboolean use_indicators; gboolean show_white_space; gboolean show_indent_guide; diff --git a/src/interface.c b/src/interface.c index ed072294..efad1208 100644 --- a/src/interface.c +++ b/src/interface.c @@ -34,10 +34,10 @@ create_window1 (void) GtkWidget *vbox1; GtkWidget *menubar1; GtkWidget *file1; - GtkWidget *menuitem1_menu; + GtkWidget *file1_menu; GtkWidget *menu_new1; GtkWidget *menu_new_with_template1; - GtkWidget *image1758; + GtkWidget *image1776; GtkWidget *menu_new_with_template1_menu; GtkWidget *invisible2; GtkWidget *separator12; @@ -48,11 +48,11 @@ create_window1 (void) GtkWidget *menu_save1; GtkWidget *menu_save_as1; GtkWidget *menu_save_all1; - GtkWidget *image1759; + GtkWidget *image1777; GtkWidget *menu_reload1; - GtkWidget *image1760; + GtkWidget *image1778; GtkWidget *menu_reload_as1; - GtkWidget *image1761; + GtkWidget *image1779; GtkWidget *menu_reload_as1_menu; GtkWidget *invisible7; GtkWidget *separator21; @@ -64,7 +64,7 @@ create_window1 (void) GtkWidget *separator14; GtkWidget *menu_close1; GtkWidget *menu_close_all1; - GtkWidget *image1762; + GtkWidget *image1780; GtkWidget *menu_separatormenuitem1; GtkWidget *menu_quit1; GtkWidget *edit1; @@ -90,20 +90,20 @@ create_window1 (void) GtkWidget *menu_duplicate_line1; GtkWidget *separator29; GtkWidget *menu_increase_indent1; - GtkWidget *image1763; + GtkWidget *image1781; GtkWidget *menu_decrease_indent1; - GtkWidget *image1764; + GtkWidget *image1782; GtkWidget *separator37; GtkWidget *send_selection_to2; GtkWidget *send_selection_to2_menu; GtkWidget *invisible13; GtkWidget *separator18; GtkWidget *insert_include2; - GtkWidget *image1765; + GtkWidget *image1783; GtkWidget *insert_include2_menu; GtkWidget *invisible4; GtkWidget *add_comments1; - GtkWidget *image1766; + GtkWidget *image1784; GtkWidget *add_comments1_menu; GtkWidget *menu_add_changelog_entry1; GtkWidget *insert_file_header1; @@ -112,7 +112,7 @@ create_window1 (void) GtkWidget *insert_gpl_notice2; GtkWidget *insert_bsd_license_notice2; GtkWidget *insert_date1; - GtkWidget *image1767; + GtkWidget *image1785; GtkWidget *insert_date1_menu; GtkWidget *invisible8; GtkWidget *separator9; @@ -124,7 +124,7 @@ create_window1 (void) GtkWidget *find_previous1; GtkWidget *find_in_files1; GtkWidget *replace1; - GtkWidget *image1768; + GtkWidget *image1786; GtkWidget *separator33; GtkWidget *find_nextsel1; GtkWidget *find_prevsel1; @@ -132,11 +132,11 @@ create_window1 (void) GtkWidget *next_message1; GtkWidget *separator32; GtkWidget *go_to_line1; - GtkWidget *image1769; - GtkWidget *menuitem3; + GtkWidget *image1787; + GtkWidget *menu_view1; GtkWidget *menuitem3_menu; GtkWidget *menu_change_font1; - GtkWidget *image1770; + GtkWidget *image1788; GtkWidget *menu_separator4; GtkWidget *menu_toggle_all_additional_widgets1; GtkWidget *menu_fullscreen1; @@ -149,10 +149,10 @@ create_window1 (void) GtkWidget *menu_zoom_in1; GtkWidget *menu_zoom_out1; GtkWidget *normal_size1; - GtkWidget *menu_item4; + GtkWidget *menu_document1; GtkWidget *menu_item4_menu; GtkWidget *menu_line_breaking1; - GtkWidget *menu_use_auto_indention1; + GtkWidget *menu_use_auto_indentation1; GtkWidget *set_file_readonly1; GtkWidget *menu_write_unicode_bom1; GtkWidget *separator10; @@ -179,21 +179,21 @@ create_window1 (void) GtkWidget *menu_project1; GtkWidget *menu_project1_menu; GtkWidget *project_new1; - GtkWidget *image1771; + GtkWidget *image1789; GtkWidget *project_open1; - GtkWidget *image1772; + GtkWidget *image1790; GtkWidget *project_close1; - GtkWidget *image1773; + GtkWidget *image1791; GtkWidget *separator34; GtkWidget *project_properties1; GtkWidget *menu_build1; GtkWidget *tools1; GtkWidget *tools1_menu; GtkWidget *menu_choose_color1; - GtkWidget *image1774; + GtkWidget *image1792; GtkWidget *menu_count_words1; GtkWidget *menu_insert_special_chars1; - GtkWidget *menu_item5; + GtkWidget *menu_help1; GtkWidget *menu_item5_menu; GtkWidget *help1; GtkWidget *keyboard_shortcuts1; @@ -284,20 +284,20 @@ create_window1 (void) gtk_widget_show (file1); gtk_container_add (GTK_CONTAINER (menubar1), file1); - menuitem1_menu = gtk_menu_new (); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (file1), menuitem1_menu); + file1_menu = gtk_menu_new (); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (file1), file1_menu); menu_new1 = gtk_image_menu_item_new_from_stock ("gtk-new", accel_group); gtk_widget_show (menu_new1); - gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_new1); + gtk_container_add (GTK_CONTAINER (file1_menu), menu_new1); menu_new_with_template1 = gtk_image_menu_item_new_with_mnemonic (_("New (with _Template)")); gtk_widget_show (menu_new_with_template1); - gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_new_with_template1); + gtk_container_add (GTK_CONTAINER (file1_menu), menu_new_with_template1); - image1758 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1758); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image1758); + image1776 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1776); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image1776); 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); @@ -307,58 +307,58 @@ create_window1 (void) separator12 = gtk_separator_menu_item_new (); gtk_widget_show (separator12); - gtk_container_add (GTK_CONTAINER (menuitem1_menu), separator12); + gtk_container_add (GTK_CONTAINER (file1_menu), separator12); gtk_widget_set_sensitive (separator12, FALSE); menu_open1 = gtk_image_menu_item_new_from_stock ("gtk-open", accel_group); gtk_widget_show (menu_open1); - gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_open1); + gtk_container_add (GTK_CONTAINER (file1_menu), menu_open1); menu_open_selected_file1 = gtk_menu_item_new_with_mnemonic (_("Open Selected F_ile")); gtk_widget_show (menu_open_selected_file1); - gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_open_selected_file1); + gtk_container_add (GTK_CONTAINER (file1_menu), menu_open_selected_file1); recent_files1 = gtk_menu_item_new_with_mnemonic (_("Recent _Files")); gtk_widget_show (recent_files1); - gtk_container_add (GTK_CONTAINER (menuitem1_menu), recent_files1); + gtk_container_add (GTK_CONTAINER (file1_menu), recent_files1); separator13 = gtk_separator_menu_item_new (); gtk_widget_show (separator13); - gtk_container_add (GTK_CONTAINER (menuitem1_menu), separator13); + gtk_container_add (GTK_CONTAINER (file1_menu), separator13); gtk_widget_set_sensitive (separator13, FALSE); menu_save1 = gtk_image_menu_item_new_from_stock ("gtk-save", accel_group); gtk_widget_show (menu_save1); - gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_save1); + gtk_container_add (GTK_CONTAINER (file1_menu), menu_save1); menu_save_as1 = gtk_image_menu_item_new_from_stock ("gtk-save-as", accel_group); gtk_widget_show (menu_save_as1); - gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_save_as1); + gtk_container_add (GTK_CONTAINER (file1_menu), menu_save_as1); menu_save_all1 = gtk_image_menu_item_new_with_mnemonic (_("Save A_ll")); gtk_widget_show (menu_save_all1); - gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_save_all1); + gtk_container_add (GTK_CONTAINER (file1_menu), menu_save_all1); gtk_tooltips_set_tip (tooltips, menu_save_all1, _("Saves all open files"), NULL); - image1759 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1759); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image1759); + image1777 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1777); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image1777); menu_reload1 = gtk_image_menu_item_new_with_mnemonic (_("_Reload")); gtk_widget_show (menu_reload1); - gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_reload1); + gtk_container_add (GTK_CONTAINER (file1_menu), menu_reload1); - image1760 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1760); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image1760); + image1778 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1778); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image1778); menu_reload_as1 = gtk_image_menu_item_new_with_mnemonic (_("R_eload As")); gtk_widget_show (menu_reload_as1); - gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_reload_as1); + gtk_container_add (GTK_CONTAINER (file1_menu), menu_reload_as1); - image1761 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1761); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image1761); + image1779 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1779); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image1779); menu_reload_as1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_reload_as1), menu_reload_as1_menu); @@ -368,59 +368,59 @@ create_window1 (void) separator21 = gtk_separator_menu_item_new (); gtk_widget_show (separator21); - gtk_container_add (GTK_CONTAINER (menuitem1_menu), separator21); + gtk_container_add (GTK_CONTAINER (file1_menu), separator21); gtk_widget_set_sensitive (separator21, FALSE); load_tags1 = gtk_menu_item_new_with_mnemonic (_("Load Ta_gs")); gtk_widget_show (load_tags1); - gtk_container_add (GTK_CONTAINER (menuitem1_menu), load_tags1); + gtk_container_add (GTK_CONTAINER (file1_menu), load_tags1); gtk_tooltips_set_tip (tooltips, load_tags1, _("Load global tags file"), NULL); separator39 = gtk_separator_menu_item_new (); gtk_widget_show (separator39); - gtk_container_add (GTK_CONTAINER (menuitem1_menu), separator39); + gtk_container_add (GTK_CONTAINER (file1_menu), separator39); gtk_widget_set_sensitive (separator39, FALSE); preferences2 = gtk_image_menu_item_new_from_stock ("gtk-properties", accel_group); gtk_widget_show (preferences2); - gtk_container_add (GTK_CONTAINER (menuitem1_menu), preferences2); + gtk_container_add (GTK_CONTAINER (file1_menu), preferences2); separator24 = gtk_separator_menu_item_new (); gtk_widget_show (separator24); - gtk_container_add (GTK_CONTAINER (menuitem1_menu), separator24); + gtk_container_add (GTK_CONTAINER (file1_menu), separator24); gtk_widget_set_sensitive (separator24, FALSE); print1 = gtk_image_menu_item_new_from_stock ("gtk-print", accel_group); gtk_widget_show (print1); - gtk_container_add (GTK_CONTAINER (menuitem1_menu), print1); + gtk_container_add (GTK_CONTAINER (file1_menu), print1); gtk_tooltips_set_tip (tooltips, print1, _("Prints the current file"), NULL); separator14 = gtk_separator_menu_item_new (); gtk_widget_show (separator14); - gtk_container_add (GTK_CONTAINER (menuitem1_menu), separator14); + gtk_container_add (GTK_CONTAINER (file1_menu), separator14); gtk_widget_set_sensitive (separator14, FALSE); menu_close1 = gtk_image_menu_item_new_from_stock ("gtk-close", accel_group); gtk_widget_show (menu_close1); - gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_close1); + gtk_container_add (GTK_CONTAINER (file1_menu), menu_close1); menu_close_all1 = gtk_image_menu_item_new_with_mnemonic (_("C_lose All")); gtk_widget_show (menu_close_all1); - gtk_container_add (GTK_CONTAINER (menuitem1_menu), 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); - image1762 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1762); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image1762); + image1780 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1780); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image1780); menu_separatormenuitem1 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separatormenuitem1); - gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_separatormenuitem1); + gtk_container_add (GTK_CONTAINER (file1_menu), menu_separatormenuitem1); gtk_widget_set_sensitive (menu_separatormenuitem1, FALSE); menu_quit1 = gtk_image_menu_item_new_from_stock ("gtk-quit", accel_group); gtk_widget_show (menu_quit1); - gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_quit1); + gtk_container_add (GTK_CONTAINER (file1_menu), menu_quit1); gtk_tooltips_set_tip (tooltips, menu_quit1, _("Quit Geany"), NULL); edit1 = gtk_menu_item_new_with_mnemonic (_("_Edit")); @@ -519,17 +519,17 @@ create_window1 (void) gtk_widget_show (menu_increase_indent1); gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_increase_indent1); - image1763 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1763); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image1763); + image1781 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1781); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image1781); 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); - image1764 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1764); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image1764); + image1782 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1782); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image1782); separator37 = gtk_separator_menu_item_new (); gtk_widget_show (separator37); @@ -555,9 +555,9 @@ create_window1 (void) gtk_widget_show (insert_include2); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_include2); - image1765 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1765); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image1765); + image1783 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1783); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image1783); insert_include2_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include2), insert_include2_menu); @@ -569,9 +569,9 @@ create_window1 (void) gtk_widget_show (add_comments1); gtk_container_add (GTK_CONTAINER (edit1_menu), add_comments1); - image1766 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1766); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image1766); + image1784 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1784); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image1784); add_comments1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (add_comments1), add_comments1_menu); @@ -610,9 +610,9 @@ create_window1 (void) gtk_widget_show (insert_date1); gtk_container_add (GTK_CONTAINER (edit1_menu), insert_date1); - image1767 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1767); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image1767); + image1785 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1785); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image1785); insert_date1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_date1), insert_date1_menu); @@ -656,9 +656,9 @@ create_window1 (void) gtk_widget_show (replace1); gtk_container_add (GTK_CONTAINER (search1_menu), replace1); - image1768 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1768); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image1768); + image1786 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1786); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image1786); separator33 = gtk_separator_menu_item_new (); gtk_widget_show (separator33); @@ -691,25 +691,25 @@ create_window1 (void) gtk_widget_show (go_to_line1); gtk_container_add (GTK_CONTAINER (search1_menu), go_to_line1); - image1769 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1769); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image1769); + image1787 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1787); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image1787); - menuitem3 = gtk_menu_item_new_with_mnemonic (_("_View")); - gtk_widget_show (menuitem3); - gtk_container_add (GTK_CONTAINER (menubar1), menuitem3); + menu_view1 = gtk_menu_item_new_with_mnemonic (_("_View")); + gtk_widget_show (menu_view1); + gtk_container_add (GTK_CONTAINER (menubar1), menu_view1); menuitem3_menu = gtk_menu_new (); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem3), menuitem3_menu); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_view1), menuitem3_menu); menu_change_font1 = gtk_image_menu_item_new_with_mnemonic (_("Change _Font")); gtk_widget_show (menu_change_font1); gtk_container_add (GTK_CONTAINER (menuitem3_menu), menu_change_font1); gtk_tooltips_set_tip (tooltips, menu_change_font1, _("Change the default font"), NULL); - image1770 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1770); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image1770); + image1788 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1788); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image1788); menu_separator4 = gtk_separator_menu_item_new (); gtk_widget_show (menu_separator4); @@ -770,12 +770,12 @@ create_window1 (void) gtk_widget_show (normal_size1); gtk_container_add (GTK_CONTAINER (menuitem3_menu), normal_size1); - menu_item4 = gtk_menu_item_new_with_mnemonic (_("_Document")); - gtk_widget_show (menu_item4); - gtk_container_add (GTK_CONTAINER (menubar1), menu_item4); + menu_document1 = gtk_menu_item_new_with_mnemonic (_("_Document")); + gtk_widget_show (menu_document1); + gtk_container_add (GTK_CONTAINER (menubar1), menu_document1); menu_item4_menu = gtk_menu_new (); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item4), menu_item4_menu); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_document1), menu_item4_menu); menu_line_breaking1 = gtk_check_menu_item_new_with_mnemonic (_("_Line Wrapping")); gtk_widget_show (menu_line_breaking1); @@ -783,10 +783,10 @@ create_window1 (void) gtk_tooltips_set_tip (tooltips, menu_line_breaking1, _("Wrap the line at the window border and continue it on the next line. Note: line wrapping has a high performance cost for large documents so should be disabled on slow machines."), NULL); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_line_breaking1), TRUE); - menu_use_auto_indention1 = gtk_check_menu_item_new_with_mnemonic (_("_Use Auto-indentation")); - gtk_widget_show (menu_use_auto_indention1); - gtk_container_add (GTK_CONTAINER (menu_item4_menu), menu_use_auto_indention1); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_use_auto_indention1), TRUE); + menu_use_auto_indentation1 = gtk_check_menu_item_new_with_mnemonic (_("_Use Auto-indentation")); + gtk_widget_show (menu_use_auto_indentation1); + gtk_container_add (GTK_CONTAINER (menu_item4_menu), menu_use_auto_indentation1); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_use_auto_indentation1), TRUE); set_file_readonly1 = gtk_check_menu_item_new_with_mnemonic (_("Read _Only")); gtk_widget_show (set_file_readonly1); @@ -897,25 +897,25 @@ create_window1 (void) gtk_widget_show (project_new1); gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_new1); - image1771 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1771); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image1771); + image1789 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1789); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image1789); 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); - image1772 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1772); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image1772); + image1790 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1790); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image1790); 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); - image1773 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1773); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image1773); + image1791 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1791); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image1791); separator34 = gtk_separator_menu_item_new (); gtk_widget_show (separator34); @@ -942,9 +942,9 @@ create_window1 (void) 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); - image1774 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); - gtk_widget_show (image1774); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image1774); + image1792 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU); + gtk_widget_show (image1792); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image1792); menu_count_words1 = gtk_menu_item_new_with_mnemonic (_("_Word Count")); gtk_widget_show (menu_count_words1); @@ -955,12 +955,12 @@ create_window1 (void) gtk_widget_show (menu_insert_special_chars1); gtk_container_add (GTK_CONTAINER (tools1_menu), menu_insert_special_chars1); - menu_item5 = gtk_menu_item_new_with_mnemonic (_("_Help")); - gtk_widget_show (menu_item5); - gtk_container_add (GTK_CONTAINER (menubar1), menu_item5); + menu_help1 = gtk_menu_item_new_with_mnemonic (_("_Help")); + gtk_widget_show (menu_help1); + gtk_container_add (GTK_CONTAINER (menubar1), menu_help1); menu_item5_menu = gtk_menu_new (); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item5), menu_item5_menu); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_help1), menu_item5_menu); help1 = gtk_image_menu_item_new_from_stock ("gtk-help", accel_group); gtk_widget_show (help1); @@ -1451,8 +1451,8 @@ create_window1 (void) g_signal_connect ((gpointer) menu_line_breaking1, "toggled", G_CALLBACK (on_line_breaking1_toggled), NULL); - g_signal_connect ((gpointer) menu_use_auto_indention1, "toggled", - G_CALLBACK (on_use_auto_indention1_toggled), + g_signal_connect ((gpointer) menu_use_auto_indentation1, "toggled", + G_CALLBACK (on_use_auto_indentation1_toggled), NULL); g_signal_connect ((gpointer) set_file_readonly1, "toggled", G_CALLBACK (on_set_file_readonly1_toggled), @@ -1602,10 +1602,10 @@ create_window1 (void) GLADE_HOOKUP_OBJECT (window1, vbox1, "vbox1"); GLADE_HOOKUP_OBJECT (window1, menubar1, "menubar1"); GLADE_HOOKUP_OBJECT (window1, file1, "file1"); - GLADE_HOOKUP_OBJECT (window1, menuitem1_menu, "menuitem1_menu"); + 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, image1758, "image1758"); + GLADE_HOOKUP_OBJECT (window1, image1776, "image1776"); 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"); @@ -1616,11 +1616,11 @@ create_window1 (void) 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, image1759, "image1759"); + GLADE_HOOKUP_OBJECT (window1, image1777, "image1777"); GLADE_HOOKUP_OBJECT (window1, menu_reload1, "menu_reload1"); - GLADE_HOOKUP_OBJECT (window1, image1760, "image1760"); + GLADE_HOOKUP_OBJECT (window1, image1778, "image1778"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1, "menu_reload_as1"); - GLADE_HOOKUP_OBJECT (window1, image1761, "image1761"); + GLADE_HOOKUP_OBJECT (window1, image1779, "image1779"); GLADE_HOOKUP_OBJECT (window1, menu_reload_as1_menu, "menu_reload_as1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible7, "invisible7"); GLADE_HOOKUP_OBJECT (window1, separator21, "separator21"); @@ -1632,7 +1632,7 @@ create_window1 (void) GLADE_HOOKUP_OBJECT (window1, separator14, "separator14"); GLADE_HOOKUP_OBJECT (window1, menu_close1, "menu_close1"); GLADE_HOOKUP_OBJECT (window1, menu_close_all1, "menu_close_all1"); - GLADE_HOOKUP_OBJECT (window1, image1762, "image1762"); + GLADE_HOOKUP_OBJECT (window1, image1780, "image1780"); GLADE_HOOKUP_OBJECT (window1, menu_separatormenuitem1, "menu_separatormenuitem1"); GLADE_HOOKUP_OBJECT (window1, menu_quit1, "menu_quit1"); GLADE_HOOKUP_OBJECT (window1, edit1, "edit1"); @@ -1658,20 +1658,20 @@ create_window1 (void) 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, image1763, "image1763"); + GLADE_HOOKUP_OBJECT (window1, image1781, "image1781"); GLADE_HOOKUP_OBJECT (window1, menu_decrease_indent1, "menu_decrease_indent1"); - GLADE_HOOKUP_OBJECT (window1, image1764, "image1764"); + GLADE_HOOKUP_OBJECT (window1, image1782, "image1782"); 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, insert_include2, "insert_include2"); - GLADE_HOOKUP_OBJECT (window1, image1765, "image1765"); + GLADE_HOOKUP_OBJECT (window1, image1783, "image1783"); GLADE_HOOKUP_OBJECT (window1, insert_include2_menu, "insert_include2_menu"); GLADE_HOOKUP_OBJECT (window1, invisible4, "invisible4"); GLADE_HOOKUP_OBJECT (window1, add_comments1, "add_comments1"); - GLADE_HOOKUP_OBJECT (window1, image1766, "image1766"); + GLADE_HOOKUP_OBJECT (window1, image1784, "image1784"); 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"); @@ -1680,7 +1680,7 @@ create_window1 (void) 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, image1767, "image1767"); + GLADE_HOOKUP_OBJECT (window1, image1785, "image1785"); GLADE_HOOKUP_OBJECT (window1, insert_date1_menu, "insert_date1_menu"); GLADE_HOOKUP_OBJECT (window1, invisible8, "invisible8"); GLADE_HOOKUP_OBJECT (window1, separator9, "separator9"); @@ -1692,7 +1692,7 @@ create_window1 (void) 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, image1768, "image1768"); + GLADE_HOOKUP_OBJECT (window1, image1786, "image1786"); GLADE_HOOKUP_OBJECT (window1, separator33, "separator33"); GLADE_HOOKUP_OBJECT (window1, find_nextsel1, "find_nextsel1"); GLADE_HOOKUP_OBJECT (window1, find_prevsel1, "find_prevsel1"); @@ -1700,11 +1700,11 @@ create_window1 (void) GLADE_HOOKUP_OBJECT (window1, next_message1, "next_message1"); GLADE_HOOKUP_OBJECT (window1, separator32, "separator32"); GLADE_HOOKUP_OBJECT (window1, go_to_line1, "go_to_line1"); - GLADE_HOOKUP_OBJECT (window1, image1769, "image1769"); - GLADE_HOOKUP_OBJECT (window1, menuitem3, "menuitem3"); + GLADE_HOOKUP_OBJECT (window1, image1787, "image1787"); + GLADE_HOOKUP_OBJECT (window1, menu_view1, "menu_view1"); GLADE_HOOKUP_OBJECT (window1, menuitem3_menu, "menuitem3_menu"); GLADE_HOOKUP_OBJECT (window1, menu_change_font1, "menu_change_font1"); - GLADE_HOOKUP_OBJECT (window1, image1770, "image1770"); + GLADE_HOOKUP_OBJECT (window1, image1788, "image1788"); 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"); @@ -1717,10 +1717,10 @@ create_window1 (void) GLADE_HOOKUP_OBJECT (window1, menu_zoom_in1, "menu_zoom_in1"); GLADE_HOOKUP_OBJECT (window1, menu_zoom_out1, "menu_zoom_out1"); GLADE_HOOKUP_OBJECT (window1, normal_size1, "normal_size1"); - GLADE_HOOKUP_OBJECT (window1, menu_item4, "menu_item4"); + GLADE_HOOKUP_OBJECT (window1, menu_document1, "menu_document1"); GLADE_HOOKUP_OBJECT (window1, menu_item4_menu, "menu_item4_menu"); GLADE_HOOKUP_OBJECT (window1, menu_line_breaking1, "menu_line_breaking1"); - GLADE_HOOKUP_OBJECT (window1, menu_use_auto_indention1, "menu_use_auto_indention1"); + GLADE_HOOKUP_OBJECT (window1, menu_use_auto_indentation1, "menu_use_auto_indentation1"); GLADE_HOOKUP_OBJECT (window1, set_file_readonly1, "set_file_readonly1"); GLADE_HOOKUP_OBJECT (window1, menu_write_unicode_bom1, "menu_write_unicode_bom1"); GLADE_HOOKUP_OBJECT (window1, separator10, "separator10"); @@ -1746,21 +1746,21 @@ create_window1 (void) 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, image1771, "image1771"); + GLADE_HOOKUP_OBJECT (window1, image1789, "image1789"); GLADE_HOOKUP_OBJECT (window1, project_open1, "project_open1"); - GLADE_HOOKUP_OBJECT (window1, image1772, "image1772"); + GLADE_HOOKUP_OBJECT (window1, image1790, "image1790"); GLADE_HOOKUP_OBJECT (window1, project_close1, "project_close1"); - GLADE_HOOKUP_OBJECT (window1, image1773, "image1773"); + GLADE_HOOKUP_OBJECT (window1, image1791, "image1791"); 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, image1774, "image1774"); + GLADE_HOOKUP_OBJECT (window1, image1792, "image1792"); GLADE_HOOKUP_OBJECT (window1, menu_count_words1, "menu_count_words1"); GLADE_HOOKUP_OBJECT (window1, menu_insert_special_chars1, "menu_insert_special_chars1"); - GLADE_HOOKUP_OBJECT (window1, menu_item5, "menu_item5"); + GLADE_HOOKUP_OBJECT (window1, menu_help1, "menu_help1"); GLADE_HOOKUP_OBJECT (window1, menu_item5_menu, "menu_item5_menu"); GLADE_HOOKUP_OBJECT (window1, help1, "help1"); GLADE_HOOKUP_OBJECT (window1, keyboard_shortcuts1, "keyboard_shortcuts1"); diff --git a/src/keyfile.c b/src/keyfile.c index bda845b9..e0ae50ba 100644 --- a/src/keyfile.c +++ b/src/keyfile.c @@ -178,7 +178,7 @@ void configuration_save() g_key_file_set_boolean(config, PACKAGE, "use_folding", editor_prefs.folding); g_key_file_set_boolean(config, PACKAGE, "unfold_all_children", editor_prefs.unfold_all_children); g_key_file_set_boolean(config, PACKAGE, "show_editor_scrollbars", editor_prefs.show_scrollbars); - g_key_file_set_integer(config, PACKAGE, "indention_mode", editor_prefs.indention_mode); + g_key_file_set_integer(config, PACKAGE, "indent_mode", editor_prefs.indent_mode); g_key_file_set_boolean(config, PACKAGE, "use_tab_to_indent", app->use_tab_to_indent); g_key_file_set_boolean(config, PACKAGE, "use_indicators", editor_prefs.use_indicators); g_key_file_set_boolean(config, PACKAGE, "show_indent_guide", editor_prefs.show_indent_guide); @@ -390,7 +390,7 @@ gboolean configuration_load() app->statusbar_visible = utils_get_setting_boolean(config, PACKAGE, "statusbar_visible", TRUE); app->msgwindow_visible = utils_get_setting_boolean(config, PACKAGE, "msgwindow_visible", TRUE); editor_prefs.line_breaking = utils_get_setting_boolean(config, PACKAGE, "line_breaking", FALSE); //default is off for better performance - editor_prefs.indention_mode = utils_get_setting_integer(config, PACKAGE, "indention_mode", INDENT_ADVANCED); + editor_prefs.indent_mode = utils_get_setting_integer(config, PACKAGE, "indent_mode", INDENT_ADVANCED); app->use_tab_to_indent = utils_get_setting_boolean(config, PACKAGE, "use_tab_to_indent", FALSE); editor_prefs.use_indicators = utils_get_setting_boolean(config, PACKAGE, "use_indicators", TRUE); editor_prefs.show_indent_guide = utils_get_setting_boolean(config, PACKAGE, "show_indent_guide", FALSE); diff --git a/src/main.c b/src/main.c index 4dcb8243..1b22b614 100644 --- a/src/main.c +++ b/src/main.c @@ -220,8 +220,8 @@ static void apply_settings(void) gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM( lookup_widget(app->window, "menu_line_breaking1")), editor_prefs.line_breaking); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM( - lookup_widget(app->window, "menu_use_auto_indention1")), - (editor_prefs.indention_mode != INDENT_NONE)); + lookup_widget(app->window, "menu_use_auto_indentation1")), + (editor_prefs.indent_mode != INDENT_NONE)); app->ignore_callback = FALSE; // connect the toolbar dropdown menu for the new button @@ -317,7 +317,7 @@ static void main_init(void) app->sensitive_buttons[18] = lookup_widget(app->window, "menu_undo2"); app->sensitive_buttons[19] = lookup_widget(app->window, "preferences2"); app->sensitive_buttons[20] = lookup_widget(app->window, "menu_reload1"); - app->sensitive_buttons[21] = lookup_widget(app->window, "menu_item4"); + app->sensitive_buttons[21] = lookup_widget(app->window, "menu_document1"); app->sensitive_buttons[22] = lookup_widget(app->window, "menu_markers_margin1"); app->sensitive_buttons[23] = lookup_widget(app->window, "menu_linenumber_margin1"); app->sensitive_buttons[24] = lookup_widget(app->window, "menu_choose_color1"); diff --git a/src/prefs.c b/src/prefs.c index 3ca5f6e4..aaf6ec9a 100644 --- a/src/prefs.c +++ b/src/prefs.c @@ -254,7 +254,7 @@ void prefs_init_dialog(void) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.show_line_endings); widget = lookup_widget(app->prefs_dialog, "combo_auto_indent_mode"); - gtk_combo_box_set_active(GTK_COMBO_BOX(widget), editor_prefs.indention_mode); + gtk_combo_box_set_active(GTK_COMBO_BOX(widget), editor_prefs.indent_mode); widget = lookup_widget(app->prefs_dialog, "check_line_wrapping"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.line_breaking); @@ -593,7 +593,7 @@ void on_prefs_button_clicked(GtkDialog *dialog, gint response, gpointer user_dat editor_prefs.show_line_endings = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); widget = lookup_widget(app->prefs_dialog, "combo_auto_indent_mode"); - editor_prefs.indention_mode = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); + editor_prefs.indent_mode = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); widget = lookup_widget(app->prefs_dialog, "check_line_wrapping"); editor_prefs.line_breaking = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); diff --git a/src/sciwrappers.c b/src/sciwrappers.c index c37b5c0f..7fa13336 100644 --- a/src/sciwrappers.c +++ b/src/sciwrappers.c @@ -634,7 +634,7 @@ void sci_set_savepoint(ScintillaObject *sci) } -void sci_set_indentionguides(ScintillaObject *sci, gboolean enable) +void sci_set_indentation_guides(ScintillaObject *sci, gboolean enable) { SSM(sci, SCI_SETINDENTATIONGUIDES, enable, 0); } diff --git a/src/sciwrappers.h b/src/sciwrappers.h index c67249d2..ac9b6afd 100644 --- a/src/sciwrappers.h +++ b/src/sciwrappers.h @@ -122,7 +122,7 @@ void sci_set_tab_width (ScintillaObject * sci, gint width); gint sci_get_tab_width (ScintillaObject * sci); gchar sci_get_char_at (ScintillaObject * sci, gint pos); void sci_set_savepoint (ScintillaObject * sci); -void sci_set_indentionguides (ScintillaObject * sci, gboolean enable); +void sci_set_indentation_guides (ScintillaObject * sci, gboolean enable); void sci_use_popup (ScintillaObject * sci, gboolean enable); void sci_goto_pos (ScintillaObject * sci, gint pos, gboolean unfold); void sci_set_search_anchor (ScintillaObject * sci); diff --git a/src/ui_utils.c b/src/ui_utils.c index 3d899aa3..fc51f175 100644 --- a/src/ui_utils.c +++ b/src/ui_utils.c @@ -560,7 +560,7 @@ void ui_treeviews_show_hide(G_GNUC_UNUSED gboolean force) void ui_document_show_hide(gint idx) { gchar *widget_name; - GtkWidget *indention; + GtkWidget *check_indent; if (idx == -1) idx = document_get_cur_idx(); @@ -570,14 +570,14 @@ void ui_document_show_hide(gint idx) app->ignore_callback = TRUE; - indention = lookup_widget(app->window, "menu_use_auto_indention1"); + check_indent = lookup_widget(app->window, "menu_use_auto_indentation1"); gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM(lookup_widget(app->window, "menu_line_breaking1")), doc_list[idx].line_breaking); gtk_check_menu_item_set_active( - GTK_CHECK_MENU_ITEM(indention), - doc_list[idx].use_auto_indention); + GTK_CHECK_MENU_ITEM(check_indent), + doc_list[idx].auto_indent); gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM(lookup_widget(app->window, "set_file_readonly1")), doc_list[idx].readonly); @@ -594,7 +594,7 @@ void ui_document_show_hide(gint idx) gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(lookup_widget(app->window, widget_name)), TRUE); - gtk_widget_set_sensitive(indention, editor_prefs.indention_mode != INDENT_NONE); + gtk_widget_set_sensitive(check_indent, editor_prefs.indent_mode != INDENT_NONE); gtk_widget_set_sensitive(lookup_widget(app->window, "menu_write_unicode_bom1"), encodings_is_unicode_charset(doc_list[idx].encoding)); @@ -603,7 +603,6 @@ void ui_document_show_hide(gint idx) filetypes_select_radio_item(doc_list[idx].file_type); app->ignore_callback = FALSE; - }