SF.net SVN: geany: [1013] trunk

Revision: 1013 http://svn.sourceforge.net/geany/?rev=1013&view=rev Author: ntrel Date: 2006-11-18 08:52:23 -0800 (Sat, 18 Nov 2006)

Log Message: ----------- Add Preferences frame alignment for Tools, Templates, Keybindings. Revert tab placement label text.

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

Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-11-18 15:47:28 UTC (rev 1012) +++ trunk/ChangeLog 2006-11-18 16:52:23 UTC (rev 1013) @@ -10,6 +10,9 @@ Rearranged some Preferences dialog options, added Files tab. Disable tab position when file tabs are hidden (not new file tab placement option, it still affects order of pages). + * src/interface.c, geany.glade: + Add Preferences frame alignment for Tools, Templates, Keybindings. + Revert tab placement label text.

2006-11-17 Enrico Tröger enrico.troeger@uvena.de

Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2006-11-18 15:47:28 UTC (rev 1012) +++ trunk/geany.glade 2006-11-18 16:52:23 UTC (rev 1013) @@ -4462,13 +4462,13 @@ <child> <widget class="GtkLabel" id="label150"> <property name="visible">True</property> - <property name="label" translatable="yes">Notebook tab placement:</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.5</property> + <property name="xalign">0</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> @@ -4576,7 +4576,7 @@ <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">7</property> @@ -5267,7 +5267,7 @@ <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> @@ -5374,443 +5374,489 @@ </child>

<child> - <widget class="GtkVBox" id="vbox2"> + <widget class="GtkFrame" id="frame20"> <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">12</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="GtkLabel" id="label17"> + <widget class="GtkAlignment" id="alignment23"> <property name="visible">True</property> - <property name="label" translatable="yes">Enter tool paths below. Tools you do not need can be left blank.</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">6</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">False</property> - <property name="fill">False</property> - </packing> - </child> + <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="table1"> - <property name="visible">True</property> - <property name="n_rows">5</property> - <property name="n_columns">3</property> - <property name="homogeneous">False</property> - <property name="row_spacing">7</property> - <property name="column_spacing">5</property> - <child> - <widget class="GtkLabel" id="label11"> + <widget class="GtkVBox" id="vbox2"> <property name="visible">True</property> - <property name="label" translatable="yes">Make:</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> + <property name="homogeneous">False</property> + <property name="spacing">12</property>

- <child> - <widget class="GtkLabel" id="label97"> - <property name="visible">True</property> - <property name="label" translatable="yes">Terminal:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label117"> - <property name="visible">True</property> - <property name="label" translatable="yes">Browser:</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="GtkEntry" id="entry_com_make"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Path and options for the make tool</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">*</property> - <property name="activates_default">False</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="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkEntry" id="entry_com_term"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">A terminal emulator like xterm, gnome-terminal or konsole (should accept the -e argument)</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">*</property> - <property name="activates_default">False</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkEntry" id="entry_browser"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Path (and possibly additional arguments) to your favorite browser</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">*</property> - <property name="activates_default">False</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkButton" id="button_make"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <child> - <widget class="GtkImage" id="image285"> + <widget class="GtkLabel" id="label17"> <property name="visible">True</property> - <property name="stock">gtk-open</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> + <property name="label" translatable="yes">Enter tool paths below. Tools you do not need can be left blank.</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="ypad">6</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">False</property> + <property name="fill">False</property> + </packing> </child> - </widget> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</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="GtkButton" id="button_term"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <child> - <widget class="GtkImage" id="image286"> + <widget class="GtkTable" id="table1"> <property name="visible">True</property> - <property name="stock">gtk-open</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</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> + <property name="n_rows">5</property> + <property name="n_columns">3</property> + <property name="homogeneous">False</property> + <property name="row_spacing">7</property> + <property name="column_spacing">5</property>

