Revision: 4761 http://geany.svn.sourceforge.net/geany/?rev=4761&view=rev Author: ntrel Date: 2010-03-15 13:12:54 +0000 (Mon, 15 Mar 2010)
Log Message: ----------- Apply patch from Eugene Arshinov to make frame packing/alignment more consistent (thanks).
Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/interface.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-03-15 13:01:16 UTC (rev 4760) +++ trunk/ChangeLog 2010-03-15 13:12:54 UTC (rev 4761) @@ -7,6 +7,9 @@ Change 'This is a wrapper function for...' to 'Wraps...' in brief descriptions. Change 'After all...' to 'Afterwards...'. + * src/interface.c, geany.glade: + Apply patch from Eugene Arshinov to make frame packing/alignment + more consistent (thanks).
2010-03-12 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2010-03-15 13:01:16 UTC (rev 4760) +++ trunk/geany.glade 2010-03-15 13:12:54 UTC (rev 4761) @@ -3397,7 +3397,7 @@ </widget> <packing> <property name="padding">0</property> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> </packing> </child> @@ -3433,9 +3433,10 @@
<child> <widget class="GtkVBox" id="vbox41"> + <property name="border_width">5</property> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">0</property> + <property name="spacing">10</property>
<child> <widget class="GtkFrame" id="frame19"> @@ -3578,7 +3579,6 @@
<child> <widget class="GtkFrame" id="frame36"> - <property name="border_width">5</property> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="label_yalign">0.5</property> @@ -3789,7 +3789,7 @@ </widget> <packing> <property name="padding">0</property> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> </packing> </child> @@ -5655,9 +5655,10 @@
<child> <widget class="GtkVBox" id="vbox40"> + <property name="border_width">5</property> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">6</property> + <property name="spacing">10</property>
<child> <widget class="GtkVBox" id="label_project_indent_warning"> @@ -6060,7 +6061,7 @@ </widget> <packing> <property name="padding">0</property> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> </packing> </child> @@ -6096,13 +6097,13 @@
<child> <widget class="GtkVBox" id="vbox39"> + <property name="border_width">5</property> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">1</property> + <property name="spacing">10</property>
<child> <widget class="GtkFrame" id="frame18"> - <property name="border_width">5</property> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="label_yalign">0.5</property> @@ -6446,7 +6447,6 @@
<child> <widget class="GtkFrame" id="frame38"> - <property name="border_width">5</property> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="label_yalign">0.5</property> @@ -8457,7 +8457,7 @@ </widget> <packing> <property name="padding">0</property> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> </packing> </child> @@ -8492,488 +8492,501 @@ </child>
<child> - <widget class="GtkFrame" id="frame21"> + <widget class="GtkVBox" id="vbox49"> <property name="border_width">5</property> <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> + <property name="homogeneous">False</property> + <property name="spacing">10</property>
<child> - <widget class="GtkAlignment" id="alignment24"> + <widget class="GtkFrame" id="frame21"> <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">1</property> - <property name="yscale">1</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">12</property> - <property name="right_padding">0</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_NONE</property>
<child> - <widget class="GtkVBox" id="vbox9"> + <widget class="GtkAlignment" id="alignment24"> <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">12</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="vbox31"> + <widget class="GtkVBox" id="vbox9"> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">0</property> + <property name="spacing">12</property>
<child> - <placeholder/> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <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">6</property> - <property name="column_spacing">6</property> - - <child> - <widget class="GtkEntry" id="entry_template_mail"> + <widget class="GtkVBox" id="vbox31"> <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">0</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> + <child> + <placeholder/> + </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="y_options"></property> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child>
<child> - <widget class="GtkLabel" id="label126"> + <widget class="GtkTable" id="table6"> <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> + <property name="n_rows">8</property> + <property name="n_columns">2</property> + <property name="homogeneous">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">6</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> - </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="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="label216"> - <property name="visible">True</property> - <property name="label" translatable="yes">Year:</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">5</property> - <property name="bottom_attach">6</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="label217"> - <property name="visible">True</property> - <property name="label" translatable="yes">Date:</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">6</property> - <property name="bottom_attach">7</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="GtkLabel" id="label218"> - <property name="visible">True</property> - <property name="label" translatable="yes">Date & Time:</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">7</property> - <property name="bottom_attach">8</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>
- <child> - <widget class="GtkEntry" id="entry_template_datetime"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Specify a format for the the {datetime} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function.</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">7</property> - <property name="bottom_attach">8</property> - <property name="y_options"></property> - </packing> - </child> + <child> + <widget class="GtkLabel" id="label216"> + <property name="visible">True</property> + <property name="label" translatable="yes">Year:</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">5</property> + <property name="bottom_attach">6</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child>
- <child> - <widget class="GtkEntry" id="entry_template_year"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Specify a format for the the {year} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function.</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">5</property> - <property name="bottom_attach">6</property> - <property name="y_options"></property> - </packing> - </child> + <child> + <widget class="GtkLabel" id="label217"> + <property name="visible">True</property> + <property name="label" translatable="yes">Date:</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">6</property> + <property name="bottom_attach">7</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child>
- <child> - <widget class="GtkEntry" id="entry_template_date"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Specify a format for the the {date} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function.</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="label218"> + <property name="visible">True</property> + <property name="label" translatable="yes">Date & Time:</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">7</property> + <property name="bottom_attach">8</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkEntry" id="entry_template_datetime"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Specify a format for the the {datetime} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function.</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">7</property> + <property name="bottom_attach">8</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkEntry" id="entry_template_year"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Specify a format for the the {year} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function.</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">5</property> + <property name="bottom_attach">6</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkEntry" id="entry_template_date"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Specify a format for the the {date} wildcard. You can use any conversion specifiers which can be used with the ANSI C strftime function.</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">6</property> + <property name="bottom_attach">7</property> + <property name="y_options"></property> + </packing> + </child> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">6</property> - <property name="bottom_attach">7</property> - <property name="y_options"></property> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> </packing> </child> </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> </child> </widget> </child> - </widget> - </child>
- <child> - <widget class="GtkLabel" id="label180"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>Template data</b></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> + <child> + <widget class="GtkLabel" id="label180"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Template data</b></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> </widget> <packing> - <property name="type">label_item</property> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> </packing> </child> </widget> @@ -9170,7 +9183,7 @@ <property name="border_width">5</property> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">0</property> + <property name="spacing">10</property>
<child> <widget class="GtkFrame" id="frame32"> @@ -9971,10 +9984,10 @@
<child> <widget class="GtkVBox" id="vbox47"> - <property name="border_width">6</property> + <property name="border_width">5</property> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">3</property> + <property name="spacing">10</property>
<child> <widget class="GtkFrame" id="frame40"> @@ -10183,10 +10196,6 @@ <property name="fill">True</property> </packing> </child> - - <child> - <placeholder/> - </child> </widget> <packing> <property name="tab_expand">False</property>
Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2010-03-15 13:01:16 UTC (rev 4760) +++ trunk/src/interface.c 2010-03-15 13:12:54 UTC (rev 4761) @@ -2661,6 +2661,7 @@ GtkWidget *image1919; GtkWidget *label193; GtkWidget *label96; + GtkWidget *vbox49; GtkWidget *frame21; GtkWidget *alignment24; GtkWidget *vbox9; @@ -2814,7 +2815,7 @@
frame25 = gtk_frame_new (NULL); gtk_widget_show (frame25); - gtk_box_pack_start (GTK_BOX (vbox20), frame25, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox20), frame25, FALSE, TRUE, 0); gtk_frame_set_shadow_type (GTK_FRAME (frame25), GTK_SHADOW_NONE);
alignment28 = gtk_alignment_new (0.5, 0.5, 1, 1); @@ -2912,9 +2913,10 @@ gtk_widget_show (label233); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook5), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook5), 0), label233);
- vbox41 = gtk_vbox_new (FALSE, 0); + vbox41 = gtk_vbox_new (FALSE, 10); gtk_widget_show (vbox41); gtk_container_add (GTK_CONTAINER (notebook5), vbox41); + gtk_container_set_border_width (GTK_CONTAINER (vbox41), 5);
frame19 = gtk_frame_new (NULL); gtk_widget_show (frame19); @@ -2958,7 +2960,6 @@ frame36 = gtk_frame_new (NULL); gtk_widget_show (frame36); gtk_box_pack_start (GTK_BOX (vbox41), frame36, FALSE, TRUE, 0); - gtk_container_set_border_width (GTK_CONTAINER (frame36), 5); gtk_frame_set_shadow_type (GTK_FRAME (frame36), GTK_SHADOW_NONE);
alignment39 = gtk_alignment_new (0.5, 0.5, 1, 1); @@ -2991,7 +2992,7 @@
frame35 = gtk_frame_new (NULL); gtk_widget_show (frame35); - gtk_box_pack_start (GTK_BOX (vbox41), frame35, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox41), frame35, FALSE, TRUE, 0); gtk_frame_set_shadow_type (GTK_FRAME (frame35), GTK_SHADOW_NONE);
alignment38 = gtk_alignment_new (0.5, 0.5, 1, 1); @@ -3562,9 +3563,10 @@ gtk_widget_show (label211); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook4), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook4), 0), label211);
- vbox40 = gtk_vbox_new (FALSE, 6); + vbox40 = gtk_vbox_new (FALSE, 10); gtk_widget_show (vbox40); gtk_container_add (GTK_CONTAINER (notebook4), vbox40); + gtk_container_set_border_width (GTK_CONTAINER (vbox40), 5);
label_project_indent_warning = gtk_vbox_new (FALSE, 0); gtk_widget_show (label_project_indent_warning); @@ -3572,7 +3574,7 @@
frame27 = gtk_frame_new (NULL); gtk_widget_show (frame27); - gtk_box_pack_start (GTK_BOX (vbox40), frame27, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox40), 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); @@ -3704,14 +3706,14 @@ gtk_widget_show (label232); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook4), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook4), 1), label232);
- vbox39 = gtk_vbox_new (FALSE, 1); + vbox39 = gtk_vbox_new (FALSE, 10); gtk_widget_show (vbox39); gtk_container_add (GTK_CONTAINER (notebook4), vbox39); + gtk_container_set_border_width (GTK_CONTAINER (vbox39), 5);
frame18 = gtk_frame_new (NULL); gtk_widget_show (frame18); gtk_box_pack_start (GTK_BOX (vbox39), frame18, FALSE, TRUE, 0); - gtk_container_set_border_width (GTK_CONTAINER (frame18), 5); gtk_frame_set_shadow_type (GTK_FRAME (frame18), GTK_SHADOW_NONE);
alignment21 = gtk_alignment_new (0.5, 0.5, 1, 1); @@ -3813,7 +3815,6 @@ frame38 = gtk_frame_new (NULL); gtk_widget_show (frame38); gtk_box_pack_start (GTK_BOX (vbox39), frame38, FALSE, TRUE, 0); - gtk_container_set_border_width (GTK_CONTAINER (frame38), 5); gtk_frame_set_shadow_type (GTK_FRAME (frame38), GTK_SHADOW_NONE);
alignment42 = gtk_alignment_new (0.5, 0.5, 1, 1); @@ -4379,7 +4380,7 @@
frame26 = gtk_frame_new (NULL); gtk_widget_show (frame26); - gtk_box_pack_start (GTK_BOX (vbox23), frame26, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox23), frame26, FALSE, TRUE, 0); gtk_frame_set_shadow_type (GTK_FRAME (frame26), GTK_SHADOW_NONE);
alignment29 = gtk_alignment_new (0.5, 0.5, 1, 1); @@ -4426,10 +4427,14 @@ gtk_widget_show (label96); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 5), label96);
+ vbox49 = gtk_vbox_new (FALSE, 10); + gtk_widget_show (vbox49); + gtk_container_add (GTK_CONTAINER (notebook2), vbox49); + gtk_container_set_border_width (GTK_CONTAINER (vbox49), 5); + frame21 = gtk_frame_new (NULL); gtk_widget_show (frame21); - gtk_container_add (GTK_CONTAINER (notebook2), frame21); - gtk_container_set_border_width (GTK_CONTAINER (frame21), 5); + gtk_box_pack_start (GTK_BOX (vbox49), frame21, FALSE, TRUE, 0); gtk_frame_set_shadow_type (GTK_FRAME (frame21), GTK_SHADOW_NONE);
alignment24 = gtk_alignment_new (0.5, 0.5, 1, 1); @@ -4619,7 +4624,7 @@ gtk_widget_show (label151); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 7), label151);
- vbox27 = gtk_vbox_new (FALSE, 0); + vbox27 = gtk_vbox_new (FALSE, 10); gtk_widget_show (vbox27); gtk_container_add (GTK_CONTAINER (notebook2), vbox27); gtk_container_set_border_width (GTK_CONTAINER (vbox27), 5); @@ -5072,6 +5077,7 @@ GLADE_HOOKUP_OBJECT (prefs_dialog, image1919, "image1919"); GLADE_HOOKUP_OBJECT (prefs_dialog, label193, "label193"); GLADE_HOOKUP_OBJECT (prefs_dialog, label96, "label96"); + GLADE_HOOKUP_OBJECT (prefs_dialog, vbox49, "vbox49"); GLADE_HOOKUP_OBJECT (prefs_dialog, frame21, "frame21"); GLADE_HOOKUP_OBJECT (prefs_dialog, alignment24, "alignment24"); GLADE_HOOKUP_OBJECT (prefs_dialog, vbox9, "vbox9"); @@ -5307,10 +5313,10 @@ gtk_widget_show (label227); gtk_notebook_set_tab_label (GTK_NOTEBOOK (project_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (project_notebook), 0), label227);
- vbox47 = gtk_vbox_new (FALSE, 3); + vbox47 = gtk_vbox_new (FALSE, 10); gtk_widget_show (vbox47); gtk_container_add (GTK_CONTAINER (project_notebook), vbox47); - gtk_container_set_border_width (GTK_CONTAINER (vbox47), 6); + gtk_container_set_border_width (GTK_CONTAINER (vbox47), 5);
frame40 = gtk_frame_new (NULL); gtk_widget_show (frame40);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.