diff options
| -rw-r--r-- | sc/Library_sc.mk | 15 | ||||
| -rw-r--r-- | sc/UIConfig_scalc.mk | 2 | ||||
| -rw-r--r-- | sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx | 25 | ||||
| -rw-r--r-- | sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx | 25 | ||||
| -rw-r--r-- | sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx | 8 | ||||
| -rw-r--r-- | sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx | 20 | ||||
| -rw-r--r-- | sc/source/ui/inc/CorrelationDialog.hxx | 8 | ||||
| -rw-r--r-- | sc/source/ui/inc/CovarianceDialog.hxx | 8 | ||||
| -rw-r--r-- | sc/source/ui/inc/MatrixComparisonGenerator.hxx | 6 | ||||
| -rw-r--r-- | sc/source/ui/inc/StatisticsInputOutputDialog.hxx | 14 | ||||
| -rwxr-xr-x[-rw-r--r--] | sc/uiconfig/scalc/ui/analysisofvariancedialog.ui | 146 | ||||
| -rwxr-xr-x | sc/uiconfig/scalc/ui/correlationdialog.ui | 11 | ||||
| -rwxr-xr-x | sc/uiconfig/scalc/ui/covariancedialog.ui | 11 | ||||
| -rwxr-xr-x[-rw-r--r--] | sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui | 79 |
15 files changed, 265 insertions, 117 deletions
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index 3cd88dbb20a7..509595f24615 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -471,13 +471,14 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/ui/sidebar/CellBorderStylePopup \ sc/source/ui/sidebar/NumberFormatPropertyPanel \ sc/source/ui/sidebar/ScPanelFactory \ - sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog \ - sc/source/ui/StatisticsDialogs/SamplingDialog \ - sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog \ - sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog \ - sc/source/ui/StatisticsDialogs/CorrelationDialog \ - sc/source/ui/StatisticsDialogs/CovarianceDialog \ - sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog \ + sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog \ + sc/source/ui/StatisticsDialogs/CorrelationDialog \ + sc/source/ui/StatisticsDialogs/CovarianceDialog \ + sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog \ + sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator \ + sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog \ + sc/source/ui/StatisticsDialogs/SamplingDialog \ + sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog \ sc/source/ui/undo/areasave \ sc/source/ui/undo/refundo \ sc/source/ui/undo/target \ diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index 6ec6ee42eb21..bfe0346c1c9d 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -64,6 +64,8 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/analysisofvariancedialog \ sc/uiconfig/scalc/ui/cellprotectionpage \ sc/uiconfig/scalc/ui/consolidatedialog \ + sc/uiconfig/scalc/ui/correlationdialog \ + sc/uiconfig/scalc/ui/covariancedialog \ sc/uiconfig/scalc/ui/createnamesdialog \ sc/uiconfig/scalc/ui/dataform \ sc/uiconfig/scalc/ui/definedatabaserangedialog \ diff --git a/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx b/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx index 7655824ac92b..4f17a48943db 100644 --- a/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx @@ -25,15 +25,7 @@ ScCorrelationDialog::ScCorrelationDialog( ScMatrixComparisonGenerator( pSfxBindings, pChildWindow, pParent, pViewData, "CorrelationDialog", "modules/scalc/ui/correlationdialog.ui" ) -{ - get(mpGroupByColumnsRadio, "groupedby-columns-radio"); - get(mpGroupByRowsRadio, "groupedby-rows-radio"); - - mpGroupByColumnsRadio->SetToggleHdl( LINK( this, ScCorrelationDialog, GroupByChanged ) ); - mpGroupByRowsRadio->SetToggleHdl( LINK( this, ScCorrelationDialog, GroupByChanged ) ); - - mpGroupByColumnsRadio->Check(true); -} +{} sal_Bool ScCorrelationDialog::Close() { @@ -50,19 +42,4 @@ const OUString& ScCorrelationDialog::getTemplate() return strCorrelationTemplate; } -ScMatrixComparisonGenerator::GroupedBy ScCorrelationDialog::getGroupedBy() -{ - return mGroupedBy; -} - -IMPL_LINK_NOARG(ScCorrelationDialog, GroupByChanged) -{ - if (mpGroupByColumnsRadio->IsChecked()) - mGroupedBy = BY_COLUMN; - else if (mpGroupByRowsRadio->IsChecked()) - mGroupedBy = BY_ROW; - - return 0; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx index dbcb97f6a592..3918654d50f6 100644 --- a/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx @@ -25,15 +25,7 @@ ScCovarianceDialog::ScCovarianceDialog( ScMatrixComparisonGenerator( pSfxBindings, pChildWindow, pParent, pViewData, "CovarianceDialog", "modules/scalc/ui/covariancedialog.ui" ) -{ - get(mpGroupByColumnsRadio, "groupedby-columns-radio"); - get(mpGroupByRowsRadio, "groupedby-rows-radio"); - - mpGroupByColumnsRadio->SetToggleHdl( LINK( this, ScCovarianceDialog, GroupByChanged ) ); - mpGroupByRowsRadio->SetToggleHdl( LINK( this, ScCovarianceDialog, GroupByChanged ) ); - - mpGroupByColumnsRadio->Check(true); -} +{} sal_Bool ScCovarianceDialog::Close() { @@ -50,19 +42,4 @@ const OUString& ScCovarianceDialog::getTemplate() return strCovarianceTemplate; } -ScMatrixComparisonGenerator::GroupedBy ScCovarianceDialog::getGroupedBy() -{ - return mGroupedBy; -} - -IMPL_LINK_NOARG(ScCovarianceDialog, GroupByChanged) -{ - if (mpGroupByColumnsRadio->IsChecked()) - mGroupedBy = BY_COLUMN; - else if (mpGroupByRowsRadio->IsChecked()) - mGroupedBy = BY_ROW; - - return 0; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx index ed9bf1c17eb5..80d1b87c5258 100644 --- a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx @@ -54,7 +54,7 @@ static const StatisticCalculation lclCalcDefinitions[] = { 0, NULL } }; -static const OUString lclWildcardRange("%RANGE%"); +static const OUString strWildcardRange("%RANGE%"); } @@ -120,7 +120,7 @@ void ScDescriptiveStatisticsDialog::CalculateInputAndWriteToOutput( ) { aAddress = ScAddress(outCol, outRow, outTab); aFormulaTemplate = OUString::createFromAscii(lclCalcDefinitions[i].aFormula); - aFormulaString = aFormulaTemplate.replaceAll(lclWildcardRange, aReferenceString); + aFormulaString = aFormulaTemplate.replaceAll(strWildcardRange, aReferenceString); pDocShell->GetDocFunc().SetFormulaCell(aAddress, new ScFormulaCell(mDocument, aAddress, aFormulaString), true); outRow++; } diff --git a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx index d3e22816e04c..ad5f67095539 100644 --- a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx +++ b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx @@ -69,7 +69,7 @@ void ScMatrixComparisonGenerator::CalculateInputAndWriteToOutput( ) ScRangeList aRangeList; - if (getGroupedBy() == BY_COLUMN) + if (mGroupedBy == BY_COLUMN) aRangeList = MakeColumnRangeList(inTab, aStart, aEnd); else aRangeList = MakeRowRangeList(inTab, aStart, aEnd); @@ -85,7 +85,7 @@ void ScMatrixComparisonGenerator::CalculateInputAndWriteToOutput( ) { aAddress = ScAddress(outCol, outRow, outTab); OUString aLabel; - if (getGroupedBy() == BY_COLUMN) + if (mGroupedBy == BY_COLUMN) aLabel = strColumnLabelTemplate.replaceAll(strWildcardNumber, OUString::number(i + 1)); else aLabel = strRowLabelTemplate.replaceAll(strWildcardNumber, OUString::number(i + 1)); @@ -103,7 +103,7 @@ void ScMatrixComparisonGenerator::CalculateInputAndWriteToOutput( ) aAddress = ScAddress(outCol, outRow, outTab); OUString aLabel; - if (getGroupedBy() == BY_COLUMN) + if (mGroupedBy == BY_COLUMN) aLabel = strColumnLabelTemplate.replaceAll(strWildcardNumber, OUString::number(i + 1)); else aLabel = strRowLabelTemplate.replaceAll(strWildcardNumber, OUString::number(i + 1)); @@ -119,7 +119,7 @@ void ScMatrixComparisonGenerator::CalculateInputAndWriteToOutput( ) mOutputAddress.Row() + 1, inTab); - if (getGroupedBy() == BY_COLUMN) + if (mGroupedBy == BY_COLUMN) writeCorrelationFormulasByColumn(aAddress, aRangeList); else writeCorrelationFormulasByRow(aAddress, aRangeList); diff --git a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx index ff431d7cf677..7374965e2bc3 100644 --- a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx @@ -60,6 +60,7 @@ ScStatisticsInputOutputDialog::ScStatisticsInputOutputDialog( mViewData ( pViewData ), mDocument ( pViewData->GetDocument() ), mAddressDetails ( mDocument->GetAddressConvention(), 0, 0 ), + mGroupedBy ( BY_COLUMN ), mCurrentAddress ( pViewData->GetCurX(), pViewData->GetCurY(), pViewData->GetTabNo() ), mDialogLostFocus( false ) { @@ -79,6 +80,9 @@ ScStatisticsInputOutputDialog::ScStatisticsInputOutputDialog( get(mpButtonApply, "apply"); get(mpButtonClose, "close"); + get(mpGroupByColumnsRadio, "groupedby-columns-radio"); + get(mpGroupByRowsRadio, "groupedby-rows-radio"); + Init(); GetRangeFromSelection(); } @@ -107,6 +111,12 @@ void ScStatisticsInputOutputDialog::Init() mpOutputRangeButton->SetLoseFocusHdl( aLink ); mpOutputRangeEdit->GrabFocus(); + + mpGroupByColumnsRadio->SetToggleHdl( LINK( this, ScStatisticsInputOutputDialog, GroupByChanged ) ); + mpGroupByRowsRadio->SetToggleHdl( LINK( this, ScStatisticsInputOutputDialog, GroupByChanged ) ); + + mpGroupByColumnsRadio->Check(true); + mpGroupByRowsRadio->Check(false); } void ScStatisticsInputOutputDialog::GetRangeFromSelection() @@ -202,4 +212,14 @@ IMPL_LINK_NOARG( ScStatisticsInputOutputDialog, LoseFocusHandler ) return 0; } +IMPL_LINK_NOARG( ScStatisticsInputOutputDialog, GroupByChanged ) +{ + if (mpGroupByColumnsRadio->IsChecked()) + mGroupedBy = BY_COLUMN; + else if (mpGroupByRowsRadio->IsChecked()) + mGroupedBy = BY_ROW; + + return 0; +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/CorrelationDialog.hxx b/sc/source/ui/inc/CorrelationDialog.hxx index 76e94e1eaffb..4e89cc05897a 100644 --- a/sc/source/ui/inc/CorrelationDialog.hxx +++ b/sc/source/ui/inc/CorrelationDialog.hxx @@ -15,13 +15,6 @@ class ScCorrelationDialog : public ScMatrixComparisonGenerator { -private: - RadioButton* mpGroupByColumnsRadio; - RadioButton* mpGroupByRowsRadio; - GroupedBy mGroupedBy; - - DECL_LINK( GroupByChanged, void* ); - public: ScCorrelationDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, @@ -32,7 +25,6 @@ public: protected: virtual const OUString& getLabel(); virtual const OUString& getTemplate(); - virtual GroupedBy getGroupedBy(); }; diff --git a/sc/source/ui/inc/CovarianceDialog.hxx b/sc/source/ui/inc/CovarianceDialog.hxx index 675f3dbf5a0d..cd46701dc74d 100644 --- a/sc/source/ui/inc/CovarianceDialog.hxx +++ b/sc/source/ui/inc/CovarianceDialog.hxx @@ -15,13 +15,6 @@ class ScCovarianceDialog : public ScMatrixComparisonGenerator { -private: - RadioButton* mpGroupByColumnsRadio; - RadioButton* mpGroupByRowsRadio; - GroupedBy mGroupedBy; - - DECL_LINK( GroupByChanged, void* ); - public: ScCovarianceDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, @@ -32,7 +25,6 @@ public: protected: virtual const OUString& getLabel(); virtual const OUString& getTemplate(); - virtual GroupedBy getGroupedBy(); }; #endif diff --git a/sc/source/ui/inc/MatrixComparisonGenerator.hxx b/sc/source/ui/inc/MatrixComparisonGenerator.hxx index 6a0af4c37a7e..6cb32017dd0e 100644 --- a/sc/source/ui/inc/MatrixComparisonGenerator.hxx +++ b/sc/source/ui/inc/MatrixComparisonGenerator.hxx @@ -31,17 +31,11 @@ public: virtual ~ScMatrixComparisonGenerator(); - enum GroupedBy { - BY_COLUMN, - BY_ROW - }; - protected: virtual void CalculateInputAndWriteToOutput(); virtual const OUString& getLabel() = 0; virtual const OUString& getTemplate() = 0; - virtual GroupedBy getGroupedBy() = 0; void writeCorrelationFormulasByColumn(ScAddress aOutputAddress, ScRangeList aRangeList); void writeCorrelationFormulasByRow(ScAddress aOutputAddress, ScRangeList aRangeList); diff --git a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx index a6ad9a72b450..b4d83444ba47 100644 --- a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx +++ b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx @@ -22,6 +22,11 @@ class ScStatisticsInputOutputDialog : public ScAnyRefDlg { public: + enum GroupedBy { + BY_COLUMN, + BY_ROW + }; + ScStatisticsInputOutputDialog( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScViewData* pViewData, @@ -51,28 +56,27 @@ protected: ScRange mInputRange; ScAddress::Details mAddressDetails; ScAddress mOutputAddress; + GroupedBy mGroupedBy; static ScRangeList MakeColumnRangeList(SCTAB aTab, ScAddress aStart, ScAddress aEnd); static ScRangeList MakeRowRangeList(SCTAB aTab, ScAddress aStart, ScAddress aEnd); - private: // Widgets PushButton* mpButtonApply; OKButton* mpButtonOk; CloseButton* mpButtonClose; - + RadioButton* mpGroupByColumnsRadio; + RadioButton* mpGroupByRowsRadio; formula::RefEdit* mpActiveEdit; - - ScAddress mCurrentAddress; - bool mDialogLostFocus; void Init(); void GetRangeFromSelection(); + DECL_LINK( GroupByChanged, void* ); DECL_LINK( OkClicked, PushButton* ); DECL_LINK( CloseClicked, PushButton* ); DECL_LINK( ApplyClicked, PushButton* ); diff --git a/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui b/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui index d2ed1792c5c2..b61c59bd48e9 100644..100755 --- a/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui +++ b/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.16.0 on Sun Nov 3 11:59:31 2013 --> <interface> <!-- interface-requires gtk+ 3.0 --> <!-- interface-requires LibreOffice 1.0 --> @@ -109,7 +110,6 @@ <property name="hexpand">True</property> <property name="invisible_char">•</property> <property name="width_chars">30</property> - <property name="invisible_char_set">True</property> </object> <packing> <property name="left_attach">1</property> @@ -155,7 +155,6 @@ <property name="hexpand">True</property> <property name="invisible_char">•</property> <property name="width_chars">30</property> - <property name="invisible_char_set">True</property> </object> <packing> <property name="left_attach">1</property> @@ -178,33 +177,150 @@ </packing> </child> <child> - <object class="GtkLabel" id="alpha-label"> + <object class="GtkFrame" id="frame-grouped-by"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Alpha</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">alpha-spin</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment2"> + <property name="visible">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="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="GtkRadioButton" id="groupedby-columns-radio"> + <property name="label" translatable="yes">Columns</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="xalign">0</property> + <property name="active">True</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="height">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="groupedby-rows-radio"> + <property name="label" translatable="yes">Rows</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">groupedby-columns-radio</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Grouped by</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">2</property> - <property name="width">1</property> + <property name="width">3</property> <property name="height">1</property> </packing> </child> <child> - <object class="GtkSpinButton" id="alpha-spin"> + <object class="GtkFrame" id="frame-options"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="invisible_char">•</property> - <property name="adjustment">alpha-adjustment</property> - <property name="digits">2</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment1"> + <property name="visible">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="alpha-label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Alpha</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="alpha-spin"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="invisible_char">•</property> + <property name="adjustment">alpha-adjustment</property> + <property name="digits">2</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Parameters</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - <property name="width">2</property> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + <property name="width">3</property> <property name="height">1</property> </packing> </child> diff --git a/sc/uiconfig/scalc/ui/correlationdialog.ui b/sc/uiconfig/scalc/ui/correlationdialog.ui index 0bc5c9e80488..c8ff57737c42 100755 --- a/sc/uiconfig/scalc/ui/correlationdialog.ui +++ b/sc/uiconfig/scalc/ui/correlationdialog.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.0 on Sat Nov 2 22:30:40 2013 --> +<!-- Generated with glade 3.16.0 on Sun Nov 3 11:48:01 2013 --> <interface> <!-- interface-requires gtk+ 3.0 --> <!-- interface-requires LibreOffice 1.0 --> @@ -197,12 +197,11 @@ <property name="receives_default">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> - <property name="group">groupedby-rows-radio</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">2</property> + <property name="width">1</property> <property name="height">1</property> </packing> </child> @@ -217,9 +216,9 @@ <property name="group">groupedby-columns-radio</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">2</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> <property name="height">1</property> </packing> </child> diff --git a/sc/uiconfig/scalc/ui/covariancedialog.ui b/sc/uiconfig/scalc/ui/covariancedialog.ui index e74caf60de74..05acbf4378fa 100755 --- a/sc/uiconfig/scalc/ui/covariancedialog.ui +++ b/sc/uiconfig/scalc/ui/covariancedialog.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.0 on Sat Nov 2 22:31:31 2013 --> +<!-- Generated with glade 3.16.0 on Sun Nov 3 11:48:59 2013 --> <interface> <!-- interface-requires gtk+ 3.0 --> <!-- interface-requires LibreOffice 1.0 --> @@ -197,12 +197,11 @@ <property name="receives_default">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> - <property name="group">groupedby-rows-radio</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">2</property> + <property name="width">1</property> <property name="height">1</property> </packing> </child> @@ -217,9 +216,9 @@ <property name="group">groupedby-columns-radio</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">2</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> <property name="height">1</property> </packing> </child> diff --git a/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui b/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui index 03063de5d814..b32e2b38c0c2 100644..100755 --- a/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui +++ b/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.16.0 on Sun Nov 3 11:50:24 2013 --> <interface> <!-- interface-requires gtk+ 3.0 --> <!-- interface-requires LibreOffice 1.0 --> @@ -102,7 +103,6 @@ <property name="hexpand">True</property> <property name="invisible_char">•</property> <property name="width_chars">30</property> - <property name="invisible_char_set">True</property> </object> <packing> <property name="left_attach">1</property> @@ -148,7 +148,6 @@ <property name="hexpand">True</property> <property name="invisible_char">•</property> <property name="width_chars">30</property> - <property name="invisible_char_set">True</property> </object> <packing> <property name="left_attach">1</property> @@ -170,6 +169,82 @@ <property name="height">1</property> </packing> </child> + <child> + <object class="GtkFrame" id="frame2"> + <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"> + <property name="visible">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="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="GtkRadioButton" id="groupedby-columns-radio"> + <property name="label" translatable="yes">Columns</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="xalign">0</property> + <property name="active">True</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="height">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="groupedby-rows-radio"> + <property name="label" translatable="yes">Rows</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">groupedby-columns-radio</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Grouped by</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">3</property> + <property name="height">1</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> |