Kaydet (Commit) fcd2f1c8 authored tarafından Caolán McNamara's avatar Caolán McNamara

weld ScTPValidationError

Change-Id: Iaea475dc1037ed070ab2ff61be647f345d39ae3c
Reviewed-on: https://gerrit.libreoffice.org/61501
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 59dd8fe1
......@@ -742,21 +742,20 @@ bool ScTPValidationHelp::FillItemSet( SfxItemSet* rArgSet )
// Error Alert Page
ScTPValidationError::ScTPValidationError( vcl::Window* pParent,
const SfxItemSet& rArgSet )
ScTPValidationError::ScTPValidationError(TabPageParent pParent,
const SfxItemSet& rArgSet)
: SfxTabPage ( pParent,
"ErrorAlertTabPage" , "modules/scalc/ui/erroralerttabpage.ui" ,
"modules/scalc/ui/erroralerttabpage.ui", "ErrorAlertTabPage",
&rArgSet )
{
get(m_pTsbShow,"tsbshow");
get(m_pLbAction,"actionCB");
get(m_pBtnSearch,"browseBtn");
get(m_pEdtTitle,"erroralert_title");
get(m_pFtError,"errormsg_label");
get(m_pEdError,"errorMsg");
m_pEdError->set_height_request(m_pEdError->GetTextHeight() * 12);
m_pEdError->set_width_request(m_pEdError->approximate_char_width() * 50);
, m_xTsbShow(m_xBuilder->weld_check_button("tsbshow"))
, m_xLbAction(m_xBuilder->weld_combo_box("actionCB"))
, m_xBtnSearch(m_xBuilder->weld_button("browseBtn"))
, m_xEdtTitle(m_xBuilder->weld_entry("erroralert_title"))
, m_xFtError(m_xBuilder->weld_label("errormsg_label"))
, m_xEdError(m_xBuilder->weld_text_view("errorMsg"))
{
m_xEdError->set_size_request(m_xEdError->get_approximate_digit_width() * 40, m_xEdError->get_height_rows(12));
Init();
}
......@@ -765,32 +764,20 @@ ScTPValidationError::~ScTPValidationError()
disposeOnce();
}
void ScTPValidationError::dispose()
{
m_pTsbShow.clear();
m_pLbAction.clear();
m_pBtnSearch.clear();
m_pEdtTitle.clear();
m_pFtError.clear();
m_pEdError.clear();
SfxTabPage::dispose();
}
void ScTPValidationError::Init()
{
m_pLbAction->SetSelectHdl( LINK( this, ScTPValidationError, SelectActionHdl ) );
m_pBtnSearch->SetClickHdl( LINK( this, ScTPValidationError, ClickSearchHdl ) );
m_xLbAction->connect_changed(LINK(this, ScTPValidationError, SelectActionHdl));
m_xBtnSearch->connect_clicked(LINK( this, ScTPValidationError, ClickSearchHdl));
m_pLbAction->SelectEntryPos( 0 );
m_pTsbShow->EnableTriState( false );
m_xLbAction->set_active(0);
SelectActionHdl( *m_pLbAction.get() );
SelectActionHdl(*m_xLbAction);
}
VclPtr<SfxTabPage> ScTPValidationError::Create( TabPageParent pParent,
const SfxItemSet* rArgSet )
VclPtr<SfxTabPage> ScTPValidationError::Create(TabPageParent pParent,
const SfxItemSet* rArgSet)
{
return VclPtr<ScTPValidationError>::Create( pParent.pParent, *rArgSet );
return VclPtr<ScTPValidationError>::Create(pParent, *rArgSet);
}
void ScTPValidationError::Reset( const SfxItemSet* rArgSet )
......@@ -798,49 +785,49 @@ void ScTPValidationError::Reset( const SfxItemSet* rArgSet )
const SfxPoolItem* pItem;
if ( rArgSet->GetItemState( FID_VALID_SHOWERR, true, &pItem ) == SfxItemState::SET )
m_pTsbShow->SetState( static_cast<const SfxBoolItem*>(pItem)->GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE );
m_xTsbShow->set_state( static_cast<const SfxBoolItem*>(pItem)->GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE );
else
m_pTsbShow->SetState( TRISTATE_TRUE ); // check by default
m_xTsbShow->set_state( TRISTATE_TRUE ); // check by default
if ( rArgSet->GetItemState( FID_VALID_ERRSTYLE, true, &pItem ) == SfxItemState::SET )
m_pLbAction->SelectEntryPos( static_cast<const SfxAllEnumItem*>(pItem)->GetValue() );
m_xLbAction->set_active( static_cast<const SfxAllEnumItem*>(pItem)->GetValue() );
else
m_pLbAction->SelectEntryPos( 0 );
m_xLbAction->set_active( 0 );
if ( rArgSet->GetItemState( FID_VALID_ERRTITLE, true, &pItem ) == SfxItemState::SET )
m_pEdtTitle->SetText( static_cast<const SfxStringItem*>(pItem)->GetValue() );
m_xEdtTitle->set_text( static_cast<const SfxStringItem*>(pItem)->GetValue() );
else
m_pEdtTitle->SetText( EMPTY_OUSTRING );
m_xEdtTitle->set_text( EMPTY_OUSTRING );
if ( rArgSet->GetItemState( FID_VALID_ERRTEXT, true, &pItem ) == SfxItemState::SET )
m_pEdError->SetText( static_cast<const SfxStringItem*>(pItem)->GetValue() );
m_xEdError->set_text( static_cast<const SfxStringItem*>(pItem)->GetValue() );
else
m_pEdError->SetText( EMPTY_OUSTRING );
m_xEdError->set_text( EMPTY_OUSTRING );
SelectActionHdl( *m_pLbAction.get() );
SelectActionHdl( *m_xLbAction.get() );
}
bool ScTPValidationError::FillItemSet( SfxItemSet* rArgSet )
{
rArgSet->Put( SfxBoolItem( FID_VALID_SHOWERR, m_pTsbShow->GetState() == TRISTATE_TRUE ) );
rArgSet->Put( SfxAllEnumItem( FID_VALID_ERRSTYLE, m_pLbAction->GetSelectedEntryPos() ) );
rArgSet->Put( SfxStringItem( FID_VALID_ERRTITLE, m_pEdtTitle->GetText() ) );
rArgSet->Put( SfxStringItem( FID_VALID_ERRTEXT, m_pEdError->GetText() ) );
rArgSet->Put( SfxBoolItem( FID_VALID_SHOWERR, m_xTsbShow->get_state() == TRISTATE_TRUE ) );
rArgSet->Put( SfxAllEnumItem( FID_VALID_ERRSTYLE, m_xLbAction->get_active() ) );
rArgSet->Put( SfxStringItem( FID_VALID_ERRTITLE, m_xEdtTitle->get_text() ) );
rArgSet->Put( SfxStringItem( FID_VALID_ERRTEXT, m_xEdError->get_text() ) );
return true;
}
IMPL_LINK_NOARG(ScTPValidationError, SelectActionHdl, ListBox&, void)
IMPL_LINK_NOARG(ScTPValidationError, SelectActionHdl, weld::ComboBox&, void)
{
ScValidErrorStyle eStyle = static_cast<ScValidErrorStyle>(m_pLbAction->GetSelectedEntryPos());
ScValidErrorStyle eStyle = static_cast<ScValidErrorStyle>(m_xLbAction->get_active());
bool bMacro = ( eStyle == SC_VALERR_MACRO );
m_pBtnSearch->Enable( bMacro );
m_pFtError->Enable( !bMacro );
m_pEdError->Enable( !bMacro );
m_xBtnSearch->set_sensitive( bMacro );
m_xFtError->set_sensitive( !bMacro );
m_xEdError->set_sensitive( !bMacro );
}
IMPL_LINK_NOARG(ScTPValidationError, ClickSearchHdl, Button*, void)
IMPL_LINK_NOARG(ScTPValidationError, ClickSearchHdl, weld::Button&, void)
{
// Use static SfxApplication method to bring up selector dialog for
// choosing a script
......@@ -848,7 +835,7 @@ IMPL_LINK_NOARG(ScTPValidationError, ClickSearchHdl, Button*, void)
if ( !aScriptURL.isEmpty() )
{
m_pEdtTitle->SetText( aScriptURL );
m_xEdtTitle->set_text( aScriptURL );
}
}
......
......@@ -279,23 +279,22 @@ public:
class ScTPValidationError : public SfxTabPage
{
private:
VclPtr<TriStateBox> m_pTsbShow;
VclPtr<ListBox> m_pLbAction;
VclPtr<PushButton> m_pBtnSearch;
VclPtr<Edit> m_pEdtTitle;
VclPtr<FixedText> m_pFtError;
VclPtr<VclMultiLineEdit> m_pEdError;
std::unique_ptr<weld::CheckButton> m_xTsbShow;
std::unique_ptr<weld::ComboBox> m_xLbAction;
std::unique_ptr<weld::Button> m_xBtnSearch;
std::unique_ptr<weld::Entry> m_xEdtTitle;
std::unique_ptr<weld::Label> m_xFtError;
std::unique_ptr<weld::TextView> m_xEdError;
void Init();
// Handler ------------------------
DECL_LINK(SelectActionHdl, ListBox&, void);
DECL_LINK(ClickSearchHdl, Button*, void);
DECL_LINK(SelectActionHdl, weld::ComboBox&, void);
DECL_LINK(ClickSearchHdl, weld::Button&, void);
public:
ScTPValidationError( vcl::Window* pParent, const SfxItemSet& rArgSet );
virtual ~ScTPValidationError() override;
virtual void dispose() override;
ScTPValidationError(TabPageParent pParent, const SfxItemSet& rArgSet);
virtual ~ScTPValidationError() override;
static VclPtr<SfxTabPage> Create ( TabPageParent pParent, const SfxItemSet* rArgSet );
virtual bool FillItemSet ( SfxItemSet* rArgSet ) override;
......
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<interface domain="sc">
<!-- interface-requires gtk+ 3.0 -->
<requires lib="gtk+" version="3.18"/>
<object class="GtkBox" id="ErrorAlertTabPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
......@@ -55,33 +56,29 @@
<object class="GtkLabel" id="action_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes" context="erroralerttabpage|action_label">_Action:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">actionCB</property>
<property name="xalign">0</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="GtkLabel" id="title_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="label" translatable="yes" context="erroralerttabpage|title_label">_Title:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">erroralert_title</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
......@@ -91,7 +88,7 @@
<property name="vexpand">True</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTextView" id="errorMsg:border">
<object class="GtkTextView" id="errorMsg">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="vexpand">True</property>
......@@ -102,36 +99,33 @@
<property name="left_attach">1</property>
<property name="top_attach">2</property>
<property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="erroralert_title">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activates_default">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
<property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="errormsg_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="label" translatable="yes" context="erroralerttabpage|errormsg_label">_Error message:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">errorMsg:border</property>
<property name="mnemonic_widget">errorMsg</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
......@@ -145,8 +139,6 @@
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
......@@ -164,8 +156,6 @@
<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>
......
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