- <child> - <widget class="GtkButton" id="button_browser"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> + <child> + <widget class="GtkLabel" id="label11"> + <property name="visible">True</property> + <property name="label" translatable="yes">Make:</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="GtkImage" id="image287"> - <property name="visible">True</property> - <property name="stock">gtk-open</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> + <child> + <widget class="GtkLabel" id="label97"> + <property name="visible">True</property> + <property name="label" translatable="yes">Terminal:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child>

- <child> - <widget class="GtkLabel" id="label154"> - <property name="visible">True</property> - <property name="label" translatable="yes">Print command:</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="GtkLabel" id="label117"> + <property name="visible">True</property> + <property name="label" translatable="yes">Browser:</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="GtkEntry" id="entry_print"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Path to the command for printing files (use %f for the filename).</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">*</property> - <property name="activates_default">False</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="GtkEntry" id="entry_com_make"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Path and options for the make tool</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">*</property> + <property name="activates_default">False</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="y_options"></property> + </packing> + </child>

- <child> - <widget class="GtkButton" id="button_print"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> + <child> + <widget class="GtkEntry" id="entry_com_term"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">A terminal emulator like xterm, gnome-terminal or konsole (should accept the -e argument)</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">*</property> + <property name="activates_default">False</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options"></property> + </packing> + </child>

- <child> - <widget class="GtkImage" id="image763"> - <property name="visible">True</property> - <property name="stock">gtk-open</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</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="GtkEntry" id="entry_browser"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Path (and possibly additional arguments) to your favorite browser</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">*</property> + <property name="activates_default">False</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="y_options"></property> + </packing> + </child>

- <child> - <widget class="GtkLabel" id="label171"> - <property name="visible">True</property> - <property name="label" translatable="yes">Grep:</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">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> + <child> + <widget class="GtkButton" id="button_make"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property>

- <child> - <widget class="GtkEntry" id="entry_grep"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">*</property> - <property name="activates_default">False</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="y_options"></property> - </packing> - </child> + <child> + <widget class="GtkImage" id="image285"> + <property name="visible">True</property> + <property name="stock">gtk-open</property> + <property name="icon_size">4</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + </child> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</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="GtkButton" id="button_grep"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> + <child> + <widget class="GtkButton" id="button_term"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property>

- <child> - <widget class="GtkImage" id="image808"> - <property name="visible">True</property> - <property name="stock">gtk-open</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> + <child> + <widget class="GtkImage" id="image286"> + <property name="visible">True</property> + <property name="stock">gtk-open</property> + <property name="icon_size">4</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + </child> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</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="GtkButton" id="button_browser"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + + <child> + <widget class="GtkImage" id="image287"> + <property name="visible">True</property> + <property name="stock">gtk-open</property> + <property name="icon_size">4</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + </child> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label154"> + <property name="visible">True</property> + <property name="label" translatable="yes">Print command:</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="GtkEntry" id="entry_print"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Path to the command for printing files (use %f for the filename).</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">*</property> + <property name="activates_default">False</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="GtkButton" id="button_print"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + + <child> + <widget class="GtkImage" id="image763"> + <property name="visible">True</property> + <property name="stock">gtk-open</property> + <property name="icon_size">4</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + </child> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</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="GtkLabel" id="label171"> + <property name="visible">True</property> + <property name="label" translatable="yes">Grep:</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">4</property> + <property name="bottom_attach">5</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkEntry" id="entry_grep"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">*</property> + <property name="activates_default">False</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="button_grep"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + + <child> + <widget class="GtkImage" id="image808"> + <property name="visible">True</property> + <property name="stock">gtk-open</property> + <property name="icon_size">4</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + </child> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> </child> </widget> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> </child> </widget> + </child> + + <child> + <widget class="GtkLabel" id="label179"> + <property name="visible">True</property> + <property name="label" translatable="yes">&lt;b&gt;Tool paths&lt;/b&gt;</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="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="type">label_item</property> </packing> </child> </widget> @@ -5844,308 +5890,354 @@ </child>

<child> - <widget class="GtkVBox" id="vbox9"> + <widget class="GtkFrame" id="frame21"> <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_NONE</property>

