Revision: 2563 http://geany.svn.sourceforge.net/geany/?rev=2563&view=rev Author: ntrel Date: 2008-05-09 07:17:25 -0700 (Fri, 09 May 2008)
Log Message: ----------- Rename old uses of line breaking -> line wrapping. This includes the keyfile pref, so any users with this enabled will have to reset it.
Modified Paths: -------------- trunk/src/callbacks.c trunk/src/callbacks.h trunk/src/interface.c trunk/src/keyfile.c trunk/src/main.c trunk/src/ui_utils.c
Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2008-05-09 12:13:29 UTC (rev 2562) +++ trunk/src/callbacks.c 2008-05-09 14:17:25 UTC (rev 2563) @@ -964,7 +964,7 @@
void -on_line_breaking1_toggled (GtkCheckMenuItem *checkmenuitem, +on_line_wrapping1_toggled (GtkCheckMenuItem *checkmenuitem, gpointer user_data) { if (! app->ignore_callback)
Modified: trunk/src/callbacks.h =================================================================== --- trunk/src/callbacks.h 2008-05-09 12:13:29 UTC (rev 2562) +++ trunk/src/callbacks.h 2008-05-09 14:17:25 UTC (rev 2563) @@ -316,7 +316,7 @@ gpointer user_data);
void -on_line_breaking1_toggled (GtkCheckMenuItem *checkmenuitem, +on_line_wrapping1_toggled (GtkCheckMenuItem *checkmenuitem, gpointer user_data);
void
Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2008-05-09 12:13:29 UTC (rev 2562) +++ trunk/src/interface.c 2008-05-09 14:17:25 UTC (rev 2563) @@ -149,7 +149,7 @@ GtkWidget *normal_size1; GtkWidget *menu_document1; GtkWidget *menu_document1_menu; - GtkWidget *menu_line_breaking1; + GtkWidget *menu_line_wrapping1; GtkWidget *line_breaking1; GtkWidget *menu_use_auto_indentation1; GtkWidget *indent_type1; @@ -777,11 +777,11 @@ menu_document1_menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_document1), menu_document1_menu);
- menu_line_breaking1 = gtk_check_menu_item_new_with_mnemonic (_("_Line Wrapping")); - gtk_widget_show (menu_line_breaking1); - gtk_container_add (GTK_CONTAINER (menu_document1_menu), menu_line_breaking1); - 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_line_wrapping1 = gtk_check_menu_item_new_with_mnemonic (_("_Line Wrapping")); + gtk_widget_show (menu_line_wrapping1); + gtk_container_add (GTK_CONTAINER (menu_document1_menu), menu_line_wrapping1); + gtk_tooltips_set_tip (tooltips, menu_line_wrapping1, _("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_wrapping1), TRUE);
line_breaking1 = gtk_check_menu_item_new_with_mnemonic (_("Line _Breaking")); gtk_widget_show (line_breaking1); @@ -1500,8 +1500,8 @@ g_signal_connect ((gpointer) normal_size1, "activate", G_CALLBACK (on_normal_size1_activate), NULL); - g_signal_connect ((gpointer) menu_line_breaking1, "toggled", - G_CALLBACK (on_line_breaking1_toggled), + g_signal_connect ((gpointer) menu_line_wrapping1, "toggled", + G_CALLBACK (on_line_wrapping1_toggled), NULL); g_signal_connect ((gpointer) line_breaking1, "toggled", G_CALLBACK (on_line_breaking1_activate), @@ -1799,7 +1799,7 @@ GLADE_HOOKUP_OBJECT (window1, normal_size1, "normal_size1"); GLADE_HOOKUP_OBJECT (window1, menu_document1, "menu_document1"); GLADE_HOOKUP_OBJECT (window1, menu_document1_menu, "menu_document1_menu"); - GLADE_HOOKUP_OBJECT (window1, menu_line_breaking1, "menu_line_breaking1"); + GLADE_HOOKUP_OBJECT (window1, menu_line_wrapping1, "menu_line_wrapping1"); GLADE_HOOKUP_OBJECT (window1, line_breaking1, "line_breaking1"); GLADE_HOOKUP_OBJECT (window1, menu_use_auto_indentation1, "menu_use_auto_indentation1"); GLADE_HOOKUP_OBJECT (window1, indent_type1, "indent_type1");
Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2008-05-09 12:13:29 UTC (rev 2562) +++ trunk/src/keyfile.c 2008-05-09 14:17:25 UTC (rev 2563) @@ -231,7 +231,7 @@ g_key_file_set_integer(config, PACKAGE, "indent_mode", editor_prefs.indent_mode); g_key_file_set_integer(config, PACKAGE, "check_detect_indent", editor_prefs.detect_tab_mode); g_key_file_set_boolean(config, PACKAGE, "use_indicators", editor_prefs.use_indicators); - g_key_file_set_boolean(config, PACKAGE, "line_breaking", editor_prefs.line_wrapping); + g_key_file_set_boolean(config, PACKAGE, "line_wrapping", editor_prefs.line_wrapping); g_key_file_set_boolean(config, PACKAGE, "auto_close_xml_tags", editor_prefs.auto_close_xml_tags); g_key_file_set_boolean(config, PACKAGE, "complete_snippets", editor_prefs.complete_snippets); g_key_file_set_boolean(config, PACKAGE, "auto_complete_symbols", editor_prefs.auto_complete_symbols); @@ -522,7 +522,7 @@ editor_prefs.long_line_column = utils_get_setting_integer(config, PACKAGE, "long_line_column", 72); editor_prefs.symbolcompletion_min_chars = utils_get_setting_integer(config, PACKAGE, "symbolcompletion_min_chars", GEANY_MIN_SYMBOLLIST_CHARS); editor_prefs.symbolcompletion_max_height = utils_get_setting_integer(config, PACKAGE, "symbolcompletion_max_height", GEANY_MAX_SYMBOLLIST_HEIGHT); - editor_prefs.line_wrapping = utils_get_setting_boolean(config, PACKAGE, "line_breaking", FALSE); /* default is off for better performance */ + editor_prefs.line_wrapping = utils_get_setting_boolean(config, PACKAGE, "line_wrapping", FALSE); /* default is off for better performance */ editor_prefs.indent_mode = utils_get_setting_integer(config, PACKAGE, "indent_mode", INDENT_CURRENTCHARS); editor_prefs.detect_tab_mode = utils_get_setting_integer(config, PACKAGE, "check_detect_indent", FALSE); editor_prefs.use_tab_to_indent = utils_get_setting_boolean(config, PACKAGE, "use_tab_to_indent", FALSE);
Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2008-05-09 12:13:29 UTC (rev 2562) +++ trunk/src/main.c 2008-05-09 14:17:25 UTC (rev 2563) @@ -251,7 +251,7 @@
app->ignore_callback = TRUE; gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM( - lookup_widget(app->window, "menu_line_breaking1")), editor_prefs.line_wrapping); + lookup_widget(app->window, "menu_line_wrapping1")), editor_prefs.line_wrapping); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM( lookup_widget(app->window, "menu_use_auto_indentation1")), (editor_prefs.indent_mode != INDENT_NONE));
Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2008-05-09 12:13:29 UTC (rev 2562) +++ trunk/src/ui_utils.c 2008-05-09 14:17:25 UTC (rev 2563) @@ -677,7 +677,7 @@ app->ignore_callback = TRUE;
gtk_check_menu_item_set_active( - GTK_CHECK_MENU_ITEM(lookup_widget(app->window, "menu_line_breaking1")), + GTK_CHECK_MENU_ITEM(lookup_widget(app->window, "menu_line_wrapping1")), doc_list[idx].line_wrapping);
gtk_check_menu_item_set_active(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.