sc/uiconfig/scalc/ui/samplingdialog.ui | 244 +++++++++++++++++++-------------- vcl/source/window/builder.cxx | 15 +- 2 files changed, 158 insertions(+), 101 deletions(-)
New commits: commit 935479913eb53349f106fdace3e0c7cee4399eb5 Author: Szymon Kłos <[email protected]> AuthorDate: Tue Dec 8 16:59:12 2020 +0100 Commit: Szymon Kłos <[email protected]> CommitDate: Mon Dec 14 09:46:18 2020 +0100 jsdialog: enable statistics dialogs Change-Id: Ie139192755baf925a864e26e579503b68f6ac65b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107587 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Szymon Kłos <[email protected]> diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index aa6b2f4ab90e..bc1e9d36c10a 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -173,7 +173,20 @@ weld::Builder* Application::CreateBuilder(weld::Widget* pParent, const OUString if (rUIFile == "modules/scalc/ui/pivottablelayoutdialog.ui" || rUIFile == "modules/scalc/ui/selectsource.ui" || rUIFile == "modules/scalc/ui/managenamesdialog.ui" - || rUIFile == "modules/scalc/ui/definename.ui") + || rUIFile == "modules/scalc/ui/definename.ui" + || rUIFile == "modules/scalc/ui/correlationdialog.ui" + || rUIFile == "modules/scalc/ui/samplingdialog.ui" + || rUIFile == "modules/scalc/ui/descriptivestatisticsdialog.ui" + || rUIFile == "modules/scalc/ui/analysisofvariancedialog.ui" + || rUIFile == "modules/scalc/ui/covariancedialog.ui" + || rUIFile == "modules/scalc/ui/exponentialsmoothingdialog.ui" + || rUIFile == "modules/scalc/ui/movingaveragedialog.ui" + || rUIFile == "modules/scalc/ui/regressiondialog.ui" + || rUIFile == "modules/scalc/ui/ttestdialog.ui" + || rUIFile == "modules/scalc/ui/ttestdialog.ui" + || rUIFile == "modules/scalc/ui/ztestdialog.ui" + || rUIFile == "modules/scalc/ui/chisquaretestdialog.ui" + || rUIFile == "modules/scalc/ui/fourieranalysisdialog.ui") { bUseJSBuilder = true; } commit f11b25030460e3dcfc7c75f479b844ea1e9c349e Author: Szymon Kłos <[email protected]> AuthorDate: Fri Dec 11 11:25:42 2020 +0100 Commit: Szymon Kłos <[email protected]> CommitDate: Mon Dec 14 09:46:08 2020 +0100 sampling dialog: improve layout added correct alignment for sections under radio buttons Change-Id: I3235182447d37056349f8954a757b6330863c7b0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107588 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Szymon Kłos <[email protected]> diff --git a/sc/uiconfig/scalc/ui/samplingdialog.ui b/sc/uiconfig/scalc/ui/samplingdialog.ui index e185f7c9f787..656eda9ae534 100644 --- a/sc/uiconfig/scalc/ui/samplingdialog.ui +++ b/sc/uiconfig/scalc/ui/samplingdialog.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> +<!-- Generated with glade 3.20.4 --> <interface domain="sc"> <requires lib="gtk+" version="3.18"/> <object class="GtkAdjustment" id="period-adjustment"> @@ -22,9 +22,6 @@ <property name="default_width">0</property> <property name="default_height">0</property> <property name="type_hint">dialog</property> - <child> - <placeholder/> - </child> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> <property name="can_focus">False</property> @@ -223,44 +220,10 @@ <property name="left_padding">12</property> <property name="right_padding">12</property> <child> - <object class="GtkGrid" id="grid2"> + <object class="GtkBox"> <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="GtkSpinButton" id="sample-size-spin"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="text">1</property> - <property name="adjustment">sample-size-adjustment</property> - <property name="value">1</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">12</property> - <property name="hexpand">True</property> - <property name="xpad">12</property> - <property name="label" translatable="yes" context="samplingdialog|label1">Sample size:</property> - <property name="use_underline">True</property> - <property name="justify">center</property> - <property name="mnemonic_widget">sample-size-spin</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> + <property name="orientation">vertical</property> <child> <object class="GtkRadioButton" id="random-method-radio"> <property name="label" translatable="yes" context="samplingdialog|random-method-radio">Random</property> @@ -273,90 +236,168 @@ <property name="draw_indicator">True</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">2</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkRadioButton" id="periodic-method-radio"> - <property name="label" translatable="yes" context="samplingdialog|periodic-method-radio">Periodic</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> - <property name="group">random-method-radio</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="period-spin"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="text">1</property> - <property name="adjustment">period-adjustment</property> - <property name="value">1</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">5</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label3"> + <object class="GtkAlignment"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">12</property> - <property name="hexpand">True</property> - <property name="xpad">12</property> - <property name="label" translatable="yes" context="samplingdialog|label3">Period:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">period-spin</property> - <property name="xalign">0</property> + <property name="top_padding">6</property> + <property name="bottom_padding">6</property> + <property name="left_padding">12</property> + <property name="right_padding">12</property> + <child> + <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="GtkSpinButton" id="sample-size-spin"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="text">1</property> + <property name="adjustment">sample-size-adjustment</property> + <property name="value">1</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_left">12</property> + <property name="hexpand">True</property> + <property name="xpad">12</property> + <property name="label" translatable="yes" context="samplingdialog|label1">Sample size:</property> + <property name="use_underline">True</property> + <property name="justify">center</property> + <property name="mnemonic_widget">sample-size-spin</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="with-replacement"> + <property name="label" translatable="yes" context="samplingdialog|with-replacement">With replacement</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">1</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="keep-order"> + <property name="label" translatable="yes" context="samplingdialog|keep-order">Keep order</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> + </packing> + </child> + </object> + </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkCheckButton" id="with-replacement"> - <property name="label" translatable="yes" context="samplingdialog|with-replacement">With replacement</property> + <object class="GtkRadioButton" id="periodic-method-radio"> + <property name="label" translatable="yes" context="samplingdialog|periodic-method-radio">Periodic</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> + <property name="group">random-method-radio</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - <property name="width">2</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> <child> - <object class="GtkCheckButton" id="keep-order"> - <property name="label" translatable="yes" context="samplingdialog|keep-order">Keep order</property> + <object class="GtkAlignment"> <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> + <property name="can_focus">False</property> + <property name="top_padding">6</property> + <property name="bottom_padding">6</property> + <property name="left_padding">12</property> + <property name="right_padding">12</property> + <child> + <object class="GtkGrid" id="grid3"> + <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="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="xpad">12</property> + <property name="label" translatable="yes" context="samplingdialog|label3">Period:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">period-spin</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="period-spin"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="text">1</property> + <property name="adjustment">period-adjustment</property> + <property name="value">1</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - <property name="width">2</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> </packing> </child> </object> @@ -387,5 +428,8 @@ <action-widget response="-6">cancel</action-widget> <action-widget response="-11">help</action-widget> </action-widgets> + <child> + <placeholder/> + </child> </object> </interface> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