<child> - <widget class="GtkLabel" id="label120"> + <widget class="GtkAlignment" id="alignment24"> <property name="visible">True</property> - <property name="label" translatable="yes">Specify here information you want to use in templates. -See documentation if you don't know how templates work.</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">6</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">False</property> - <property name="fill">False</property> - </packing> - </child> + <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="table6"> - <property name="visible">True</property> - <property name="n_rows">8</property> - <property name="n_columns">2</property> - <property name="homogeneous">False</property> - <property name="row_spacing">7</property> - <property name="column_spacing">5</property> - <child> - <widget class="GtkEntry" id="entry_template_mail"> + <widget class="GtkVBox" id="vbox9"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">email address of the developer</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">*</property> - <property name="activates_default">False</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="y_options"></property> - </packing> - </child> + <property name="homogeneous">False</property> + <property name="spacing">12</property>

- <child> - <widget class="GtkEntry" id="entry_template_initial"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Initials of the developer name</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">*</property> - <property name="activates_default">False</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"></property> - </packing> - </child> + <child> + <widget class="GtkLabel" id="label120"> + <property name="visible">True</property> + <property name="label" translatable="yes">Set the information to be used in templates. See the documentation for details.</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</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">6</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">False</property> + <property name="fill">False</property> + </packing> + </child>

- <child> - <widget class="GtkLabel" id="label126"> - <property name="visible">True</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> - <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">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> + <child> + <widget class="GtkTable" id="table6"> + <property name="visible">True</property> + <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>

- <child> - <widget class="GtkEntry" id="entry_template_version"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Version number, which a new file initially has</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">*</property> - <property name="activates_default">False</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="y_options"></property> - </packing> - </child> + <child> + <widget class="GtkEntry" id="entry_template_mail"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">email address of the developer</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">*</property> + <property name="activates_default">False</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="y_options"></property> + </packing> + </child>

- <child> - <widget class="GtkEntry" id="entry_template_company"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Company name</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">*</property> - <property name="activates_default">False</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="GtkEntry" id="entry_template_initial"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Initials of the developer name</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">*</property> + <property name="activates_default">False</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options"></property> + </packing> + </child>

- <child> - <widget class="GtkLabel" id="label129"> - <property name="visible">True</property> - <property name="label" translatable="yes">Developer:</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="label126"> + <property name="visible">True</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> + <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">4</property> + <property name="bottom_attach">5</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child>

- <child> - <widget class="GtkLabel" id="label123"> - <property name="visible">True</property> - <property name="label" translatable="yes">Company:</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="GtkEntry" id="entry_template_version"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Version number, which a new file initially has</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">*</property> + <property name="activates_default">False</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + <property name="y_options"></property> + </packing> + </child>

- <child> - <widget class="GtkLabel" id="label130"> - <property name="visible">True</property> - <property name="label" translatable="yes">Mail address:</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="GtkEntry" id="entry_template_company"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Company name</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">*</property> + <property name="activates_default">False</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="label131"> - <property name="visible">True</property> - <property name="label" translatable="yes">Initials:</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> + <child> + <widget class="GtkLabel" id="label129"> + <property name="visible">True</property> + <property name="label" translatable="yes">Developer:</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="GtkEntry" id="entry_template_developer"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">The name of the developer</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">*</property> - <property name="activates_default">False</property> + <child> + <widget class="GtkLabel" id="label123"> + <property name="visible">True</property> + <property name="label" translatable="yes">Company:</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="GtkLabel" id="label130"> + <property name="visible">True</property> + <property name="label" translatable="yes">Mail address:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label131"> + <property name="visible">True</property> + <property name="label" translatable="yes">Initials:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkEntry" id="entry_template_developer"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">The name of the developer</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">*</property> + <property name="activates_default">False</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="y_options"></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="GtkLabel" id="label132"> + <property name="visible">True</property> + <property name="label" translatable="yes">&lt;i&gt;Notice: For all changes you make here to take effect, you need to restart Geany.&lt;/i&gt;</property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</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">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="y_options"></property> - </packing> </child> </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> </child>

