Skip to content

C
core
Kaydet (Commit) a683074c authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

weld ScRandomNumberGeneratorDialog 

Change-Id: I9ef8dd4ba84f37bb3bec040781766ef779d02ea1
Reviewed-on: https://gerrit.libreoffice.org/70590
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 41792cee
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 92 deletions
sc/source/ui/inc/RandomNumberGeneratorDialog.hxx
Dosyayı görüntüle @ a683074c
......@@ -20,38 +20,20 @@
namespace boost { template <typename T> class optional; }
class ScRandomNumberGeneratorDialog : public ScAnyRefDlg
class ScRandomNumberGeneratorDialog : public ScAnyRefDlgController
{
public:
ScRandomNumberGeneratorDialog(
SfxBindings* pB, SfxChildWindow* pCW,
vcl::Window* pParent, ScViewData* pViewData );
weld::Window* pParent, ScViewData* pViewData );
virtual ~ScRandomNumberGeneratorDialog() override;
virtual void dispose() override;
virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override;
virtual void SetActive() override;
virtual bool Close() override;
virtual void Close() override;
private:
// Widgets
VclPtr<FixedText> mpInputRangeText;
VclPtr<formula::RefEdit> mpInputRangeEdit;
VclPtr<formula::RefButton> mpInputRangeButton;
VclPtr<ListBox> mpDistributionCombo;
VclPtr<FixedText> mpParameter1Text;
VclPtr<NumericField> mpParameter1Value;
VclPtr<FixedText> mpParameter2Text;
VclPtr<NumericField> mpParameter2Value;
VclPtr<NumericField> mpSeed;
VclPtr<CheckBox> mpEnableSeed;
VclPtr<NumericField> mpDecimalPlaces;
VclPtr<CheckBox> mpEnableRounding;
VclPtr<PushButton> mpButtonApply;
VclPtr<OKButton> mpButtonOk;
VclPtr<CloseButton> mpButtonClose;
// Data
ScViewData* const mpViewData;
ScDocument* const mpDoc;
......@@ -60,6 +42,23 @@ private:
bool mbDialogLostFocus;
// Widgets
std::unique_ptr<weld::Label> mxInputRangeText;
std::unique_ptr<formula::WeldRefEdit> mxInputRangeEdit;
std::unique_ptr<formula::WeldRefButton> mxInputRangeButton;
std::unique_ptr<weld::ComboBox> mxDistributionCombo;
std::unique_ptr<weld::Label> mxParameter1Text;
std::unique_ptr<weld::SpinButton> mxParameter1Value;
std::unique_ptr<weld::Label> mxParameter2Text;
std::unique_ptr<weld::SpinButton> mxParameter2Value;
std::unique_ptr<weld::SpinButton> mxSeed;
std::unique_ptr<weld::CheckButton> mxEnableSeed;
std::unique_ptr<weld::SpinButton> mxDecimalPlaces;
std::unique_ptr<weld::CheckButton> mxEnableRounding;
std::unique_ptr<weld::Button> mxButtonApply;
std::unique_ptr<weld::Button> mxButtonOk;
std::unique_ptr<weld::Button> mxButtonClose;
void Init();
void GetRangeFromSelection();
......@@ -69,17 +68,19 @@ private:
void SelectGeneratorAndGenerateNumbers();
DECL_LINK( OkClicked, Button*, void );
DECL_LINK( CloseClicked, Button*, void );
DECL_LINK( ApplyClicked, Button*, void );
DECL_LINK( GetFocusHandler, Control&, void );
DECL_LINK( LoseFocusHandler, Control&, void );
DECL_LINK( InputRangeModified, Edit&, void );
DECL_LINK( Parameter1ValueModified, Edit&, void );
DECL_LINK( Parameter2ValueModified, Edit&, void );
DECL_LINK( DistributionChanged, ListBox&, void );
DECL_LINK( CheckChanged, CheckBox&, void );
DECL_LINK( OkClicked, weld::Button&, void );
DECL_LINK( CloseClicked, weld::Button&, void );
DECL_LINK( ApplyClicked, weld::Button&, void );
DECL_LINK( GetEditFocusHandler, formula::WeldRefEdit&, void );
DECL_LINK( GetButtonFocusHandler, formula::WeldRefButton&, void );
DECL_LINK( LoseEditFocusHandler, formula::WeldRefEdit&, void );
DECL_LINK( LoseButtonFocusHandler, formula::WeldRefButton&, void );
DECL_LINK( InputRangeModified, formula::WeldRefEdit&, void );
DECL_LINK( Parameter1ValueModified, weld::SpinButton&, void );
DECL_LINK( Parameter2ValueModified, weld::SpinButton&, void );
DECL_LINK( DistributionChanged, weld::ComboBox&, void );
DECL_LINK( CheckChanged, weld::ToggleButton&, void );
};
......
sc/source/ui/inc/reffact.hxx
Dosyayı görüntüle @ a683074c
......@@ -76,7 +76,7 @@ private:
};
class ScRandomNumberGeneratorDialogWrapper :
public ChildWindowWrapper<SID_RANDOM_NUMBER_GENERATOR_DIALOG>
public ChildControllerWrapper<SID_RANDOM_NUMBER_GENERATOR_DIALOG>
{
private:
ScRandomNumberGeneratorDialogWrapper() = delete;
......
sc/source/ui/view/tabvwshc.cxx
Dosyayı görüntüle @ a683074c
......@@ -277,12 +277,6 @@ VclPtr<SfxModelessDialog> ScTabViewShell::CreateRefDialog(
}
break;
case SID_RANDOM_NUMBER_GENERATOR_DIALOG:
{
pResult = VclPtr<ScRandomNumberGeneratorDialog>::Create( pB, pCW, pParent, &GetViewData() );
}
break;
case SID_OPENDLG_OPTSOLVER:
{
ScViewData& rViewData = GetViewData();
......@@ -499,6 +493,9 @@ std::unique_ptr<SfxModelessDialogController> ScTabViewShell::CreateRefDialogCont
}
break;
}
case SID_RANDOM_NUMBER_GENERATOR_DIALOG:
xResult.reset(new ScRandomNumberGeneratorDialog(pB, pCW, pParent, &GetViewData()));
break;
}
if (xResult)
......
sc/uiconfig/scalc/ui/randomnumbergenerator.ui
Dosyayı görüntüle @ a683074c
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<!-- Generated with glade 3.22.1 -->
<interface domain="sc">
<requires lib="gtk+" version="3.18"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">10000000000</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkAdjustment" id="decimal-places-adjustment">
<property name="lower">1</property>
<property name="upper">255</property>
......@@ -10,52 +14,6 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkListStore" id="distribution-liststore">
<columns>
<!-- column-name value -->
<column type="gchararray"/>
<!-- column-name id -->
<column type="gint"/>
</columns>
<data>
<row>
<col id="0" translatable="yes" context="randomnumbergenerator|distribution-liststore">Uniform</col>
<col id="1">0</col>
</row>
<row>
<col id="0" translatable="yes" context="randomnumbergenerator|distribution-liststore">Uniform Integer</col>
<col id="1">8</col>
</row>
<row>
<col id="0" translatable="yes" context="randomnumbergenerator|distribution-liststore">Normal</col>
<col id="1">1</col>
</row>
<row>
<col id="0" translatable="yes" context="randomnumbergenerator|distribution-liststore">Cauchy</col>
<col id="1">2</col>
</row>
<row>
<col id="0" translatable="yes" context="randomnumbergenerator|distribution-liststore">Bernoulli</col>
<col id="1">3</col>
</row>
<row>
<col id="0" translatable="yes" context="randomnumbergenerator|distribution-liststore">Binomial</col>
<col id="1">4</col>
</row>
<row>
<col id="0" translatable="yes" context="randomnumbergenerator|distribution-liststore">Chi Squared</col>
<col id="1">5</col>
</row>
<row>
<col id="0" translatable="yes" context="randomnumbergenerator|distribution-liststore">Geometric</col>
<col id="1">6</col>
</row>
<row>
<col id="0" translatable="yes" context="randomnumbergenerator|distribution-liststore">Negative Binomial</col>
<col id="1">7</col>
</row>
</data>
</object>
<object class="GtkAdjustment" id="parameter1-adjustment">
<property name="upper">100</property>
<property name="value">1</property>
......@@ -72,7 +30,12 @@
<property name="border_width">6</property>
<property name="title" translatable="yes" context="randomnumbergenerator|RandomNumberGeneratorDialog">Random Number Generator</property>
<property name="resizable">False</property>
<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>
......@@ -188,11 +151,12 @@
</packing>
</child>
<child>
<object class="foruilo-RefEdit" id="cell-range-edit">
<object class="GtkEntry" id="cell-range-edit">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="activates_default">True</property>
<property name="width_chars">30</property>
</object>
<packing>
......@@ -202,7 +166,7 @@
</packing>
</child>
<child>
<object class="foruilo-RefButton" id="cell-range-button">
<object class="GtkButton" id="cell-range-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
......@@ -269,11 +233,22 @@
</packing>
</child>
<child>
<object class="GtkComboBox" id="distribution-combo">
<object class="GtkComboBoxText" id="distribution-combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="model">distribution-liststore</property>
<property name="active">0</property>
<items>
<item id="0" translatable="yes" context="randomnumbergenerator|distribution-liststore">Uniform</item>
<item id="8" translatable="yes" context="randomnumbergenerator|distribution-liststore">Uniform Integer</item>
<item id="1" translatable="yes" context="randomnumbergenerator|distribution-liststore">Normal</item>
<item id="2" translatable="yes" context="randomnumbergenerator|distribution-liststore">Cauchy</item>
<item id="3" translatable="yes" context="randomnumbergenerator|distribution-liststore">Bernoulli</item>
<item id="4" translatable="yes" context="randomnumbergenerator|distribution-liststore">Binomial</item>
<item id="5" translatable="yes" context="randomnumbergenerator|distribution-liststore">Chi Squared</item>
<item id="6" translatable="yes" context="randomnumbergenerator|distribution-liststore">Geometric</item>
<item id="7" translatable="yes" context="randomnumbergenerator|distribution-liststore">Negative Binomial</item>
</items>
</object>
<packing>
<property name="left_attach">1</property>
......@@ -315,6 +290,7 @@
<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">0,0000</property>
<property name="adjustment">parameter2-adjustment</property>
<property name="digits">4</property>
......@@ -329,6 +305,7 @@
<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,0000</property>
<property name="adjustment">parameter1-adjustment</property>
<property name="digits">4</property>
......@@ -416,6 +393,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="activates_default">True</property>
<property name="adjustment">adjustment1</property>
</object>
<packing>
<property name="left_attach">1</property>
......@@ -459,6 +438,7 @@
<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">decimal-places-adjustment</property>
<property name="value">1</property>
......@@ -492,7 +472,7 @@
</object>
</child>
<action-widgets>
<action-widget response="0">apply</action-widget>
<action-widget response="100">apply</action-widget>
<action-widget response="-5">ok</action-widget>
<action-widget response="-7">close</action-widget>
<action-widget response="-11">help</action-widget>
......
solenv/sanitizers/ui/modules/scalc.suppr
Dosyayı görüntüle @ a683074c
......@@ -175,6 +175,7 @@ sc/uiconfig/scalc/ui/protectsheetdlg.ui://GtkLabel[@id='insert-columns'] orphan-
sc/uiconfig/scalc/ui/protectsheetdlg.ui://GtkLabel[@id='insert-rows'] orphan-label
sc/uiconfig/scalc/ui/protectsheetdlg.ui://GtkLabel[@id='delete-columns'] orphan-label
sc/uiconfig/scalc/ui/protectsheetdlg.ui://GtkLabel[@id='delete-rows'] orphan-label
sc/uiconfig/scalc/ui/randomnumbergenerator.ui://GtkButton[@id='cell-range-button'] button-no-label
sc/uiconfig/scalc/ui/regressiondialog.ui://GtkLabel[@id='error-message'] orphan-label
sc/uiconfig/scalc/ui/regressiondialog.ui://GtkButton[@id='variable1-range-button'] button-no-label
sc/uiconfig/scalc/ui/regressiondialog.ui://GtkButton[@id='variable2-range-button'] button-no-label
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment