[Libreoffice-commits] core.git: cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk
Szymon KÅ‚os
eszkadev at gmail.com
Sun Mar 23 13:57:03 PDT 2014
cui/AllLangResTarget_cui.mk | 1
cui/UIConfig_cui.mk | 1
cui/source/dialogs/cuifmsearch.cxx | 531 ++++++++++-------------
cui/source/dialogs/fmsearch.hrc | 39 -
cui/source/dialogs/fmsearch.src | 252 ----------
cui/source/inc/cuifmsearch.hxx | 66 +-
cui/source/inc/helpid.hrc | 15
cui/uiconfig/ui/fmsearchdialog.ui | 852 +++++++++++++++++++++++++++++++++++++
8 files changed, 1122 insertions(+), 635 deletions(-)
New commits:
commit 91ddf5e09f434d67a49ad1d7c3877889c2c8ed3d
Author: Szymon KÅ‚os <eszkadev at gmail.com>
Date: Sat Mar 22 20:10:29 2014 +0100
RID_SVXDLG_SEARCHFORM dialog convert
Change-Id: I6c5f1d83733c17a561ec2218f6260794b0c4de37
Reviewed-on: https://gerrit.libreoffice.org/8718
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index e9ef5e8..bb32b79 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/dialogs/colorpicker.src \
cui/source/dialogs/commonlingui.src \
cui/source/dialogs/cuires.src \
- cui/source/dialogs/fmsearch.src \
cui/source/dialogs/gallery.src \
cui/source/dialogs/hangulhanjadlg.src \
cui/source/dialogs/hlmarkwn.src \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 7cea225..8a4d328 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/eventassigndialog \
cui/uiconfig/ui/eventassignpage \
cui/uiconfig/ui/formatnumberdialog \
+ cui/uiconfig/ui/fmsearchdialog \
cui/uiconfig/ui/gradientpage \
cui/uiconfig/ui/colorconfigwin \
cui/uiconfig/ui/connpooloptions \
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index 08b41d0..017dff1 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -56,71 +56,62 @@ void FmSearchDialog::initCommon( const Reference< XResultSet >& _rxCursor )
SvtCJKOptions aCJKOptions;
if (!aCJKOptions.IsJapaneseFindEnabled())
{
- sal_Int32 nUpper = m_cbApprox.GetPosPixel().Y();
- sal_Int32 nDifference = m_aSoundsLikeCJKSettings.GetPosPixel().Y() - nUpper;
-
// hide the options for the japanese search
- Control* pFieldsToMove[] = { &m_flState, &m_ftRecordLabel, &m_ftRecord, &m_ftHint };
- implMoveControls(pFieldsToMove, SAL_N_ELEMENTS(pFieldsToMove), nDifference, &m_flOptions);
-
- m_aSoundsLikeCJK.Hide();
- m_aSoundsLikeCJKSettings.Hide();
+ m_pSoundsLikeCJK->Hide();
+ m_pSoundsLikeCJKSettings->Hide();
}
if (!aCJKOptions.IsCJKFontEnabled())
{
- m_aHalfFullFormsCJK.Hide();
+ m_pHalfFullFormsCJK->Hide();
// never ignore the width (ignoring is expensive) if the option is not available at all
m_pSearchEngine->SetIgnoreWidthCJK( false );
}
// some initial record texts
- m_ftRecord.SetText( OUString::number(_rxCursor->getRow()) );
- m_pbClose.SetHelpText(OUString());
+ m_pftRecord->SetText( OUString::number(_rxCursor->getRow()) );
+ m_pbClose->SetHelpText(OUString());
}
FmSearchDialog::FmSearchDialog(Window* pParent, const OUString& sInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext,
const Link& lnkContextSupplier)
- :ModalDialog(pParent, CUI_RES(RID_SVXDLG_SEARCHFORM))
- ,m_flSearchFor (this, CUI_RES(FL_SEARCHFOR))
- ,m_rbSearchForText (this, CUI_RES(RB_SEARCHFORTEXT))
- ,m_rbSearchForNull (this, CUI_RES(RB_SEARCHFORNULL))
- ,m_rbSearchForNotNull (this, CUI_RES(RB_SEARCHFORNOTNULL))
- ,m_cmbSearchText (this, CUI_RES(CMB_SEARCHTEXT))
- ,m_flWhere (this, CUI_RES(FL_WHERE))
- ,m_ftForm (this, CUI_RES(FT_FORM))
- ,m_lbForm (this, CUI_RES(LB_FORM))
- ,m_rbAllFields (this, CUI_RES(RB_ALLFIELDS))
- ,m_rbSingleField (this, CUI_RES(RB_SINGLEFIELD))
- ,m_lbField (this, CUI_RES(LB_FIELD))
- ,m_flOptions (this, CUI_RES(FL_OPTIONS))
- ,m_ftPosition (this, CUI_RES(FT_POSITION))
- ,m_lbPosition (this, CUI_RES(LB_POSITION))
- ,m_cbUseFormat (this, CUI_RES(CB_USEFORMATTER))
- ,m_cbCase (this, CUI_RES(CB_CASE))
- ,m_cbBackwards (this, CUI_RES(CB_BACKWARD))
- ,m_cbStartOver (this, CUI_RES(CB_STARTOVER))
- ,m_cbWildCard (this, CUI_RES(CB_WILDCARD))
- ,m_cbRegular (this, CUI_RES(CB_REGULAR))
- ,m_cbApprox (this, CUI_RES(CB_APPROX))
- ,m_pbApproxSettings (this, CUI_RES(PB_APPROXSETTINGS))
- ,m_aHalfFullFormsCJK (this, CUI_RES(CB_HALFFULLFORMS))
- ,m_aSoundsLikeCJK (this, CUI_RES(CB_SOUNDSLIKECJK))
- ,m_aSoundsLikeCJKSettings (this, CUI_RES(PB_SOUNDSLIKESETTINGS))
- ,m_flState (this, CUI_RES(FL_STATE))
- ,m_ftRecordLabel (this, CUI_RES(FT_RECORDLABEL))
- ,m_ftRecord (this, CUI_RES(FT_RECORD))
- ,m_ftHint (this, CUI_RES(FT_HINT))
- ,m_pbSearchAgain (this, CUI_RES(PB_SEARCH))
- ,m_pbClose (this, CUI_RES(1))
- ,m_pbHelp (this, CUI_RES(1))
- ,m_sSearch ( m_pbSearchAgain.GetText() )
+ :ModalDialog(pParent, "RecordSearchDialog", "cui/ui/fmsearchdialog.ui")
,m_sCancel ( Button::GetStandardText( BUTTON_CANCEL ) )
,m_pPreSearchFocus( NULL )
,m_lnkContextSupplier(lnkContextSupplier)
,m_pConfig( NULL )
{
+ get(m_prbSearchForText,"rbSearchForText");
+ get(m_prbSearchForNull,"rbSearchForNull");
+ get(m_prbSearchForNotNull,"rbSearchForNotNull");
+ get(m_pcmbSearchText,"cmbSearchText");
+ m_pcmbSearchText->set_width_request(m_pcmbSearchText->approximate_char_width() * 42);
+ get(m_plbForm,"lbForm");
+ m_plbForm->set_width_request(m_plbForm->approximate_char_width() * 42);
+ get(m_prbAllFields,"rbAllFields");
+ get(m_prbSingleField,"rbSingleField");
+ get(m_plbField,"lbField");
+ get(m_plbPosition,"lbPosition");
+ get(m_pcbUseFormat,"cbUseFormat");
+ get(m_pcbCase,"cbCase");
+ get(m_pcbBackwards,"cbBackwards");
+ get(m_pcbStartOver,"cbStartOver");
+ get(m_pcbWildCard,"cbWildCard");
+ get(m_pcbRegular,"cbRegular");
+ get(m_pcbApprox,"cbApprox");
+ get(m_ppbApproxSettings,"pbApproxSettings");
+ get(m_pHalfFullFormsCJK,"HalfFullFormsCJK");
+ get(m_pSoundsLikeCJK,"SoundsLikeCJK");
+ get(m_pSoundsLikeCJKSettings,"SoundsLikeCJKSettings");
+ get(m_pbSearchAgain,"pbSearchAgain");
+ m_sSearch = m_pbSearchAgain->GetText();
+ get(m_pftRecord,"ftRecord");
+ get(m_pftHint,"ftHint");
+ get(m_pftPosition,"ftPosition");
+ get(m_pftForm,"ftForm");
+ get(m_pbClose,"close");
+
DBG_ASSERT(m_lnkContextSupplier.IsSet(), "FmSearchDialog::FmSearchDialog : have no ContextSupplier !");
FmSearchContext fmscInitial;
@@ -140,35 +131,17 @@ FmSearchDialog::FmSearchDialog(Window* pParent, const OUString& sInitialText, co
)
{
m_arrContextFields.push_back(OUString());
- m_lbForm.InsertEntry(*context);
+ m_plbForm->InsertEntry(*context);
}
- m_lbForm.SelectEntryPos(nInitialContext);
+ m_plbForm->SelectEntryPos(nInitialContext);
- m_lbForm.SetSelectHdl(LINK(this, FmSearchDialog, OnContextSelection));
+ m_plbForm->SetSelectHdl(LINK(this, FmSearchDialog, OnContextSelection));
if (m_arrContextFields.size() == 1)
- { // remove the context selection listbox and rearrange the controls accordingly
- sal_Int32 nUpper = m_lbForm.GetPosPixel().Y();
- sal_Int32 nDifference = m_rbAllFields.GetPosPixel().Y() - nUpper;
-
- // move all controls below the affected ones up
- Control* pFieldsToMove[] = { &m_rbAllFields, &m_rbSingleField, &m_lbField, &m_flOptions, &m_ftPosition, &m_lbPosition,
- &m_cbUseFormat, &m_cbCase, &m_cbBackwards, &m_cbStartOver, &m_cbWildCard, &m_cbRegular, &m_cbApprox,
- &m_pbApproxSettings, &m_aHalfFullFormsCJK, &m_aSoundsLikeCJK, &m_aSoundsLikeCJKSettings,
- &m_flState, &m_ftRecordLabel, &m_ftRecord, &m_ftHint };
-
- implMoveControls(pFieldsToMove, SAL_N_ELEMENTS(pFieldsToMove), nDifference, &m_flWhere);
-
- Point pt = m_rbAllFields.GetPosPixel();
- pt.X() = m_ftForm.GetPosPixel().X();
- m_rbAllFields.SetPosPixel( pt );
- pt = m_rbSingleField.GetPosPixel();
- pt.X() = m_ftForm.GetPosPixel().X();
- m_rbSingleField.SetPosPixel( pt );
-
+ {
// hide dispensable controls
- m_ftForm.Hide();
- m_lbForm.Hide();
+ m_pftForm->Hide();
+ m_plbForm->Hide();
}
m_pSearchEngine = new FmSearchEngine(
@@ -185,25 +158,6 @@ FmSearchDialog::FmSearchDialog(Window* pParent, const OUString& sInitialText, co
Init(fmscInitial.strUsedFields, sInitialText);
}
-void FmSearchDialog::implMoveControls(
- Control** _ppControls,
- sal_Int32 _nControls,
- sal_Int32 _nUp,
- Control* /*_pToResize*/)
-{
- for (sal_Int32 i=0; i<_nControls; ++i)
- {
- Point pt = _ppControls[i]->GetPosPixel();
- pt.Y() -= _nUp;
- _ppControls[i]->SetPosPixel(pt);
- }
-
- // resize myself
- Size sz = GetSizePixel();
- sz.Height() -= _nUp;
- SetSizePixel(sz);
-}
-
FmSearchDialog::~FmSearchDialog()
{
if (m_aDelayedPaint.IsActive())
@@ -223,33 +177,33 @@ FmSearchDialog::~FmSearchDialog()
void FmSearchDialog::Init(const OUString& strVisibleFields, const OUString& sInitialText)
{
//the initialization of all the Controls
- m_rbSearchForText.SetClickHdl(LINK(this, FmSearchDialog, OnClickedFieldRadios));
- m_rbSearchForNull.SetClickHdl(LINK(this, FmSearchDialog, OnClickedFieldRadios));
- m_rbSearchForNotNull.SetClickHdl(LINK(this, FmSearchDialog, OnClickedFieldRadios));
-
- m_rbAllFields.SetClickHdl(LINK(this, FmSearchDialog, OnClickedFieldRadios));
- m_rbSingleField.SetClickHdl(LINK(this, FmSearchDialog, OnClickedFieldRadios));
-
- m_pbSearchAgain.SetClickHdl(LINK(this, FmSearchDialog, OnClickedSearchAgain));
- m_pbApproxSettings.SetClickHdl(LINK(this, FmSearchDialog, OnClickedSpecialSettings));
- m_aSoundsLikeCJKSettings.SetClickHdl(LINK(this, FmSearchDialog, OnClickedSpecialSettings));
-
- m_lbPosition.SetSelectHdl(LINK(this, FmSearchDialog, OnPositionSelected));
- m_lbField.SetSelectHdl(LINK(this, FmSearchDialog, OnFieldSelected));
-
- m_cmbSearchText.SetModifyHdl(LINK(this, FmSearchDialog, OnSearchTextModified));
- m_cmbSearchText.EnableAutocomplete(false);
- m_cmbSearchText.SetGetFocusHdl(LINK(this, FmSearchDialog, OnFocusGrabbed));
-
- m_cbUseFormat.SetToggleHdl(LINK(this, FmSearchDialog, OnCheckBoxToggled));
- m_cbBackwards.SetToggleHdl(LINK(this, FmSearchDialog, OnCheckBoxToggled));
- m_cbStartOver.SetToggleHdl(LINK(this, FmSearchDialog, OnCheckBoxToggled));
- m_cbCase.SetToggleHdl(LINK(this, FmSearchDialog, OnCheckBoxToggled));
- m_cbWildCard.SetToggleHdl(LINK(this, FmSearchDialog, OnCheckBoxToggled));
- m_cbRegular.SetToggleHdl(LINK(this, FmSearchDialog, OnCheckBoxToggled));
- m_cbApprox.SetToggleHdl(LINK(this, FmSearchDialog, OnCheckBoxToggled));
- m_aHalfFullFormsCJK.SetToggleHdl(LINK(this, FmSearchDialog, OnCheckBoxToggled));
- m_aSoundsLikeCJK.SetToggleHdl(LINK(this, FmSearchDialog, OnCheckBoxToggled));
+ m_prbSearchForText->SetClickHdl(LINK(this, FmSearchDialog, OnClickedFieldRadios));
+ m_prbSearchForNull->SetClickHdl(LINK(this, FmSearchDialog, OnClickedFieldRadios));
+ m_prbSearchForNotNull->SetClickHdl(LINK(this, FmSearchDialog, OnClickedFieldRadios));
+
+ m_prbAllFields->SetClickHdl(LINK(this, FmSearchDialog, OnClickedFieldRadios));
+ m_prbSingleField->SetClickHdl(LINK(this, FmSearchDialog, OnClickedFieldRadios));
+
+ m_pbSearchAgain->SetClickHdl(LINK(this, FmSearchDialog, OnClickedSearchAgain));
+ m_ppbApproxSettings->SetClickHdl(LINK(this, FmSearchDialog, OnClickedSpecialSettings));
+ m_pSoundsLikeCJKSettings->SetClickHdl(LINK(this, FmSearchDialog, OnClickedSpecialSettings));
+
+ m_plbPosition->SetSelectHdl(LINK(this, FmSearchDialog, OnPositionSelected));
+ m_plbField->SetSelectHdl(LINK(this, FmSearchDialog, OnFieldSelected));
+
+ m_pcmbSearchText->SetModifyHdl(LINK(this, FmSearchDialog, OnSearchTextModified));
+ m_pcmbSearchText->EnableAutocomplete(false);
+ m_pcmbSearchText->SetGetFocusHdl(LINK(this, FmSearchDialog, OnFocusGrabbed));
+
+ m_pcbUseFormat->SetToggleHdl(LINK(this, FmSearchDialog, OnCheckBoxToggled));
+ m_pcbBackwards->SetToggleHdl(LINK(this, FmSearchDialog, OnCheckBoxToggled));
+ m_pcbStartOver->SetToggleHdl(LINK(this, FmSearchDialog, OnCheckBoxToggled));
+ m_pcbCase->SetToggleHdl(LINK(this, FmSearchDialog, OnCheckBoxToggled));
+ m_pcbWildCard->SetToggleHdl(LINK(this, FmSearchDialog, OnCheckBoxToggled));
+ m_pcbRegular->SetToggleHdl(LINK(this, FmSearchDialog, OnCheckBoxToggled));
+ m_pcbApprox->SetToggleHdl(LINK(this, FmSearchDialog, OnCheckBoxToggled));
+ m_pHalfFullFormsCJK->SetToggleHdl(LINK(this, FmSearchDialog, OnCheckBoxToggled));
+ m_pSoundsLikeCJK->SetToggleHdl(LINK(this, FmSearchDialog, OnCheckBoxToggled));
// fill the listboxes
// method of field comparison
@@ -260,35 +214,34 @@ void FmSearchDialog::Init(const OUString& strVisibleFields, const OUString& sIni
RID_STR_SEARCH_WHOLE
};
for ( size_t i=0; i<SAL_N_ELEMENTS(nResIds); ++i )
- m_lbPosition.InsertEntry( OUString( CUI_RES( nResIds[i] ) ) );
- m_lbPosition.SelectEntryPos(MATCHING_ANYWHERE);
+ m_plbPosition->InsertEntry( OUString( CUI_RES( nResIds[i] ) ) );
+ m_plbPosition->SelectEntryPos(MATCHING_ANYWHERE);
// the field listbox
for (sal_Int32 i=0; i < comphelper::string::getTokenCount(strVisibleFields, ';'); ++i)
- m_lbField.InsertEntry(comphelper::string::getToken(strVisibleFields, i, ';'));
+ m_plbField->InsertEntry(comphelper::string::getToken(strVisibleFields, i, ';'));
m_pConfig = new FmSearchConfigItem;
LoadParams();
- m_cmbSearchText.SetText(sInitialText);
+ m_pcmbSearchText->SetText(sInitialText);
// if the Edit-line has changed the text (e.g. because it contains
// control characters, as can be the case with memo fields), I use
// an empty OUString.
- OUString sRealSetText = m_cmbSearchText.GetText();
+ OUString sRealSetText = m_pcmbSearchText->GetText();
if (!sRealSetText.equals(sInitialText))
- m_cmbSearchText.SetText(OUString());
- LINK(this, FmSearchDialog, OnSearchTextModified).Call(&m_cmbSearchText);
+ m_pcmbSearchText->SetText(OUString());
+ LINK(this, FmSearchDialog, OnSearchTextModified).Call(m_pcmbSearchText);
// initial
m_aDelayedPaint.SetTimeoutHdl(LINK(this, FmSearchDialog, OnDelayedPaint));
m_aDelayedPaint.SetTimeout(500);
EnableSearchUI(sal_True);
- if ( m_rbSearchForText.IsChecked() )
- m_cmbSearchText.GrabFocus();
+ if ( m_prbSearchForText->IsChecked() )
+ m_pcmbSearchText->GrabFocus();
- FreeResource();
}
bool FmSearchDialog::Close()
@@ -297,27 +250,27 @@ bool FmSearchDialog::Close()
// then Frame will call Close anyway, which I don't want to happen
// while I'm in the middle of a search (maybe one that's running
// in its own thread)
- if (!m_pbClose.IsEnabled())
+ if (!m_pbClose->IsEnabled())
return false;
return ModalDialog::Close();
}
IMPL_LINK(FmSearchDialog, OnClickedFieldRadios, Button*, pButton)
{
- if ((pButton == &m_rbSearchForText) || (pButton == &m_rbSearchForNull) || (pButton == &m_rbSearchForNotNull))
+ if ((pButton == m_prbSearchForText) || (pButton == m_prbSearchForNull) || (pButton == m_prbSearchForNotNull))
{
EnableSearchForDependees(sal_True);
}
else
// en- or disable field list box accordingly
- if (pButton == &m_rbSingleField)
+ if (pButton == m_prbSingleField)
{
- m_lbField.Enable();
- m_pSearchEngine->RebuildUsedFields(m_lbField.GetSelectEntryPos());
+ m_plbField->Enable();
+ m_pSearchEngine->RebuildUsedFields(m_plbField->GetSelectEntryPos());
}
else
{
- m_lbField.Disable();
+ m_plbField->Disable();
m_pSearchEngine->RebuildUsedFields(-1);
}
@@ -326,37 +279,37 @@ IMPL_LINK(FmSearchDialog, OnClickedFieldRadios, Button*, pButton)
IMPL_LINK_NOARG(FmSearchDialog, OnClickedSearchAgain)
{
- if (m_pbClose.IsEnabled())
+ if (m_pbClose->IsEnabled())
{ // the button has the function 'search'
- OUString strThisRoundText = m_cmbSearchText.GetText();
+ OUString strThisRoundText = m_pcmbSearchText->GetText();
// to history
- m_cmbSearchText.RemoveEntry(strThisRoundText);
- m_cmbSearchText.InsertEntry(strThisRoundText, 0);
+ m_pcmbSearchText->RemoveEntry(strThisRoundText);
+ m_pcmbSearchText->InsertEntry(strThisRoundText, 0);
// the remove/insert makes sure that a) the OUString does not appear twice and
// that b) the last searched strings are at the beginning and limit the list length
- while (m_cmbSearchText.GetEntryCount() > MAX_HISTORY_ENTRIES)
- m_cmbSearchText.RemoveEntryAt(m_cmbSearchText.GetEntryCount()-1);
+ while (m_pcmbSearchText->GetEntryCount() > MAX_HISTORY_ENTRIES)
+ m_pcmbSearchText->RemoveEntryAt(m_pcmbSearchText->GetEntryCount()-1);
// take out the 'overflow' hint
- m_ftHint.SetText(OUString());
- m_ftHint.Invalidate();
+ m_pftHint->SetText(OUString());
+ m_pftHint->Invalidate();
- if (m_cbStartOver.IsChecked())
+ if (m_pcbStartOver->IsChecked())
{
- m_cbStartOver.Check(false);
+ m_pcbStartOver->Check(false);
EnableSearchUI(sal_False);
- if (m_rbSearchForText.IsChecked())
+ if (m_prbSearchForText->IsChecked())
m_pSearchEngine->StartOver(strThisRoundText);
else
- m_pSearchEngine->StartOverSpecial(m_rbSearchForNull.IsChecked());
+ m_pSearchEngine->StartOverSpecial(m_prbSearchForNull->IsChecked());
}
else
{
EnableSearchUI(sal_False);
- if (m_rbSearchForText.IsChecked())
+ if (m_prbSearchForText->IsChecked())
m_pSearchEngine->SearchNext(strThisRoundText);
else
- m_pSearchEngine->SearchNextSpecial(m_rbSearchForNull.IsChecked());
+ m_pSearchEngine->SearchNextSpecial(m_prbSearchForNull->IsChecked());
}
}
else
@@ -371,7 +324,7 @@ IMPL_LINK_NOARG(FmSearchDialog, OnClickedSearchAgain)
IMPL_LINK(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton )
{
- if (&m_pbApproxSettings == pButton)
+ if (m_ppbApproxSettings == pButton)
{
AbstractSvxSearchSimilarityDialog* pDlg = NULL;
@@ -390,7 +343,7 @@ IMPL_LINK(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton )
}
delete pDlg;
}
- else if (&m_aSoundsLikeCJKSettings == pButton)
+ else if (m_pSoundsLikeCJKSettings == pButton)
{
SfxItemSet aSet( SFX_APP()->GetPool() );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
@@ -404,10 +357,10 @@ IMPL_LINK(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton )
sal_Int32 nFlags = aDlg->GetTransliterationFlags();
m_pSearchEngine->SetTransliterationFlags(nFlags);
- m_cbCase.Check(m_pSearchEngine->GetCaseSensitive());
- OnCheckBoxToggled( &m_cbCase );
- m_aHalfFullFormsCJK.Check( !m_pSearchEngine->GetIgnoreWidthCJK() );
- OnCheckBoxToggled( &m_aHalfFullFormsCJK );
+ m_pcbCase->Check(m_pSearchEngine->GetCaseSensitive());
+ OnCheckBoxToggled( m_pcbCase );
+ m_pHalfFullFormsCJK->Check( !m_pSearchEngine->GetIgnoreWidthCJK() );
+ OnCheckBoxToggled( m_pHalfFullFormsCJK );
delete aDlg;
}
}
@@ -417,10 +370,10 @@ IMPL_LINK(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton )
IMPL_LINK_NOARG(FmSearchDialog, OnSearchTextModified)
{
- if ((!m_cmbSearchText.GetText().isEmpty()) || !m_rbSearchForText.IsChecked())
- m_pbSearchAgain.Enable();
+ if ((!m_pcmbSearchText->GetText().isEmpty()) || !m_prbSearchForText->IsChecked())
+ m_pbSearchAgain->Enable();
else
- m_pbSearchAgain.Disable();
+ m_pbSearchAgain->Disable();
m_pSearchEngine->InvalidatePreviousLoc();
return 0;
@@ -428,7 +381,7 @@ IMPL_LINK_NOARG(FmSearchDialog, OnSearchTextModified)
IMPL_LINK(FmSearchDialog, OnFocusGrabbed, ComboBox*, EMPTYARG)
{
- m_cmbSearchText.SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
+ m_pcmbSearchText->SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
return 0;
}
@@ -437,7 +390,7 @@ IMPL_LINK(FmSearchDialog, OnPositionSelected, ListBox*, pBox)
(void) pBox; // avoid warning
DBG_ASSERT(pBox->GetSelectEntryCount() == 1, "FmSearchDialog::OnMethodSelected : unerwartet : nicht genau ein Eintrag selektiert !");
- m_pSearchEngine->SetPosition(m_lbPosition.GetSelectEntryPos());
+ m_pSearchEngine->SetPosition(m_plbPosition->GetSelectEntryPos());
return 0;
}
@@ -446,12 +399,12 @@ IMPL_LINK(FmSearchDialog, OnFieldSelected, ListBox*, pBox)
(void) pBox; // avoid warning
DBG_ASSERT(pBox->GetSelectEntryCount() == 1, "FmSearchDialog::OnFieldSelected : unerwartet : nicht genau ein Eintrag selektiert !");
- m_pSearchEngine->RebuildUsedFields(m_rbAllFields.IsChecked() ? -1 : (sal_Int16)m_lbField.GetSelectEntryPos());
+ m_pSearchEngine->RebuildUsedFields(m_prbAllFields->IsChecked() ? -1 : (sal_Int16)m_plbField->GetSelectEntryPos());
// calls m_pSearchEngine->InvalidatePreviousLoc too
- sal_Int32 nCurrentContext = m_lbForm.GetSelectEntryPos();
+ sal_Int32 nCurrentContext = m_plbForm->GetSelectEntryPos();
if (nCurrentContext != LISTBOX_ENTRY_NOTFOUND)
- m_arrContextFields[nCurrentContext] = OUString(m_lbField.GetSelectEntry());
+ m_arrContextFields[nCurrentContext] = OUString(m_plbField->GetSelectEntry());
return 0;
}
@@ -460,20 +413,20 @@ IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox*, pBox)
sal_Bool bChecked = pBox->IsChecked();
// formatter or case -> pass on to the engine
- if (pBox == &m_cbUseFormat)
+ if (pBox == m_pcbUseFormat)
m_pSearchEngine->SetFormatterUsing(bChecked);
- else if (pBox == &m_cbCase)
+ else if (pBox == m_pcbCase)
m_pSearchEngine->SetCaseSensitive(bChecked);
// direction -> pass on and reset the checkbox-text for StartOver
- else if (pBox == &m_cbBackwards)
+ else if (pBox == m_pcbBackwards)
{
- m_cbStartOver.SetText( OUString( CUI_RES( bChecked ? RID_STR_FROM_BOTTOM : RID_STR_FROM_TOP ) ) );
+ m_pcbStartOver->SetText( OUString( CUI_RES( bChecked ? RID_STR_FROM_BOTTOM : RID_STR_FROM_TOP ) ) );
m_pSearchEngine->SetDirection(!bChecked);
}
// similarity-search or regular expression
- else if ((pBox == &m_cbApprox) || (pBox == &m_cbRegular) || (pBox == &m_cbWildCard))
+ else if ((pBox == m_pcbApprox) || (pBox == m_pcbRegular) || (pBox == m_pcbWildCard))
{
- CheckBox* pBoxes[] = { &m_cbWildCard, &m_cbRegular, &m_cbApprox };
+ CheckBox* pBoxes[] = { m_pcbWildCard, m_pcbRegular, m_pcbApprox };
for (sal_uInt32 i=0; i< SAL_N_ELEMENTS(pBoxes); ++i)
{
if (pBoxes[i] != pBox)
@@ -486,51 +439,51 @@ IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox*, pBox)
}
// pass on to the engine
- m_pSearchEngine->SetWildcard(m_cbWildCard.IsEnabled() ? m_cbWildCard.IsChecked() : sal_False);
- m_pSearchEngine->SetRegular(m_cbRegular.IsEnabled() ? m_cbRegular.IsChecked() : sal_False);
- m_pSearchEngine->SetLevenshtein(m_cbApprox.IsEnabled() ? m_cbApprox.IsChecked() : sal_False);
+ m_pSearchEngine->SetWildcard(m_pcbWildCard->IsEnabled() ? m_pcbWildCard->IsChecked() : sal_False);
+ m_pSearchEngine->SetRegular(m_pcbRegular->IsEnabled() ? m_pcbRegular->IsChecked() : sal_False);
+ m_pSearchEngine->SetLevenshtein(m_pcbApprox->IsEnabled() ? m_pcbApprox->IsChecked() : sal_False);
// (disabled boxes have to be passed to the engine as sal_False)
// adjust the Position-Listbox (which is not allowed during Wildcard-search)
- if (pBox == &m_cbWildCard)
+ if (pBox == m_pcbWildCard)
{
if (bChecked)
{
- m_ftPosition.Disable();
- m_lbPosition.Disable();
+ m_pftPosition->Disable();
+ m_plbPosition->Disable();
}
else
{
- m_ftPosition.Enable();
- m_lbPosition.Enable();
+ m_pftPosition->Enable();
+ m_plbPosition->Enable();
}
}
// and the button for similarity-search
- if (pBox == &m_cbApprox)
+ if (pBox == m_pcbApprox)
{
if (bChecked)
- m_pbApproxSettings.Enable();
+ m_ppbApproxSettings->Enable();
else
- m_pbApproxSettings.Disable();
+ m_ppbApproxSettings->Disable();
}
}
- else if (pBox == &m_aHalfFullFormsCJK)
+ else if (pBox == m_pHalfFullFormsCJK)
{
// forward to the search engine
m_pSearchEngine->SetIgnoreWidthCJK( !bChecked );
}
- else if (pBox == &m_aSoundsLikeCJK)
+ else if (pBox == m_pSoundsLikeCJK)
{
- m_aSoundsLikeCJKSettings.Enable(bChecked);
+ m_pSoundsLikeCJKSettings->Enable(bChecked);
// two other buttons which depend on this one
- sal_Bool bEnable = ( m_rbSearchForText.IsChecked()
- && !m_aSoundsLikeCJK.IsChecked()
+ sal_Bool bEnable = ( m_prbSearchForText->IsChecked()
+ && !m_pSoundsLikeCJK->IsChecked()
)
|| !SvtCJKOptions().IsJapaneseFindEnabled();
- m_cbCase.Enable(bEnable);
- m_aHalfFullFormsCJK.Enable(bEnable);
+ m_pcbCase->Enable(bEnable);
+ m_pHalfFullFormsCJK->Enable(bEnable);
// forward to the search engine
m_pSearchEngine->SetTransliteration( bChecked );
@@ -551,7 +504,7 @@ void FmSearchDialog::InitContext(sal_Int16 nContext)
DBG_ASSERT(nResult > 0, "FmSearchDialog::InitContext : ContextSupplier didn't give me any controls !");
// put the field names into the respective listbox
- m_lbField.Clear();
+ m_plbField->Clear();
if (!fmscContext.sFieldDisplayNames.isEmpty())
{
@@ -559,30 +512,30 @@ void FmSearchDialog::InitContext(sal_Int16 nContext)
DBG_ASSERT(comphelper::string::getTokenCount(fmscContext.sFieldDisplayNames, ';') == comphelper::string::getTokenCount(fmscContext.strUsedFields, ';'),
"FmSearchDialog::InitContext : invalid context description supplied !");
for (sal_Int32 i=0; i < comphelper::string::getTokenCount(fmscContext.sFieldDisplayNames, ';'); ++i)
- m_lbField.InsertEntry(comphelper::string::getToken(fmscContext.sFieldDisplayNames, i, ';'));
+ m_plbField->InsertEntry(comphelper::string::getToken(fmscContext.sFieldDisplayNames, i, ';'));
}
else
{
// else use the field names
for (sal_Int32 i=0; i < comphelper::string::getTokenCount(fmscContext.strUsedFields, ';'); ++i)
- m_lbField.InsertEntry(comphelper::string::getToken(fmscContext.strUsedFields, i, ';'));
+ m_plbField->InsertEntry(comphelper::string::getToken(fmscContext.strUsedFields, i, ';'));
}
if (nContext < (sal_Int32)m_arrContextFields.size() && !m_arrContextFields[nContext].isEmpty())
{
- m_lbField.SelectEntry(m_arrContextFields[nContext]);
+ m_plbField->SelectEntry(m_arrContextFields[nContext]);
}
else
{
- m_lbField.SelectEntryPos(0);
- if (m_rbSingleField.IsChecked() && (m_lbField.GetEntryCount() > 1))
- m_lbField.GrabFocus();
+ m_plbField->SelectEntryPos(0);
+ if (m_prbSingleField->IsChecked() && (m_plbField->GetEntryCount() > 1))
+ m_plbField->GrabFocus();
}
m_pSearchEngine->SwitchToContext(fmscContext.xCursor, fmscContext.strUsedFields, fmscContext.arrFields,
- m_rbAllFields.IsChecked() ? -1 : 0);
+ m_prbAllFields->IsChecked() ? -1 : 0);
- m_ftRecord.SetText(OUString::number(fmscContext.xCursor->getRow()));
+ m_pftRecord->SetText(OUString::number(fmscContext.xCursor->getRow()));
}
IMPL_LINK( FmSearchDialog, OnContextSelection, ListBox*, pBox)
@@ -617,31 +570,27 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable)
// the search button has two functions -> adjust its text accordingly
OUString sButtonText( bEnable ? m_sSearch : m_sCancel );
- m_pbSearchAgain.SetText( sButtonText );
+ m_pbSearchAgain->SetText( sButtonText );
if (m_pSearchEngine->GetSearchMode() != SM_BRUTE)
{
- m_flSearchFor.Enable (bEnable);
- m_rbSearchForText.Enable (bEnable);
- m_rbSearchForNull.Enable (bEnable);
- m_rbSearchForNotNull.Enable (bEnable);
- m_flWhere.Enable (bEnable);
- m_ftForm.Enable (bEnable);
- m_lbForm.Enable (bEnable);
- m_rbAllFields.Enable (bEnable);
- m_rbSingleField.Enable (bEnable);
- m_lbField.Enable (bEnable && m_rbSingleField.IsChecked());
- m_flOptions.Enable (bEnable);
- m_cbBackwards.Enable (bEnable);
- m_cbStartOver.Enable (bEnable);
- m_pbClose.Enable (bEnable);
+ m_prbSearchForText->Enable (bEnable);
+ m_prbSearchForNull->Enable (bEnable);
+ m_prbSearchForNotNull->Enable (bEnable);
+ m_plbForm->Enable (bEnable);
+ m_prbAllFields->Enable (bEnable);
+ m_prbSingleField->Enable (bEnable);
+ m_plbField->Enable (bEnable && m_prbSingleField->IsChecked());
+ m_pcbBackwards->Enable (bEnable);
+ m_pcbStartOver->Enable (bEnable);
+ m_pbClose->Enable (bEnable);
EnableSearchForDependees (bEnable);
if ( !bEnable )
{ // this means we're preparing for starting a search
// In this case, EnableSearchForDependees disabled the search button
// But as we're about to use it for cancelling the search, we really need to enable it, again
- m_pbSearchAgain.Enable( true );
+ m_pbSearchAgain->Enable( true );
}
}
@@ -668,33 +617,33 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable)
void FmSearchDialog::EnableSearchForDependees(sal_Bool bEnable)
{
- sal_Bool bSearchingForText = m_rbSearchForText.IsChecked();
- m_pbSearchAgain.Enable(bEnable && (!bSearchingForText || (!m_cmbSearchText.GetText().isEmpty())));
+ sal_Bool bSearchingForText = m_prbSearchForText->IsChecked();
+ m_pbSearchAgain->Enable(bEnable && (!bSearchingForText || (!m_pcmbSearchText->GetText().isEmpty())));
bEnable = bEnable && bSearchingForText;
- sal_Bool bEnableRedundants = !m_aSoundsLikeCJK.IsChecked() || !SvtCJKOptions().IsJapaneseFindEnabled();
-
- m_cmbSearchText.Enable (bEnable);
- m_ftPosition.Enable (bEnable && !m_cbWildCard.IsChecked());
- m_cbWildCard.Enable (bEnable && !m_cbRegular.IsChecked() && !m_cbApprox.IsChecked());
- m_cbRegular.Enable (bEnable && !m_cbWildCard.IsChecked() && !m_cbApprox.IsChecked());
- m_cbApprox.Enable (bEnable && !m_cbWildCard.IsChecked() && !m_cbRegular.IsChecked());
- m_pbApproxSettings.Enable (bEnable && m_cbApprox.IsChecked());
- m_aHalfFullFormsCJK.Enable (bEnable && bEnableRedundants);
- m_aSoundsLikeCJK.Enable (bEnable);
- m_aSoundsLikeCJKSettings.Enable (bEnable && m_aSoundsLikeCJK.IsChecked());
- m_lbPosition.Enable (bEnable && !m_cbWildCard.IsChecked());
- m_cbUseFormat.Enable (bEnable);
- m_cbCase.Enable (bEnable && bEnableRedundants);
+ sal_Bool bEnableRedundants = !m_pSoundsLikeCJK->IsChecked() || !SvtCJKOptions().IsJapaneseFindEnabled();
+
+ m_pcmbSearchText->Enable (bEnable);
+ m_pftPosition->Enable (bEnable && !m_pcbWildCard->IsChecked());
+ m_pcbWildCard->Enable (bEnable && !m_pcbRegular->IsChecked() && !m_pcbApprox->IsChecked());
+ m_pcbRegular->Enable (bEnable && !m_pcbWildCard->IsChecked() && !m_pcbApprox->IsChecked());
+ m_pcbApprox->Enable (bEnable && !m_pcbWildCard->IsChecked() && !m_pcbRegular->IsChecked());
+ m_ppbApproxSettings->Enable (bEnable && m_pcbApprox->IsChecked());
+ m_pHalfFullFormsCJK->Enable (bEnable && bEnableRedundants);
+ m_pSoundsLikeCJK->Enable (bEnable);
+ m_pSoundsLikeCJKSettings->Enable (bEnable && m_pSoundsLikeCJK->IsChecked());
+ m_plbPosition->Enable (bEnable && !m_pcbWildCard->IsChecked());
+ m_pcbUseFormat->Enable (bEnable);
+ m_pcbCase->Enable (bEnable && bEnableRedundants);
}
void FmSearchDialog::EnableControlPaint(sal_Bool bEnable)
{
- Control* pAffectedControls[] = { &m_flSearchFor, &m_rbSearchForText, &m_cmbSearchText, &m_rbSearchForNull, &m_rbSearchForNotNull,
- &m_rbSearchForText, &m_flWhere, &m_rbAllFields, &m_rbSingleField, &m_lbField, &m_flOptions, &m_ftPosition, &m_lbPosition,
- &m_cbUseFormat, &m_cbCase, &m_cbBackwards, &m_cbStartOver, &m_cbWildCard, &m_cbRegular, &m_cbApprox, &m_pbApproxSettings,
- &m_pbSearchAgain, &m_pbClose };
+ Control* pAffectedControls[] = { m_prbSearchForText, m_pcmbSearchText, m_prbSearchForNull, m_prbSearchForNotNull,
+ m_prbSearchForText, m_prbAllFields, m_prbSingleField, m_plbField, m_pftPosition, m_plbPosition,
+ m_pcbUseFormat, m_pcbCase, m_pcbBackwards, m_pcbStartOver, m_pcbWildCard, m_pcbRegular, m_pcbApprox, m_ppbApproxSettings,
+ m_pbSearchAgain, m_pbClose };
if (!bEnable)
for (sal_uInt32 i=0; i<SAL_N_ELEMENTS(pAffectedControls); ++i)
@@ -719,19 +668,19 @@ IMPL_LINK_NOARG(FmSearchDialog, OnDelayedPaint)
void FmSearchDialog::OnFound(const ::com::sun::star::uno::Any& aCursorPos, sal_Int16 nFieldPos)
{
FmFoundRecordInformation friInfo;
- friInfo.nContext = m_lbForm.GetSelectEntryPos();
+ friInfo.nContext = m_plbForm->GetSelectEntryPos();
// if I don't do a search in a context, this has an invalid value - but then it doesn't matter anyway
friInfo.aPosition = aCursorPos;
- if (m_rbAllFields.IsChecked())
+ if (m_prbAllFields->IsChecked())
friInfo.nFieldPos = nFieldPos;
else
- friInfo.nFieldPos = m_lbField.GetSelectEntryPos();
+ friInfo.nFieldPos = m_plbField->GetSelectEntryPos();
// this of course implies that I have really searched in the field that is selected in the listbox,
// which is made sure in RebuildUsedFields
m_lnkFoundHandler.Call(&friInfo);
- m_cmbSearchText.GrabFocus();
+ m_pcmbSearchText->GrabFocus();
}
IMPL_LINK(FmSearchDialog, OnSearchProgress, FmSearchProgress*, pProgress)
@@ -745,21 +694,21 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, FmSearchProgress*, pProgress)
case FmSearchProgress::STATE_PROGRESS:
if (pProgress->bOverflow)
{
- OUString sHint( CUI_RES( m_cbBackwards.IsChecked() ? RID_STR_OVERFLOW_BACKWARD : RID_STR_OVERFLOW_FORWARD ) );
- m_ftHint.SetText( sHint );
- m_ftHint.Invalidate();
+ OUString sHint( CUI_RES( m_pcbBackwards->IsChecked() ? RID_STR_OVERFLOW_BACKWARD : RID_STR_OVERFLOW_FORWARD ) );
+ m_pftHint->SetText( sHint );
+ m_pftHint->Invalidate();
}
- m_ftRecord.SetText(OUString::number(1 + pProgress->nCurrentRecord));
- m_ftRecord.Invalidate();
+ m_pftRecord->SetText(OUString::number(1 + pProgress->nCurrentRecord));
+ m_pftRecord->Invalidate();
break;
case FmSearchProgress::STATE_PROGRESS_COUNTING:
- m_ftHint.SetText(CUI_RESSTR(RID_STR_SEARCH_COUNTING));
- m_ftHint.Invalidate();
+ m_pftHint->SetText(CUI_RESSTR(RID_STR_SEARCH_COUNTING));
+ m_pftHint->Invalidate();
- m_ftRecord.SetText(OUString::number(pProgress->nCurrentRecord));
- m_ftRecord.Invalidate();
+ m_pftRecord->SetText(OUString::number(pProgress->nCurrentRecord));
+ m_pftRecord->Invalidate();
break;
case FmSearchProgress::STATE_SUCCESSFULL:
@@ -781,7 +730,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, FmSearchProgress*, pProgress)
if (m_lnkCanceledNotFoundHdl.IsSet())
{
FmFoundRecordInformation friInfo;
- friInfo.nContext = m_lbForm.GetSelectEntryPos();
+ friInfo.nContext = m_plbForm->GetSelectEntryPos();
// if I don't do a search in a context, this has an invalid value - but then it doesn't matter anyway
friInfo.aPosition = pProgress->aBookmark;
m_lnkCanceledNotFoundHdl.Call(&friInfo);
@@ -789,7 +738,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, FmSearchProgress*, pProgress)
break;
}
- m_ftRecord.SetText(OUString::number(1 + pProgress->nCurrentRecord));
+ m_pftRecord->SetText(OUString::number(1 + pProgress->nCurrentRecord));
return 0L;
}
@@ -801,64 +750,64 @@ void FmSearchDialog::LoadParams()
const OUString* pHistory = aParams.aHistory.getConstArray();
const OUString* pHistoryEnd = pHistory + aParams.aHistory.getLength();
for (; pHistory != pHistoryEnd; ++pHistory)
- m_cmbSearchText.InsertEntry( *pHistory );
+ m_pcmbSearchText->InsertEntry( *pHistory );
// I do the settings at my UI-elements and then I simply call the respective change-handler,
// that way the data is handed on to the SearchEngine and all dependent settings are done
// current field
- sal_Int32 nInitialField = m_lbField.GetEntryPos( OUString( aParams.sSingleSearchField ) );
+ sal_Int32 nInitialField = m_plbField->GetEntryPos( OUString( aParams.sSingleSearchField ) );
if (nInitialField == LISTBOX_ENTRY_NOTFOUND)
nInitialField = 0;
- m_lbField.SelectEntryPos(nInitialField);
- LINK(this, FmSearchDialog, OnFieldSelected).Call(&m_lbField);
+ m_plbField->SelectEntryPos(nInitialField);
+ LINK(this, FmSearchDialog, OnFieldSelected).Call(m_plbField);
// all fields/single field (AFTER selcting the field because OnClickedFieldRadios expects a valid value there)
if (aParams.bAllFields)
{
- m_rbSingleField.Check(false);
- m_rbAllFields.Check(true);
- LINK(this, FmSearchDialog, OnClickedFieldRadios).Call(&m_rbAllFields);
+ m_prbSingleField->Check(false);
+ m_prbAllFields->Check(true);
+ LINK(this, FmSearchDialog, OnClickedFieldRadios).Call(m_prbAllFields);
// OnClickedFieldRadios also calls to RebuildUsedFields
}
else
{
- m_rbAllFields.Check(false);
- m_rbSingleField.Check(true);
- LINK(this, FmSearchDialog, OnClickedFieldRadios).Call(&m_rbSingleField);
+ m_prbAllFields->Check(false);
+ m_prbSingleField->Check(true);
+ LINK(this, FmSearchDialog, OnClickedFieldRadios).Call(m_prbSingleField);
}
- m_lbPosition.SelectEntryPos(aParams.nPosition);
- LINK(this, FmSearchDialog, OnPositionSelected).Call(&m_lbPosition);
+ m_plbPosition->SelectEntryPos(aParams.nPosition);
+ LINK(this, FmSearchDialog, OnPositionSelected).Call(m_plbPosition);
// field formatting/case sensitivity/direction
- m_cbUseFormat.Check(aParams.bUseFormatter);
- m_cbCase.Check( aParams.isCaseSensitive() );
- m_cbBackwards.Check(aParams.bBackwards);
- LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(&m_cbUseFormat);
- LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(&m_cbCase);
- LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(&m_cbBackwards);
-
- m_aHalfFullFormsCJK.Check( !aParams.isIgnoreWidthCJK( ) ); // BEWARE: this checkbox has a inverse semantics!
- m_aSoundsLikeCJK.Check( aParams.bSoundsLikeCJK );
- LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(&m_aHalfFullFormsCJK);
- LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(&m_aSoundsLikeCJK);
-
- m_cbWildCard.Check(false);
- m_cbRegular.Check(false);
- m_cbApprox.Check(false);
- LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(&m_cbWildCard);
- LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(&m_cbRegular);
- LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(&m_cbApprox);
+ m_pcbUseFormat->Check(aParams.bUseFormatter);
+ m_pcbCase->Check( aParams.isCaseSensitive() );
+ m_pcbBackwards->Check(aParams.bBackwards);
+ LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(m_pcbUseFormat);
+ LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(m_pcbCase);
+ LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(m_pcbBackwards);
+
+ m_pHalfFullFormsCJK->Check( !aParams.isIgnoreWidthCJK( ) ); // BEWARE: this checkbox has a inverse semantics!
+ m_pSoundsLikeCJK->Check( aParams.bSoundsLikeCJK );
+ LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(m_pHalfFullFormsCJK);
+ LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(m_pSoundsLikeCJK);
+
+ m_pcbWildCard->Check(false);
+ m_pcbRegular->Check(false);
+ m_pcbApprox->Check(false);
+ LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(m_pcbWildCard);
+ LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(m_pcbRegular);
+ LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(m_pcbApprox);
CheckBox* pToCheck = NULL;
if (aParams.bWildcard)
- pToCheck = &m_cbWildCard;
+ pToCheck = m_pcbWildCard;
if (aParams.bRegular)
- pToCheck = &m_cbRegular;
+ pToCheck = m_pcbRegular;
if (aParams.bApproxSearch)
- pToCheck = &m_cbApprox;
+ pToCheck = m_pcbApprox;
if (aParams.bSoundsLikeCJK)
- pToCheck = &m_aSoundsLikeCJK;
+ pToCheck = m_pSoundsLikeCJK;
if (pToCheck)
{
pToCheck->Check(true);
@@ -873,16 +822,16 @@ void FmSearchDialog::LoadParams()
m_pSearchEngine->SetTransliterationFlags( aParams.getTransliterationFlags( ) );
- m_rbSearchForText.Check(false);
- m_rbSearchForNull.Check(false);
- m_rbSearchForNotNull.Check(false);
+ m_prbSearchForText->Check(false);
+ m_prbSearchForNull->Check(false);
+ m_prbSearchForNotNull->Check(false);
switch (aParams.nSearchForType)
{
- case 1: m_rbSearchForNull.Check(true); break;
- case 2: m_rbSearchForNotNull.Check(true); break;
- default: m_rbSearchForText.Check(true); break;
+ case 1: m_prbSearchForNull->Check(true); break;
+ case 2: m_prbSearchForNotNull->Check(true); break;
+ default: m_prbSearchForText->Check(true); break;
}
- LINK(this, FmSearchDialog, OnClickedFieldRadios).Call(&m_rbSearchForText);
+ LINK(this, FmSearchDialog, OnClickedFieldRadios).Call(m_prbSearchForText);
}
void FmSearchDialog::SaveParams() const
@@ -892,13 +841,13 @@ void FmSearchDialog::SaveParams() const
FmSearchParams aCurrentSettings;
- aCurrentSettings.aHistory.realloc( m_cmbSearchText.GetEntryCount() );
+ aCurrentSettings.aHistory.realloc( m_pcmbSearchText->GetEntryCount() );
OUString* pHistory = aCurrentSettings.aHistory.getArray();
- for (sal_Int32 i=0; i<m_cmbSearchText.GetEntryCount(); ++i, ++pHistory)
- *pHistory = m_cmbSearchText.GetEntry(i);
+ for (sal_Int32 i=0; i<m_pcmbSearchText->GetEntryCount(); ++i, ++pHistory)
+ *pHistory = m_pcmbSearchText->GetEntry(i);
- aCurrentSettings.sSingleSearchField = m_lbField.GetSelectEntry();
- aCurrentSettings.bAllFields = m_rbAllFields.IsChecked();
+ aCurrentSettings.sSingleSearchField = m_plbField->GetSelectEntry();
+ aCurrentSettings.bAllFields = m_prbAllFields->IsChecked();
aCurrentSettings.nPosition = m_pSearchEngine->GetPosition();
aCurrentSettings.bUseFormatter = m_pSearchEngine->GetFormatterUsing();
aCurrentSettings.setCaseSensitive ( m_pSearchEngine->GetCaseSensitive() );
@@ -914,9 +863,9 @@ void FmSearchDialog::SaveParams() const
aCurrentSettings.bSoundsLikeCJK = m_pSearchEngine->GetTransliteration();
aCurrentSettings.setTransliterationFlags ( m_pSearchEngine->GetTransliterationFlags() );
- if (m_rbSearchForNull.IsChecked())
+ if (m_prbSearchForNull->IsChecked())
aCurrentSettings.nSearchForType = 1;
- else if (m_rbSearchForNotNull.IsChecked())
+ else if (m_prbSearchForNotNull->IsChecked())
aCurrentSettings.nSearchForType = 2;
else
aCurrentSettings.nSearchForType = 0;
diff --git a/cui/source/dialogs/fmsearch.hrc b/cui/source/dialogs/fmsearch.hrc
index 5403f5f..c42775f 100644
--- a/cui/source/dialogs/fmsearch.hrc
+++ b/cui/source/dialogs/fmsearch.hrc
@@ -21,7 +21,6 @@
#include "svl/solar.hrc"
-#define RID_SVXDLG_SEARCHFORM (RID_FORMS_START + 7)
#define RID_STR_SEARCH_ANYWHERE (RID_FORMS_START + 85)
#define RID_STR_SEARCH_BEGINNING (RID_FORMS_START + 86)
#define RID_STR_SEARCH_END (RID_FORMS_START + 87)
@@ -34,44 +33,6 @@
#define RID_STR_OVERFLOW_BACKWARD (RID_FORMS_START + 35)
#define RID_STR_SEARCH_COUNTING (RID_FORMS_START + 76)
-#define FT_FORM 2
-#define FT_POSITION 3
-#define FT_RECORDLABEL 4
-#define FT_RECORD 5
-#define FT_HINT 6
-
-
-#define CMB_SEARCHTEXT 1
-
-#define RB_ALLFIELDS 1
-#define RB_SINGLEFIELD 2
-#define RB_SEARCHFORTEXT 3
-#define RB_SEARCHFORNULL 4
-#define RB_SEARCHFORNOTNULL 5
-
-#define LB_FORM 1
-#define LB_FIELD 2
-#define LB_POSITION 3
-
-#define PB_APPROXSETTINGS 1
-#define PB_SEARCH 2
-#define PB_SOUNDSLIKESETTINGS 3
-
-#define FL_SEARCHFOR 1
-#define FL_WHERE 2
-#define FL_OPTIONS 3
-#define FL_STATE 4
-
-#define CB_USEFORMATTER 1
-#define CB_BACKWARD 2
-#define CB_STARTOVER 3
-#define CB_CASE 4
-#define CB_WILDCARD 5
-#define CB_REGULAR 6
-#define CB_APPROX 7
-#define CB_HALFFULLFORMS 8
-#define CB_SOUNDSLIKECJK 9
-
#endif // _FMSEARCH_HRC
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/fmsearch.src b/cui/source/dialogs/fmsearch.src
index 2bd6c6e..48111ec 100644
--- a/cui/source/dialogs/fmsearch.src
+++ b/cui/source/dialogs/fmsearch.src
@@ -20,258 +20,6 @@
#include "fmsearch.hrc"
#include "helpid.hrc"
-ModalDialog RID_SVXDLG_SEARCHFORM
-{
- OutputSize = TRUE;
- SVLook = TRUE;
- Size = MAP_APPFONT( 300, 253 );
- Text [ en-US ] = "Record Search";
- Moveable = TRUE;
- HelpId = HID_FM_DLG_SEARCH;
-
- FixedLine FL_SEARCHFOR
- {
- Pos = MAP_APPFONT( 6, 8 );
- Size = MAP_APPFONT( 232, 8 );
- Text [ en-US ] = "Search for";
- };
- RadioButton RB_SEARCHFORTEXT
- {
- HelpID = "cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORTEXT";
- Pos = MAP_APPFONT( 12, 23 );
- Size = MAP_APPFONT( 50, 10 );
- Group = TRUE;
- Text [ en-US ] = "~Text";
- };
- RadioButton RB_SEARCHFORNULL
- {
- HelpID = "cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORNULL";
- Pos = MAP_APPFONT( 12, 36 );
- Size = MAP_APPFONT( 207, 10 );
- Text [ en-US ] = "Field content is ~NULL";
- };
- RadioButton RB_SEARCHFORNOTNULL
- {
- HelpID = "cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORNOTNULL";
- Pos = MAP_APPFONT( 12, 49 );
- Size = MAP_APPFONT( 207, 10 );
- Text [ en-US ] = "Field content is not NU~LL";
- };
- ComboBox CMB_SEARCHTEXT
- {
- Border = TRUE;
- Pos = MAP_APPFONT( 65, 20 );
- Size = MAP_APPFONT( 154, 80 );
- DropDown = TRUE;
- TabStop = TRUE;
- HelpId = HID_SEARCH_TEXT;
- };
-
- FixedLine FL_WHERE
- {
- Pos = MAP_APPFONT( 6, 65 );
- Size = MAP_APPFONT( 232, 8 );
- Text [ en-US ] = "Where to search";
- };
- FixedText FT_FORM
- {
- Pos = MAP_APPFONT( 12, 77 );
- Size = MAP_APPFONT( 87, 10 );
- Text [ en-US ] = "Form";
- };
- ListBox LB_FORM
- {
- HelpID = "cui:ListBox:RID_SVXDLG_SEARCHFORM:LB_FORM";
- Border = TRUE;
- Pos = MAP_APPFONT( 110, 76 );
- Size = MAP_APPFONT( 109, 60 );
- TabStop = TRUE;
- DropDown = TRUE;
- };
- RadioButton RB_ALLFIELDS
- {
- Pos = MAP_APPFONT( 24, 91 );
- Size = MAP_APPFONT( 75, 10 );
- TabStop = TRUE;
- HelpId = HID_SEARCH_ALLFIELDS;
- Text [ en-US ] = "All Fields";
- };
- RadioButton RB_SINGLEFIELD
- {
- HelpID = "cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SINGLEFIELD";
- Pos = MAP_APPFONT( 24, 106 );
- Size = MAP_APPFONT( 75, 10 );
- Text [ en-US ] = "Single field";
- };
- ListBox LB_FIELD
- {
- Border = TRUE;
- Pos = MAP_APPFONT( 110, 105 );
- Size = MAP_APPFONT( 109, 60 );
- TabStop = TRUE;
- DropDown = TRUE;
- HelpId = HID_SEARCH_FIELDSELECTION;
- };
- FixedLine FL_OPTIONS
- {
- Pos = MAP_APPFONT( 6, 126 );
- Size = MAP_APPFONT( 288, 8 );
- Text [ en-US ] = "Settings";
- };
- FixedText FT_POSITION
- {
- Pos = MAP_APPFONT( 12, 138 );
- Size = MAP_APPFONT( 87, 8 );
- Text [ en-US ] = "Position";
- };
- ListBox LB_POSITION
- {
- Border = TRUE;
- Pos = MAP_APPFONT( 110, 136 );
- Size = MAP_APPFONT( 109, 60 );
- TabStop = TRUE;
- DropDown = TRUE;
- HelpId = HID_SEARCH_POSITION;
- };
- CheckBox CB_USEFORMATTER
- {
- Pos = MAP_APPFONT( 12, 158 );
- Size = MAP_APPFONT( 90, 10 );
- TabStop = TRUE;
- HelpId = HID_SEARCH_FORMATTER;
- Text [ en-US ] = "Apply field format";
- };
- CheckBox CB_CASE
- {
- Pos = MAP_APPFONT( 12, 171 );
- Size = MAP_APPFONT( 90, 20 );
- TabStop = TRUE;
- WordBreak = TRUE;
- HelpId = HID_SEARCH_CASE;
- Text [ en-US ] = "Match case";
- };
- CheckBox CB_BACKWARD
- {
- Pos = MAP_APPFONT( 105, 158 );
- Size = MAP_APPFONT( 85, 10 );
- TabStop = TRUE;
- HelpId = HID_SEARCH_BACKWARD;
- Text [ en-US ] = "Search backwards";
- };
- CheckBox CB_STARTOVER
- {
- Pos = MAP_APPFONT( 105, 171 );
- Size = MAP_APPFONT( 85, 10 );
- TabStop = TRUE;
- HelpId = HID_SEARCH_STARTOVER;
- Text [ en-US ] = "From Beginning";
- };
- CheckBox CB_WILDCARD
- {
- Pos = MAP_APPFONT( 190, 158 );
- Size = MAP_APPFONT( 100, 10 );
- TabStop = TRUE;
- HelpId = HID_SEARCH_WILDCARD;
- Text [ en-US ] = "Wildcard expression";
- };
- CheckBox CB_REGULAR
- {
- Pos = MAP_APPFONT( 190, 171 );
- Size = MAP_APPFONT( 100, 10 );
- TabStop = TRUE;
- HelpId = HID_SEARCH_REGULAR;
- Text [ en-US ] = "Regular expression";
- };
- CheckBox CB_APPROX
- {
- Pos = MAP_APPFONT( 190, 184 );
- Size = MAP_APPFONT( 84, 20 );
- TabStop = TRUE;
- WordBreak = TRUE;
- HelpId = HID_SEARCH_APPROX;
- Text [ en-US ] = "Similarity Search";
- };
- PushButton PB_APPROXSETTINGS
- {
- Pos = MAP_APPFONT( 275, 182 );
- Size = MAP_APPFONT( 14, 14 );
- TabStop = TRUE ;
- HelpId = HID_SEARCH_APPROXSETTINGS;
- Text [ en-US ] = "...";
- };
- CheckBox CB_HALFFULLFORMS
- {
- HelpID = "cui:CheckBox:RID_SVXDLG_SEARCHFORM:CB_HALFFULLFORMS";
- Pos = MAP_APPFONT( 105, 209 );
- Size = MAP_APPFONT( 85, 10 );
- TabStop = TRUE ;
- Text [ en-US ] = "Match character width" ;
- };
- CheckBox CB_SOUNDSLIKECJK
- {
- HelpID = "cui:CheckBox:RID_SVXDLG_SEARCHFORM:CB_SOUNDSLIKECJK";
- Pos = MAP_APPFONT( 190, 209 );
- Size = MAP_APPFONT( 84, 10 );
- TabStop = TRUE ;
- Text [ en-US ] = "Sounds like (Japanese)";
- };
- PushButton PB_SOUNDSLIKESETTINGS
- {
- HelpID = "cui:PushButton:RID_SVXDLG_SEARCHFORM:PB_SOUNDSLIKESETTINGS";
- Pos = MAP_APPFONT( 275, 207 );
- Size = MAP_APPFONT( 14, 14 );
- TabStop = TRUE ;
- Text [ en-US ] = "..." ;
- };
- FixedLine FL_STATE
- {
- Pos = MAP_APPFONT( 6, 222 );
- Size = MAP_APPFONT( 288, 8 );
- Text [ en-US ] = "State";
- };
- FixedText FT_RECORDLABEL
- {
- Pos = MAP_APPFONT( 12, 232 );
- Size = MAP_APPFONT( 45, 10 );
- Text [ en-US ] = "Record :";
- };
- FixedText FT_RECORD
- {
- Pos = MAP_APPFONT( 60, 232 );
- Size = MAP_APPFONT( 30, 10 );
- UniqueId = UID_SEARCH_RECORDSTATUS;
- };
- FixedText FT_HINT
- {
- Pos = MAP_APPFONT( 99, 232 );
- Size = MAP_APPFONT( 190, 10 );
- };
- PushButton PB_SEARCH
- {
- Pos = MAP_APPFONT( 244, 6 );
- Size = MAP_APPFONT( 50, 14 );
- TabStop = TRUE;
- DefButton = TRUE;
- HelpId = HID_SEARCH_BTN_SEARCH;
- Text [ en-US ] = "Search";
- };
- CancelButton 1
- {
- Pos = MAP_APPFONT( 244, 26 );
- Size = MAP_APPFONT( 50, 14 );
- HelpId = HID_SEARCH_BTN_CLOSE;
- TabStop = TRUE;
- Text [ en-US ] = "~Close";
- };
- HelpButton 1
- {
- Pos = MAP_APPFONT( 244, 46 );
- Size = MAP_APPFONT( 50, 14 );
- TabStop = TRUE;
- Text [ en-US ] = "~Help";
- };
-};
-
String RID_STR_SEARCH_ANYWHERE
{
Text [ en-US ] = "anywhere in the field";
diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx
index 31acdbc..0d59adc 100644
--- a/cui/source/inc/cuifmsearch.hxx
+++ b/cui/source/inc/cuifmsearch.hxx
@@ -47,38 +47,32 @@ class FmSearchDialog : public ModalDialog
friend class FmSearchEngine;
// my all Controls
- FixedLine m_flSearchFor;
- RadioButton m_rbSearchForText;
- RadioButton m_rbSearchForNull;
- RadioButton m_rbSearchForNotNull;
- ComboBox m_cmbSearchText;
- FixedLine m_flWhere;
- FixedText m_ftForm;
- ListBox m_lbForm;
- RadioButton m_rbAllFields;
- RadioButton m_rbSingleField;
- ListBox m_lbField;
- FixedLine m_flOptions;
- FixedText m_ftPosition;
- ListBox m_lbPosition;
- CheckBox m_cbUseFormat;
- CheckBox m_cbCase;
- CheckBox m_cbBackwards;
- CheckBox m_cbStartOver;
- CheckBox m_cbWildCard;
- CheckBox m_cbRegular;
- CheckBox m_cbApprox;
- PushButton m_pbApproxSettings;
- CheckBox m_aHalfFullFormsCJK;
- CheckBox m_aSoundsLikeCJK;
- PushButton m_aSoundsLikeCJKSettings;
- FixedLine m_flState;
- FixedText m_ftRecordLabel;
- FixedText m_ftRecord;
- FixedText m_ftHint;
- PushButton m_pbSearchAgain;
- CancelButton m_pbClose;
- HelpButton m_pbHelp;
+ RadioButton *m_prbSearchForText;
+ RadioButton *m_prbSearchForNull;
+ RadioButton *m_prbSearchForNotNull;
+ ComboBox *m_pcmbSearchText;
+ FixedText *m_pftForm;
+ ListBox *m_plbForm;
+ RadioButton *m_prbAllFields;
+ RadioButton *m_prbSingleField;
+ ListBox *m_plbField;
+ FixedText *m_pftPosition;
+ ListBox *m_plbPosition;
+ CheckBox *m_pcbUseFormat;
+ CheckBox *m_pcbCase;
+ CheckBox *m_pcbBackwards;
+ CheckBox *m_pcbStartOver;
+ CheckBox *m_pcbWildCard;
+ CheckBox *m_pcbRegular;
+ CheckBox *m_pcbApprox;
+ PushButton *m_ppbApproxSettings;
+ CheckBox *m_pHalfFullFormsCJK;
+ CheckBox *m_pSoundsLikeCJK;
+ PushButton *m_pSoundsLikeCJKSettings;
+ FixedText *m_pftRecord;
+ FixedText *m_pftHint;
+ PushButton *m_pbSearchAgain;
+ CancelButton *m_pbClose;
OUString m_sSearch;
OUString m_sCancel;
@@ -180,18 +174,16 @@ private:
DECL_LINK( OnDelayedPaint, void* ); ///< see EnableSearchUI
- void implMoveControls(Control** _ppControls, sal_Int32 _nControls, sal_Int32 _nUp, Control* _pToResize);
-
void initCommon( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& _rxCursor );
};
inline void FmSearchDialog::SetActiveField(const OUString& strField)
{
- sal_Int32 nInitialField = m_lbField.GetEntryPos(strField);
+ sal_Int32 nInitialField = m_plbField->GetEntryPos(strField);
if (nInitialField == LISTBOX_ENTRY_NOTFOUND)
nInitialField = 0;
- m_lbField.SelectEntryPos(nInitialField);
- LINK(this, FmSearchDialog, OnFieldSelected).Call(&m_lbField);
+ m_plbField->SelectEntryPos(nInitialField);
+ LINK(this, FmSearchDialog, OnFieldSelected).Call(m_plbField);
}
#endif // INCLUDED_CUI_SOURCE_INC_CUIFMSEARCH_HXX
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 2153891..263a788 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -162,21 +162,6 @@
#define HID_SVX_DOWN_TOOLBAR_ITEM "CUI_HID_SVX_DOWN_TOOLBAR_ITEM"
#define HID_SVX_SAVE_IN "CUI_HID_SVX_SAVE_IN"
#define HID_OPTIONS_MULTIPATH_LIST "CUI_HID_OPTIONS_MULTIPATH_LIST"
-#define HID_FM_DLG_SEARCH "CUI_HID_FM_DLG_SEARCH"
-#define HID_SEARCH_TEXT "CUI_HID_SEARCH_TEXT"
-#define HID_SEARCH_ALLFIELDS "CUI_HID_SEARCH_ALLFIELDS"
-#define HID_SEARCH_FIELDSELECTION "CUI_HID_SEARCH_FIELDSELECTION"
-#define HID_SEARCH_POSITION "CUI_HID_SEARCH_POSITION"
-#define HID_SEARCH_FORMATTER "CUI_HID_SEARCH_FORMATTER"
-#define HID_SEARCH_CASE "CUI_HID_SEARCH_CASE"
-#define HID_SEARCH_BACKWARD "CUI_HID_SEARCH_BACKWARD"
-#define HID_SEARCH_STARTOVER "CUI_HID_SEARCH_STARTOVER"
-#define HID_SEARCH_WILDCARD "CUI_HID_SEARCH_WILDCARD"
-#define HID_SEARCH_REGULAR "CUI_HID_SEARCH_REGULAR"
-#define HID_SEARCH_APPROX "CUI_HID_SEARCH_APPROX"
-#define HID_SEARCH_APPROXSETTINGS "CUI_HID_SEARCH_APPROXSETTINGS"
-#define HID_SEARCH_BTN_SEARCH "CUI_HID_SEARCH_BTN_SEARCH"
-#define HID_SEARCH_BTN_CLOSE "CUI_HID_SEARCH_BTN_CLOSE"
#define HID_DIALOG_HANGULHANJA "CUI_HID_DIALOG_HANGULHANJA"
#define HID_HANGULHANJA_EDIT_DLG "CUI_HID_HANGULHANJA_EDIT_DLG"
#define HID_TPHATCH_CTRL "CUI_HID_TPHATCH_CTRL"
diff --git a/cui/uiconfig/ui/fmsearchdialog.ui b/cui/uiconfig/ui/fmsearchdialog.ui
new file mode 100644
index 0000000..d982ba6
--- /dev/null
+++ b/cui/uiconfig/ui/fmsearchdialog.ui
@@ -0,0 +1,852 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
+<interface>
+ <requires lib="gtk+" version="3.0"/>
+ <object class="GtkDialog" id="RecordSearchDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Record Search</property>
+ <property name="resizable">False</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox3">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="pbSearchAgain">
+ <property name="label" translatable="yes">S_earch</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="close">
+ <property name="label">gtk-close</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ <property name="image_position">top</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkBox" id="box3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkFrame" id="searchframe">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</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="hexpand">True</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkBox" id="box4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="orientation">vertical</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkGrid" id="grid5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkComboBox" id="cmbSearchText">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="hexpand">True</property>
+ <property name="has_entry">True</property>
+ <child internal-child="entry">
+ <object class="GtkEntry" id="combobox-entry2">
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ </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>
+ <child>
+ <object class="GtkRadioButton" id="rbSearchForText">
+ <property name="label" translatable="yes">_Text</property>
+ <property name="use_action_appearance">False</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="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>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="rbSearchForNull">
+ <property name="label" translatable="yes">Field content is _NULL</property>
+ <property name="use_action_appearance">False</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="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">rbSearchForText</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="rbSearchForNotNull">
+ <property name="label" translatable="yes">Field content is not NU_LL</property>
+ <property name="use_action_appearance">False</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="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">rbSearchForText</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </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>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="flSearchFor">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Search for</property>
+ <property name="use_underline">True</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="wheretosearchframe">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</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="hexpand">True</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkGrid" id="grid9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkGrid" id="grid11">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkBox" id="box5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkRadioButton" id="rbSingleField">
+ <property name="label" translatable="yes">_Single field</property>
+ <property name="use_action_appearance">False</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="active">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>
+ <child>
+ <object class="GtkComboBox" id="lbField">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </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>
+ <object class="GtkRadioButton" id="rbAllFields">
+ <property name="label" translatable="yes">_All fields</property>
+ <property name="use_action_appearance">False</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="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">rbSingleField</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>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">2</property>
+ </packing>
+ </child>
+ </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="GtkBox" id="box6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="replacedesc">
+ <property name="width_request">1</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="wrap">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </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>
+ </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">Where to search</property>
+ <property name="use_underline">True</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="settingsframe">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkBox" id="box7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkGrid" id="grid4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="ftPosition">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Position</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="GtkComboBox" id="lbPosition">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="hexpand">True</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>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <property name="row_homogeneous">True</property>
+ <property name="column_homogeneous">True</property>
+ <child>
+ <object class="GtkCheckButton" id="HalfFullFormsCJK">
+ <property name="label" translatable="yes">Match character wi_dth</property>
+ <property name="use_action_appearance">False</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">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkCheckButton" id="SoundsLikeCJK">
+ <property name="label" translatable="yes">Sounds like (_Japanese)</property>
+ <property name="use_action_appearance">False</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">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="SoundsLikeCJKSettings">
+ <property name="label" translatable="yes">...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="halign">center</property>
+ <property name="valign">end</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>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkCheckButton" id="cbApprox">
+ <property name="label" translatable="yes">S_imilarity Search</property>
+ <property name="use_action_appearance">False</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">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="pbApproxSettings">
+ <property name="label" translatable="yes">...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="halign">center</property>
+ <property name="valign">end</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>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="cbCase">
+ <property name="label" translatable="yes">_Match case</property>
+ <property name="use_action_appearance">False</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">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="cbStartOver">
+ <property name="label" translatable="yes">Fr_om top</property>
+ <property name="use_action_appearance">False</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">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="cbRegular">
+ <property name="label" translatable="yes">_Regular expression</property>
+ <property name="use_action_appearance">False</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>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list