<child> - <widget class="GtkLabel" id="label132"> + <widget class="GtkLabel" id="label180"> <property name="visible">True</property> - <property name="label" translatable="yes">&lt;i&gt;Notice: For all changes you make here to take effect, -you need to restart Geany.&lt;/i&gt;</property> + <property name="label" translatable="yes">&lt;b&gt;Template data&lt;/b&gt;</property> <property name="use_underline">False</property> <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -6161,9 +6253,7 @@ <property name="angle">0</property> </widget> <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="type">label_item</property> </packing> </child> </widget> @@ -6197,93 +6287,139 @@ </child>

<child> - <widget class="GtkVBox" id="vbox13"> + <widget class="GtkFrame" id="frame22"> <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">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="GtkLabel" id="label152"> + <widget class="GtkAlignment" id="alignment25"> <property name="visible">True</property> - <property name="label" translatable="yes">Here you can change keyboard shortcuts for various actions. Select one and press the Change button to enter a new shortcut, or double click on an action to edit the string representation of the shortcut directly.</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_FILL</property> - <property name="wrap">True</property> - <property name="selectable">False</property> - <property name="xalign">0.10000000149</property> - <property name="yalign">0</property> - <property name="xpad">0</property> - <property name="ypad">5</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">False</property> - <property name="fill">True</property> - </packing> - </child> + <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="GtkScrolledWindow" id="scrolledwindow8"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property> - <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property> - <property name="shadow_type">GTK_SHADOW_IN</property> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property> - <child> - <widget class="GtkTreeView" id="treeview7"> + <widget class="GtkVBox" id="vbox13"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">True</property> - <property name="rules_hint">False</property> - <property name="reorderable">False</property> - <property name="enable_search">False</property> - <property name="fixed_height_mode">False</property> - <property name="hover_selection">False</property> - <property name="hover_expand">False</property> + <property name="homogeneous">False</property> + <property name="spacing">5</property> + + <child> + <widget class="GtkLabel" id="label152"> + <property name="visible">True</property> + <property name="label" translatable="yes">Here you can change keyboard shortcuts for various actions. Select one and press the Change button to enter a new shortcut, or double click on an action to edit the string representation of the shortcut directly.</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_FILL</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">0</property> + <property name="ypad">5</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">False</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkScrolledWindow" id="scrolledwindow8"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property> + <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property> + <property name="shadow_type">GTK_SHADOW_IN</property> + <property name="window_placement">GTK_CORNER_TOP_LEFT</property> + + <child> + <widget class="GtkTreeView" id="treeview7"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="headers_visible">True</property> + <property name="rules_hint">False</property> + <property name="reorderable">False</property> + <property name="enable_search">False</property> + <property name="fixed_height_mode">False</property> + <property name="hover_selection">False</property> + <property name="hover_expand">False</property> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkAlignment" id="alignment10"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xscale">0.300000011921</property> + <property name="yscale">1</property> + <property name="top_padding">0</property> + <property name="bottom_padding">5</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> + + <child> + <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="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> </widget> </child> </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> </child>

