mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

weld MatchCaseControl Item Window

Browse Source 
Change-Id: I33a8d96c449e653284d570ef534dcc453f27ad5e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88619
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2020-02-13 16:48:02 +00:00
parent 3b081e6605
commit 13b15ca63a
4 changed files with 90 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
solenv/sanitizers/ui/svx.suppr
View File

@@ -6,6 +6,7 @@ svx/uiconfig/ui/asianphoneticguidedialog.ui://GtkLabel[@id='basetextft'] orphan-
svx/uiconfig/ui/asianphoneticguidedialog.ui://GtkLabel[@id='rubytextft'] orphan-label
svx/uiconfig/ui/asianphoneticguidedialog.ui://GtkEntry[@id='Left1ED'] no-labelled-by
svx/uiconfig/ui/asianphoneticguidedialog.ui://GtkEntry[@id='Right1ED'] no-labelled-by
svx/uiconfig/ui/checkbuttonbox.ui://GtkCheckButton[@id='checkbutton'] button-no-label
svx/uiconfig/ui/colorwindow.ui://GtkButton[@id='auto_color_button'] button-no-label
svx/uiconfig/ui/columnswindow.ui://GtkSpinButton[@id='spinbutton'] no-labelled-by
svx/uiconfig/ui/compressgraphicdialog.ui://GtkLabel[@id='label13'] orphan-label

1
svx/UIConfig_svx.mk
View File

@@ -23,6 +23,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/asianphoneticguidedialog \
svx/uiconfig/ui/cellmenu \
svx/uiconfig/ui/charsetmenu \
svx/uiconfig/ui/checkbuttonbox \
svx/uiconfig/ui/chineseconversiondialog \
svx/uiconfig/ui/chinesedictionary \
svx/uiconfig/ui/classificationdialog \

71
svx/source/tbxctrls/tbunosearchcontrollers.cxx
View File

@@ -78,6 +78,58 @@ static const char COMMAND_SEARCHFORMATTED[] = ".uno:SearchFormattedDisplayString
static const sal_Int32 REMEMBER_SIZE = 10;
class CheckButtonItemWindow final : public InterimItemWindow
{
public:
CheckButtonItemWindow(vcl::Window* pParent)
: InterimItemWindow(pParent, "svx/ui/checkbuttonbox.ui", "CheckButtonBox")
, m_xWidget(m_xBuilder->weld_check_button("checkbutton"))
{
m_xWidget->connect_key_press(LINK(this, CheckButtonItemWindow, KeyInputHdl));
}
void SetOptimalSize()
{
SetSizePixel(m_xWidget->get_preferred_size());
}
void set_label(const OUString& rText)
{
m_xWidget->set_label(rText);
}
bool get_active() const
{
return m_xWidget->get_active();
}
virtual void dispose() override
{
m_xWidget.reset();
InterimItemWindow::dispose();
}
virtual ~CheckButtonItemWindow() override
{
disposeOnce();
}
virtual void GetFocus() override
{
m_xWidget->grab_focus();
}
private:
std::unique_ptr<weld::CheckButton> m_xWidget;
DECL_LINK(KeyInputHdl, const KeyEvent&, bool);
};
IMPL_LINK(CheckButtonItemWindow, KeyInputHdl, const KeyEvent&, rKeyEvent, bool)
{
return ChildKeyInput(rKeyEvent);
}
void impl_executeSearch( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::frame::XFrame >& xFrame,
const ToolBox* pToolBox,
@@ -106,9 +158,9 @@ void impl_executeSearch( const css::uno::Reference< css::uno::XComponentContext
sFindText = pItemWin->get_active_text();
} else if ( sItemCommand == COMMAND_MATCHCASE )
{
CheckBox* pItemWin = static_cast<CheckBox*>( pToolBox->GetItemWindow(id) );
CheckButtonItemWindow* pItemWin = static_cast<CheckButtonItemWindow*>( pToolBox->GetItemWindow(id) );
if (pItemWin)
aMatchCase = pItemWin->IsChecked();
aMatchCase = pItemWin->get_active();
} else if ( sItemCommand == COMMAND_SEARCHFORMATTED )
{
CheckBox* pItemWin = static_cast<CheckBox*>( pToolBox->GetItemWindow(id) );
@@ -800,14 +852,14 @@ public:
virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override;
private:
VclPtr<CheckBox> m_pMatchCaseControl;
VclPtr<CheckButtonItemWindow> m_xMatchCaseControl;
};
MatchCaseToolboxController::MatchCaseToolboxController( const css::uno::Reference< css::uno::XComponentContext >& rxContext )
: svt::ToolboxController( rxContext,
css::uno::Reference< css::frame::XFrame >(),
COMMAND_MATCHCASE )
, m_pMatchCaseControl(nullptr)
, m_xMatchCaseControl(nullptr)
{
}
@@ -856,7 +908,7 @@ void SAL_CALL MatchCaseToolboxController::dispose()
svt::ToolboxController::dispose();
m_pMatchCaseControl.disposeAndClear();
m_xMatchCaseControl.disposeAndClear();
}
// XInitialization
@@ -875,12 +927,11 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL MatchCaseToolboxController::cr
if ( pParent )
{
ToolBox* pToolbar = static_cast<ToolBox*>(pParent.get());
m_pMatchCaseControl = VclPtr<CheckBox>::Create( pToolbar, 0 );
m_pMatchCaseControl->SetText( SvxResId( RID_SVXSTR_FINDBAR_MATCHCASE ) );
Size aSize( m_pMatchCaseControl->GetOptimalSize() );
m_pMatchCaseControl->SetSizePixel( aSize );
m_xMatchCaseControl = VclPtr<CheckButtonItemWindow>::Create(pToolbar);
m_xMatchCaseControl->set_label(SvxResId(RID_SVXSTR_FINDBAR_MATCHCASE));
m_xMatchCaseControl->SetOptimalSize();
}
xItemWindow = VCLUnoHelper::GetInterface( m_pMatchCaseControl );
xItemWindow = VCLUnoHelper::GetInterface(m_xMatchCaseControl);
return xItemWindow;
}

27
svx/uiconfig/ui/checkbuttonbox.ui Normal file
View File

@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<interface domain="sc">
<requires lib="gtk+" version="3.18"/>
<object class="GtkBox" id="CheckButtonBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
</interface>