sc/uiconfig/scalc/ui/randomnumbergenerator.ui | 311 +++++++++++++-------------
1 file changed, 156 insertions(+), 155 deletions(-)
New commits:
commit 09426fdd9480b192c7a314d72bac12900f049c4b
Author: Olivier Hallot <olivier.hal...@edx.srv.br>
Date: Sat Aug 30 15:56:09 2014 -0300
Improve layout of random number generator dialog
New widgets arrangement in Calc - Edit - Fill - Random Numbers dialog.
I placed the distribution parameters closer to the distribution combo box.
Custom Seed and Decimal Places are now global options for the generators.
Help page for the new layout will follow.
Change-Id: I0d3f4c09b2c172271b675078abca6013c35a1da2
Reviewed-on: https://gerrit.libreoffice.org/11206
Reviewed-by: Thomas Arnhold <tho...@arnhold.org>
Tested-by: Thomas Arnhold <tho...@arnhold.org>
diff --git a/sc/uiconfig/scalc/ui/randomnumbergenerator.ui
b/sc/uiconfig/scalc/ui/randomnumbergenerator.ui
index 1e3e00b..6dab133 100644
--- a/sc/uiconfig/scalc/ui/randomnumbergenerator.ui
+++ b/sc/uiconfig/scalc/ui/randomnumbergenerator.ui
@@ -77,6 +77,80 @@
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="apply">
+ <property name="label">gtk-apply</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="close">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
<object class="GtkFrame" id="frame-data">
<property name="visible">True</property>
@@ -156,81 +230,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area1">
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="apply">
- <property name="label">gtk-apply</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="ok">
- <property name="label">gtk-ok</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="close">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="help">
- <property name="label">gtk-help</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -282,30 +282,31 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="enable-seed-check">
- <property name="label" translatable="yes">Enable
Custom Seed</property>
+ <object class="GtkLabel" id="parameter1-label">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="xalign">0</property>
- <property name="draw_indicator">True</property>
+ <property name="label"
translatable="yes">...</property>
+ <property name="use_underline">True</property>
+ <property
name="mnemonic_widget">parameter1-spin</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">2</property>
+ <property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="seed-label">
+ <object class="GtkLabel" id="parameter2-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="xalign">0</property>
- <property name="label"
translatable="yes">Seed</property>
+ <property name="label"
translatable="yes">...</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">seed-spin</property>
+ <property
name="mnemonic_widget">parameter2-spin</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -315,66 +316,36 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="seed-spin">
+ <object class="GtkSpinButton" id="parameter1-spin">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="invisible_char">â¢</property>
+ <property name="text"
translatable="yes">0,0000</property>
+ <property
name="adjustment">parameter2-adjustment</property>
+ <property name="digits">4</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton"
id="enable-rounding-check">
- <property name="label" translatable="yes">Enable
Rounding</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- <property name="width">2</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="decimal-places-label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Decimal
Places</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">decimal-places-spin</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
+ <property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="decimal-places-spin">
+ <object class="GtkSpinButton" id="parameter2-spin">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="invisible_char">â¢</property>
- <property name="text" translatable="yes">1</property>
- <property
name="adjustment">decimal-places-adjustment</property>
+ <property name="text"
translatable="yes">1,0000</property>
+ <property
name="adjustment">parameter1-adjustment</property>
+ <property name="digits">4</property>
<property name="value">1</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">4</property>
+ <property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
@@ -401,13 +372,13 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame-parameters">
+ <object class="GtkFrame" id="frame-options">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">6</property>
@@ -415,37 +386,36 @@
<property name="left_padding">12</property>
<property name="right_padding">12</property>
<child>
- <object class="GtkGrid" id="grid1">
+ <object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
- <object class="GtkLabel" id="parameter1-label">
+ <object class="GtkCheckButton" id="enable-seed-check">
+ <property name="label" translatable="yes">Enable
Custom Seed</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">...</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property
name="mnemonic_widget">parameter1-spin</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
+ <property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="parameter2-label">
+ <object class="GtkLabel" id="seed-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="xalign">0</property>
- <property name="label"
translatable="yes">...</property>
+ <property name="label"
translatable="yes">Seed</property>
<property name="use_underline">True</property>
- <property
name="mnemonic_widget">parameter2-spin</property>
+ <property name="mnemonic_widget">seed-spin</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -455,36 +425,65 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="parameter1-spin">
+ <object class="GtkSpinButton" id="seed-spin">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="invisible_char">â¢</property>
- <property name="text"
translatable="yes">0,0000</property>
- <property
name="adjustment">parameter2-adjustment</property>
- <property name="digits">4</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="parameter2-spin">
+ <object class="GtkCheckButton"
id="enable-rounding-check">
+ <property name="label" translatable="yes">Enable
Rounding</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="decimal-places-label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Decimal
Places</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="decimal-places-spin">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="invisible_char">â¢</property>
- <property name="text"
translatable="yes">1,0000</property>
- <property
name="adjustment">parameter1-adjustment</property>
- <property name="digits">4</property>
+ <property name="text" translatable="yes">1</property>
+ <property
name="adjustment">decimal-places-adjustment</property>
<property name="value">1</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">1</property>
+ <property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
@@ -494,10 +493,10 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label3">
+ <object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Distribution
Parameters</property>
+ <property name="label" translatable="yes">Options</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -521,19 +520,21 @@
<object class="GtkSizeGroup" id="sizegroup1">
<widgets>
<widget name="distribution-label"/>
- <widget name="seed-label"/>
- <widget name="decimal-places-label"/>
<widget name="parameter1-label"/>
<widget name="parameter2-label"/>
+ <widget name="enable-seed-check"/>
+ <widget name="seed-label"/>
+ <widget name="enable-rounding-check"/>
+ <widget name="decimal-places-label"/>
</widgets>
</object>
<object class="GtkSizeGroup" id="sizegroup2">
<widgets>
<widget name="distribution-combo"/>
- <widget name="seed-spin"/>
- <widget name="decimal-places-spin"/>
<widget name="parameter1-spin"/>
<widget name="parameter2-spin"/>
+ <widget name="seed-spin"/>
+ <widget name="decimal-places-spin"/>
</widgets>
</object>
</interface>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