<child> - <widget class="GtkAlignment" id="alignment10"> + <widget class="GtkLabel" id="label181"> <property name="visible">True</property> + <property name="label" translatable="yes">&lt;b&gt;Keyboard shortcuts&lt;/b&gt;</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="xscale">0.300000011921</property> - <property name="yscale">1</property> - <property name="top_padding">0</property> - <property name="bottom_padding">5</property> - <property name="left_padding">0</property> - <property name="right_padding">0</property> - - <child> - <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="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - </widget> - </child> + <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">False</property> - <property name="fill">False</property> + <property name="type">label_item</property> </packing> </child> </widget>

Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2006-11-18 15:47:28 UTC (rev 1012) +++ trunk/src/interface.c 2006-11-18 16:52:23 UTC (rev 1013) @@ -2282,6 +2282,8 @@ GtkWidget *spin_autocheight; GtkWidget *label177; GtkWidget *label95; + GtkWidget *frame20; + GtkWidget *alignment23; GtkWidget *vbox2; GtkWidget *label17; GtkWidget *table1; @@ -2305,7 +2307,10 @@ GtkWidget *entry_grep; GtkWidget *button_grep; GtkWidget *image808; + GtkWidget *label179; GtkWidget *label96; + GtkWidget *frame21; + GtkWidget *alignment24; GtkWidget *vbox9; GtkWidget *label120; GtkWidget *table6; @@ -2320,13 +2325,17 @@ GtkWidget *label131; GtkWidget *entry_template_developer; GtkWidget *label132; + GtkWidget *label180; GtkWidget *label119; + GtkWidget *frame22; + GtkWidget *alignment25; GtkWidget *vbox13; GtkWidget *label152; GtkWidget *scrolledwindow8; GtkWidget *treeview7; GtkWidget *alignment10; GtkWidget *button2; + GtkWidget *label181; GtkWidget *label151; GtkWidget *dialog_action_area3; GtkWidget *button3; @@ -2925,11 +2934,12 @@ gtk_table_set_row_spacings (GTK_TABLE (table10), 3); gtk_table_set_col_spacings (GTK_TABLE (table10), 25);

- label150 = gtk_label_new (_("Notebook tab placement:")); + 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); @@ -2967,6 +2977,7 @@ 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>")); @@ -3179,6 +3190,7 @@ label173 = gtk_label_new (_("Rows of autocompletion list:")); gtk_widget_show (label173); gtk_box_pack_start (GTK_BOX (hbox6), label173, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (label173), 0, 0.5);

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); @@ -3196,18 +3208,29 @@ gtk_widget_show (label95); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 4), label95);

+ frame20 = gtk_frame_new (NULL); + gtk_widget_show (frame20); + gtk_container_add (GTK_CONTAINER (notebook2), frame20); + gtk_frame_set_shadow_type (GTK_FRAME (frame20), GTK_SHADOW_NONE); + + alignment23 = gtk_alignment_new (0.5, 0.5, 1, 1); + gtk_widget_show (alignment23); + gtk_container_add (GTK_CONTAINER (frame20), alignment23); + gtk_alignment_set_padding (GTK_ALIGNMENT (alignment23), 0, 0, 12, 0); + vbox2 = gtk_vbox_new (FALSE, 12); gtk_widget_show (vbox2); - gtk_container_add (GTK_CONTAINER (notebook2), vbox2); + gtk_container_add (GTK_CONTAINER (alignment23), vbox2);

label17 = gtk_label_new (_("Enter tool paths below. Tools you do not need can be left blank.")); gtk_widget_show (label17); gtk_box_pack_start (GTK_BOX (vbox2), label17, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (label17), 0, 0.5); gtk_misc_set_padding (GTK_MISC (label17), 0, 6);

table1 = gtk_table_new (5, 3, FALSE); gtk_widget_show (table1); - gtk_box_pack_start (GTK_BOX (vbox2), table1, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox2), table1, FALSE, TRUE, 0); gtk_table_set_row_spacings (GTK_TABLE (table1), 7); gtk_table_set_col_spacings (GTK_TABLE (table1), 5);

@@ -3330,22 +3353,39 @@ gtk_widget_show (image808); gtk_container_add (GTK_CONTAINER (button_grep), image808);

+ label179 = gtk_label_new (_("<b>Tool paths</b>")); + gtk_widget_show (label179); + gtk_frame_set_label_widget (GTK_FRAME (frame20), label179); + gtk_label_set_use_markup (GTK_LABEL (label179), TRUE); + label96 = gtk_label_new (_("Tools")); gtk_widget_show (label96); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 5), label96);

