SF.net SVN: geany: [654] trunk
ntrel at users.sourceforge.net
ntrel at xxxxx
Tue Aug 1 10:06:39 UTC 2006
Revision: 654
Author: ntrel
Date: 2006-08-01 03:06:28 -0700 (Tue, 01 Aug 2006)
ViewCVS: http://svn.sourceforge.net/geany/?rev=654&view=rev
Log Message:
-----------
Added Auto indentation and Line wrapping options to Preferences dialog; Split up Miscellaneous items into Display and Features; Renamed Change Selection and Run toolbutton.
Modified Paths:
--------------
trunk/ChangeLog
trunk/geany.glade
trunk/src/callbacks.c
trunk/src/document.c
trunk/src/interface.c
trunk/src/keyfile.c
trunk/src/prefs.c
trunk/src/utils.c
trunk/src/utils.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-07-31 09:39:33 UTC (rev 653)
+++ trunk/ChangeLog 2006-08-01 10:06:28 UTC (rev 654)
@@ -1,3 +1,12 @@
+2006-08-01 Nick Treleaven <nick.treleaven at btinternet.com>
+
+ * src/interface.c, src/utils.c, src/utils.h, src/callbacks.c,
+ src/keyfile.c, src/document.c, src/prefs.c, geany.glade:
+ Added Auto indentation and Line wrapping options to Preferences
+ dialog. Split up Miscellaneous items into Display and Features.
+ Renamed Change Selection and Run toolbutton.
+
+
2006-07-31 Enrico Tröger <enrico.troeger at uvena.de>
* src/keybindings.c, src/sci_cb.c:
Modified: trunk/geany.glade
===================================================================
--- trunk/geany.glade 2006-07-31 09:39:33 UTC (rev 653)
+++ trunk/geany.glade 2006-08-01 10:06:28 UTC (rev 654)
@@ -57,7 +57,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image929">
+ <widget class="GtkImage" id="image959">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
@@ -150,7 +150,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="image930">
+ <widget class="GtkImage" id="image960">
<property name="visible">True</property>
<property name="stock">gtk-save</property>
<property name="icon_size">1</property>
@@ -171,7 +171,7 @@
<signal name="activate" handler="on_toolbutton23_clicked" last_modification_time="Mon, 24 Jul 2006 19:26:04 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image931">
+ <widget class="GtkImage" id="image961">
<property name="visible">True</property>
<property name="stock">gtk-revert-to-saved</property>
<property name="icon_size">1</property>
@@ -191,7 +191,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image932">
+ <widget class="GtkImage" id="image962">
<property name="visible">True</property>
<property name="stock">gtk-revert-to-saved</property>
<property name="icon_size">1</property>
@@ -271,7 +271,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="image933">
+ <widget class="GtkImage" id="image963">
<property name="visible">True</property>
<property name="stock">gtk-close</property>
<property name="icon_size">1</property>
@@ -402,7 +402,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image934">
+ <widget class="GtkImage" id="image964">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
@@ -434,7 +434,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image935">
+ <widget class="GtkImage" id="image965">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
@@ -511,7 +511,8 @@
<child>
<widget class="GtkMenuItem" id="menu_change_selection2">
<property name="visible">True</property>
- <property name="label" translatable="yes">Change _Selection</property>
+ <property name="tooltip" translatable="yes">Convert the case of the current selection</property>
+ <property name="label" translatable="yes">C_onvert case</property>
<property name="use_underline">True</property>
<child>
@@ -612,7 +613,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="image936">
+ <widget class="GtkImage" id="image966">
<property name="visible">True</property>
<property name="stock">gtk-find-and-replace</property>
<property name="icon_size">1</property>
@@ -654,7 +655,7 @@
<signal name="activate" handler="on_go_to_line1_activate" last_modification_time="Tue, 23 May 2006 17:10:49 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image937">
+ <widget class="GtkImage" id="image967">
<property name="visible">True</property>
<property name="stock">gtk-jump-to</property>
<property name="icon_size">1</property>
@@ -689,7 +690,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="image938">
+ <widget class="GtkImage" id="image968">
<property name="visible">True</property>
<property name="stock">gtk-select-font</property>
<property name="icon_size">1</property>
@@ -711,7 +712,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="image939">
+ <widget class="GtkImage" id="image969">
<property name="visible">True</property>
<property name="stock">gtk-select-color</property>
<property name="icon_size">1</property>
@@ -843,8 +844,8 @@
<child>
<widget class="GtkCheckMenuItem" id="menu_line_breaking1">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Break the line at the window border and continue it on the next line</property>
- <property name="label" translatable="yes">_Line breaking</property>
+ <property name="tooltip" translatable="yes">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.</property>
+ <property name="label" translatable="yes">_Line wrapping</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<signal name="toggled" handler="on_line_breaking1_toggled" last_modification_time="Sun, 04 Sep 2005 11:12:08 GMT"/>
@@ -1299,8 +1300,6 @@
<widget class="GtkToolButton" id="toolbutton26">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Run or view the current file</property>
- <property name="label" translatable="yes">Run</property>
- <property name="use_underline">True</property>
<property name="stock_id">gtk-execute</property>
<property name="visible_horizontal">True</property>
<property name="visible_vertical">True</property>
@@ -2305,7 +2304,7 @@
<child>
<widget class="GtkMenuItem" id="change_selection1">
<property name="visible">True</property>
- <property name="label" translatable="yes">Change Selection</property>
+ <property name="label" translatable="yes">Convert case</property>
<property name="use_underline">True</property>
<child>
@@ -4588,16 +4587,75 @@
<property name="fill">False</property>
</packing>
</child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label102">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Display</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkFrame" id="frame14">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.5</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment17">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">12</property>
+ <property name="right_padding">0</property>
+
+ <child>
+ <widget class="GtkVBox" id="vbox17">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
<child>
- <widget class="GtkCheckButton" id="check_xmltag">
+ <widget class="GtkCheckButton" id="check_auto_indent">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Automatic completion of open XML tags(includes HTML tags)</property>
+ <property name="tooltip" translatable="yes">Add the same indentation as the previous line after pressing enter</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">XML tag auto completion</property>
+ <property name="label" translatable="yes">Auto indentation</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">False</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -4610,6 +4668,26 @@
</child>
<child>
+ <widget class="GtkCheckButton" id="check_line_wrapping">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">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.</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Line wrapping</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_auto_complete">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Automatic completion of often used constructs like if and for</property>
@@ -4630,11 +4708,11 @@
</child>
<child>
- <widget class="GtkCheckButton" id="check_folding">
+ <widget class="GtkCheckButton" id="check_xmltag">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Whether to enable folding the code</property>
+ <property name="tooltip" translatable="yes">Automatic completion of open XML tags(includes HTML tags)</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Enable folding</property>
+ <property name="label" translatable="yes">XML tag auto completion</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">False</property>
@@ -4650,11 +4728,11 @@
</child>
<child>
- <widget class="GtkCheckButton" id="check_indicators">
+ <widget class="GtkCheckButton" id="check_folding">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Whether to use indicators(a squiggly underline) to highlight the lines, where the compiler found a warning or an error.</property>
+ <property name="tooltip" translatable="yes">Whether to enable folding the code</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Use indicators to show compile errors</property>
+ <property name="label" translatable="yes">Enable folding</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">False</property>
@@ -4670,22 +4748,17 @@
</child>
<child>
- <widget class="GtkLabel" id="label148">
+ <widget class="GtkCheckButton" id="check_indicators">
<property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
+ <property name="tooltip" translatable="yes">Whether to use indicators (a squiggly underline) to highlight the lines where the compiler found a warning or an error.</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Use indicators to show compile errors</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">False</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -4693,19 +4766,15 @@
<property name="fill">False</property>
</packing>
</child>
-
- <child>
- <placeholder/>
- </child>
</widget>
</child>
</widget>
</child>
<child>
- <widget class="GtkLabel" id="label102">
+ <widget class="GtkLabel" id="label172">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Miscellaneous</b></property>
+ <property name="label" translatable="yes"><b>Features</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4731,10 +4800,6 @@
<property name="fill">True</property>
</packing>
</child>
-
- <child>
- <placeholder/>
- </child>
</widget>
<packing>
<property name="tab_expand">False</property>
@@ -5710,7 +5775,7 @@
</child>
</widget>
<packing>
- <property name="padding">0</property>
+ <property name="padding">6</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
Modified: trunk/src/callbacks.c
===================================================================
--- trunk/src/callbacks.c 2006-07-31 09:39:33 UTC (rev 653)
+++ trunk/src/callbacks.c 2006-08-01 10:06:28 UTC (rev 654)
@@ -738,32 +738,14 @@
if (idx >= 0 && app->opening_session_files == FALSE)
{
- app->ignore_callback = TRUE;
- 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(lookup_widget(app->window, "menu_use_auto_indention1")),
- doc_list[idx].use_auto_indention);
- gtk_check_menu_item_set_active(
- GTK_CHECK_MENU_ITEM(lookup_widget(app->window, "set_file_readonly1")),
- doc_list[idx].readonly);
- gtk_check_menu_item_set_active(
- GTK_CHECK_MENU_ITEM(lookup_widget(app->window, "menu_write_unicode_bom1")),
- doc_list[idx].has_bom);
-
- gtk_widget_set_sensitive(lookup_widget(app->window, "menu_write_unicode_bom1"),
- utils_is_unicode_charset(doc_list[idx].encoding));
-
gtk_tree_model_foreach(GTK_TREE_MODEL(tv.store_openfiles), treeviews_find_node, GINT_TO_POINTER(idx));
document_set_text_changed(idx);
+ utils_document_show_hide(idx); //update the document menu
utils_build_show_hide(idx);
utils_update_statusbar(idx, -1);
utils_set_window_title(idx);
utils_update_tag_list(idx, FALSE);
-
- app->ignore_callback = FALSE;
}
}
Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c 2006-07-31 09:39:33 UTC (rev 653)
+++ trunk/src/document.c 2006-08-01 10:06:28 UTC (rev 654)
@@ -184,8 +184,8 @@
{
doc_list[i].is_valid = FALSE;
doc_list[i].has_tags = FALSE;
- doc_list[i].use_auto_indention = TRUE;
- doc_list[i].line_breaking = TRUE;
+ doc_list[i].use_auto_indention = app->pref_editor_use_auto_indention;
+ doc_list[i].line_breaking = app->pref_editor_line_breaking;
doc_list[i].readonly = FALSE;
doc_list[i].tag_store = NULL;
doc_list[i].tag_tree = NULL;
@@ -282,8 +282,8 @@
this->last_check = time(NULL);
this->do_overwrite = FALSE;
this->readonly = FALSE;
- this->line_breaking = TRUE;
- this->use_auto_indention = TRUE;
+ this->line_breaking = app->pref_editor_line_breaking;
+ this->use_auto_indention = app->pref_editor_use_auto_indention;
this->has_tags = FALSE;
this->is_valid = TRUE;
@@ -366,6 +366,7 @@
doc_list[idx].mtime = time(NULL);
doc_list[idx].changed = FALSE;
document_set_text_changed(idx);
+ utils_document_show_hide(idx); //update the document menu
#ifdef G_OS_WIN32
sci_set_eol_mode(doc_list[idx].sci, SC_EOL_CRLF);
#else
@@ -604,26 +605,10 @@
sci_goto_pos(doc_list[idx].sci, pos, TRUE);
- app->ignore_callback = TRUE;
-
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(
- lookup_widget(app->window, "menu_write_unicode_bom1")), doc_list[idx].has_bom);
- gtk_widget_set_sensitive(lookup_widget(app->window, "menu_write_unicode_bom1"),
- utils_is_unicode_charset(doc_list[idx].encoding));
-
- app->ignore_callback = FALSE;
-
if (! reload)
{
filetype *use_ft = (ft != NULL) ? ft : filetypes_get_from_filename(utf8_filename);
- app->ignore_callback = TRUE;
-
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(lookup_widget(app->window, "set_file_readonly1")),
- readonly);
-
- app->ignore_callback = FALSE;
-
doc_list[idx].readonly = readonly;
sci_set_readonly(doc_list[idx].sci, readonly);
@@ -636,6 +621,7 @@
}
document_set_text_changed(idx);
+ utils_document_show_hide(idx); //update the document menu
g_free(data);
Modified: trunk/src/interface.c
===================================================================
--- trunk/src/interface.c 2006-07-31 09:39:33 UTC (rev 653)
+++ trunk/src/interface.c 2006-08-01 10:06:28 UTC (rev 654)
@@ -37,7 +37,7 @@
GtkWidget *menuitem1_menu;
GtkWidget *menu_new1;
GtkWidget *menu_new_with_template1;
- GtkWidget *image929;
+ GtkWidget *image959;
GtkWidget *menu_new_with_template1_menu;
GtkWidget *invisible2;
GtkWidget *separator12;
@@ -49,11 +49,11 @@
GtkWidget *menu_save1;
GtkWidget *menu_save_as1;
GtkWidget *menu_save_all1;
- GtkWidget *image930;
+ GtkWidget *image960;
GtkWidget *menu_reload1;
- GtkWidget *image931;
+ GtkWidget *image961;
GtkWidget *menu_reload_as1;
- GtkWidget *image932;
+ GtkWidget *image962;
GtkWidget *menu_reload_as1_menu;
GtkWidget *invisible7;
GtkWidget *separator21;
@@ -63,7 +63,7 @@
GtkWidget *separator14;
GtkWidget *menu_close1;
GtkWidget *menu_close_all1;
- GtkWidget *image933;
+ GtkWidget *image963;
GtkWidget *menu_separatormenuitem1;
GtkWidget *menu_quit1;
GtkWidget *edit1;
@@ -79,11 +79,11 @@
GtkWidget *menu_select_all1;
GtkWidget *separator25;
GtkWidget *insert_include2;
- GtkWidget *image934;
+ GtkWidget *image964;
GtkWidget *insert_include2_menu;
GtkWidget *invisible4;
GtkWidget *add_comments1;
- GtkWidget *image935;
+ GtkWidget *image965;
GtkWidget *add_comments1_menu;
GtkWidget *menu_add_changelog_entry1;
GtkWidget *insert_file_header1;
@@ -104,18 +104,18 @@
GtkWidget *find_next1;
GtkWidget *find_previous1;
GtkWidget *replace1;
- GtkWidget *image936;
+ GtkWidget *image966;
GtkWidget *separator27;
GtkWidget *find_in_files1;
GtkWidget *separator11;
GtkWidget *go_to_line1;
- GtkWidget *image937;
+ GtkWidget *image967;
GtkWidget *menuitem3;
GtkWidget *menuitem3_menu;
GtkWidget *menu_change_font1;
- GtkWidget *image938;
+ GtkWidget *image968;
GtkWidget *menu_choose_color1;
- GtkWidget *image939;
+ GtkWidget *image969;
GtkWidget *menu_separator4;
GtkWidget *menu_fullscreen1;
GtkWidget *menu_show_messages_window1;
@@ -251,9 +251,9 @@
gtk_widget_show (menu_new_with_template1);
gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_new_with_template1);
- image929 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image929);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image929);
+ image959 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image959);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image959);
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);
@@ -298,25 +298,25 @@
gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_save_all1);
gtk_tooltips_set_tip (tooltips, menu_save_all1, _("Saves all open files"), NULL);
- image930 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image930);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image930);
+ image960 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image960);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image960);
menu_reload1 = gtk_image_menu_item_new_with_mnemonic (_("_Reload"));
gtk_widget_show (menu_reload1);
gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_reload1);
- image931 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image931);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image931);
+ image961 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image961);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image961);
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);
- image932 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image932);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image932);
+ image962 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image962);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image962);
menu_reload_as1_menu = gtk_menu_new ();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_reload_as1), menu_reload_as1_menu);
@@ -357,9 +357,9 @@
gtk_container_add (GTK_CONTAINER (menuitem1_menu), menu_close_all1);
gtk_tooltips_set_tip (tooltips, menu_close_all1, _("Closes all open files"), NULL);
- image933 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image933);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image933);
+ image963 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image963);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image963);
menu_separatormenuitem1 = gtk_separator_menu_item_new ();
gtk_widget_show (menu_separatormenuitem1);
@@ -425,9 +425,9 @@
gtk_widget_show (insert_include2);
gtk_container_add (GTK_CONTAINER (edit1_menu), insert_include2);
- image934 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image934);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image934);
+ image964 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image964);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image964);
insert_include2_menu = gtk_menu_new ();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include2), insert_include2_menu);
@@ -439,9 +439,9 @@
gtk_widget_show (add_comments1);
gtk_container_add (GTK_CONTAINER (edit1_menu), add_comments1);
- image935 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image935);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image935);
+ image965 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image965);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image965);
add_comments1_menu = gtk_menu_new ();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (add_comments1), add_comments1_menu);
@@ -476,9 +476,10 @@
gtk_container_add (GTK_CONTAINER (edit1_menu), separator18);
gtk_widget_set_sensitive (separator18, FALSE);
- menu_change_selection2 = gtk_menu_item_new_with_mnemonic (_("Change _Selection"));
+ menu_change_selection2 = gtk_menu_item_new_with_mnemonic (_("C_onvert case"));
gtk_widget_show (menu_change_selection2);
gtk_container_add (GTK_CONTAINER (edit1_menu), menu_change_selection2);
+ gtk_tooltips_set_tip (tooltips, menu_change_selection2, _("Convert the case of the current selection"), NULL);
menu_change_selection2_menu = gtk_menu_new ();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_change_selection2), menu_change_selection2_menu);
@@ -528,9 +529,9 @@
gtk_widget_show (replace1);
gtk_container_add (GTK_CONTAINER (search1_menu), replace1);
- image936 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image936);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image936);
+ image966 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image966);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image966);
separator27 = gtk_separator_menu_item_new ();
gtk_widget_show (separator27);
@@ -550,9 +551,9 @@
gtk_widget_show (go_to_line1);
gtk_container_add (GTK_CONTAINER (search1_menu), go_to_line1);
- image937 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image937);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image937);
+ image967 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image967);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image967);
menuitem3 = gtk_menu_item_new_with_mnemonic (_("_View"));
gtk_widget_show (menuitem3);
@@ -566,18 +567,18 @@
gtk_container_add (GTK_CONTAINER (menuitem3_menu), menu_change_font1);
gtk_tooltips_set_tip (tooltips, menu_change_font1, _("Change the default font"), NULL);
- image938 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image938);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image938);
+ image968 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image968);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image968);
menu_choose_color1 = gtk_image_menu_item_new_with_mnemonic (_("Show _Colour Chooser"));
gtk_widget_show (menu_choose_color1);
gtk_container_add (GTK_CONTAINER (menuitem3_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);
- image939 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image939);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image939);
+ image969 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image969);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image969);
menu_separator4 = gtk_separator_menu_item_new ();
gtk_widget_show (menu_separator4);
@@ -641,10 +642,10 @@
menu_item4_menu = gtk_menu_new ();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item4), menu_item4_menu);
- menu_line_breaking1 = gtk_check_menu_item_new_with_mnemonic (_("_Line breaking"));
+ menu_line_breaking1 = gtk_check_menu_item_new_with_mnemonic (_("_Line wrapping"));
gtk_widget_show (menu_line_breaking1);
gtk_container_add (GTK_CONTAINER (menu_item4_menu), menu_line_breaking1);
- gtk_tooltips_set_tip (tooltips, menu_line_breaking1, _("Break the line at the window border and continue it on the next line"), NULL);
+ 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"));
@@ -839,9 +840,7 @@
gtk_container_add (GTK_CONTAINER (toolbar1), toolbutton13);
gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (toolbutton13), tooltips, _("Compile the current file"), NULL);
- tmp_image = gtk_image_new_from_stock ("gtk-execute", tmp_toolbar_icon_size);
- gtk_widget_show (tmp_image);
- toolbutton26 = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Run"));
+ toolbutton26 = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-execute");
gtk_widget_show (toolbutton26);
gtk_container_add (GTK_CONTAINER (toolbar1), toolbutton26);
gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (toolbutton26), tooltips, _("Run or view the current file"), NULL);
@@ -1303,7 +1302,7 @@
GLADE_HOOKUP_OBJECT (window1, menuitem1_menu, "menuitem1_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, image929, "image929");
+ GLADE_HOOKUP_OBJECT (window1, image959, "image959");
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");
@@ -1315,11 +1314,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, image930, "image930");
+ GLADE_HOOKUP_OBJECT (window1, image960, "image960");
GLADE_HOOKUP_OBJECT (window1, menu_reload1, "menu_reload1");
- GLADE_HOOKUP_OBJECT (window1, image931, "image931");
+ GLADE_HOOKUP_OBJECT (window1, image961, "image961");
GLADE_HOOKUP_OBJECT (window1, menu_reload_as1, "menu_reload_as1");
- GLADE_HOOKUP_OBJECT (window1, image932, "image932");
+ GLADE_HOOKUP_OBJECT (window1, image962, "image962");
GLADE_HOOKUP_OBJECT (window1, menu_reload_as1_menu, "menu_reload_as1_menu");
GLADE_HOOKUP_OBJECT (window1, invisible7, "invisible7");
GLADE_HOOKUP_OBJECT (window1, separator21, "separator21");
@@ -1329,7 +1328,7 @@
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, image933, "image933");
+ GLADE_HOOKUP_OBJECT (window1, image963, "image963");
GLADE_HOOKUP_OBJECT (window1, menu_separatormenuitem1, "menu_separatormenuitem1");
GLADE_HOOKUP_OBJECT (window1, menu_quit1, "menu_quit1");
GLADE_HOOKUP_OBJECT (window1, edit1, "edit1");
@@ -1345,11 +1344,11 @@
GLADE_HOOKUP_OBJECT (window1, menu_select_all1, "menu_select_all1");
GLADE_HOOKUP_OBJECT (window1, separator25, "separator25");
GLADE_HOOKUP_OBJECT (window1, insert_include2, "insert_include2");
- GLADE_HOOKUP_OBJECT (window1, image934, "image934");
+ GLADE_HOOKUP_OBJECT (window1, image964, "image964");
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, image935, "image935");
+ GLADE_HOOKUP_OBJECT (window1, image965, "image965");
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");
@@ -1370,18 +1369,18 @@
GLADE_HOOKUP_OBJECT (window1, find_next1, "find_next1");
GLADE_HOOKUP_OBJECT (window1, find_previous1, "find_previous1");
GLADE_HOOKUP_OBJECT (window1, replace1, "replace1");
- GLADE_HOOKUP_OBJECT (window1, image936, "image936");
+ GLADE_HOOKUP_OBJECT (window1, image966, "image966");
GLADE_HOOKUP_OBJECT (window1, separator27, "separator27");
GLADE_HOOKUP_OBJECT (window1, find_in_files1, "find_in_files1");
GLADE_HOOKUP_OBJECT (window1, separator11, "separator11");
GLADE_HOOKUP_OBJECT (window1, go_to_line1, "go_to_line1");
- GLADE_HOOKUP_OBJECT (window1, image937, "image937");
+ GLADE_HOOKUP_OBJECT (window1, image967, "image967");
GLADE_HOOKUP_OBJECT (window1, menuitem3, "menuitem3");
GLADE_HOOKUP_OBJECT (window1, menuitem3_menu, "menuitem3_menu");
GLADE_HOOKUP_OBJECT (window1, menu_change_font1, "menu_change_font1");
- GLADE_HOOKUP_OBJECT (window1, image938, "image938");
+ GLADE_HOOKUP_OBJECT (window1, image968, "image968");
GLADE_HOOKUP_OBJECT (window1, menu_choose_color1, "menu_choose_color1");
- GLADE_HOOKUP_OBJECT (window1, image939, "image939");
+ GLADE_HOOKUP_OBJECT (window1, image969, "image969");
GLADE_HOOKUP_OBJECT (window1, menu_separator4, "menu_separator4");
GLADE_HOOKUP_OBJECT (window1, menu_fullscreen1, "menu_fullscreen1");
GLADE_HOOKUP_OBJECT (window1, menu_show_messages_window1, "menu_show_messages_window1");
@@ -1754,7 +1753,7 @@
gtk_container_add (GTK_CONTAINER (edit_menu1), separator17);
gtk_widget_set_sensitive (separator17, FALSE);
- change_selection1 = gtk_menu_item_new_with_mnemonic (_("Change Selection"));
+ change_selection1 = gtk_menu_item_new_with_mnemonic (_("Convert case"));
gtk_widget_show (change_selection1);
gtk_container_add (GTK_CONTAINER (edit_menu1), change_selection1);
@@ -2042,12 +2041,17 @@
GtkWidget *check_indent;
GtkWidget *check_white_space;
GtkWidget *check_line_end;
+ GtkWidget *label102;
+ GtkWidget *frame14;
+ GtkWidget *alignment17;
+ GtkWidget *vbox17;
+ GtkWidget *check_auto_indent;
+ GtkWidget *check_line_wrapping;
+ GtkWidget *check_auto_complete;
GtkWidget *check_xmltag;
- GtkWidget *check_auto_complete;
GtkWidget *check_folding;
GtkWidget *check_indicators;
- GtkWidget *label148;
- GtkWidget *label102;
+ GtkWidget *label172;
GtkWidget *label95;
GtkWidget *vbox2;
GtkWidget *label17;
@@ -2114,7 +2118,7 @@
notebook2 = gtk_notebook_new ();
gtk_widget_show (notebook2);
- gtk_box_pack_start (GTK_BOX (dialog_vbox3), notebook2, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (dialog_vbox3), notebook2, TRUE, TRUE, 6);
GTK_WIDGET_UNSET_FLAGS (notebook2, GTK_CAN_FOCUS);
gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook2), GTK_POS_LEFT);
@@ -2797,39 +2801,64 @@
gtk_tooltips_set_tip (tooltips, check_line_end, _("Show the line ending character"), NULL);
gtk_button_set_focus_on_click (GTK_BUTTON (check_line_end), FALSE);
- check_xmltag = gtk_check_button_new_with_mnemonic (_("XML tag auto completion"));
- gtk_widget_show (check_xmltag);
- gtk_box_pack_start (GTK_BOX (vbox12), check_xmltag, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, check_xmltag, _("Automatic completion of open XML tags(includes HTML tags)"), NULL);
- gtk_button_set_focus_on_click (GTK_BUTTON (check_xmltag), FALSE);
+ label102 = gtk_label_new (_("<b>Display</b>"));
+ gtk_widget_show (label102);
+ gtk_frame_set_label_widget (GTK_FRAME (frame5), label102);
+ gtk_label_set_use_markup (GTK_LABEL (label102), TRUE);
+ frame14 = gtk_frame_new (NULL);
+ gtk_widget_show (frame14);
+ gtk_box_pack_start (GTK_BOX (vbox5), frame14, TRUE, TRUE, 0);
+ gtk_frame_set_shadow_type (GTK_FRAME (frame14), GTK_SHADOW_NONE);
+
+ alignment17 = gtk_alignment_new (0.5, 0.5, 1, 1);
+ gtk_widget_show (alignment17);
+ gtk_container_add (GTK_CONTAINER (frame14), alignment17);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (alignment17), 0, 0, 12, 0);
+
+ vbox17 = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox17);
+ gtk_container_add (GTK_CONTAINER (alignment17), vbox17);
+
+ check_auto_indent = gtk_check_button_new_with_mnemonic (_("Auto indentation"));
+ gtk_widget_show (check_auto_indent);
+ gtk_box_pack_start (GTK_BOX (vbox17), check_auto_indent, FALSE, FALSE, 0);
+ gtk_tooltips_set_tip (tooltips, check_auto_indent, _("Add the same indentation as the previous line after pressing enter"), NULL);
+
+ check_line_wrapping = gtk_check_button_new_with_mnemonic (_("Line wrapping"));
+ gtk_widget_show (check_line_wrapping);
+ gtk_box_pack_start (GTK_BOX (vbox17), check_line_wrapping, FALSE, FALSE, 0);
+ gtk_tooltips_set_tip (tooltips, check_line_wrapping, _("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);
+
check_auto_complete = gtk_check_button_new_with_mnemonic (_("Construct auto completion"));
gtk_widget_show (check_auto_complete);
- gtk_box_pack_start (GTK_BOX (vbox12), check_auto_complete, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox17), check_auto_complete, FALSE, FALSE, 0);
gtk_tooltips_set_tip (tooltips, check_auto_complete, _("Automatic completion of often used constructs like if and for"), NULL);
gtk_button_set_focus_on_click (GTK_BUTTON (check_auto_complete), FALSE);
+ check_xmltag = gtk_check_button_new_with_mnemonic (_("XML tag auto completion"));
+ gtk_widget_show (check_xmltag);
+ gtk_box_pack_start (GTK_BOX (vbox17), check_xmltag, FALSE, FALSE, 0);
+ gtk_tooltips_set_tip (tooltips, check_xmltag, _("Automatic completion of open XML tags(includes HTML tags)"), NULL);
+ gtk_button_set_focus_on_click (GTK_BUTTON (check_xmltag), FALSE);
+
check_folding = gtk_check_button_new_with_mnemonic (_("Enable folding"));
gtk_widget_show (check_folding);
- gtk_box_pack_start (GTK_BOX (vbox12), check_folding, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox17), check_folding, FALSE, FALSE, 0);
gtk_tooltips_set_tip (tooltips, check_folding, _("Whether to enable folding the code"), NULL);
gtk_button_set_focus_on_click (GTK_BUTTON (check_folding), FALSE);
check_indicators = gtk_check_button_new_with_mnemonic (_("Use indicators to show compile errors"));
gtk_widget_show (check_indicators);
- gtk_box_pack_start (GTK_BOX (vbox12), check_indicators, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, check_indicators, _("Whether to use indicators(a squiggly underline) to highlight the lines, where the compiler found a warning or an error."), NULL);
+ gtk_box_pack_start (GTK_BOX (vbox17), check_indicators, FALSE, FALSE, 0);
+ gtk_tooltips_set_tip (tooltips, check_indicators, _("Whether to use indicators (a squiggly underline) to highlight the lines where the compiler found a warning or an error."), NULL);
gtk_button_set_focus_on_click (GTK_BUTTON (check_indicators), FALSE);
- label148 = gtk_label_new ("");
- gtk_widget_show (label148);
- gtk_box_pack_start (GTK_BOX (vbox12), label148, FALSE, FALSE, 0);
+ label172 = gtk_label_new (_("<b>Features</b>"));
+ gtk_widget_show (label172);
+ gtk_frame_set_label_widget (GTK_FRAME (frame14), label172);
+ gtk_label_set_use_markup (GTK_LABEL (label172), TRUE);
- label102 = gtk_label_new (_("<b>Miscellaneous</b>"));
- gtk_widget_show (label102);
- gtk_frame_set_label_widget (GTK_FRAME (frame5), label102);
- gtk_label_set_use_markup (GTK_LABEL (label102), TRUE);
-
label95 = gtk_label_new (_("Editor"));
gtk_widget_show (label95);
gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 3), label95);
@@ -3231,12 +3260,17 @@
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, label102, "label102");
+ GLADE_HOOKUP_OBJECT (prefs_dialog, frame14, "frame14");
+ GLADE_HOOKUP_OBJECT (prefs_dialog, alignment17, "alignment17");
+ GLADE_HOOKUP_OBJECT (prefs_dialog, vbox17, "vbox17");
+ GLADE_HOOKUP_OBJECT (prefs_dialog, check_auto_indent, "check_auto_indent");
+ GLADE_HOOKUP_OBJECT (prefs_dialog, check_line_wrapping, "check_line_wrapping");
+ GLADE_HOOKUP_OBJECT (prefs_dialog, check_auto_complete, "check_auto_complete");
GLADE_HOOKUP_OBJECT (prefs_dialog, check_xmltag, "check_xmltag");
- GLADE_HOOKUP_OBJECT (prefs_dialog, check_auto_complete, "check_auto_complete");
GLADE_HOOKUP_OBJECT (prefs_dialog, check_folding, "check_folding");
GLADE_HOOKUP_OBJECT (prefs_dialog, check_indicators, "check_indicators");
- GLADE_HOOKUP_OBJECT (prefs_dialog, label148, "label148");
- GLADE_HOOKUP_OBJECT (prefs_dialog, label102, "label102");
+ GLADE_HOOKUP_OBJECT (prefs_dialog, label172, "label172");
GLADE_HOOKUP_OBJECT (prefs_dialog, label95, "label95");
GLADE_HOOKUP_OBJECT (prefs_dialog, vbox2, "vbox2");
GLADE_HOOKUP_OBJECT (prefs_dialog, label17, "label17");
Modified: trunk/src/keyfile.c
===================================================================
--- trunk/src/keyfile.c 2006-07-31 09:39:33 UTC (rev 653)
+++ trunk/src/keyfile.c 2006-08-01 10:06:28 UTC (rev 654)
@@ -247,21 +247,21 @@
app->sidebar_openfiles_visible = utils_get_setting_boolean(config, PACKAGE, "sidebar_openfiles_visible", TRUE);
app->sidebar_visible = utils_get_setting_boolean(config, PACKAGE, "sidebar_visible", TRUE);
app->msgwindow_visible = utils_get_setting_boolean(config, PACKAGE, "msgwindow_visible", TRUE);
- app->pref_editor_folding = utils_get_setting_boolean(config, PACKAGE, "use_folding", TRUE);
+ app->pref_editor_line_breaking = utils_get_setting_boolean(config, PACKAGE, "line_breaking", FALSE); //default is off for better performance
+ app->pref_editor_use_auto_indention = utils_get_setting_boolean(config, PACKAGE, "use_auto_indention", TRUE);
app->pref_editor_use_indicators = utils_get_setting_boolean(config, PACKAGE, "use_indicators", TRUE);
- app->pref_editor_use_auto_indention = utils_get_setting_boolean(config, PACKAGE, "use_auto_indention", TRUE);
app->pref_editor_show_indent_guide = utils_get_setting_boolean(config, PACKAGE, "show_indent_guide", FALSE);
app->pref_editor_show_white_space = utils_get_setting_boolean(config, PACKAGE, "show_white_space", FALSE);
+ app->pref_editor_show_line_endings = utils_get_setting_boolean(config, PACKAGE, "show_line_endings", FALSE);
+ app->pref_editor_auto_close_xml_tags = utils_get_setting_boolean(config, PACKAGE, "auto_close_xml_tags", TRUE);
+ app->pref_editor_auto_complete_constructs = utils_get_setting_boolean(config, PACKAGE, "auto_complete_constructs", TRUE);
+ app->pref_editor_folding = utils_get_setting_boolean(config, PACKAGE, "use_folding", TRUE);
app->show_markers_margin = utils_get_setting_boolean(config, PACKAGE, "show_markers_margin", TRUE);
app->show_linenumber_margin = utils_get_setting_boolean(config, PACKAGE, "show_linenumber_margin", TRUE);
- app->pref_editor_show_line_endings = utils_get_setting_boolean(config, PACKAGE, "show_line_endings", FALSE);
- app->pref_editor_line_breaking = utils_get_setting_boolean(config, PACKAGE, "line_breaking", TRUE);
app->fullscreen = utils_get_setting_boolean(config, PACKAGE, "fullscreen", FALSE);
app->tab_order_ltr = utils_get_setting_boolean(config, PACKAGE, "tab_order_ltr", FALSE);
app->brace_match_ltgt = utils_get_setting_boolean(config, PACKAGE, "brace_match_ltgt", FALSE);
app->switch_msgwin_pages = utils_get_setting_boolean(config, PACKAGE, "switch_msgwin_pages", FALSE);
- app->pref_editor_auto_close_xml_tags = utils_get_setting_boolean(config, PACKAGE, "auto_close_xml_tags", TRUE);
- app->pref_editor_auto_complete_constructs = utils_get_setting_boolean(config, PACKAGE, "auto_complete_constructs", TRUE);
app->editor_font = utils_get_setting_string(config, PACKAGE, "editor_font", GEANY_DEFAULT_FONT_EDITOR);
app->tagbar_font = utils_get_setting_string(config, PACKAGE, "tagbar_font", GEANY_DEFAULT_FONT_SYMBOL_LIST);
app->msgwin_font = utils_get_setting_string(config, PACKAGE, "msgwin_font", GEANY_DEFAULT_FONT_MSG_WINDOW);
Modified: trunk/src/prefs.c
===================================================================
--- trunk/src/prefs.c 2006-07-31 09:39:33 UTC (rev 653)
+++ trunk/src/prefs.c 2006-08-01 10:06:28 UTC (rev 654)
@@ -215,12 +215,18 @@
widget = lookup_widget(app->prefs_dialog, "check_line_end");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_editor_show_line_endings);
- widget = lookup_widget(app->prefs_dialog, "check_xmltag");
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_editor_auto_close_xml_tags);
+ widget = lookup_widget(app->prefs_dialog, "check_auto_indent");
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_editor_use_auto_indention);
+ widget = lookup_widget(app->prefs_dialog, "check_line_wrapping");
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_editor_line_breaking);
+
widget = lookup_widget(app->prefs_dialog, "check_auto_complete");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_editor_auto_complete_constructs);
+ widget = lookup_widget(app->prefs_dialog, "check_xmltag");
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_editor_auto_close_xml_tags);
+
widget = lookup_widget(app->prefs_dialog, "check_folding");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), app->pref_editor_folding);
@@ -498,12 +504,18 @@
widget = lookup_widget(app->prefs_dialog, "check_line_end");
app->pref_editor_show_line_endings = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
- widget = lookup_widget(app->prefs_dialog, "check_xmltag");
- app->pref_editor_auto_close_xml_tags = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+ widget = lookup_widget(app->prefs_dialog, "check_auto_indent");
+ app->pref_editor_use_auto_indention = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+ widget = lookup_widget(app->prefs_dialog, "check_line_wrapping");
+ app->pref_editor_line_breaking = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+
widget = lookup_widget(app->prefs_dialog, "check_auto_complete");
app->pref_editor_auto_complete_constructs = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+ widget = lookup_widget(app->prefs_dialog, "check_xmltag");
+ app->pref_editor_auto_close_xml_tags = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+
widget = lookup_widget(app->prefs_dialog, "check_indicators");
app->pref_editor_use_indicators = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
Modified: trunk/src/utils.c
===================================================================
--- trunk/src/utils.c 2006-07-31 09:39:33 UTC (rev 653)
+++ trunk/src/utils.c 2006-08-01 10:06:28 UTC (rev 654)
@@ -2506,3 +2506,29 @@
}
return FALSE;
}
+
+
+void utils_document_show_hide(gint idx)
+{
+ if (idx == -1 || ! doc_list[idx].is_valid) return;
+ app->ignore_callback = TRUE;
+
+ 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(lookup_widget(app->window, "menu_use_auto_indention1")),
+ doc_list[idx].use_auto_indention);
+ gtk_check_menu_item_set_active(
+ GTK_CHECK_MENU_ITEM(lookup_widget(app->window, "set_file_readonly1")),
+ doc_list[idx].readonly);
+ gtk_check_menu_item_set_active(
+ GTK_CHECK_MENU_ITEM(lookup_widget(app->window, "menu_write_unicode_bom1")),
+ doc_list[idx].has_bom);
+
+ gtk_widget_set_sensitive(lookup_widget(app->window, "menu_write_unicode_bom1"),
+ utils_is_unicode_charset(doc_list[idx].encoding));
+
+ app->ignore_callback = FALSE;
+
+}
Modified: trunk/src/utils.h
===================================================================
--- trunk/src/utils.h 2006-07-31 09:39:33 UTC (rev 653)
+++ trunk/src/utils.h 2006-08-01 10:06:28 UTC (rev 654)
@@ -225,4 +225,6 @@
gboolean utils_is_unicode_charset(const gchar *string);
+void utils_document_show_hide(gint idx);
+
#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