[Libreoffice-commits] .: cui/source
Andras Timar
timar at kemper.freedesktop.org
Thu Jun 16 01:00:59 PDT 2011
cui/source/options/optinet2.cxx | 407 ----------------------------------------
cui/source/options/optinet2.hrc | 23 --
cui/source/options/optinet2.hxx | 65 ------
cui/source/options/optinet2.src | 166 ----------------
cui/source/options/treeopt.cxx | 2
cui/source/options/treeopt.src | 3
6 files changed, 1 insertion(+), 665 deletions(-)
New commits:
commit e64f2c88bde72cec12df88478f20e59495141052
Author: Samuel Cantrell <samuelcantrell at gmail.com>
Date: Thu Jun 16 09:57:53 2011 +0200
remove Search Options page from Internet group on Options dialog fdo#38146
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index b61a72d..d897fb8 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -635,413 +635,6 @@ IMPL_LINK( SvxProxyTabPage, LoseFocusHdl_Impl, Edit *, pEdit )
}
-/********************************************************************/
-/* */
-/* SvxSearchTabPage */
-/* */
-/********************************************************************/
-
-SvxSearchTabPage::SvxSearchTabPage(Window* pParent, const SfxItemSet& rSet ) :
-
- SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_INET_SEARCH ), rSet ),
-
- aSearchGB ( this, CUI_RES( GB_SEARCH ) ),
- aSearchLB ( this, CUI_RES( LB_SEARCH ) ),
- aSearchNameFT ( this, CUI_RES( FT_SEARCH_NAME ) ),
- aSearchNameED ( this, CUI_RES( ED_SEARCH_NAME ) ),
- aSearchFT ( this, CUI_RES( FT_SEARCH ) ),
- aAndRB ( this, CUI_RES( RB_AND ) ),
- aOrRB ( this, CUI_RES( RB_OR ) ),
- aExactRB ( this, CUI_RES( RB_EXACT ) ),
-
- aURLFT ( this, CUI_RES( FT_URL ) ),
- aURLED ( this, CUI_RES( ED_URL ) ),
-
- aPostFixFT ( this, CUI_RES( FT_POSTFIX ) ),
- aPostFixED ( this, CUI_RES( ED_POSTFIX ) ),
- aSeparatorFT ( this, CUI_RES( FT_SEPARATOR ) ),
- aSeparatorED ( this, CUI_RES( ED_SEPARATOR ) ),
- aCaseFT ( this, CUI_RES( FT_CASE ) ),
- aCaseED ( this, CUI_RES( ED_CASE ) ),
-
- aNewPB ( this, CUI_RES( PB_NEW ) ),
- aAddPB ( this, CUI_RES( PB_ADD ) ),
- aChangePB ( this, CUI_RES( PB_CHANGE ) ),
- aDeletePB ( this, CUI_RES( PB_DELETE ) ),
-
- sModifyMsg(CUI_RES(MSG_MODIFY))
-{
- FreeResource();
-
- SetExchangeSupport();
- aCaseED.SelectEntryPos(0); // falls kein Eintrag vorhanden ist, kann es sonst "Arger geben
-
- aNewPB.SetClickHdl(LINK( this, SvxSearchTabPage, NewSearchHdl_Impl ) );
- aAddPB.SetClickHdl(LINK( this, SvxSearchTabPage, AddSearchHdl_Impl ) );
- aChangePB.SetClickHdl(LINK( this, SvxSearchTabPage, ChangeSearchHdl_Impl ) );
- aDeletePB.SetClickHdl(LINK( this, SvxSearchTabPage, DeleteSearchHdl_Impl ) );
- aSearchLB.SetSelectHdl(LINK( this, SvxSearchTabPage, SearchEntryHdl_Impl ) );
-
- Link aLink = LINK( this, SvxSearchTabPage, SearchModifyHdl_Impl );
- aSearchNameED.SetModifyHdl( aLink );
- aURLED.SetModifyHdl( aLink );
- aSeparatorED.SetModifyHdl( aLink );
- aPostFixED.SetModifyHdl( aLink );
- aCaseED.SetSelectHdl( aLink );
-
- aLink = LINK( this, SvxSearchTabPage, SearchPartHdl_Impl );
- aAndRB.SetClickHdl( aLink );
- aOrRB.SetClickHdl( aLink );
- aExactRB.SetClickHdl( aLink );
-
- InitControls_Impl();
-}
-
-// -----------------------------------------------------------------------
-SvxSearchTabPage::~SvxSearchTabPage()
-{
-}
-// -----------------------------------------------------------------------
-
-SfxTabPage* SvxSearchTabPage::Create(Window* pParent, const SfxItemSet& rAttrSet )
-{
- return new SvxSearchTabPage(pParent, rAttrSet);
-}
-
-// -----------------------------------------------------------------------
-
-void SvxSearchTabPage::Reset( const SfxItemSet& )
-{
- //The two lines below are moved here from the last part of this method
- aChangePB.Disable();
- aAddPB.Disable();
-
- sal_uInt16 nCount = aSearchConfig.Count();
- aSearchLB.Clear();
- for(sal_uInt16 i = 0; i < nCount; i++)
- {
- const SvxSearchEngineData& rData = aSearchConfig.GetData(i);
- aSearchLB.InsertEntry(rData.sEngineName);
- }
-
- if ( nCount )
- {
- aSearchLB.SelectEntryPos(0);
- SearchEntryHdl_Impl( &aSearchLB );
- }
- else
- aDeletePB.Disable();
-}
-
-// -----------------------------------------------------------------------
-
-sal_Bool SvxSearchTabPage::FillItemSet( SfxItemSet& )
-{
- if(aSearchConfig.IsModified())
- aSearchConfig.Commit();
- return sal_True;
-}
-/*--------------------------------------------------------------------*/
-
-void SvxSearchTabPage::ActivatePage( const SfxItemSet& )
-{
-}
-
-/*--------------------------------------------------------------------*/
-
-int SvxSearchTabPage::DeactivatePage( SfxItemSet* _pSet )
-{
- if(!ConfirmLeave(String()))
- return KEEP_PAGE;
-
- if ( _pSet )
- FillItemSet( *_pSet );
- return LEAVE_PAGE;
-}
-
-// -----------------------------------------------------------------------
-
-sal_Bool SvxSearchTabPage::ConfirmLeave( const String& rStringSelection)
-{
- if(aChangePB.IsEnabled())
- {
- QueryBox aQuery(this, WB_YES_NO_CANCEL|WB_DEF_YES, sModifyMsg);
- sal_uInt16 nRet = aQuery.Execute();
- if(RET_CANCEL == nRet)
- {
- if(rStringSelection.Len())
- aSearchLB.SelectEntry(sLastSelectedEntry);
- return sal_False;
- }
- else if(RET_YES == nRet)
- {
- sal_uInt16 nEntryPos = aSearchLB.GetEntryPos( aSearchNameED.GetText() );
- if ( nEntryPos != LISTBOX_ENTRY_NOTFOUND )
- aSearchLB.SelectEntryPos(nEntryPos);
- else
- aSearchLB.SetNoSelection();
- ChangeSearchHdl_Impl(0);
- if(rStringSelection.Len())
- aSearchLB.SelectEntry(rStringSelection);
- }
- else if(RET_NO == nRet)
- {
- aChangePB.Enable(sal_False);
- aAddPB.Enable(sal_False);
- SearchEntryHdl_Impl(&aSearchLB);
- }
- }
- if(aAddPB.IsEnabled())
- {
- QueryBox aQuery(this, WB_YES_NO_CANCEL|WB_DEF_YES, sModifyMsg);
- sal_uInt16 nRet = aQuery.Execute();
- if(RET_CANCEL == nRet)
- {
- aSearchLB.SetNoSelection();
- return sal_False;
- }
- else if(RET_YES == nRet)
- {
- aSearchLB.SetNoSelection();
- AddSearchHdl_Impl(0);
- if(rStringSelection.Len())
- aSearchLB.SelectEntry(rStringSelection);
- }
- else if(RET_NO == nRet)
- {
- aAddPB.Enable(sal_False);
- aChangePB.Enable(sal_False);
- NewSearchHdl_Impl(0);
- }
-
- }
- return sal_True;
-}
-
-// -----------------------------------------------------------------------
-
-void SvxSearchTabPage::InitControls_Impl()
-{
- // detect longest label text
- sal_Int32 i = 0;
- long nLabelTextWidth = 0;
- Window* pLabels[] = { &aSearchNameFT, &aSearchFT, &aURLFT, &aPostFixFT, &aSeparatorFT, &aCaseFT };
- Window** pLabel = pLabels;
- const sal_Int32 nLabelCount = SAL_N_ELEMENTS( pLabels );
- for ( ; i < nLabelCount; ++i, ++pLabel )
- {
- long nTemp = (*pLabel)->GetCtrlTextWidth( (*pLabel)->GetText() );
- if ( nTemp > nLabelTextWidth )
- nLabelTextWidth = nTemp;
- }
-
- // resize all labels
- nLabelTextWidth = nLabelTextWidth * 120 / 100; // additional space looks better
- const long nLabelWidth = aSearchNameFT.GetSizePixel().Width();
- const long nDelta = nLabelWidth - nLabelTextWidth;
- pLabel = pLabels;
- for ( i = 0; i < nLabelCount; ++i, ++pLabel )
- {
- Size aNewSize = (*pLabel)->GetSizePixel();
- aNewSize.Width() += nDelta;
- (*pLabel)->SetSizePixel( aNewSize );
- }
-
- // resize and move the edits
- Window* pEdits[] = { &aSearchNameED, &aAndRB, &aOrRB,
- &aExactRB, &aURLED, &aPostFixED, &aSeparatorED, &aCaseED };
- Window** pEdit = pEdits;
- const sal_Int32 nCCount = SAL_N_ELEMENTS( pEdits );
- for ( i = 0; i < nCCount; ++i, ++pEdit )
- {
- Point aNewPos = (*pEdit)->GetPosPixel();
- aNewPos.X() -= nDelta;
- Size aNewSize = (*pEdit)->GetSizePixel();
- if ( (*pEdit) != &aSeparatorED && (*pEdit) != &aCaseED )
- aNewSize.Width() += nDelta;
- (*pEdit)->SetPosSizePixel( aNewPos, aNewSize );
- }
-}
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( SvxSearchTabPage, NewSearchHdl_Impl, PushButton *, EMPTYARG )
-{
- SearchEntryHdl_Impl(&aSearchLB);
- if(aChangePB.IsEnabled() || aAddPB.IsEnabled())
- return 0;
- aSearchNameED.SetText( String() );
- aSearchLB.SetNoSelection();
- aCurrentSrchData = SvxSearchEngineData();
- aAndRB.Check( sal_True );
- SearchEntryHdl_Impl( &aSearchLB );
- SearchPartHdl_Impl( &aAndRB );
- return 0;
-}
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( SvxSearchTabPage, AddSearchHdl_Impl, PushButton *, EMPTYARG )
-{
- aAddPB.Enable(sal_False);
- aChangePB.Enable(sal_False);
- aCurrentSrchData.sEngineName = aSearchNameED.GetText();
- aSearchConfig.SetData(aCurrentSrchData);
- aSearchLB.InsertEntry( aCurrentSrchData.sEngineName );
- aSearchLB.SelectEntry( aCurrentSrchData.sEngineName );
- SearchEntryHdl_Impl( &aSearchLB );
- return 0;
-}
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( SvxSearchTabPage, ChangeSearchHdl_Impl, PushButton *, EMPTYARG )
-{
- aChangePB.Enable(sal_False);
- aAddPB.Enable(sal_False);
- sal_uInt16 nPos = aSearchLB.GetSelectEntryPos();
- if ( nPos != LISTBOX_ENTRY_NOTFOUND )
- {
- String sEngine = aSearchLB.GetSelectEntry();
- aCurrentSrchData.sEngineName = sEngine;
- aSearchConfig.SetData(aCurrentSrchData);
- aSearchLB.SelectEntry(sEngine);
- SearchEntryHdl_Impl(&aSearchLB);
- }
- else
- {
- SetUpdateMode(sal_False);
- String sEntry = aSearchNameED.GetText();
- // im AddHdl wird sLastSelectedEntry umgesetzt
- String sTemp(sLastSelectedEntry);
- AddSearchHdl_Impl(0);
- aSearchLB.SelectEntry(sTemp);
- DeleteSearchHdl_Impl(0);
- aSearchLB.SelectEntry(sEntry);
- SearchEntryHdl_Impl(&aSearchLB);
- SetUpdateMode(sal_True);
- }
- return 0;
-}
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( SvxSearchTabPage, DeleteSearchHdl_Impl, PushButton *, EMPTYARG)
-{
- aChangePB.Enable(sal_False);
- sal_uInt16 nPos = aSearchLB.GetSelectEntryPos();
- DBG_ASSERT(nPos != LISTBOX_ENTRY_NOTFOUND, "kein Eintrag selektiert!");
- aSearchConfig.RemoveData(aSearchLB.GetSelectEntry());
- aSearchLB.RemoveEntry(nPos);
- aSearchLB.SelectEntryPos(0);
- SearchEntryHdl_Impl(&aSearchLB);
- return 0;
-}
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( SvxSearchTabPage, SearchEntryHdl_Impl, ListBox*, pBox )
-{
- sal_uInt16 nEntryPos = pBox->GetSelectEntryPos();
- if ( nEntryPos != LISTBOX_ENTRY_NOTFOUND )
- {
- String sSelection(pBox->GetSelectEntry());
- if(!ConfirmLeave(sSelection))
- return 0;
-
- const SvxSearchEngineData* pData = aSearchConfig.GetData(sSelection);
- DBG_ASSERT(pData, "SearchEngine not available");
- if(pData)
- {
- aSearchNameED.SetText(sSelection);
- sLastSelectedEntry = sSelection;
- sal_Bool bAnd = aAndRB.IsChecked();
- sal_Bool bOr = aOrRB.IsChecked();
-
- aURLED.SetText(bAnd ? pData->sAndPrefix : bOr ? pData->sOrPrefix : pData->sExactPrefix);
- aSeparatorED.SetText( bAnd ? pData->sAndSeparator : bOr ? pData->sOrSeparator : pData->sExactSeparator);
- aPostFixED.SetText(bAnd ? pData->sAndSuffix : bOr ? pData->sOrSuffix : pData->sExactSuffix );
- sal_Int32 nCase = bAnd ? pData->nAndCaseMatch : bOr ? pData->nOrCaseMatch : pData->nExactCaseMatch;
- aCaseED.SelectEntryPos( (sal_uInt16)nCase );
- aCurrentSrchData = *pData;
- }
- aDeletePB.Enable();
- }
- else
- {
- aDeletePB.Enable(sal_False);
- sLastSelectedEntry.Erase();
- }
- aChangePB.Enable(sal_False);
- aAddPB.Enable(sal_False);
- return 0;
-}
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( SvxSearchTabPage, SearchModifyHdl_Impl, SvxNoSpaceEdit*, pEdit )
-{
- if ( pEdit == &aSearchNameED )
- {
- sal_Bool bTextLen = ( 0 != pEdit->GetText().Len() );
- sal_Bool bFound = sal_False;
- if ( bTextLen )
- {
- sal_uInt16 nEntryPos = aSearchLB.GetEntryPos( pEdit->GetText() );
- bFound = ( nEntryPos != LISTBOX_ENTRY_NOTFOUND );
- if ( bFound )
- aSearchLB.SelectEntryPos(nEntryPos);
- else
- aSearchLB.SetNoSelection();
- }
- aChangePB.Enable( sLastSelectedEntry.Len() > 0 );
- aDeletePB.Enable(bFound);
- aAddPB.Enable(bTextLen && !bFound);
- }
- else
- {
- if ( aSearchLB.GetSelectEntryCount() && sLastSelectedEntry.Len() > 0 )
- aChangePB.Enable();
-
- if(aAndRB.IsChecked())
- {
- aCurrentSrchData.sAndPrefix = aURLED.GetText();
- aCurrentSrchData.sAndSeparator = aSeparatorED.GetText();
- aCurrentSrchData.sAndSuffix = aPostFixED.GetText();
- aCurrentSrchData.nAndCaseMatch = aCaseED.GetSelectEntryPos();
- }
- else if(aOrRB.IsChecked())
- {
- aCurrentSrchData.sOrPrefix = aURLED.GetText();
- aCurrentSrchData.sOrSeparator = aSeparatorED.GetText();
- aCurrentSrchData.sOrSuffix = aPostFixED.GetText();
- aCurrentSrchData.nOrCaseMatch = aCaseED.GetSelectEntryPos();
- }
- else
- {
- aCurrentSrchData.sExactPrefix = aURLED.GetText();
- aCurrentSrchData.sExactSeparator = aSeparatorED.GetText();
- aCurrentSrchData.sExactSuffix = aPostFixED.GetText();
- aCurrentSrchData.nExactCaseMatch = aCaseED.GetSelectEntryPos();
- }
- }
- return 0;
-}
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( SvxSearchTabPage, SearchPartHdl_Impl, RadioButton *, EMPTYARG )
-{
- sal_Bool bAnd = aAndRB.IsChecked();
- sal_Bool bOr = aOrRB.IsChecked();
-
- aURLED.SetText(bAnd ? aCurrentSrchData.sAndPrefix : bOr ? aCurrentSrchData.sOrPrefix : aCurrentSrchData.sExactPrefix);
- aSeparatorED.SetText( bAnd ? aCurrentSrchData.sAndSeparator : bOr ? aCurrentSrchData.sOrSeparator : aCurrentSrchData.sExactSeparator);
- aPostFixED.SetText(bAnd ? aCurrentSrchData.sAndSuffix : bOr ? aCurrentSrchData.sOrSuffix : aCurrentSrchData.sExactSuffix );
- sal_Int32 nCase = bAnd ? aCurrentSrchData.nAndCaseMatch : bOr ? aCurrentSrchData.nOrCaseMatch : aCurrentSrchData.nExactCaseMatch;
- aCaseED.SelectEntryPos( (sal_uInt16)nCase );
- return 0;
-}
//#98647#----------------------------------------------
void SvxScriptExecListBox::RequestHelp( const HelpEvent& rHEvt )
diff --git a/cui/source/options/optinet2.hrc b/cui/source/options/optinet2.hrc
index 75f9445..2ccee07 100755
--- a/cui/source/options/optinet2.hrc
+++ b/cui/source/options/optinet2.hrc
@@ -56,29 +56,6 @@
#define FT_HTTPS_PORT 15
#define ED_HTTPS_PORT 15
-// Search ------------------------------------------------------------------
-#define GB_SEARCH 40
-#define LB_SEARCH 40
-#define FT_SEARCH_NAME 41
-#define ED_SEARCH_NAME 41
-#define FT_SEARCH 42
-#define RB_AND 43
-#define RB_OR 44
-#define RB_EXACT 45
-#define FT_URL 46
-#define ED_URL 46
-#define FT_POSTFIX 47
-#define ED_POSTFIX 47
-#define FT_SEPARATOR 48
-#define ED_SEPARATOR 48
-#define FT_CASE 49
-#define ED_CASE 49
-#define PB_CHANGE 53
-#define PB_DELETE 54
-#define PB_ADD 55
-#define PB_NEW 56
-#define MSG_MODIFY 57
-
// Protocols --------------------------------------------------------------
#define GB_DNS 105
#define RB_DNS_AUTO 106
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index ff9d67b..cbad0be 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -51,7 +51,6 @@ class SvtInetOptions;
#ifndef SV_NODIALOG
#define PROXY_CONTROLS 23
#define CACHE_CONTROLS 20
-#define INET_SEARCH 19
#define TYPE_CONTROLS 18
@@ -143,70 +142,6 @@ public:
virtual void Reset( const SfxItemSet& rSet );
};
-// class SvxSearchTabPage ------------------------------------------------
-class SvxSearchConfig;
-class SvxSearchTabPage : public SfxTabPage
-{
- using TabPage::ActivatePage;
- using TabPage::DeactivatePage;
-
-private:
- FixedLine aSearchGB;
- ListBox aSearchLB;
- FixedText aSearchNameFT;
- SvxNoSpaceEdit aSearchNameED;
-
- FixedText aSearchFT;
- RadioButton aAndRB;
- RadioButton aOrRB;
- RadioButton aExactRB;
-
- FixedText aURLFT;
- SvxNoSpaceEdit aURLED;
-
- FixedText aPostFixFT;
- SvxNoSpaceEdit aPostFixED;
- FixedText aSeparatorFT;
- SvxNoSpaceEdit aSeparatorED;
- FixedText aCaseFT;
- ListBox aCaseED;
-
- PushButton aNewPB;
- PushButton aAddPB;
- PushButton aChangePB;
- PushButton aDeletePB;
-
- String sLastSelectedEntry;
- String sModifyMsg;
-
- SvxSearchConfig aSearchConfig;
- SvxSearchEngineData aCurrentSrchData;
-
-#ifdef _SVX_OPTINET2_CXX
- void InitControls_Impl();
-
- DECL_LINK( NewSearchHdl_Impl, PushButton * );
- DECL_LINK( AddSearchHdl_Impl, PushButton * );
- DECL_LINK( ChangeSearchHdl_Impl, PushButton * );
- DECL_LINK( DeleteSearchHdl_Impl, PushButton * );
- DECL_LINK( SearchEntryHdl_Impl, ListBox * );
- DECL_LINK( SearchModifyHdl_Impl, SvxNoSpaceEdit * );
- DECL_LINK( SearchPartHdl_Impl, RadioButton * );
-#endif
-
- virtual void ActivatePage( const SfxItemSet& rSet );
- virtual int DeactivatePage( SfxItemSet* pSet = 0 );
- sal_Bool ConfirmLeave( const String& rStringSelection );
-
- SvxSearchTabPage( Window* pParent, const SfxItemSet& rSet );
- virtual ~SvxSearchTabPage();
-
-public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual sal_Bool FillItemSet( SfxItemSet& rSet );
- virtual void Reset( const SfxItemSet& rSet );
-};
-
// #98647# class SvxScriptExecListBox ------------------------------------
class SvxScriptExecListBox : public ListBox
{ // for adding tooltips to ListBox
diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src
index 72eaafd..80543f8 100644
--- a/cui/source/options/optinet2.src
+++ b/cui/source/options/optinet2.src
@@ -274,172 +274,6 @@ TabPage RID_SVXPAGE_INET_PROXY
Text [ en-US ] = "is not a valid entry for this field. Please specify a value between 1 and 255." ;
};
};
-/************************************************************************/
-/* */
-/* Suche */
-/* */
-/************************************************************************/
-TabPage RID_SVXPAGE_INET_SEARCH
-{
- HelpId = HID_OPTIONS_SEARCH ;
- OutputSize = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
- SVLook = TRUE ;
- Hide = TRUE ;
- Text [ en-US ] = "Search" ;
-
- #define GB_SEARCH_LEFT 6
- #define GB_SEARCH_TOP 3
- FixedLine GB_SEARCH
- {
- Pos = MAP_APPFONT ( GB_SEARCH_LEFT , GB_SEARCH_TOP ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- Text [ en-US ] = "Search in" ;
- };
- ListBox LB_SEARCH
- {
- HelpID = "cui:ListBox:RID_SVXPAGE_INET_SEARCH:LB_SEARCH";
- Pos = MAP_APPFONT ( 12 , GB_SEARCH_TOP + 11 ) ;
- Size = MAP_APPFONT ( 39 , 120 ) ;
- Border = TRUE ;
- AutoHScroll = TRUE;
- };
- #define LABEL_START_XPOS (GB_SEARCH_LEFT + 6 + 39 + 5 )
- #define LABEL_LEN 64
- #define EDIT_START_XPOS (LABEL_START_XPOS + LABEL_LEN + 3)
- FixedText FT_SEARCH_NAME
- {
- Pos = MAP_APPFONT ( LABEL_START_XPOS , GB_SEARCH_TOP + 13 ) ;
- Size = MAP_APPFONT ( LABEL_LEN , 8 ) ;
- Text [ en-US ] = "~Name" ;
- };
- Edit ED_SEARCH_NAME
- {
- HelpID = "cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_SEARCH_NAME";
- Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 11 ) ;
- Size = MAP_APPFONT ( 125 , 12 ) ;
- Border = TRUE ;
- };
- FixedText FT_SEARCH
- {
- Pos = MAP_APPFONT ( LABEL_START_XPOS , GB_SEARCH_TOP + 27 ) ;
- Size = MAP_APPFONT ( LABEL_LEN , 8 ) ;
- Text [ en-US ] = "Type" ;
- };
- RadioButton RB_AND
- {
- HelpID = "cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_AND";
- Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 26 ) ;
- Size = MAP_APPFONT ( 125 , 10 ) ;
- Check = TRUE ;
- Text [ en-US ] = "And" ;
- };
- RadioButton RB_OR
- {
- HelpID = "cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_OR";
- Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 39 ) ;
- Size = MAP_APPFONT ( 125 , 10 ) ;
- Text [ en-US ] = "~Or" ;
- };
- RadioButton RB_EXACT
- {
- HelpID = "cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_EXACT";
- Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 52 ) ;
- Size = MAP_APPFONT ( 125 , 10 ) ;
- Text [ en-US ] = "E~xact" ;
- };
- FixedText FT_URL
- {
- Pos = MAP_APPFONT ( LABEL_START_XPOS , GB_SEARCH_TOP + 67 ) ;
- Size = MAP_APPFONT ( LABEL_LEN , 8 ) ;
- Text [ en-US ] = "~Prefix" ;
- };
- Edit ED_URL
- {
- HelpID = "cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_URL";
- Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 65 ) ;
- Size = MAP_APPFONT ( 125 , 12 ) ;
- Border = TRUE ;
- };
- FixedText FT_POSTFIX
- {
- Pos = MAP_APPFONT ( LABEL_START_XPOS , GB_SEARCH_TOP + 82 ) ;
- Size = MAP_APPFONT ( LABEL_LEN , 8 ) ;
- Text [ en-US ] = "Su~ffix" ;
- };
- Edit ED_POSTFIX
- {
- HelpID = "cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_POSTFIX";
- Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 80 ) ;
- Size = MAP_APPFONT ( 125 , 12 ) ;
- Border = TRUE ;
- };
- FixedText FT_SEPARATOR
- {
- Pos = MAP_APPFONT ( LABEL_START_XPOS , GB_SEARCH_TOP + 97 ) ;
- Size = MAP_APPFONT ( LABEL_LEN , 8 ) ;
- Text [ en-US ] = "~Separator" ;
- };
- Edit ED_SEPARATOR
- {
- HelpID = "cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_SEPARATOR";
- Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 95 ) ;
- Size = MAP_APPFONT ( 42 , 12 ) ;
- Border = TRUE ;
- };
- FixedText FT_CASE
- {
- Pos = MAP_APPFONT ( LABEL_START_XPOS, GB_SEARCH_TOP + 112 ) ;
- Size = MAP_APPFONT ( LABEL_LEN , 8 ) ;
- Text [ en-US ] = "~Case match" ;
- };
- ListBox ED_CASE
- {
- HelpID = "cui:ListBox:RID_SVXPAGE_INET_SEARCH:ED_CASE";
- Pos = MAP_APPFONT ( EDIT_START_XPOS, GB_SEARCH_TOP + 110 ) ;
- Size = MAP_APPFONT ( 42 , 48 ) ;
- Border = TRUE ;
- DropDown = TRUE ;
- StringList [ en-US ] =
- {
- < "None" ; > ;
- < "Upper" ; > ;
- < "Lower" ; > ;
- };
- };
- PushButton PB_NEW
- {
- HelpID = "cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_NEW";
- Pos = MAP_APPFONT ( 39 , GB_SEARCH_TOP + 131 + 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "N~ew";
- };
- PushButton PB_ADD
- {
- HelpID = "cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_ADD";
- Pos = MAP_APPFONT ( 92 , GB_SEARCH_TOP + 131 + 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "~Add" ;
- };
- PushButton PB_CHANGE
- {
- HelpID = "cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_CHANGE";
- Pos = MAP_APPFONT ( 145 , GB_SEARCH_TOP + 131 + 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "~Modify" ;
- };
- PushButton PB_DELETE
- {
- HelpID = "cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_DELETE";
- Pos = MAP_APPFONT ( 198 , GB_SEARCH_TOP + 131 + 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "~Delete" ;
- };
- String MSG_MODIFY
- {
- Text [ en-US ] = "Do you want to accept the current modification?";
- };
-};
/************************************************************************/
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 410d229..a6ae334 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -346,7 +346,6 @@ SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, Window* pParent, const SfxItem
case RID_SVXPAGE_ASIAN_LAYOUT: fnCreate = &SvxAsianLayoutPage::Create; break;
case RID_SVX_FONT_SUBSTITUTION: fnCreate = &SvxFontSubstTabPage::Create; break;
case RID_SVXPAGE_INET_PROXY: fnCreate = &SvxProxyTabPage::Create; break;
- case RID_SVXPAGE_INET_SEARCH: fnCreate = &SvxSearchTabPage::Create; break;
case RID_SVXPAGE_INET_SECURITY: fnCreate = &SvxSecurityTabPage::Create; break;
case RID_SVXPAGE_INET_MAIL: fnCreate = &SvxEMailTabPage::Create; break;
case RID_SVXPAGE_COLORCONFIG: fnCreate = &SvxColorOptionsTabPage::Create; break;
@@ -405,7 +404,6 @@ static OptionsMapping_Impl const OptionsMap_Impl[] =
{ "LanguageSettings", "ComplexTextLayout", RID_SVXPAGE_OPTIONS_CTL },
{ "Internet", NULL, SID_INET_DLG },
{ "Internet", "Proxy", RID_SVXPAGE_INET_PROXY },
- { "Internet", "Search", RID_SVXPAGE_INET_SEARCH },
{ "Internet", "Email", RID_SVXPAGE_INET_MAIL },
{ "Internet", "MozillaPlugin", RID_SVXPAGE_INET_MOZPLUGIN },
{ "LoadSave", NULL, SID_FILTER_DLG },
diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src
index 55eaf83..ff7d70f 100644
--- a/cui/source/options/treeopt.src
+++ b/cui/source/options/treeopt.src
@@ -119,7 +119,7 @@ ModalDialog RID_OFADLG_OPTIONS_TREE
{
< "This dialog is used to define general settings when working with %PRODUCTNAME. Enter your personal data, the defaults to be used when saving documents, and paths to important files. These settings will be saved automatically and used in later sessions as well."; SID_GENERAL_OPTIONS; > ;
< "This is where you make settings concerning language and writing aids for your work with %PRODUCTNAME."; SID_LANGUAGE_OPTIONS; > ;
- < "This is where you configure %PRODUCTNAME for the Internet. You can define search engines or save your proxy settings." ; SID_INET_DLG; > ;
+ < "This is where you configure %PRODUCTNAME for the Internet. You can save your proxy settings." ; SID_INET_DLG; > ;
< "This is where you specify various settings for text documents. These settings determine how your text documents are handled in %PRODUCTNAME and are valid for all new %PRODUCTNAME Writer documents. You can also define a few settings for the active text document if you save it afterwards." ; SID_SW_EDITOPTIONS; > ;
< "This is where you define the basic settings for %PRODUCTNAME documents in HTML format. For example, you decide which contents should be displayed on the screen or printed, how the pages are scrolled on the screen, in which color keywords are highlighted in the source text and much more." ; SID_SW_ONLINEOPTIONS; > ;
< "This is where you define various global settings for spreadsheets. For example, you can define which contents should be displayed and in which direction the cursor will move after you enter data in a cell. You also define sort lists, the number of the decimal places displayed, etc." ; SID_SC_EDITOPTIONS; > ;
@@ -184,7 +184,6 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES
{
< "Internet" ; 0; > ;
< "Proxy" ; RID_SVXPAGE_INET_PROXY; > ;
- < "Search" ; RID_SVXPAGE_INET_SEARCH; > ;
< "E-mail" ; RID_SVXPAGE_INET_MAIL; > ;
< "Browser Plug-in" ; RID_SVXPAGE_INET_MOZPLUGIN; > ;
};
More information about the Libreoffice-commits
mailing list