- vbox9 = gtk_vbox_new (FALSE, 0); + frame21 = gtk_frame_new (NULL); + gtk_widget_show (frame21); + gtk_container_add (GTK_CONTAINER (notebook2), frame21); + gtk_frame_set_shadow_type (GTK_FRAME (frame21), GTK_SHADOW_NONE); + + alignment24 = gtk_alignment_new (0.5, 0.5, 1, 1); + gtk_widget_show (alignment24); + gtk_container_add (GTK_CONTAINER (frame21), alignment24); + gtk_alignment_set_padding (GTK_ALIGNMENT (alignment24), 0, 0, 12, 0); + + vbox9 = gtk_vbox_new (FALSE, 12); gtk_widget_show (vbox9); - gtk_container_add (GTK_CONTAINER (notebook2), vbox9); + gtk_container_add (GTK_CONTAINER (alignment24), vbox9);

- label120 = gtk_label_new (_("Specify here information you want to use in templates.\nSee documentation if you don't know how templates work.")); + label120 = gtk_label_new (_("Set the information to be used in templates. See the documentation for details.")); gtk_widget_show (label120); gtk_box_pack_start (GTK_BOX (vbox9), label120, FALSE, FALSE, 0); + gtk_label_set_line_wrap (GTK_LABEL (label120), TRUE); + gtk_misc_set_alignment (GTK_MISC (label120), 0, 0.5); gtk_misc_set_padding (GTK_MISC (label120), 0, 6);

- table6 = gtk_table_new (8, 2, FALSE); + table6 = gtk_table_new (5, 2, FALSE); gtk_widget_show (table6); - gtk_box_pack_start (GTK_BOX (vbox9), table6, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox9), table6, FALSE, TRUE, 0); gtk_table_set_row_spacings (GTK_TABLE (table6), 7); gtk_table_set_col_spacings (GTK_TABLE (table6), 5);

@@ -3419,25 +3459,42 @@ (GtkAttachOptions) (0), 0, 0); gtk_tooltips_set_tip (tooltips, entry_template_developer, _("The name of the developer"), NULL);

- label132 = gtk_label_new (_("<i>Notice: For all changes you make here to take effect,\nyou need to restart Geany.</i>")); + label132 = gtk_label_new (_("<i>Notice: For all changes you make here to take effect, you need to restart Geany.</i>")); gtk_widget_show (label132); gtk_box_pack_start (GTK_BOX (vbox9), label132, FALSE, FALSE, 0); gtk_label_set_use_markup (GTK_LABEL (label132), TRUE); + gtk_label_set_line_wrap (GTK_LABEL (label132), TRUE); + gtk_misc_set_alignment (GTK_MISC (label132), 0, 0.5);

+ label180 = gtk_label_new (_("<b>Template data</b>")); + gtk_widget_show (label180); + gtk_frame_set_label_widget (GTK_FRAME (frame21), label180); + gtk_label_set_use_markup (GTK_LABEL (label180), TRUE); + label119 = gtk_label_new (_("Templates")); gtk_widget_show (label119); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 6), label119);

+ frame22 = gtk_frame_new (NULL); + gtk_widget_show (frame22); + gtk_container_add (GTK_CONTAINER (notebook2), frame22); + gtk_frame_set_shadow_type (GTK_FRAME (frame22), GTK_SHADOW_NONE); + + alignment25 = gtk_alignment_new (0.5, 0.5, 1, 1); + gtk_widget_show (alignment25); + gtk_container_add (GTK_CONTAINER (frame22), alignment25); + gtk_alignment_set_padding (GTK_ALIGNMENT (alignment25), 0, 0, 12, 0); + vbox13 = gtk_vbox_new (FALSE, 5); gtk_widget_show (vbox13); - gtk_container_add (GTK_CONTAINER (notebook2), vbox13); + gtk_container_add (GTK_CONTAINER (alignment25), vbox13);

label152 = gtk_label_new (_("Here you can change keyboard shortcuts for various actions. Select one and press the Change button to enter a new shortcut, or double click on an action to edit the string representation of the shortcut directly.")); gtk_widget_show (label152); gtk_box_pack_start (GTK_BOX (vbox13), label152, FALSE, TRUE, 0); gtk_label_set_justify (GTK_LABEL (label152), GTK_JUSTIFY_FILL); gtk_label_set_line_wrap (GTK_LABEL (label152), TRUE); - gtk_misc_set_alignment (GTK_MISC (label152), 0.1, 0); + gtk_misc_set_alignment (GTK_MISC (label152), 0, 0); gtk_misc_set_padding (GTK_MISC (label152), 0, 5);

