SF.net SVN: geany: [1690] trunk
ntrel at users.sourceforge.net
ntrel at xxxxx
Wed Jul 11 16:08:04 UTC 2007
Revision: 1690
http://svn.sourceforge.net/geany/?rev=1690&view=rev
Author: ntrel
Date: 2007-07-11 09:08:03 -0700 (Wed, 11 Jul 2007)
Log Message:
-----------
Rearrange some of the Prefs dialog:
Add Indentation frame on Editor tab, with tab width setting.
Add Display tab for visual editor settings.
Move Files tab below Editor tab (not needed so often).
Add frame for toolbar page.
Change some spacing to multiples of 3 (Gnome HIG recommends multiples
of 6).
Minor reordering of some checkbox groups.
Add mnemonic for Keybindings 'Change' button.
Modified Paths:
--------------
trunk/ChangeLog
trunk/geany.glade
trunk/src/interface.c
trunk/src/prefs.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-07-11 15:27:57 UTC (rev 1689)
+++ trunk/ChangeLog 2007-07-11 16:08:03 UTC (rev 1690)
@@ -12,6 +12,16 @@
Add custom wordchars and whitespace_chars support for Python & Ruby.
Group setting lexer, wordchars, autocompletion height together in
apply_filetype_properties().
+ * src/interface.c, src/prefs.c, geany.glade:
+ Rearrange some of the Prefs dialog:
+ Add Indentation frame on Editor tab, with tab width setting.
+ Add Display tab for visual editor settings.
+ Move Files tab below Editor tab (not needed so often).
+ Add frame for toolbar page.
+ Change some spacing to multiples of 3 (Gnome HIG recommends multiples
+ of 6).
+ Minor reordering of some checkbox groups.
+ Add mnemonic for Keybindings 'Change' button.
2007-07-09 Enrico Tröger <enrico.troeger at uvena.de>
Modified: trunk/geany.glade
===================================================================
--- trunk/geany.glade 2007-07-11 15:27:57 UTC (rev 1689)
+++ trunk/geany.glade 2007-07-11 16:08:03 UTC (rev 1690)
@@ -3357,8 +3357,8 @@
<property name="n_rows">2</property>
<property name="n_columns">3</property>
<property name="homogeneous">False</property>
- <property name="row_spacing">2</property>
- <property name="column_spacing">5</property>
+ <property name="row_spacing">3</property>
+ <property name="column_spacing">6</property>
<child>
<widget class="GtkLabel" id="label191">
@@ -3371,7 +3371,7 @@
<property name="selectable">False</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
- <property name="xpad">6</property>
+ <property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
@@ -3450,7 +3450,7 @@
<property name="selectable">False</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
- <property name="xpad">6</property>
+ <property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
@@ -4248,14 +4248,14 @@
<property name="spacing">10</property>
<child>
- <widget class="GtkFrame" id="frame12">
+ <widget class="GtkFrame" id="frame28">
<property name="visible">True</property>
- <property name="label_xalign">0.5</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="alignment15">
+ <widget class="GtkAlignment" id="alignment31">
<property name="visible">True</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -4282,9 +4282,9 @@
</child>
<child>
- <widget class="GtkLabel" id="label166">
+ <widget class="GtkLabel" id="label196">
<property name="visible">True</property>
- <property name="label" translatable="yes"></property>
+ <property name="label" translatable="yes"><b>Toolbar</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4307,7 +4307,7 @@
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
</packing>
</child>
@@ -4802,614 +4802,12 @@
</child>
<child>
- <widget class="GtkVBox" id="vbox18">
+ <widget class="GtkVBox" id="vbox24">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">10</property>
<child>
- <widget class="GtkFrame" id="frame6">
- <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="alignment7">
- <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="vbox8">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">3</property>
-
- <child>
- <widget class="GtkTable" id="table5">
- <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">25</property>
-
- <child>
- <widget class="GtkEventBox" id="eventbox1">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Sets the default encoding for newly created files.</property>
- <property name="visible_window">True</property>
- <property name="above_child">False</property>
-
- <child>
- <widget class="GtkComboBox" id="combo_new_encoding">
- <property name="visible">True</property>
- <property name="add_tearoffs">False</property>
- <property name="focus_on_click">True</property>
- </widget>
- </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>
-
- <child>
- <widget class="GtkLabel" id="label153">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Default encoding (new files):</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="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">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">fill</property>
- <property name="y_options"></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">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label_open_encoding">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Default encoding (existing files):</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="GtkCheckButton" id="check_open_encoding">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">This option disables the automatic detection of the file encoding when opening files and opens the file with the specified encoding (usually not needed).</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Use fixed encoding when opening files</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">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEventBox" id="eventbox3">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Sets the default encoding for opening existing files.</property>
- <property name="visible_window">True</property>
- <property name="above_child">False</property>
-
- <child>
- <widget class="GtkComboBox" id="combo_open_encoding">
- <property name="visible">True</property>
- <property name="add_tearoffs">False</property>
- <property name="focus_on_click">True</property>
- </widget>
- </child>
- </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">fill</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="label109">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>New files</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="frame2">
- <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="alignment3">
- <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="vbox6">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkCheckButton" id="check_trailing_spaces">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Removes trailing spaces and tabs and the end of lines</property>
- <property name="label" translatable="yes">Strip 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="GtkCheckButton" id="check_new_line">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Ensures that at the end of the file is a new line</property>
- <property name="label" translatable="yes">Ensure new line at file end</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_replace_tabs">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Replaces all tabs in document by spaces.</property>
- <property name="label" translatable="yes">Replace tabs by 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>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label19">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Saving files</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="frame17">
- <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="alignment20">
- <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="table10">
- <property name="visible">True</property>
- <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">25</property>
-
- <child>
- <widget class="GtkLabel" id="label150">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Placement of new file tabs:</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="GtkSpinButton" id="spin_mru">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Specifies the number of files which are stored in the Recent files 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">True</property>
- <property name="adjustment">4 1 50 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="hbox3">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">12</property>
-
- <child>
- <widget class="GtkRadioButton" id="radio_tab_left">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">File tabs will be placed on the left of the notebook</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Left</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">True</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_tab_right">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">File tabs will be placed on the right of the notebook</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Right</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_tab_left</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>
- <property name="y_options">fill</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label147">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Recent files list length:</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">7</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>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label176">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Misc.</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>
- </widget>
- <packing>
- <property name="tab_expand">False</property>
- <property name="tab_fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label174">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Files</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="frame5">
<property name="visible">True</property>
<property name="label_xalign">0</property>
@@ -5807,20 +5205,55 @@
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">False</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="frame14">
+ <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="alignment17">
+ <widget class="GtkAlignment" id="alignment30">
<property name="visible">True</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -5832,18 +5265,69 @@
<property name="right_padding">0</property>
<child>
- <widget class="GtkVBox" id="vbox17">
+ <widget class="GtkVBox" id="vbox25">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
- <widget class="GtkHBox" id="hbox7">
+ <widget class="GtkCheckButton" id="check_use_tabs">
<property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Whenever some whitespace is inserted by Geany it will use tabs when enabled otherwise Geany will use just spaces.</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Use tabs when inserting whitespace</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">2</property>
+ <property name="n_columns">2</property>
<property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="row_spacing">3</property>
+ <property name="column_spacing">25</property>
<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">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="label183">
<property name="visible">True</property>
<property name="label" translatable="yes">Auto indentation mode:</property>
@@ -5862,44 +5346,123 @@
<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="GtkEventBox" id="eventbox2">
+ <widget class="GtkSpinButton" id="spin_tab_width">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Selects the indentation mode. Use None to disable auto indentation completely. Basic indents new lines with the same indentation as the previous line. Advanced does the same and indents also curly brackets.</property>
- <property name="visible_window">True</property>
- <property name="above_child">False</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">0</property>
+ <property name="bottom_attach">1</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
+ <child>
+ <widget class="GtkComboBox" id="combo_auto_indent_mode">
+ <property name="visible">True</property>
+ <property name="items" translatable="yes">None
Basic
Advanced</property>
- <property name="add_tearoffs">False</property>
- <property name="focus_on_click">True</property>
- </widget>
- </child>
+ <property name="add_tearoffs">False</property>
+ <property name="focus_on_click">True</property>
</widget>
<packing>
- <property name="padding">5</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">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">fill</property>
+ <property name="y_options">fill</property>
</packing>
</child>
</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>
+ </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>
+ </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="frame14">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.5</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment17">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">12</property>
+ <property name="right_padding">0</property>
+
+ <child>
+ <widget class="GtkVBox" id="vbox17">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
<child>
<widget class="GtkCheckButton" id="check_line_wrapping">
<property name="visible">True</property>
@@ -5921,11 +5484,11 @@
</child>
<child>
- <widget class="GtkCheckButton" id="check_folding">
+ <widget class="GtkCheckButton" id="check_disable_dnd">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Whether to enable folding the code</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">Enable folding</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">False</property>
@@ -5941,11 +5504,11 @@
</child>
<child>
- <widget class="GtkCheckButton" id="check_unfold_children">
+ <widget class="GtkCheckButton" id="check_folding">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Unfold all children of a fold point when unfolding it.</property>
+ <property name="tooltip" translatable="yes">Whether to enable folding the code</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Unfold all children of a fold point</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>
@@ -5961,11 +5524,11 @@
</child>
<child>
- <widget class="GtkCheckButton" id="check_indicators">
+ <widget class="GtkCheckButton" id="check_unfold_children">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Whether to use indicators (a squiggly underline) to highlight the lines where the compiler found a warning or an error.</property>
+ <property name="tooltip" translatable="yes">Unfold all children of a fold point when unfolding it.</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Use indicators to show compile errors</property>
+ <property name="label" translatable="yes">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>
@@ -5981,11 +5544,11 @@
</child>
<child>
- <widget class="GtkCheckButton" id="check_disable_dnd">
+ <widget class="GtkCheckButton" id="check_indicators">
<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">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">Disable Drag and Drop</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>
@@ -5999,26 +5562,6 @@
<property name="fill">False</property>
</packing>
</child>
-
- <child>
- <widget class="GtkCheckButton" id="check_use_tabs">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Whenever some whitespace is inserted by Geany it will use tabs when enabled otherwise Geany will use just spaces.</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Use tabs when inserting whitespace</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>
</child>
</widget>
@@ -6143,18 +5686,18 @@
<widget class="GtkHBox" id="hbox6">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">20</property>
+ <property name="spacing">12</property>
<child>
- <widget class="GtkLabel" id="label182">
+ <widget class="GtkLabel" id="label173">
<property name="visible">True</property>
- <property name="label" translatable="yes"></property>
+ <property name="label" translatable="yes">Rows of autocompletion 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>
@@ -6171,9 +5714,164 @@
</child>
<child>
- <widget class="GtkLabel" id="label173">
+ <widget class="GtkSpinButton" id="spin_autocheight">
<property name="visible">True</property>
- <property name="label" translatable="yes">Rows of autocompletion list:</property>
+ <property name="tooltip" translatable="yes">Number of rows to display in the autocompletion 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">10 1 99 1 10 10</property>
+ </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="label177">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Autocompletion</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="label95">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Editor</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="vbox18">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">10</property>
+
+ <child>
+ <widget class="GtkFrame" id="frame6">
+ <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="alignment7">
+ <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="vbox8">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">3</property>
+
+ <child>
+ <widget class="GtkTable" id="table5">
+ <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">12</property>
+
+ <child>
+ <widget class="GtkEventBox" id="eventbox1">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Sets the default encoding for newly created files.</property>
+ <property name="visible_window">True</property>
+ <property name="above_child">False</property>
+
+ <child>
+ <widget class="GtkComboBox" id="combo_new_encoding">
+ <property name="visible">True</property>
+ <property name="add_tearoffs">False</property>
+ <property name="focus_on_click">True</property>
+ </widget>
+ </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>
+
+ <child>
+ <widget class="GtkLabel" id="label153">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Default encoding (new files):</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -6189,47 +5887,221 @@
<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">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_autocheight">
+ <widget class="GtkCheckButton" id="check_open_encoding">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Number of rows to display in the autocompletion list.</property>
+ <property name="tooltip" translatable="yes">This option disables the automatic detection of the file encoding when opening files and opens the file with the specified encoding (usually not needed).</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">Use fixed encoding when opening files</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">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label_open_encoding">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Default encoding (existing files):</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">10 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="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</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="GtkEventBox" id="eventbox3">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Sets the default encoding for opening existing files.</property>
+ <property name="visible_window">True</property>
+ <property name="above_child">False</property>
+
+ <child>
+ <widget class="GtkComboBox" id="combo_open_encoding">
+ <property name="visible">True</property>
+ <property name="add_tearoffs">False</property>
+ <property name="focus_on_click">True</property>
+ </widget>
+ </child>
+ </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">fill</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="label109">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>New files</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="frame2">
+ <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="alignment3">
+ <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="vbox6">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkCheckButton" id="check_new_line">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Ensures that at the end of the file is a new line</property>
+ <property name="label" translatable="yes">Ensure new line at file end</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_trailing_spaces">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Removes trailing spaces and tabs and the end of lines</property>
+ <property name="label" translatable="yes">Strip 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="GtkCheckButton" id="check_replace_tabs">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Replaces all tabs in document by spaces.</property>
+ <property name="label" translatable="yes">Replace tabs by 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>
</widget>
</child>
</widget>
</child>
<child>
- <widget class="GtkLabel" id="label177">
+ <widget class="GtkLabel" id="label19">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Autocompletion</b></property>
+ <property name="label" translatable="yes"><b>Saving files</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -6251,10 +6123,208 @@
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkFrame" id="frame17">
+ <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="alignment20">
+ <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="table10">
+ <property name="visible">True</property>
+ <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">25</property>
+
+ <child>
+ <widget class="GtkLabel" id="label150">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Placement of new file tabs:</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="GtkSpinButton" id="spin_mru">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Specifies the number of files which are stored in the Recent files 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">True</property>
+ <property name="adjustment">4 1 50 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="hbox3">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">12</property>
+
+ <child>
+ <widget class="GtkRadioButton" id="radio_tab_left">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">File tabs will be placed on the left of the notebook</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Left</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">True</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_tab_right">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">File tabs will be placed on the right of the notebook</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Right</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_tab_left</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>
+ <property name="y_options">fill</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label147">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Recent files list length:</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">7</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>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label176">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Misc.</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>
</widget>
<packing>
<property name="tab_expand">False</property>
@@ -6263,9 +6333,9 @@
</child>
<child>
- <widget class="GtkLabel" id="label95">
+ <widget class="GtkLabel" id="label174">
<property name="visible">True</property>
- <property name="label" translatable="yes">Editor</property>
+ <property name="label" translatable="yes">Files</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -6347,7 +6417,7 @@
<property name="n_rows">4</property>
<property name="n_columns">3</property>
<property name="homogeneous">False</property>
- <property name="row_spacing">2</property>
+ <property name="row_spacing">3</property>
<property name="column_spacing">5</property>
<child>
@@ -6731,7 +6801,7 @@
<property name="n_rows">2</property>
<property name="n_columns">3</property>
<property name="homogeneous">False</property>
- <property name="row_spacing">2</property>
+ <property name="row_spacing">3</property>
<property name="column_spacing">5</property>
<child>
@@ -7011,8 +7081,8 @@
<property name="n_rows">5</property>
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
- <property name="row_spacing">7</property>
- <property name="column_spacing">5</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
<widget class="GtkEntry" id="entry_template_mail">
@@ -7061,7 +7131,7 @@
<child>
<widget class="GtkLabel" id="label126">
<property name="visible">True</property>
- <property name="label" translatable="yes">Initial Version:</property>
+ <property name="label" translatable="yes">Initial version:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -7448,7 +7518,7 @@
<widget class="GtkButton" id="button2">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Change</property>
+ <property name="label" translatable="yes">C_hange</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
Modified: trunk/src/interface.c
===================================================================
--- trunk/src/interface.c 2007-07-11 15:27:57 UTC (rev 1689)
+++ trunk/src/interface.c 2007-07-11 16:08:03 UTC (rev 1690)
@@ -2464,10 +2464,10 @@
GtkWidget *label187;
GtkWidget *label157;
GtkWidget *vbox15;
- GtkWidget *frame12;
- GtkWidget *alignment15;
+ GtkWidget *frame28;
+ GtkWidget *alignment31;
GtkWidget *check_toolbar_show;
- GtkWidget *label166;
+ GtkWidget *label196;
GtkWidget *frame11;
GtkWidget *alignment14;
GtkWidget *vbox16;
@@ -2495,43 +2495,7 @@
GtkWidget *radio_toolbar_image;
GtkWidget *label167;
GtkWidget *label164;
- GtkWidget *vbox18;
- GtkWidget *frame6;
- GtkWidget *alignment7;
- GtkWidget *vbox8;
- GtkWidget *table5;
- GtkWidget *eventbox1;
- GtkWidget *combo_new_encoding;
- GtkWidget *label153;
- GtkWidget *label116;
- GtkObject *spin_tab_width_adj;
- GtkWidget *spin_tab_width;
- GtkWidget *label_open_encoding;
- GtkWidget *check_open_encoding;
- GtkWidget *eventbox3;
- GtkWidget *combo_open_encoding;
- GtkWidget *label109;
- GtkWidget *frame2;
- GtkWidget *alignment3;
- GtkWidget *vbox6;
- GtkWidget *check_trailing_spaces;
- GtkWidget *check_new_line;
- GtkWidget *check_replace_tabs;
- GtkWidget *label19;
- GtkWidget *frame17;
- GtkWidget *alignment20;
- GtkWidget *table10;
- GtkWidget *label150;
- GtkObject *spin_mru_adj;
- GtkWidget *spin_mru;
- GtkWidget *hbox3;
- GtkWidget *radio_tab_left;
- GSList *radio_tab_left_group = NULL;
- GtkWidget *radio_tab_right;
- GtkWidget *label147;
- GtkWidget *label176;
- GtkWidget *label174;
- GtkWidget *vbox5;
+ GtkWidget *vbox24;
GtkWidget *frame5;
GtkWidget *alignment6;
GtkWidget *vbox12;
@@ -2555,19 +2519,27 @@
GtkWidget *radio_long_line_background;
GtkWidget *radio_long_line_disabled;
GtkWidget *label155;
+ GtkWidget *label194;
+ GtkWidget *vbox5;
+ GtkWidget *frame27;
+ GtkWidget *alignment30;
+ GtkWidget *vbox25;
+ GtkWidget *check_use_tabs;
+ GtkWidget *table13;
+ GtkWidget *label116;
+ GtkWidget *label183;
+ GtkObject *spin_tab_width_adj;
+ GtkWidget *spin_tab_width;
+ GtkWidget *combo_auto_indent_mode;
+ GtkWidget *label195;
GtkWidget *frame14;
GtkWidget *alignment17;
GtkWidget *vbox17;
- GtkWidget *hbox7;
- GtkWidget *label183;
- GtkWidget *eventbox2;
- GtkWidget *combo_auto_indent_mode;
GtkWidget *check_line_wrapping;
+ GtkWidget *check_disable_dnd;
GtkWidget *check_folding;
GtkWidget *check_unfold_children;
GtkWidget *check_indicators;
- GtkWidget *check_disable_dnd;
- GtkWidget *check_use_tabs;
GtkWidget *label172;
GtkWidget *frame18;
GtkWidget *alignment21;
@@ -2576,12 +2548,44 @@
GtkWidget *check_xmltag;
GtkWidget *check_symbol_auto_completion;
GtkWidget *hbox6;
- GtkWidget *label182;
GtkWidget *label173;
GtkObject *spin_autocheight_adj;
GtkWidget *spin_autocheight;
GtkWidget *label177;
GtkWidget *label95;
+ GtkWidget *vbox18;
+ GtkWidget *frame6;
+ GtkWidget *alignment7;
+ GtkWidget *vbox8;
+ GtkWidget *table5;
+ GtkWidget *eventbox1;
+ GtkWidget *combo_new_encoding;
+ GtkWidget *label153;
+ GtkWidget *check_open_encoding;
+ GtkWidget *label_open_encoding;
+ GtkWidget *eventbox3;
+ GtkWidget *combo_open_encoding;
+ GtkWidget *label109;
+ GtkWidget *frame2;
+ GtkWidget *alignment3;
+ GtkWidget *vbox6;
+ GtkWidget *check_new_line;
+ GtkWidget *check_trailing_spaces;
+ GtkWidget *check_replace_tabs;
+ GtkWidget *label19;
+ GtkWidget *frame17;
+ GtkWidget *alignment20;
+ GtkWidget *table10;
+ GtkWidget *label150;
+ GtkObject *spin_mru_adj;
+ GtkWidget *spin_mru;
+ GtkWidget *hbox3;
+ GtkWidget *radio_tab_left;
+ GSList *radio_tab_left_group = NULL;
+ GtkWidget *radio_tab_right;
+ GtkWidget *label147;
+ GtkWidget *label176;
+ GtkWidget *label174;
GtkWidget *vbox23;
GtkWidget *frame20;
GtkWidget *alignment23;
@@ -2776,8 +2780,8 @@
table11 = gtk_table_new (2, 3, FALSE);
gtk_widget_show (table11);
gtk_container_add (GTK_CONTAINER (alignment28), table11);
- gtk_table_set_row_spacings (GTK_TABLE (table11), 2);
- gtk_table_set_col_spacings (GTK_TABLE (table11), 5);
+ gtk_table_set_row_spacings (GTK_TABLE (table11), 3);
+ gtk_table_set_col_spacings (GTK_TABLE (table11), 6);
label191 = gtk_label_new (_("Startup path:"));
gtk_widget_show (label191);
@@ -2785,7 +2789,6 @@
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment (GTK_MISC (label191), 0, 0.5);
- gtk_misc_set_padding (GTK_MISC (label191), 6, 0);
startup_path_entry = gtk_entry_new ();
gtk_widget_show (startup_path_entry);
@@ -2811,7 +2814,6 @@
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment (GTK_MISC (label192), 0, 0.5);
- gtk_misc_set_padding (GTK_MISC (label192), 6, 0);
project_file_path_entry = gtk_entry_new ();
gtk_widget_show (project_file_path_entry);
@@ -3050,27 +3052,26 @@
gtk_widget_show (vbox15);
gtk_container_add (GTK_CONTAINER (notebook2), vbox15);
- frame12 = gtk_frame_new (NULL);
- gtk_widget_show (frame12);
- gtk_box_pack_start (GTK_BOX (vbox15), frame12, FALSE, FALSE, 0);
- gtk_frame_set_label_align (GTK_FRAME (frame12), 0.5, 0.5);
- gtk_frame_set_shadow_type (GTK_FRAME (frame12), GTK_SHADOW_NONE);
+ frame28 = gtk_frame_new (NULL);
+ gtk_widget_show (frame28);
+ gtk_box_pack_start (GTK_BOX (vbox15), frame28, FALSE, TRUE, 0);
+ gtk_frame_set_shadow_type (GTK_FRAME (frame28), GTK_SHADOW_NONE);
- alignment15 = gtk_alignment_new (0.5, 0.5, 1, 1);
- gtk_widget_show (alignment15);
- gtk_container_add (GTK_CONTAINER (frame12), alignment15);
- gtk_alignment_set_padding (GTK_ALIGNMENT (alignment15), 0, 0, 12, 0);
+ alignment31 = gtk_alignment_new (0.5, 0.5, 1, 1);
+ gtk_widget_show (alignment31);
+ gtk_container_add (GTK_CONTAINER (frame28), alignment31);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (alignment31), 0, 0, 12, 0);
check_toolbar_show = gtk_check_button_new_with_mnemonic (_("Show Toolbar"));
gtk_widget_show (check_toolbar_show);
- gtk_container_add (GTK_CONTAINER (alignment15), check_toolbar_show);
+ gtk_container_add (GTK_CONTAINER (alignment31), check_toolbar_show);
GTK_WIDGET_UNSET_FLAGS (check_toolbar_show, GTK_CAN_FOCUS);
gtk_button_set_focus_on_click (GTK_BUTTON (check_toolbar_show), FALSE);
- label166 = gtk_label_new ("");
- gtk_widget_show (label166);
- gtk_frame_set_label_widget (GTK_FRAME (frame12), label166);
- gtk_label_set_use_markup (GTK_LABEL (label166), TRUE);
+ label196 = gtk_label_new (_("<b>Toolbar</b>"));
+ gtk_widget_show (label196);
+ gtk_frame_set_label_widget (GTK_FRAME (frame28), label196);
+ gtk_label_set_use_markup (GTK_LABEL (label196), TRUE);
frame11 = gtk_frame_new (NULL);
gtk_widget_show (frame11);
@@ -3233,215 +3234,13 @@
gtk_widget_show (label164);
gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 2), label164);
- vbox18 = gtk_vbox_new (FALSE, 10);
- gtk_widget_show (vbox18);
- gtk_container_add (GTK_CONTAINER (notebook2), vbox18);
+ vbox24 = gtk_vbox_new (FALSE, 10);
+ gtk_widget_show (vbox24);
+ gtk_container_add (GTK_CONTAINER (notebook2), vbox24);
- frame6 = gtk_frame_new (NULL);
- gtk_widget_show (frame6);
- gtk_box_pack_start (GTK_BOX (vbox18), frame6, FALSE, TRUE, 0);
- gtk_frame_set_shadow_type (GTK_FRAME (frame6), GTK_SHADOW_NONE);
-
- alignment7 = gtk_alignment_new (0.5, 0.5, 1, 1);
- gtk_widget_show (alignment7);
- gtk_container_add (GTK_CONTAINER (frame6), alignment7);
- gtk_alignment_set_padding (GTK_ALIGNMENT (alignment7), 0, 0, 12, 0);
-
- vbox8 = gtk_vbox_new (FALSE, 3);
- gtk_widget_show (vbox8);
- gtk_container_add (GTK_CONTAINER (alignment7), vbox8);
-
- table5 = gtk_table_new (4, 2, FALSE);
- gtk_widget_show (table5);
- gtk_box_pack_start (GTK_BOX (vbox8), table5, FALSE, TRUE, 0);
- gtk_table_set_row_spacings (GTK_TABLE (table5), 3);
- gtk_table_set_col_spacings (GTK_TABLE (table5), 25);
-
- eventbox1 = gtk_event_box_new ();
- gtk_widget_show (eventbox1);
- gtk_table_attach (GTK_TABLE (table5), eventbox1, 1, 2, 0, 1,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (GTK_FILL), 0, 0);
- gtk_tooltips_set_tip (tooltips, eventbox1, _("Sets the default encoding for newly created files."), NULL);
-
- combo_new_encoding = gtk_combo_box_new_text ();
- gtk_widget_show (combo_new_encoding);
- gtk_container_add (GTK_CONTAINER (eventbox1), combo_new_encoding);
-
- label153 = gtk_label_new (_("Default encoding (new files):"));
- gtk_widget_show (label153);
- gtk_table_attach (GTK_TABLE (table5), label153, 0, 1, 0, 1,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label153), 0, 0.5);
-
- label116 = gtk_label_new (_("Tab Width:"));
- gtk_widget_show (label116);
- gtk_table_attach (GTK_TABLE (table5), label116, 0, 1, 3, 4,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label116), 0, 0.5);
-
- spin_tab_width_adj = gtk_adjustment_new (-1, 1, 99, 1, 10, 10);
- spin_tab_width = gtk_spin_button_new (GTK_ADJUSTMENT (spin_tab_width_adj), 1, 0);
- gtk_widget_show (spin_tab_width);
- gtk_table_attach (GTK_TABLE (table5), spin_tab_width, 1, 2, 3, 4,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_tooltips_set_tip (tooltips, spin_tab_width, _("The width in chars, which one tab character will take"), NULL);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_tab_width), TRUE);
- gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (spin_tab_width), GTK_UPDATE_IF_VALID);
- gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spin_tab_width), TRUE);
-
- label_open_encoding = gtk_label_new (_("Default encoding (existing files):"));
- gtk_widget_show (label_open_encoding);
- gtk_table_attach (GTK_TABLE (table5), label_open_encoding, 0, 1, 2, 3,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label_open_encoding), 0, 0.5);
-
- check_open_encoding = gtk_check_button_new_with_mnemonic (_("Use fixed encoding when opening files"));
- gtk_widget_show (check_open_encoding);
- gtk_table_attach (GTK_TABLE (table5), check_open_encoding, 0, 2, 1, 2,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_tooltips_set_tip (tooltips, check_open_encoding, _("This option disables the automatic detection of the file encoding when opening files and opens the file with the specified encoding (usually not needed)."), NULL);
- gtk_button_set_focus_on_click (GTK_BUTTON (check_open_encoding), FALSE);
-
- eventbox3 = gtk_event_box_new ();
- gtk_widget_show (eventbox3);
- gtk_table_attach (GTK_TABLE (table5), eventbox3, 1, 2, 2, 3,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (GTK_FILL), 0, 0);
- gtk_tooltips_set_tip (tooltips, eventbox3, _("Sets the default encoding for opening existing files."), NULL);
-
- combo_open_encoding = gtk_combo_box_new_text ();
- gtk_widget_show (combo_open_encoding);
- gtk_container_add (GTK_CONTAINER (eventbox3), combo_open_encoding);
-
- label109 = gtk_label_new (_("<b>New files</b>"));
- gtk_widget_show (label109);
- gtk_frame_set_label_widget (GTK_FRAME (frame6), label109);
- gtk_label_set_use_markup (GTK_LABEL (label109), TRUE);
-
- frame2 = gtk_frame_new (NULL);
- gtk_widget_show (frame2);
- gtk_box_pack_start (GTK_BOX (vbox18), frame2, FALSE, TRUE, 0);
- gtk_frame_set_shadow_type (GTK_FRAME (frame2), GTK_SHADOW_NONE);
-
- alignment3 = gtk_alignment_new (0.5, 0.5, 1, 1);
- gtk_widget_show (alignment3);
- gtk_container_add (GTK_CONTAINER (frame2), alignment3);
- gtk_alignment_set_padding (GTK_ALIGNMENT (alignment3), 0, 0, 12, 0);
-
- vbox6 = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox6);
- gtk_container_add (GTK_CONTAINER (alignment3), vbox6);
-
- check_trailing_spaces = gtk_check_button_new_with_mnemonic (_("Strip trailing spaces"));
- gtk_widget_show (check_trailing_spaces);
- gtk_box_pack_start (GTK_BOX (vbox6), check_trailing_spaces, FALSE, FALSE, 0);
- GTK_WIDGET_UNSET_FLAGS (check_trailing_spaces, GTK_CAN_FOCUS);
- gtk_tooltips_set_tip (tooltips, check_trailing_spaces, _("Removes trailing spaces and tabs and the end of lines"), NULL);
- gtk_button_set_focus_on_click (GTK_BUTTON (check_trailing_spaces), FALSE);
-
- check_new_line = gtk_check_button_new_with_mnemonic (_("Ensure new line at file end"));
- gtk_widget_show (check_new_line);
- gtk_box_pack_start (GTK_BOX (vbox6), check_new_line, FALSE, FALSE, 0);
- GTK_WIDGET_UNSET_FLAGS (check_new_line, GTK_CAN_FOCUS);
- gtk_tooltips_set_tip (tooltips, check_new_line, _("Ensures that at the end of the file is a new line"), NULL);
- gtk_button_set_focus_on_click (GTK_BUTTON (check_new_line), FALSE);
-
- check_replace_tabs = gtk_check_button_new_with_mnemonic (_("Replace tabs by space"));
- gtk_widget_show (check_replace_tabs);
- gtk_box_pack_start (GTK_BOX (vbox6), check_replace_tabs, FALSE, FALSE, 0);
- GTK_WIDGET_UNSET_FLAGS (check_replace_tabs, GTK_CAN_FOCUS);
- gtk_tooltips_set_tip (tooltips, check_replace_tabs, _("Replaces all tabs in document by spaces."), NULL);
- gtk_button_set_focus_on_click (GTK_BUTTON (check_replace_tabs), FALSE);
-
- label19 = gtk_label_new (_("<b>Saving files</b>"));
- gtk_widget_show (label19);
- gtk_frame_set_label_widget (GTK_FRAME (frame2), label19);
- gtk_label_set_use_markup (GTK_LABEL (label19), TRUE);
-
- frame17 = gtk_frame_new (NULL);
- gtk_widget_show (frame17);
- gtk_box_pack_start (GTK_BOX (vbox18), frame17, FALSE, TRUE, 0);
- gtk_frame_set_shadow_type (GTK_FRAME (frame17), GTK_SHADOW_NONE);
-
- alignment20 = gtk_alignment_new (0.5, 0.5, 1, 1);
- gtk_widget_show (alignment20);
- gtk_container_add (GTK_CONTAINER (frame17), alignment20);
- gtk_alignment_set_padding (GTK_ALIGNMENT (alignment20), 0, 0, 12, 0);
-
- table10 = gtk_table_new (2, 2, FALSE);
- gtk_widget_show (table10);
- gtk_container_add (GTK_CONTAINER (alignment20), table10);
- gtk_table_set_row_spacings (GTK_TABLE (table10), 3);
- gtk_table_set_col_spacings (GTK_TABLE (table10), 25);
-
- label150 = gtk_label_new (_("Placement of new file tabs:"));
- gtk_widget_show (label150);
- gtk_table_attach (GTK_TABLE (table10), label150, 0, 1, 0, 1,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label150), 0, 0.5);
-
- spin_mru_adj = gtk_adjustment_new (4, 1, 50, 1, 10, 10);
- spin_mru = gtk_spin_button_new (GTK_ADJUSTMENT (spin_mru_adj), 1, 0);
- gtk_widget_show (spin_mru);
- gtk_table_attach (GTK_TABLE (table10), spin_mru, 1, 2, 1, 2,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_tooltips_set_tip (tooltips, spin_mru, _("Specifies the number of files which are stored in the Recent files list."), NULL);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_mru), TRUE);
- gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spin_mru), TRUE);
-
- hbox3 = gtk_hbox_new (FALSE, 12);
- gtk_widget_show (hbox3);
- gtk_table_attach (GTK_TABLE (table10), hbox3, 1, 2, 0, 1,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (GTK_FILL), 0, 0);
-
- radio_tab_left = gtk_radio_button_new_with_mnemonic (NULL, _("Left"));
- gtk_widget_show (radio_tab_left);
- gtk_box_pack_start (GTK_BOX (hbox3), radio_tab_left, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, radio_tab_left, _("File tabs will be placed on the left of the notebook"), NULL);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_tab_left), radio_tab_left_group);
- radio_tab_left_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_tab_left));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio_tab_left), TRUE);
-
- radio_tab_right = gtk_radio_button_new_with_mnemonic (NULL, _("Right"));
- gtk_widget_show (radio_tab_right);
- gtk_box_pack_start (GTK_BOX (hbox3), radio_tab_right, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, radio_tab_right, _("File tabs will be placed on the right of the notebook"), NULL);
- gtk_radio_button_set_group (GTK_RADIO_BUTTON (radio_tab_right), radio_tab_left_group);
- radio_tab_left_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio_tab_right));
-
- label147 = gtk_label_new (_("Recent files list length:"));
- gtk_widget_show (label147);
- gtk_table_attach (GTK_TABLE (table10), label147, 0, 1, 1, 2,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label147), 0, 0.5);
- gtk_misc_set_padding (GTK_MISC (label147), 0, 7);
-
- label176 = gtk_label_new (_("<b>Misc.</b>"));
- gtk_widget_show (label176);
- gtk_frame_set_label_widget (GTK_FRAME (frame17), label176);
- gtk_label_set_use_markup (GTK_LABEL (label176), TRUE);
-
- label174 = gtk_label_new (_("Files"));
- gtk_widget_show (label174);
- gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 3), label174);
-
- vbox5 = gtk_vbox_new (FALSE, 10);
- gtk_widget_show (vbox5);
- gtk_container_add (GTK_CONTAINER (notebook2), vbox5);
-
frame5 = gtk_frame_new (NULL);
gtk_widget_show (frame5);
- gtk_box_pack_start (GTK_BOX (vbox5), frame5, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox24), frame5, FALSE, TRUE, 0);
gtk_frame_set_shadow_type (GTK_FRAME (frame5), GTK_SHADOW_NONE);
alignment6 = gtk_alignment_new (0.5, 0.5, 1, 1);
@@ -3482,7 +3281,7 @@
frame8 = gtk_frame_new (NULL);
gtk_widget_show (frame8);
- gtk_box_pack_start (GTK_BOX (vbox5), frame8, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox24), frame8, TRUE, TRUE, 0);
gtk_frame_set_shadow_type (GTK_FRAME (frame8), GTK_SHADOW_NONE);
alignment11 = gtk_alignment_new (0.5, 0.5, 1, 1);
@@ -3566,6 +3365,78 @@
gtk_frame_set_label_widget (GTK_FRAME (frame8), label155);
gtk_label_set_use_markup (GTK_LABEL (label155), TRUE);
+ label194 = gtk_label_new (_("Display"));
+ gtk_widget_show (label194);
+ gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 3), label194);
+
+ vbox5 = gtk_vbox_new (FALSE, 10);
+ gtk_widget_show (vbox5);
+ gtk_container_add (GTK_CONTAINER (notebook2), vbox5);
+
+ frame27 = gtk_frame_new (NULL);
+ gtk_widget_show (frame27);
+ gtk_box_pack_start (GTK_BOX (vbox5), frame27, FALSE, TRUE, 0);
+ gtk_frame_set_shadow_type (GTK_FRAME (frame27), GTK_SHADOW_NONE);
+
+ alignment30 = gtk_alignment_new (0.5, 0.5, 1, 1);
+ gtk_widget_show (alignment30);
+ gtk_container_add (GTK_CONTAINER (frame27), alignment30);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (alignment30), 0, 0, 12, 0);
+
+ vbox25 = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox25);
+ gtk_container_add (GTK_CONTAINER (alignment30), vbox25);
+
+ check_use_tabs = gtk_check_button_new_with_mnemonic (_("Use tabs when inserting whitespace"));
+ gtk_widget_show (check_use_tabs);
+ gtk_box_pack_start (GTK_BOX (vbox25), check_use_tabs, FALSE, FALSE, 0);
+ gtk_tooltips_set_tip (tooltips, check_use_tabs, _("Whenever some whitespace is inserted by Geany it will use tabs when enabled otherwise Geany will use just spaces."), NULL);
+ gtk_button_set_focus_on_click (GTK_BUTTON (check_use_tabs), FALSE);
+
+ table13 = gtk_table_new (2, 2, FALSE);
+ gtk_widget_show (table13);
+ gtk_box_pack_start (GTK_BOX (vbox25), table13, FALSE, TRUE, 0);
+ gtk_table_set_row_spacings (GTK_TABLE (table13), 3);
+ gtk_table_set_col_spacings (GTK_TABLE (table13), 25);
+
+ label116 = gtk_label_new (_("Tab Width:"));
+ gtk_widget_show (label116);
+ gtk_table_attach (GTK_TABLE (table13), label116, 0, 1, 0, 1,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_misc_set_alignment (GTK_MISC (label116), 0, 0.5);
+
+ label183 = gtk_label_new (_("Auto indentation mode:"));
+ gtk_widget_show (label183);
+ gtk_table_attach (GTK_TABLE (table13), label183, 0, 1, 1, 2,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+
+ spin_tab_width_adj = gtk_adjustment_new (1, 1, 99, 1, 10, 10);
+ spin_tab_width = gtk_spin_button_new (GTK_ADJUSTMENT (spin_tab_width_adj), 1, 0);
+ gtk_widget_show (spin_tab_width);
+ gtk_table_attach (GTK_TABLE (table13), spin_tab_width, 1, 2, 0, 1,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_tooltips_set_tip (tooltips, spin_tab_width, _("The width in chars, which one tab character will take"), NULL);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_tab_width), TRUE);
+ gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (spin_tab_width), GTK_UPDATE_IF_VALID);
+ gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spin_tab_width), TRUE);
+
+ combo_auto_indent_mode = gtk_combo_box_new_text ();
+ gtk_widget_show (combo_auto_indent_mode);
+ gtk_table_attach (GTK_TABLE (table13), combo_auto_indent_mode, 1, 2, 1, 2,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (GTK_FILL), 0, 0);
+ gtk_combo_box_append_text (GTK_COMBO_BOX (combo_auto_indent_mode), _("None"));
+ gtk_combo_box_append_text (GTK_COMBO_BOX (combo_auto_indent_mode), _("Basic"));
+ gtk_combo_box_append_text (GTK_COMBO_BOX (combo_auto_indent_mode), _("Advanced"));
+
+ label195 = gtk_label_new (_("<b>Indentation</b>"));
+ gtk_widget_show (label195);
+ gtk_frame_set_label_widget (GTK_FRAME (frame27), label195);
+ gtk_label_set_use_markup (GTK_LABEL (label195), TRUE);
+
frame14 = gtk_frame_new (NULL);
gtk_widget_show (frame14);
gtk_box_pack_start (GTK_BOX (vbox5), frame14, FALSE, TRUE, 0);
@@ -3580,31 +3451,17 @@
gtk_widget_show (vbox17);
gtk_container_add (GTK_CONTAINER (alignment17), vbox17);
- hbox7 = gtk_hbox_new (FALSE, 0);
- gtk_widget_show (hbox7);
- gtk_box_pack_start (GTK_BOX (vbox17), hbox7, FALSE, FALSE, 0);
-
- label183 = gtk_label_new (_("Auto indentation mode:"));
- gtk_widget_show (label183);
- gtk_box_pack_start (GTK_BOX (hbox7), label183, FALSE, FALSE, 0);
-
- eventbox2 = gtk_event_box_new ();
- gtk_widget_show (eventbox2);
- gtk_box_pack_start (GTK_BOX (hbox7), eventbox2, FALSE, TRUE, 5);
- gtk_tooltips_set_tip (tooltips, eventbox2, _("Selects the indentation mode. Use None to disable auto indentation completely. Basic indents new lines with the same indentation as the previous line. Advanced does the same and indents also curly brackets."), NULL);
-
- combo_auto_indent_mode = gtk_combo_box_new_text ();
- gtk_widget_show (combo_auto_indent_mode);
- gtk_container_add (GTK_CONTAINER (eventbox2), combo_auto_indent_mode);
- gtk_combo_box_append_text (GTK_COMBO_BOX (combo_auto_indent_mode), _("None"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (combo_auto_indent_mode), _("Basic"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (combo_auto_indent_mode), _("Advanced"));
-
check_line_wrapping = gtk_check_button_new_with_mnemonic (_("Line wrapping"));
gtk_widget_show (check_line_wrapping);
gtk_box_pack_start (GTK_BOX (vbox17), check_line_wrapping, FALSE, FALSE, 0);
gtk_tooltips_set_tip (tooltips, check_line_wrapping, _("Wrap the line at the window border and continue it on the next line. Note: line wrapping has a high performance cost for large documents so should be disabled on slow machines."), NULL);
+ check_disable_dnd = gtk_check_button_new_with_mnemonic (_("Disable Drag and Drop"));
+ gtk_widget_show (check_disable_dnd);
+ gtk_box_pack_start (GTK_BOX (vbox17), check_disable_dnd, FALSE, FALSE, 0);
+ gtk_tooltips_set_tip (tooltips, check_disable_dnd, _("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."), NULL);
+ gtk_button_set_focus_on_click (GTK_BUTTON (check_disable_dnd), FALSE);
+
check_folding = gtk_check_button_new_with_mnemonic (_("Enable folding"));
gtk_widget_show (check_folding);
gtk_box_pack_start (GTK_BOX (vbox17), check_folding, FALSE, FALSE, 0);
@@ -3623,18 +3480,6 @@
gtk_tooltips_set_tip (tooltips, check_indicators, _("Whether to use indicators (a squiggly underline) to highlight the lines where the compiler found a warning or an error."), NULL);
gtk_button_set_focus_on_click (GTK_BUTTON (check_indicators), FALSE);
- check_disable_dnd = gtk_check_button_new_with_mnemonic (_("Disable Drag and Drop"));
- gtk_widget_show (check_disable_dnd);
- gtk_box_pack_start (GTK_BOX (vbox17), check_disable_dnd, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, check_disable_dnd, _("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."), NULL);
- gtk_button_set_focus_on_click (GTK_BUTTON (check_disable_dnd), FALSE);
-
- check_use_tabs = gtk_check_button_new_with_mnemonic (_("Use tabs when inserting whitespace"));
- gtk_widget_show (check_use_tabs);
- gtk_box_pack_start (GTK_BOX (vbox17), check_use_tabs, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, check_use_tabs, _("Whenever some whitespace is inserted by Geany it will use tabs when enabled otherwise Geany will use just spaces."), NULL);
- gtk_button_set_focus_on_click (GTK_BUTTON (check_use_tabs), FALSE);
-
label172 = gtk_label_new (_("<b>Features</b>"));
gtk_widget_show (label172);
gtk_frame_set_label_widget (GTK_FRAME (frame14), label172);
@@ -3672,14 +3517,10 @@
gtk_tooltips_set_tip (tooltips, check_symbol_auto_completion, _("Automatic completion of known symbols in open files (function names, global variables, ...)"), NULL);
gtk_button_set_focus_on_click (GTK_BUTTON (check_symbol_auto_completion), FALSE);
- hbox6 = gtk_hbox_new (FALSE, 20);
+ hbox6 = gtk_hbox_new (FALSE, 12);
gtk_widget_show (hbox6);
gtk_box_pack_start (GTK_BOX (vbox19), hbox6, FALSE, FALSE, 0);
- label182 = gtk_label_new ("");
- gtk_widget_show (label182);
- gtk_box_pack_start (GTK_BOX (hbox6), label182, FALSE, FALSE, 0);
-
label173 = gtk_label_new (_("Rows of autocompletion list:"));
gtk_widget_show (label173);
gtk_box_pack_start (GTK_BOX (hbox6), label173, FALSE, FALSE, 0);
@@ -3688,7 +3529,7 @@
spin_autocheight_adj = gtk_adjustment_new (10, 1, 99, 1, 10, 10);
spin_autocheight = gtk_spin_button_new (GTK_ADJUSTMENT (spin_autocheight_adj), 1, 0);
gtk_widget_show (spin_autocheight);
- gtk_box_pack_start (GTK_BOX (hbox6), spin_autocheight, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox6), spin_autocheight, FALSE, TRUE, 0);
gtk_tooltips_set_tip (tooltips, spin_autocheight, _("Number of rows to display in the autocompletion list."), NULL);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_autocheight), TRUE);
@@ 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