Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Tue, 27 May 2014 13:53:32 UTC Commit: 4adbd5088060839421eb34adb42dd762d6e5b034 https://github.com/geany/geany/commit/4adbd5088060839421eb34adb42dd762d6e5b0...

Log Message: ----------- Remove some empty table rows and columns from the Glade file

Cleanup some useless placeholders, and replace some one-column tables with vertical boxes.

No UI changes.

Modified Paths: -------------- data/geany.glade

Modified: data/geany.glade 162 lines changed, 52 insertions(+), 110 deletions(-) =================================================================== @@ -2431,9 +2431,6 @@ </packing> </child> <child> - <placeholder/> - </child> - <child> <object class="GtkFrame" id="frame_toolbar_style"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -2535,7 +2532,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> @@ -2641,7 +2638,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> </object> @@ -3548,26 +3545,9 @@ <property name="can_focus">False</property> <property name="left_padding">12</property> <child> - <object class="GtkTable" id="table16"> + <object class="GtkVBox" id="vbox10"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="n_rows">5</property> - <property name="n_columns">2</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> <child> <object class="GtkCheckButton" id="check_autoclose_parenthesis"> <property name="label" translatable="yes">Parenthesis ( )</property> @@ -3579,59 +3559,57 @@ <property name="draw_indicator">True</property> </object> <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkCheckButton" id="check_autoclose_squote"> - <property name="label" translatable="yes">Single quotes ' '</property> + <object class="GtkCheckButton" id="check_autoclose_cbracket"> + <property name="label" translatable="yes">Curly brackets { }</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Auto-close single quote when typing an opening one</property> + <property name="tooltip_text" translatable="yes">Auto-close curly bracket when typing an opening one</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> </object> <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkCheckButton" id="check_autoclose_cbracket"> - <property name="label" translatable="yes">Curly brackets { }</property> + <object class="GtkCheckButton" id="check_autoclose_sbracket"> + <property name="label" translatable="yes">Square brackets [ ]</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Auto-close curly bracket when typing an opening one</property> + <property name="tooltip_text" translatable="yes">Auto-close square-bracket when typing an opening one</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> </object> <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> <child> - <object class="GtkCheckButton" id="check_autoclose_sbracket"> - <property name="label" translatable="yes">Square brackets [ ]</property> + <object class="GtkCheckButton" id="check_autoclose_squote"> + <property name="label" translatable="yes">Single quotes ' '</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Auto-close square-bracket when typing an opening one</property> + <property name="tooltip_text" translatable="yes">Auto-close single quote when typing an opening one</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> </object> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">3</property> </packing> </child> <child> @@ -3645,10 +3623,9 @@ <property name="draw_indicator">True</property> </object> <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"/> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">4</property> </packing> </child> </object> @@ -5959,35 +5936,9 @@ </packing> </child> <child> - <object class="GtkTable" id="table4"> + <object class="GtkVBox" id="vbox16"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="n_rows">8</property> - <property name="n_columns">2</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> <child> <object class="GtkCheckButton" id="check_scroll_key"> <property name="label" translatable="yes">Scroll on keystroke</property> @@ -5998,8 +5949,9 @@ <property name="draw_indicator">True</property> </object> <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> @@ -6012,10 +5964,9 @@ <property name="draw_indicator">True</property> </object> <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> <child> @@ -6028,10 +5979,9 @@ <property name="draw_indicator">True</property> </object> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> <child> @@ -6044,10 +5994,9 @@ <property name="draw_indicator">True</property> </object> <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> </packing> </child> <child> @@ -6060,10 +6009,9 @@ <property name="draw_indicator">True</property> </object> <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> </packing> </child> <child> @@ -6076,10 +6024,9 @@ <property name="draw_indicator">True</property> </object> <packing> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> </packing> </child> <child> @@ -6092,10 +6039,9 @@ <property name="draw_indicator">True</property> </object> <packing> - <property name="top_attach">6</property> - <property name="bottom_attach">7</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">6</property> </packing> </child> <child> @@ -6109,10 +6055,9 @@ <property name="draw_indicator">True</property> </object> <packing> - <property name="top_attach">7</property> - <property name="bottom_attach">8</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">7</property> </packing> </child> </object> @@ -9197,9 +9142,6 @@ <property name="position">0</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="position">3</property>

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).