scrolledwindow8 = gtk_scrolled_window_new (NULL, NULL); @@ -3459,6 +3516,11 @@ gtk_widget_show (button2); gtk_container_add (GTK_CONTAINER (alignment10), button2);

+ label181 = gtk_label_new (_("<b>Keyboard shortcuts</b>")); + gtk_widget_show (label181); + gtk_frame_set_label_widget (GTK_FRAME (frame22), label181); + gtk_label_set_use_markup (GTK_LABEL (label181), TRUE); + label151 = gtk_label_new (_("Keybindings")); gtk_widget_show (label151); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 7), label151); @@ -3629,6 +3691,8 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, spin_autocheight, "spin_autocheight"); GLADE_HOOKUP_OBJECT (prefs_dialog, label177, "label177"); GLADE_HOOKUP_OBJECT (prefs_dialog, label95, "label95"); + GLADE_HOOKUP_OBJECT (prefs_dialog, frame20, "frame20"); + GLADE_HOOKUP_OBJECT (prefs_dialog, alignment23, "alignment23"); GLADE_HOOKUP_OBJECT (prefs_dialog, vbox2, "vbox2"); GLADE_HOOKUP_OBJECT (prefs_dialog, label17, "label17"); GLADE_HOOKUP_OBJECT (prefs_dialog, table1, "table1"); @@ -3652,7 +3716,10 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, entry_grep, "entry_grep"); GLADE_HOOKUP_OBJECT (prefs_dialog, button_grep, "button_grep"); GLADE_HOOKUP_OBJECT (prefs_dialog, image808, "image808"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label179, "label179"); GLADE_HOOKUP_OBJECT (prefs_dialog, label96, "label96"); + GLADE_HOOKUP_OBJECT (prefs_dialog, frame21, "frame21"); + GLADE_HOOKUP_OBJECT (prefs_dialog, alignment24, "alignment24"); GLADE_HOOKUP_OBJECT (prefs_dialog, vbox9, "vbox9"); GLADE_HOOKUP_OBJECT (prefs_dialog, label120, "label120"); GLADE_HOOKUP_OBJECT (prefs_dialog, table6, "table6"); @@ -3667,13 +3734,17 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, label131, "label131"); GLADE_HOOKUP_OBJECT (prefs_dialog, entry_template_developer, "entry_template_developer"); GLADE_HOOKUP_OBJECT (prefs_dialog, label132, "label132"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label180, "label180"); GLADE_HOOKUP_OBJECT (prefs_dialog, label119, "label119"); + GLADE_HOOKUP_OBJECT (prefs_dialog, frame22, "frame22"); + GLADE_HOOKUP_OBJECT (prefs_dialog, alignment25, "alignment25"); GLADE_HOOKUP_OBJECT (prefs_dialog, vbox13, "vbox13"); GLADE_HOOKUP_OBJECT (prefs_dialog, label152, "label152"); GLADE_HOOKUP_OBJECT (prefs_dialog, scrolledwindow8, "scrolledwindow8"); GLADE_HOOKUP_OBJECT (prefs_dialog, treeview7, "treeview7"); GLADE_HOOKUP_OBJECT (prefs_dialog, alignment10, "alignment10"); GLADE_HOOKUP_OBJECT (prefs_dialog, button2, "button2"); + GLADE_HOOKUP_OBJECT (prefs_dialog, label181, "label181"); GLADE_HOOKUP_OBJECT (prefs_dialog, label151, "label151"); GLADE_HOOKUP_OBJECT_NO_REF (prefs_dialog, dialog_action_area3, "dialog_action_area3"); GLADE_HOOKUP_OBJECT (prefs_dialog, button3, "button3");

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.