SF.net SVN: geany: [2723] trunk

ntrel at users.sourceforge.net ntrel at xxxxx
Tue Jun 24 14:33:07 UTC 2008


Revision: 2723
          http://geany.svn.sourceforge.net/geany/?rev=2723&view=rev
Author:   ntrel
Date:     2008-06-24 07:32:54 -0700 (Tue, 24 Jun 2008)

Log Message:
-----------
Split Preferences dialog Editor tab into a sub-notebook, with
Features, Completions and Display pages. This also reduces the
minimum height of the Preferences dialog.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/doc/geany.html
    trunk/doc/geany.txt
    trunk/geany.glade
    trunk/src/interface.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-06-24 12:25:23 UTC (rev 2722)
+++ trunk/ChangeLog	2008-06-24 14:32:54 UTC (rev 2723)
@@ -2,6 +2,10 @@
 
  * src/keybindings.c:
    Make keyboard shortcuts dialog non-modal (#1999384).
+ * src/interface.c, doc/geany.txt, doc/geany.html, geany.glade:
+   Split Preferences dialog Editor tab into a sub-notebook, with
+   Features, Completions and Display pages. This also reduces the
+   minimum height of the Preferences dialog.
 
 
 2008-06-21  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/doc/geany.html
===================================================================
--- trunk/doc/geany.html	2008-06-24 12:25:23 UTC (rev 2722)
+++ trunk/doc/geany.html	2008-06-24 14:32:54 UTC (rev 2723)
@@ -3,10 +3,10 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.4.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" />
 <title>Geany</title>
 <meta name="authors" content="Enrico Tröger  Nick Treleaven  Frank Lanitz" />
-<meta name="date" content="2008-06-08" />
+<meta name="date" content="2008-06-19" />
 <style type="text/css">
 
 /*
@@ -139,7 +139,7 @@
 <br />Nick Treleaven
 <br />Frank Lanitz</td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2008-06-08</td></tr>
+<td>2008-06-19</td></tr>
 <tr><th class="docinfo-name">Version:</th>
 <td>0.15</td></tr>
 </tbody>
@@ -258,15 +258,15 @@
 <li><a class="reference" href="#appearance" id="id77" name="id77">Appearance</a></li>
 </ul>
 </li>
-<li><a class="reference" href="#display-tab-in-preferences-dialog" id="id78" name="id78">Display tab in preferences dialog</a><ul>
-<li><a class="reference" href="#display" id="id79" name="id79">Display</a></li>
-<li><a class="reference" href="#long-line-marker" id="id80" name="id80">Long line marker</a></li>
+<li><a class="reference" href="#editor-features-tab-in-preferences-dialog" id="id78" name="id78">Editor Features tab in preferences dialog</a><ul>
+<li><a class="reference" href="#indentation-group" id="id79" name="id79">Indentation group</a></li>
+<li><a class="reference" href="#features" id="id80" name="id80">Features</a></li>
 </ul>
 </li>
-<li><a class="reference" href="#editor-tab-in-preferences-dialog" id="id81" name="id81">Editor tab in preferences dialog</a><ul>
-<li><a class="reference" href="#indentation-group" id="id82" name="id82">Indentation group</a></li>
-<li><a class="reference" href="#features" id="id83" name="id83">Features</a></li>
-<li><a class="reference" href="#completions" id="id84" name="id84">Completions</a></li>
+<li><a class="reference" href="#editor-completions-tab-in-preferences-dialog" id="id81" name="id81">Editor Completions tab in preferences dialog</a></li>
+<li><a class="reference" href="#editor-display-tab-in-preferences-dialog" id="id82" name="id82">Editor Display tab in preferences dialog</a><ul>
+<li><a class="reference" href="#display" id="id83" name="id83">Display</a></li>
+<li><a class="reference" href="#long-line-marker" id="id84" name="id84">Long line marker</a></li>
 </ul>
 </li>
 <li><a class="reference" href="#files-tab-in-preferences-dialog" id="id85" name="id85">Files tab in preferences dialog</a><ul>
@@ -902,7 +902,7 @@
 <div class="section">
 <h3><a class="toc-backref" href="#id33" id="indentation" name="indentation">Indentation</a></h3>
 <p>Geany allows each document to indent either with a tab character
-or multiple spaces. The default indent mode is set in the <a class="reference" href="#editor-tab-in-preferences-dialog">Editor
+or multiple spaces. The default indent mode is set in the <a class="reference" href="#editor-features-tab-in-preferences-dialog">Editor Features
 tab in preferences dialog</a>. But this can be overridden using either
 the <em>Document->Indent Type</em> menu, or by using the <em>Detect from file</em>
 indentation preference. When enabled, this scans each file that is opened
@@ -1656,54 +1656,10 @@
 </div>
 </div>
 <div class="section">
-<h3><a class="toc-backref" href="#id78" id="display-tab-in-preferences-dialog" name="display-tab-in-preferences-dialog">Display tab in preferences dialog</a></h3>
-<p>This is for visual elements displayed in the editor window.</p>
-<img alt="./images/pref_dialog_display.png" src="./images/pref_dialog_display.png" />
-<div class="section">
-<h4><a class="toc-backref" href="#id79" id="display" name="display">Display</a></h4>
-<dl class="docutils">
-<dt>Show indendation guides</dt>
-<dd>Show vertical lines to help show how much leading indentation there
-is on each line.</dd>
-<dt>Show whitespaces</dt>
-<dd>Mark all tabs with an arrow "-->" symbol and spaces with dots to
-show which kinds of whitespace are used.</dd>
-<dt>Show line endings</dt>
-<dd>Displays a symbol everywhere that a carriage return or line feed
-is present.</dd>
-</dl>
-</div>
-<div class="section">
-<h4><a class="toc-backref" href="#id80" id="long-line-marker" name="long-line-marker">Long line marker</a></h4>
-<p>The long line marker helps to indicate overly-long lines, or as a hint
-to the user for when to break the line.</p>
-<dl class="docutils">
-<dt>Type</dt>
-<dd><dl class="first last docutils">
-<dt>Line</dt>
-<dd>Show a thin vertical line in the editor window at the given column
-position.</dd>
-<dt>Background</dt>
-<dd>Change the background color of characters after the given column
-position to the color set below. (This is recommended over the
-<em>Line</em> setting if you use proportional fonts).</dd>
-<dt>Disabled</dt>
-<dd>Don't mark long lines at all.</dd>
-</dl>
-</dd>
-<dt>Long line marker</dt>
-<dd>Set this value to a value greater than zero to specify the column
-where it should appear.</dd>
-<dt>Long line marker color</dt>
-<dd>Set the color of the long line marker.</dd>
-</dl>
-</div>
-</div>
-<div class="section">
-<h3><a class="toc-backref" href="#id81" id="editor-tab-in-preferences-dialog" name="editor-tab-in-preferences-dialog">Editor tab in preferences dialog</a></h3>
+<h3><a class="toc-backref" href="#id78" id="editor-features-tab-in-preferences-dialog" name="editor-features-tab-in-preferences-dialog">Editor Features tab in preferences dialog</a></h3>
 <img alt="./images/pref_dialog_edit.png" src="./images/pref_dialog_edit.png" />
 <div class="section">
-<h4><a class="toc-backref" href="#id82" id="indentation-group" name="indentation-group">Indentation group</a></h4>
+<h4><a class="toc-backref" href="#id79" id="indentation-group" name="indentation-group">Indentation group</a></h4>
 <p>See <a class="reference" href="#indentation">Indentation</a> for more information.</p>
 <dl class="docutils">
 <dt>Type</dt>
@@ -1728,7 +1684,7 @@
 </dl>
 </div>
 <div class="section">
-<h4><a class="toc-backref" href="#id83" id="features" name="features">Features</a></h4>
+<h4><a class="toc-backref" href="#id80" id="features" name="features">Features</a></h4>
 <dl class="docutils">
 <dt>Line wrapping</dt>
 <dd>Show long lines wrapped around to new display lines.</dd>
@@ -1755,8 +1711,9 @@
 is enabled for the current document.</dd>
 </dl>
 </div>
+</div>
 <div class="section">
-<h4><a class="toc-backref" href="#id84" id="completions" name="completions">Completions</a></h4>
+<h3><a class="toc-backref" href="#id81" id="editor-completions-tab-in-preferences-dialog" name="editor-completions-tab-in-preferences-dialog">Editor Completions tab in preferences dialog</a></h3>
 <dl class="docutils">
 <dt>Snippet Completion</dt>
 <dd>Whether to replace special keywords after typing Tab into a
@@ -1791,8 +1748,51 @@
 <dd>The maximum number of symbols to show in the autocompletion window.</dd>
 </dl>
 </div>
+<div class="section">
+<h3><a class="toc-backref" href="#id82" id="editor-display-tab-in-preferences-dialog" name="editor-display-tab-in-preferences-dialog">Editor Display tab in preferences dialog</a></h3>
+<p>This is for visual elements displayed in the editor window.</p>
+<img alt="./images/pref_dialog_display.png" src="./images/pref_dialog_display.png" />
+<div class="section">
+<h4><a class="toc-backref" href="#id83" id="display" name="display">Display</a></h4>
+<dl class="docutils">
+<dt>Show indendation guides</dt>
+<dd>Show vertical lines to help show how much leading indentation there
+is on each line.</dd>
+<dt>Show whitespaces</dt>
+<dd>Mark all tabs with an arrow "-->" symbol and spaces with dots to
+show which kinds of whitespace are used.</dd>
+<dt>Show line endings</dt>
+<dd>Displays a symbol everywhere that a carriage return or line feed
+is present.</dd>
+</dl>
 </div>
 <div class="section">
+<h4><a class="toc-backref" href="#id84" id="long-line-marker" name="long-line-marker">Long line marker</a></h4>
+<p>The long line marker helps to indicate overly-long lines, or as a hint
+to the user for when to break the line.</p>
+<dl class="docutils">
+<dt>Type</dt>
+<dd><dl class="first last docutils">
+<dt>Line</dt>
+<dd>Show a thin vertical line in the editor window at the given column
+position.</dd>
+<dt>Background</dt>
+<dd>Change the background color of characters after the given column
+position to the color set below. (This is recommended over the
+<em>Line</em> setting if you use proportional fonts).</dd>
+<dt>Disabled</dt>
+<dd>Don't mark long lines at all.</dd>
+</dl>
+</dd>
+<dt>Long line marker</dt>
+<dd>Set this value to a value greater than zero to specify the column
+where it should appear.</dd>
+<dt>Long line marker color</dt>
+<dd>Set the color of the long line marker.</dd>
+</dl>
+</div>
+</div>
+<div class="section">
 <h3><a class="toc-backref" href="#id85" id="files-tab-in-preferences-dialog" name="files-tab-in-preferences-dialog">Files tab in preferences dialog</a></h3>
 <img alt="./images/pref_dialog_files.png" src="./images/pref_dialog_files.png" />
 <div class="section">
@@ -4141,7 +4141,7 @@
 <div class="footer">
 <hr class="footer" />
 <a class="reference" href="geany.txt">View document source</a>.
-Generated on: 2008-06-19 15:57 UTC.
+Generated on: 2008-06-24 14:28 UTC.
 Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
 
 </div>

Modified: trunk/doc/geany.txt
===================================================================
--- trunk/doc/geany.txt	2008-06-24 12:25:23 UTC (rev 2722)
+++ trunk/doc/geany.txt	2008-06-24 14:32:54 UTC (rev 2723)
@@ -583,7 +583,7 @@
 ^^^^^^^^^^^
 
 Geany allows each document to indent either with a tab character
-or multiple spaces. The default indent mode is set in the `Editor
+or multiple spaces. The default indent mode is set in the `Editor Features
 tab in preferences dialog`_. But this can be overridden using either
 the *Document->Indent Type* menu, or by using the *Detect from file*
 indentation preference. When enabled, this scans each file that is opened
@@ -1425,56 +1425,9 @@
     Select the size of the icons you see (large or small).
 
 
-Display tab in preferences dialog
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Editor Features tab in preferences dialog
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-This is for visual elements displayed in the editor window.
-
-.. image:: ./images/pref_dialog_display.png
-
-
-Display
-```````
-
-Show indendation guides
-    Show vertical lines to help show how much leading indentation there
-    is on each line.
-
-Show whitespaces
-    Mark all tabs with an arrow "-->" symbol and spaces with dots to
-    show which kinds of whitespace are used.
-
-Show line endings
-    Displays a symbol everywhere that a carriage return or line feed
-    is present.
-
-Long line marker
-````````````````
-
-The long line marker helps to indicate overly-long lines, or as a hint
-to the user for when to break the line.
-
-Type
-    Line
-        Show a thin vertical line in the editor window at the given column
-        position.
-    Background
-        Change the background color of characters after the given column
-        position to the color set below. (This is recommended over the
-        *Line* setting if you use proportional fonts).
-    Disabled
-        Don't mark long lines at all.
-
-Long line marker
-    Set this value to a value greater than zero to specify the column
-    where it should appear.
-
-Long line marker color
-    Set the color of the long line marker.
-
-Editor tab in preferences dialog
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
 .. image:: ./images/pref_dialog_edit.png
 
 Indentation group
@@ -1536,9 +1489,10 @@
     The editor column number to insert a newline at when Line Breaking
     is enabled for the current document.
 
-Completions
-```````````
 
+Editor Completions tab in preferences dialog
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
 Snippet Completion
     Whether to replace special keywords after typing Tab into a
     pre-defined text snippet.
@@ -1576,6 +1530,54 @@
     The maximum number of symbols to show in the autocompletion window.
 
 
+Editor Display tab in preferences dialog
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This is for visual elements displayed in the editor window.
+
+.. image:: ./images/pref_dialog_display.png
+
+
+Display
+```````
+
+Show indendation guides
+    Show vertical lines to help show how much leading indentation there
+    is on each line.
+
+Show whitespaces
+    Mark all tabs with an arrow "-->" symbol and spaces with dots to
+    show which kinds of whitespace are used.
+
+Show line endings
+    Displays a symbol everywhere that a carriage return or line feed
+    is present.
+
+Long line marker
+````````````````
+
+The long line marker helps to indicate overly-long lines, or as a hint
+to the user for when to break the line.
+
+Type
+    Line
+        Show a thin vertical line in the editor window at the given column
+        position.
+    Background
+        Change the background color of characters after the given column
+        position to the color set below. (This is recommended over the
+        *Line* setting if you use proportional fonts).
+    Disabled
+        Don't mark long lines at all.
+
+Long line marker
+    Set this value to a value greater than zero to specify the column
+    where it should appear.
+
+Long line marker color
+    Set the color of the long line marker.
+
+
 Files tab in preferences dialog
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

Modified: trunk/geany.glade
===================================================================
--- trunk/geany.glade	2008-06-24 12:25:23 UTC (rev 2722)
+++ trunk/geany.glade	2008-06-24 14:32:54 UTC (rev 2723)
@@ -5275,315 +5275,333 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkVBox" id="vbox24">
+	    <widget class="GtkNotebook" id="notebook4">
 	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">10</property>
+	      <property name="can_focus">True</property>
+	      <property name="show_tabs">True</property>
+	      <property name="show_border">True</property>
+	      <property name="tab_pos">GTK_POS_TOP</property>
+	      <property name="scrollable">False</property>
+	      <property name="enable_popup">False</property>
 
 	      <child>
-		<widget class="GtkFrame" id="frame5">
+		<widget class="GtkVBox" id="vbox5">
 		  <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>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">10</property>
 
 		  <child>
-		    <widget class="GtkAlignment" id="alignment6">
+		    <widget class="GtkFrame" id="frame27">
 		      <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">5</property>
-		      <property name="left_padding">12</property>
-		      <property name="right_padding">6</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="GtkVBox" id="vbox12">
+			<widget class="GtkAlignment" id="alignment30">
 			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</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="GtkCheckButton" id="checkbutton1">
-			      <property name="tooltip" translatable="yes">Use white text on a black background.</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Invert syntax highlighting colors</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_indent">
+			    <widget class="GtkVBox" id="vbox25">
 			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">Shows small dotted lines to help you to use the right indentation.</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Show indentation guides</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>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">0</property>
 
-			  <child>
-			    <widget class="GtkCheckButton" id="check_white_space">
-			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">Marks spaces with dots and tabs with arrows.</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Show white space</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>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
+			      <child>
+				<widget class="GtkTable" id="table13">
+				  <property name="visible">True</property>
+				  <property name="n_rows">4</property>
+				  <property name="n_columns">2</property>
+				  <property name="homogeneous">False</property>
+				  <property name="row_spacing">3</property>
+				  <property name="column_spacing">24</property>
 
-			  <child>
-			    <widget class="GtkCheckButton" id="check_line_end">
-			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">Show the line ending character</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Show line endings</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>
+				  <child>
+				    <widget class="GtkLabel" id="label183">
+				      <property name="visible">True</property>
+				      <property name="label" translatable="yes">Auto-indent mode:</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>
+				    </widget>
+				    <packing>
+				      <property name="left_attach">0</property>
+				      <property name="right_attach">1</property>
+				      <property name="top_attach">3</property>
+				      <property name="bottom_attach">4</property>
+				      <property name="x_options">fill</property>
+				      <property name="y_options"></property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkComboBox" id="combo_auto_indent_mode">
+				      <property name="visible">True</property>
+				      <property name="items" translatable="yes">None
+Basic
+Current chars
+Match braces</property>
+				      <property name="add_tearoffs">False</property>
+				      <property name="focus_on_click">True</property>
+				    </widget>
+				    <packing>
+				      <property name="left_attach">1</property>
+				      <property name="right_attach">2</property>
+				      <property name="top_attach">3</property>
+				      <property name="bottom_attach">4</property>
+				      <property name="x_options">fill</property>
+				      <property name="y_options">fill</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkSpinButton" id="spin_tab_width">
+				      <property name="visible">True</property>
+				      <property name="tooltip" translatable="yes">The width in chars, which one tab character will take</property>
+				      <property name="can_focus">True</property>
+				      <property name="climb_rate">1</property>
+				      <property name="digits">0</property>
+				      <property name="numeric">True</property>
+				      <property name="update_policy">GTK_UPDATE_IF_VALID</property>
+				      <property name="snap_to_ticks">False</property>
+				      <property name="wrap">True</property>
+				      <property name="adjustment">1 1 99 1 10 10</property>
+				    </widget>
+				    <packing>
+				      <property name="left_attach">1</property>
+				      <property name="right_attach">2</property>
+				      <property name="top_attach">2</property>
+				      <property name="bottom_attach">3</property>
+				      <property name="x_options">fill</property>
+				      <property name="y_options"></property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkLabel" id="label116">
+				      <property name="visible">True</property>
+				      <property name="label" translatable="yes">Tab width:</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</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="left_attach">0</property>
+				      <property name="right_attach">1</property>
+				      <property name="top_attach">2</property>
+				      <property name="bottom_attach">3</property>
+				      <property name="x_options">fill</property>
+				      <property name="y_options"></property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkHBox" id="hbox8">
+				      <property name="visible">True</property>
+				      <property name="homogeneous">False</property>
+				      <property name="spacing">12</property>
+
+				      <child>
+					<widget class="GtkRadioButton" id="radio_indent_tabs">
+					  <property name="visible">True</property>
+					  <property name="tooltip" translatable="yes">Whether to use tabs or spaces when indentation is inserted.</property>
+					  <property name="can_focus">True</property>
+					  <property name="label" translatable="yes">_Tabs</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="GtkRadioButton" id="radio_indent_spaces">
+					  <property name="visible">True</property>
+					  <property name="tooltip" translatable="yes">Whether to use tabs or spaces when indentation is inserted.</property>
+					  <property name="can_focus">True</property>
+					  <property name="label" translatable="yes">_Spaces</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>
+					  <property name="group">radio_indent_tabs</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+				    </widget>
+				    <packing>
+				      <property name="left_attach">1</property>
+				      <property name="right_attach">2</property>
+				      <property name="top_attach">0</property>
+				      <property name="bottom_attach">1</property>
+				      <property name="x_options">fill</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkLabel" id="label200">
+				      <property name="visible">True</property>
+				      <property name="label" translatable="yes">Type:</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</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="left_attach">0</property>
+				      <property name="right_attach">1</property>
+				      <property name="top_attach">0</property>
+				      <property name="bottom_attach">1</property>
+				      <property name="x_options">fill</property>
+				      <property name="y_options"></property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkCheckButton" id="check_detect_indent">
+				      <property name="visible">True</property>
+				      <property name="tooltip" translatable="yes">Whether to detect the indentation type from file contents when a file is opened.</property>
+				      <property name="can_focus">True</property>
+				      <property name="label" translatable="yes">Detect from file</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="left_attach">1</property>
+				      <property name="right_attach">2</property>
+				      <property name="top_attach">1</property>
+				      <property name="bottom_attach">2</property>
+				      <property name="x_options">fill</property>
+				      <property name="y_options"></property>
+				    </packing>
+				  </child>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">True</property>
+				</packing>
+			      </child>
 			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <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>
+		      <child>
+			<widget class="GtkLabel" id="label195">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes"><b>Indentation</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="type">label_item</property>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">True</property>
 		    </packing>
 		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
 
-	      <child>
-		<widget class="GtkFrame" id="frame8">
-		  <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="alignment11">
+		    <widget class="GtkFrame" id="frame14">
 		      <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>
+		      <property name="label_xalign">0</property>
+		      <property name="label_yalign">0.5</property>
+		      <property name="shadow_type">GTK_SHADOW_NONE</property>
 
 		      <child>
-			<widget class="GtkTable" id="table7">
+			<widget class="GtkAlignment" id="alignment17">
 			  <property name="visible">True</property>
-			  <property name="n_rows">3</property>
-			  <property name="n_columns">2</property>
-			  <property name="homogeneous">False</property>
-			  <property name="row_spacing">3</property>
-			  <property name="column_spacing">24</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="GtkLabel" id="label133">
+			    <widget class="GtkVBox" id="vbox17">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Long line marker:</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</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="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label134">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Long line marker color:</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</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="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">2</property>
-			      <property name="bottom_attach">3</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label156">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Type:</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</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="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkColorButton" id="long_line_color">
-			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">Sets the color of the long line marker</property>
-			      <property name="can_focus">True</property>
-			      <property name="use_alpha">False</property>
-			      <property name="title" translatable="yes">Color Chooser</property>
-			      <property name="focus_on_click">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">2</property>
-			      <property name="bottom_attach">3</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkSpinButton" id="spin_long_line">
-			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">The long line marker is a thin vertical line in the editor. It helps to mark long lines, or as a hint to break the line. Set this value to a value greater than 0 to specify the column where it should appear.</property>
-			      <property name="can_focus">True</property>
-			      <property name="climb_rate">1</property>
-			      <property name="digits">0</property>
-			      <property name="numeric">True</property>
-			      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-			      <property name="snap_to_ticks">False</property>
-			      <property name="wrap">True</property>
-			      <property name="adjustment">72 0 1000 1 10 10</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox5">
-			      <property name="visible">True</property>
 			      <property name="homogeneous">False</property>
-			      <property name="spacing">12</property>
+			      <property name="spacing">0</property>
 
 			      <child>
-				<widget class="GtkRadioButton" id="radio_long_line_line">
+				<widget class="GtkCheckButton" id="check_line_wrapping">
 				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">Prints a vertical line in the editor window at the given cursor position (see below).</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</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>
@@ -5599,18 +5617,17 @@
 			      </child>
 
 			      <child>
-				<widget class="GtkRadioButton" id="radio_long_line_background">
+				<widget class="GtkCheckButton" id="check_smart_home">
 				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">The background color of characters after the given cursor position (see below) changed to the color set below. (This is recommended if you use proportional fonts)</property>
+				  <property name="tooltip" translatable="yes">When "smart" home is enabled, the HOME key will move the caret to the first non-blank character of the line, unless it is already there, it moves to the very beginning of the line. When this feature is disabled, the HOME key always moves the caret to the start of the current line, regardless of its current position.</property>
 				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Background</property>
+				  <property name="label" translatable="yes">Enable "smart" home key</property>
 				  <property name="use_underline">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
+				  <property name="focus_on_click">False</property>
 				  <property name="active">False</property>
 				  <property name="inconsistent">False</property>
 				  <property name="draw_indicator">True</property>
-				  <property name="group">radio_long_line_line</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -5620,17 +5637,17 @@
 			      </child>
 
 			      <child>
-				<widget class="GtkRadioButton" id="radio_long_line_disabled">
+				<widget class="GtkCheckButton" id="check_disable_dnd">
 				  <property name="visible">True</property>
+				  <property name="tooltip" translatable="yes">Disable drag and drop completely in the editor window so you can't drag and drop any selections within or outside of the editor window.</property>
 				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Disabled</property>
+				  <property name="label" translatable="yes">Disable Drag and Drop</property>
 				  <property name="use_underline">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
+				  <property name="focus_on_click">False</property>
 				  <property name="active">False</property>
 				  <property name="inconsistent">False</property>
 				  <property name="draw_indicator">True</property>
-				  <property name="group">radio_long_line_line</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -5638,237 +5655,110 @@
 				  <property name="fill">False</property>
 				</packing>
 			      </child>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
 
-		  <child>
-		    <widget class="GtkLabel" id="label155">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes"><b>Long line marker</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>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label194">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Display</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>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox5">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">10</property>
-
-	      <child>
-		<widget class="GtkFrame" id="frame27">
-		  <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="alignment30">
-		      <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="vbox25">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</property>
-
-			  <child>
-			    <widget class="GtkTable" id="table13">
-			      <property name="visible">True</property>
-			      <property name="n_rows">4</property>
-			      <property name="n_columns">2</property>
-			      <property name="homogeneous">False</property>
-			      <property name="row_spacing">3</property>
-			      <property name="column_spacing">24</property>
-
 			      <child>
-				<widget class="GtkLabel" id="label183">
+				<widget class="GtkCheckButton" id="check_folding">
 				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Auto-indent mode:</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 enable folding the code</property>
+				  <property name="can_focus">True</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>
+				  <property name="active">False</property>
+				  <property name="inconsistent">False</property>
+				  <property name="draw_indicator">True</property>
 				</widget>
 				<packing>
-				  <property name="left_attach">0</property>
-				  <property name="right_attach">1</property>
-				  <property name="top_attach">3</property>
-				  <property name="bottom_attach">4</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
 				</packing>
 			      </child>
 
 			      <child>
-				<widget class="GtkComboBox" id="combo_auto_indent_mode">
+				<widget class="GtkCheckButton" id="check_unfold_children">
 				  <property name="visible">True</property>
-				  <property name="items" translatable="yes">None
-Basic
-Current chars
-Match braces</property>
-				  <property name="add_tearoffs">False</property>
-				  <property name="focus_on_click">True</property>
+				  <property name="tooltip" translatable="yes">Fold or unfold all children of a fold point. By pressing the Shift key while clicking on a fold symbol the contrary behavior is used.</property>
+				  <property name="can_focus">True</property>
+				  <property name="label" translatable="yes">Fold/Unfold all children of a fold point</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="left_attach">1</property>
-				  <property name="right_attach">2</property>
-				  <property name="top_attach">3</property>
-				  <property name="bottom_attach">4</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options">fill</property>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
 				</packing>
 			      </child>
 
 			      <child>
-				<widget class="GtkSpinButton" id="spin_tab_width">
+				<widget class="GtkCheckButton" id="check_indicators">
 				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">The width in chars, which one tab character will take</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="climb_rate">1</property>
-				  <property name="digits">0</property>
-				  <property name="numeric">True</property>
-				  <property name="update_policy">GTK_UPDATE_IF_VALID</property>
-				  <property name="snap_to_ticks">False</property>
-				  <property name="wrap">True</property>
-				  <property name="adjustment">1 1 99 1 10 10</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="left_attach">1</property>
-				  <property name="right_attach">2</property>
-				  <property name="top_attach">2</property>
-				  <property name="bottom_attach">3</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
 				</packing>
 			      </child>
 
 			      <child>
-				<widget class="GtkLabel" id="label116">
+				<widget class="GtkCheckButton" id="check_newline_strip">
 				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Tab width:</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</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">Enable newline to strip the trailing spaces on the previous line.</property>
+				  <property name="can_focus">True</property>
+				  <property name="label" translatable="yes">Newline strips trailing spaces</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="left_attach">0</property>
-				  <property name="right_attach">1</property>
-				  <property name="top_attach">2</property>
-				  <property name="bottom_attach">3</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
 				</packing>
 			      </child>
 
 			      <child>
-				<widget class="GtkHBox" id="hbox8">
+				<widget class="GtkHBox" id="hbox11">
 				  <property name="visible">True</property>
 				  <property name="homogeneous">False</property>
 				  <property name="spacing">12</property>
 
 				  <child>
-				    <widget class="GtkRadioButton" id="radio_indent_tabs">
+				    <widget class="GtkLabel" id="label209">
 				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">Whether to use tabs or spaces when indentation is inserted.</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">_Tabs</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>
+				      <property name="label" translatable="yes">Line breaking column:</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>
 				    </widget>
 				    <packing>
 				      <property name="padding">0</property>
@@ -5878,136 +5768,107 @@
 				  </child>
 
 				  <child>
-				    <widget class="GtkRadioButton" id="radio_indent_spaces">
+				    <widget class="GtkSpinButton" id="spin_line_break">
 				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">Whether to use tabs or spaces when indentation is inserted.</property>
 				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">_Spaces</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>
-				      <property name="group">radio_indent_tabs</property>
+				      <property name="climb_rate">1</property>
+				      <property name="digits">0</property>
+				      <property name="numeric">True</property>
+				      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+				      <property name="snap_to_ticks">False</property>
+				      <property name="wrap">False</property>
+				      <property name="adjustment">72 3 1000 1 10 10</property>
 				    </widget>
 				    <packing>
 				      <property name="padding">0</property>
 				      <property name="expand">False</property>
-				      <property name="fill">False</property>
+				      <property name="fill">True</property>
 				    </packing>
 				  </child>
 				</widget>
 				<packing>
-				  <property name="left_attach">1</property>
-				  <property name="right_attach">2</property>
-				  <property name="top_attach">0</property>
-				  <property name="bottom_attach">1</property>
-				  <property name="x_options">fill</property>
+				  <property name="padding">0</property>
+				  <property name="expand">True</property>
+				  <property name="fill">True</property>
 				</packing>
 			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="label200">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Type:</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</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="left_attach">0</property>
-				  <property name="right_attach">1</property>
-				  <property name="top_attach">0</property>
-				  <property name="bottom_attach">1</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkCheckButton" id="check_detect_indent">
-				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">Whether to detect the indentation type from file contents when a file is opened.</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Detect from file</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="left_attach">1</property>
-				  <property name="right_attach">2</property>
-				  <property name="top_attach">1</property>
-				  <property name="bottom_attach">2</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
 			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">True</property>
-			    </packing>
 			  </child>
 			</widget>
 		      </child>
-		    </widget>
-		  </child>
 
-		  <child>
-		    <widget class="GtkLabel" id="label195">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes"><b>Indentation</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>
+		      <child>
+			<widget class="GtkLabel" id="label172">
+			  <property name="visible">True</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>
+			  <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="type">label_item</property>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">True</property>
 		    </packing>
 		  </child>
+
+		  <child>
+		    <placeholder/>
+		  </child>
 		</widget>
 		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
+		  <property name="tab_expand">False</property>
+		  <property name="tab_fill">True</property>
 		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkFrame" id="frame14">
+		<widget class="GtkLabel" id="label211">
 		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Features</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>
+		</widget>
+		<packing>
+		  <property name="type">tab</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkFrame" id="frame18">
+		  <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">
+		    <widget class="GtkAlignment" id="alignment21">
 		      <property name="visible">True</property>
 		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
@@ -6019,39 +5880,19 @@
 		      <property name="right_padding">0</property>
 
 		      <child>
-			<widget class="GtkVBox" id="vbox17">
+			<widget class="GtkVBox" id="vbox19">
 			  <property name="visible">True</property>
 			  <property name="homogeneous">False</property>
 			  <property name="spacing">0</property>
 
 			  <child>
-			    <widget class="GtkCheckButton" id="check_line_wrapping">
+			    <widget class="GtkCheckButton" id="check_complete_snippets">
 			      <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="tooltip" translatable="yes">Type a defined short character sequence and complete it to a more complex string using a single keypress.</property>
 			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Line wrapping</property>
+			      <property name="label" translatable="yes">Snippet completion</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_smart_home">
-			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">When "smart" home is enabled, the HOME key will move the caret to the first non-blank character of the line, unless it is already there, it moves to the very beginning of the line. When this feature is disabled, the HOME key always moves the caret to the start of the current line, regardless of its current position.</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Enable "smart" home key</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>
@@ -6065,11 +5906,11 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkCheckButton" id="check_disable_dnd">
+			    <widget class="GtkCheckButton" id="check_xmltag">
 			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">Disable drag and drop completely in the editor window so you can't drag and drop any selections within or outside of the editor window.</property>
+			      <property name="tooltip" translatable="yes">Automatic completion and closing of XML tags (includes HTML tags)</property>
 			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Disable Drag and Drop</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>
@@ -6085,11 +5926,11 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkCheckButton" id="check_folding">
+			    <widget class="GtkCheckButton" id="check_auto_multiline">
 			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">Whether to enable folding the code</property>
+			      <property name="tooltip" translatable="yes">Continue automatically multi-line comments in languages like C, C++ and Java when a new line is entered inside such a comment.</property>
 			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Enable folding</property>
+			      <property name="label" translatable="yes">Automatic continuation multi-line comments</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
 			      <property name="focus_on_click">False</property>
@@ -6105,11 +5946,11 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkCheckButton" id="check_unfold_children">
+			    <widget class="GtkCheckButton" id="check_symbol_auto_completion">
 			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">Fold or unfold all children of a fold point. By pressing the Shift key while clicking on a fold symbol the contrary behavior is used.</property>
+			      <property name="tooltip" translatable="yes">Automatic completion of known symbols in open files (function names, global variables, ...)</property>
 			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Fold/Unfold all children of a fold point</property>
+			      <property name="label" translatable="yes">Automatic symbol completion</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
 			      <property name="focus_on_click">False</property>
@@ -6125,61 +5966,74 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkCheckButton" id="check_indicators">
+			    <widget class="GtkTable" id="table14">
 			      <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="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>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
+			      <property name="n_rows">2</property>
+			      <property name="n_columns">2</property>
+			      <property name="homogeneous">False</property>
+			      <property name="row_spacing">3</property>
+			      <property name="column_spacing">12</property>
 
-			  <child>
-			    <widget class="GtkCheckButton" id="check_newline_strip">
-			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">Enable newline to strip the trailing spaces on the previous line.</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Newline strips trailing spaces</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>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
+			      <child>
+				<widget class="GtkSpinButton" id="spin_symbollistheight">
+				  <property name="visible">True</property>
+				  <property name="tooltip" translatable="yes">Number of rows to display in the auto completion list.</property>
+				  <property name="can_focus">True</property>
+				  <property name="climb_rate">1</property>
+				  <property name="digits">0</property>
+				  <property name="numeric">True</property>
+				  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+				  <property name="snap_to_ticks">False</property>
+				  <property name="wrap">False</property>
+				  <property name="adjustment">9 1 99 1 10 10</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">1</property>
+				  <property name="bottom_attach">2</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
 
-			  <child>
-			    <widget class="GtkHBox" id="hbox11">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">12</property>
+			      <child>
+				<widget class="GtkLabel" id="label205">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Characters to type for completion:</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</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="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
 
 			      <child>
-				<widget class="GtkLabel" id="label209">
+				<widget class="GtkLabel" id="label173">
 				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Line breaking column:</property>
+				  <property name="label" translatable="yes">Rows of symbol completion list:</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="xalign">0</property>
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
@@ -6189,15 +6043,19 @@
 				  <property name="angle">0</property>
 				</widget>
 				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">1</property>
+				  <property name="bottom_attach">2</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
 				</packing>
 			      </child>
 
 			      <child>
-				<widget class="GtkSpinButton" id="spin_line_break">
+				<widget class="GtkSpinButton" id="spin_symbol_complete_chars">
 				  <property name="visible">True</property>
+				  <property name="tooltip" translatable="yes">The amount of characters which are necessary to show the symbol auto completion list.</property>
 				  <property name="can_focus">True</property>
 				  <property name="climb_rate">1</property>
 				  <property name="digits">0</property>
@@ -6205,12 +6063,14 @@
 				  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 				  <property name="snap_to_ticks">False</property>
 				  <property name="wrap">False</property>
-				  <property name="adjustment">72 3 1000 1 10 10</property>
+				  <property name="adjustment">9 1 99 1 10 10</property>
 				</widget>
 				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">True</property>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="y_options"></property>
 				</packing>
 			      </child>
 			    </widget>
@@ -6226,9 +6086,9 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkLabel" id="label172">
+		    <widget class="GtkLabel" id="label177">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes"><b>Features</b></property>
+		      <property name="label" translatable="yes"><b>Completions</b></property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -6249,152 +6109,238 @@
 		  </child>
 		</widget>
 		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
+		  <property name="tab_expand">False</property>
+		  <property name="tab_fill">True</property>
 		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkFrame" id="frame18">
+		<widget class="GtkLabel" id="label212">
 		  <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>
+		  <property name="label" translatable="yes">Completions</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>
+		</widget>
+		<packing>
+		  <property name="type">tab</property>
+		</packing>
+	      </child>
 
+	      <child>
+		<widget class="GtkVBox" id="vbox24">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">10</property>
+
 		  <child>
-		    <widget class="GtkAlignment" id="alignment21">
+		    <widget class="GtkFrame" id="frame5">
 		      <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>
+		      <property name="label_xalign">0</property>
+		      <property name="label_yalign">0.5</property>
+		      <property name="shadow_type">GTK_SHADOW_NONE</property>
 
 		      <child>
-			<widget class="GtkVBox" id="vbox19">
+			<widget class="GtkAlignment" id="alignment6">
 			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</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">5</property>
+			  <property name="left_padding">12</property>
+			  <property name="right_padding">6</property>
 
 			  <child>
-			    <widget class="GtkCheckButton" id="check_complete_snippets">
+			    <widget class="GtkVBox" id="vbox12">
 			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">Type a defined short character sequence and complete it to a more complex string using a single keypress.</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Snippet completion</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>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">0</property>
 
-			  <child>
-			    <widget class="GtkCheckButton" id="check_xmltag">
-			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">Automatic completion and closing of XML tags (includes HTML tags)</property>
-			      <property name="can_focus">True</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>
-			      <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="checkbutton1">
+				  <property name="tooltip" translatable="yes">Use white text on a black background.</property>
+				  <property name="can_focus">True</property>
+				  <property name="label" translatable="yes">Invert syntax highlighting colors</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_multiline">
-			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">Continue automatically multi-line comments in languages like C, C++ and Java when a new line is entered inside such a comment.</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Automatic continuation multi-line comments</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>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
+			      <child>
+				<widget class="GtkCheckButton" id="check_indent">
+				  <property name="visible">True</property>
+				  <property name="tooltip" translatable="yes">Shows small dotted lines to help you to use the right indentation.</property>
+				  <property name="can_focus">True</property>
+				  <property name="label" translatable="yes">Show indentation guides</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>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
 
-			  <child>
-			    <widget class="GtkCheckButton" id="check_symbol_auto_completion">
-			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">Automatic completion of known symbols in open files (function names, global variables, ...)</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Automatic symbol completion</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>
+			      <child>
+				<widget class="GtkCheckButton" id="check_white_space">
+				  <property name="visible">True</property>
+				  <property name="tooltip" translatable="yes">Marks spaces with dots and tabs with arrows.</property>
+				  <property name="can_focus">True</property>
+				  <property name="label" translatable="yes">Show white space</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>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkCheckButton" id="check_line_end">
+				  <property name="visible">True</property>
+				  <property name="tooltip" translatable="yes">Show the line ending character</property>
+				  <property name="can_focus">True</property>
+				  <property name="label" translatable="yes">Show line endings</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>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
 			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
 			  </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">False</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkFrame" id="frame8">
+		      <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="alignment11">
+			  <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="GtkTable" id="table14">
+			    <widget class="GtkTable" id="table7">
 			      <property name="visible">True</property>
-			      <property name="n_rows">2</property>
+			      <property name="n_rows">3</property>
 			      <property name="n_columns">2</property>
 			      <property name="homogeneous">False</property>
 			      <property name="row_spacing">3</property>
-			      <property name="column_spacing">12</property>
+			      <property name="column_spacing">24</property>
 
 			      <child>
-				<widget class="GtkSpinButton" id="spin_symbollistheight">
+				<widget class="GtkLabel" id="label133">
 				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">Number of rows to display in the auto completion list.</property>
-				  <property name="can_focus">True</property>
-				  <property name="climb_rate">1</property>
-				  <property name="digits">0</property>
-				  <property name="numeric">True</property>
-				  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-				  <property name="snap_to_ticks">False</property>
+				  <property name="label" translatable="yes">Long line marker:</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="adjustment">9 1 99 1 10 10</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0</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="left_attach">1</property>
-				  <property name="right_attach">2</property>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">1</property>
 				  <property name="top_attach">1</property>
 				  <property name="bottom_attach">2</property>
+				  <property name="x_options">fill</property>
 				  <property name="y_options"></property>
 				</packing>
 			      </child>
 
 			      <child>
-				<widget class="GtkLabel" id="label205">
+				<widget class="GtkLabel" id="label134">
 				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Characters to type for completion:</property>
+				  <property name="label" translatable="yes">Long line marker color:</property>
 				  <property name="use_underline">False</property>
 				  <property name="use_markup">False</property>
 				  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -6412,17 +6358,17 @@
 				<packing>
 				  <property name="left_attach">0</property>
 				  <property name="right_attach">1</property>
-				  <property name="top_attach">0</property>
-				  <property name="bottom_attach">1</property>
+				  <property name="top_attach">2</property>
+				  <property name="bottom_attach">3</property>
 				  <property name="x_options">fill</property>
 				  <property name="y_options"></property>
 				</packing>
 			      </child>
 
 			      <child>
-				<widget class="GtkLabel" id="label173">
+				<widget class="GtkLabel" id="label156">
 				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Rows of symbol completion list:</property>
+				  <property name="label" translatable="yes">Type:</property>
 				  <property name="use_underline">False</property>
 				  <property name="use_markup">False</property>
 				  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -6440,75 +6386,194 @@
 				<packing>
 				  <property name="left_attach">0</property>
 				  <property name="right_attach">1</property>
-				  <property name="top_attach">1</property>
-				  <property name="bottom_attach">2</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
 				  <property name="x_options">fill</property>
 				  <property name="y_options"></property>
 				</packing>
 			      </child>
 
 			      <child>
-				<widget class="GtkSpinButton" id="spin_symbol_complete_chars">
+				<widget class="GtkColorButton" id="long_line_color">
 				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">The amount of characters which are necessary to show the symbol auto completion list.</property>
+				  <property name="tooltip" translatable="yes">Sets the color of the long line marker</property>
 				  <property name="can_focus">True</property>
+				  <property name="use_alpha">False</property>
+				  <property name="title" translatable="yes">Color Chooser</property>
+				  <property name="focus_on_click">True</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">2</property>
+				  <property name="bottom_attach">3</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkSpinButton" id="spin_long_line">
+				  <property name="visible">True</property>
+				  <property name="tooltip" translatable="yes">The long line marker is a thin vertical line in the editor. It helps to mark long lines, or as a hint to break the line. Set this value to a value greater than 0 to specify the column where it should appear.</property>
+				  <property name="can_focus">True</property>
 				  <property name="climb_rate">1</property>
 				  <property name="digits">0</property>
 				  <property name="numeric">True</property>
 				  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 				  <property name="snap_to_ticks">False</property>
-				  <property name="wrap">False</property>
-				  <property name="adjustment">9 1 99 1 10 10</property>
+				  <property name="wrap">True</property>
+				  <property name="adjustment">72 0 1000 1 10 10</property>
 				</widget>
 				<packing>
 				  <property name="left_attach">1</property>
 				  <property name="right_attach">2</property>
+				  <property name="top_attach">1</property>
+				  <property name="bottom_attach">2</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkHBox" id="hbox5">
+				  <property name="visible">True</property>
+				  <property name="homogeneous">False</property>
+				  <property name="spacing">12</property>
+
+				  <child>
+				    <widget class="GtkRadioButton" id="radio_long_line_line">
+				      <property name="visible">True</property>
+				      <property name="tooltip" translatable="yes">Prints a vertical line in the editor window at the given cursor position (see below).</property>
+				      <property name="can_focus">True</property>
+				      <property name="label" translatable="yes">Line</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="GtkRadioButton" id="radio_long_line_background">
+				      <property name="visible">True</property>
+				      <property name="tooltip" translatable="yes">The background color of characters after the given cursor position (see below) changed to the color set below. (This is recommended if you use proportional fonts)</property>
+				      <property name="can_focus">True</property>
+				      <property name="label" translatable="yes">Background</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>
+				      <property name="group">radio_long_line_line</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>

@@ Diff output truncated at 100000 characters. @@

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