Skip to content

C
core
Kaydet (Commit) 0b0fb87f authored tarafından Mihály Palenik's avatar Mihály Palenik Kaydeden (comit) Samuel Mehrbrodt
Dosyalara gözat
Seçenekler

Delete unnecessary global options from Options dialog 

Here https://wiki.documentfoundation.org/Design/Whiteboards/Options/Global
are unnecessary global options. These options are set in Expert
Configuration dialog under org.oppenoffice.Office.Common node.

Preference name, Property, Location in Options dialog;
Help, Tip, General/Help/Tips;
Undo, Steps, Memory/Undo/Number of Undo Steps;
Font/View, History, View/Font Lists/Show font history;
Drawinglayer, TransparentSelection, View/Selection/Transparency;
Drawinglayer, TransparentSelectionPercent,
View/Selection/Transparency level;
Accessibility, IsHelpTipsDisappear,
Accessibility/Help tips disappear after ... seconds;
Accessibility, HelpTipSeconds,
Accessibility/Help tips disappear after ... seconds;
Filter/HTML/Export, Browser,
Load/Save/HTML Compatibility/Export/Export choice;

Change-Id: I5152a40b5029bfbfc3850ff60305ec34b5380fb2
Reviewed-on: https://gerrit.libreoffice.org/17481Reviewed-by: 's avatarSamuel Mehrbrodt <s.mehrbrodt@gmail.com>
Tested-by: 's avatarSamuel Mehrbrodt <s.mehrbrodt@gmail.com>
üst 9d307abe
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 364 deletions
cui/source/options/optaccessibility.cxx
Dosyayı görüntüle @ 0b0fb87f
......@@ -41,15 +41,11 @@ SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage(vcl::Window* pPar
get(m_pTextSelectionInReadonly, "textselinreadonly");
get(m_pAnimatedGraphics, "animatedgraphics");
get(m_pAnimatedTexts, "animatedtext");
get(m_pTipHelpCB, "tiphelptimeout");
get(m_pTipHelpNF, "tiphelptimeoutnf");
get(m_pAutoDetectHC, "autodetecthc");
get(m_pAutomaticFontColor, "autofontcolor");
get(m_pPagePreviews, "systempagepreviewcolor");
m_pTipHelpCB->SetClickHdl(LINK(this, SvxAccessibilityOptionsTabPage, TipHelpHdl));
#ifdef UNX
// UNIX: read the gconf2 setting instead to use the checkbox
m_pAccessibilityTool->Hide();
......@@ -69,8 +65,6 @@ void SvxAccessibilityOptionsTabPage::dispose()
m_pTextSelectionInReadonly.clear();
m_pAnimatedGraphics.clear();
m_pAnimatedTexts.clear();
m_pTipHelpCB.clear();
m_pTipHelpNF.clear();
m_pAutoDetectHC.clear();
m_pAutomaticFontColor.clear();
m_pPagePreviews.clear();
......@@ -87,8 +81,6 @@ bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet* )
//aConfig.Set... from controls
m_pImpl->m_aConfig.SetIsForPagePreviews( m_pPagePreviews->IsChecked() );
m_pImpl->m_aConfig.SetIsHelpTipsDisappear( m_pTipHelpCB->IsChecked() );
m_pImpl->m_aConfig.SetHelpTipSeconds( (short)m_pTipHelpNF->GetValue() );
m_pImpl->m_aConfig.SetIsAllowAnimatedGraphics( m_pAnimatedGraphics->IsChecked() );
m_pImpl->m_aConfig.SetIsAllowAnimatedText( m_pAnimatedTexts->IsChecked() );
m_pImpl->m_aConfig.SetIsAutomaticFontColor( m_pAutomaticFontColor->IsChecked() );
......@@ -112,8 +104,6 @@ void SvxAccessibilityOptionsTabPage::Reset( const SfxItemSet* )
//set controls from aConfig.Get...
m_pPagePreviews->Check( m_pImpl->m_aConfig.GetIsForPagePreviews() );
EnableTipHelp( m_pImpl->m_aConfig.GetIsHelpTipsDisappear() );
m_pTipHelpNF->SetValue( m_pImpl->m_aConfig.GetHelpTipSeconds() );
m_pAnimatedGraphics->Check( m_pImpl->m_aConfig.GetIsAllowAnimatedGraphics() );
m_pAnimatedTexts->Check( m_pImpl->m_aConfig.GetIsAllowAnimatedText() );
m_pAutomaticFontColor->Check( m_pImpl->m_aConfig.GetIsAutomaticFontColor() );
......@@ -126,17 +116,4 @@ void SvxAccessibilityOptionsTabPage::Reset( const SfxItemSet* )
m_pAccessibilityTool->Check(aMiscSettings.GetEnableATToolSupport());
}
IMPL_LINK(SvxAccessibilityOptionsTabPage, TipHelpHdl, CheckBox*, pBox)
{
bool bChecked = pBox->IsChecked();
m_pTipHelpNF->Enable(bChecked);
return 0;
}
void SvxAccessibilityOptionsTabPage::EnableTipHelp(bool bCheck)
{
m_pTipHelpCB->Check(bCheck);
m_pTipHelpNF->Enable(bCheck);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
cui/source/options/optaccessibility.hxx
Dosyayı görüntüle @ 0b0fb87f
......@@ -29,15 +29,10 @@ class SvxAccessibilityOptionsTabPage : public SfxTabPage
VclPtr<CheckBox> m_pTextSelectionInReadonly;
VclPtr<CheckBox> m_pAnimatedGraphics;
VclPtr<CheckBox> m_pAnimatedTexts;
VclPtr<CheckBox> m_pTipHelpCB;
VclPtr<NumericField> m_pTipHelpNF;
VclPtr<CheckBox> m_pAutoDetectHC;
VclPtr<CheckBox> m_pAutomaticFontColor;
VclPtr<CheckBox> m_pPagePreviews;
DECL_LINK(TipHelpHdl, CheckBox*);
void EnableTipHelp(bool bCheck);
SvxAccessibilityOptionsTabPage_Impl* m_pImpl;
public:
......
cui/source/options/optgdlg.cxx
Dosyayı görüntüle @ 0b0fb87f
......@@ -40,7 +40,6 @@
#include <svtools/miscopt.hxx>
#include <unotools/printwarningoptions.hxx>
#include <unotools/syslocaleoptions.hxx>
#include <svtools/accessibilityoptions.hxx>
#include <unotools/configitem.hxx>
#include <sfx2/objsh.hxx>
#include <comphelper/string.hxx>
......@@ -264,7 +263,6 @@ namespace
OfaMiscTabPage::OfaMiscTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "OptGeneralPage", "cui/ui/optgeneralpage.ui", &rSet)
{
get(m_pToolTipsCB, "tooltips");
get(m_pExtHelpCB, "exthelp");
if (!lcl_HasSystemFilePicker())
get<VclContainer>("filedlgframe")->Hide();
......@@ -302,9 +300,6 @@ OfaMiscTabPage::OfaMiscTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
TwoFigureConfigHdl(m_pYearValueField);
SetExchangeSupport();
aLink = LINK( this, OfaMiscTabPage, HelpCheckHdl_Impl );
m_pToolTipsCB->SetClickHdl( aLink );
}
OfaMiscTabPage::~OfaMiscTabPage()
......@@ -314,7 +309,6 @@ OfaMiscTabPage::~OfaMiscTabPage()
void OfaMiscTabPage::dispose()
{
m_pToolTipsCB.clear();
m_pExtHelpCB.clear();
m_pFileDlgROImage.clear();
m_pFileDlgCB.clear();
......@@ -339,11 +333,8 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet )
std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create());
SvtHelpOptions aHelpOptions;
if ( m_pToolTipsCB->IsValueChangedFromSaved() )
aHelpOptions.SetHelpTips( m_pToolTipsCB->IsChecked() );
bool bChecked = ( m_pExtHelpCB->IsChecked() && m_pToolTipsCB->IsChecked() );
if ( bChecked != (m_pExtHelpCB->GetSavedValue() == TRISTATE_TRUE) )
aHelpOptions.SetExtendedHelp( bChecked );
if ( m_pExtHelpCB->IsChecked() != (m_pExtHelpCB->GetSavedValue() == TRISTATE_TRUE) )
aHelpOptions.SetExtendedHelp( m_pExtHelpCB->IsChecked() );
if ( m_pFileDlgCB->IsValueChangedFromSaved() )
{
......@@ -396,10 +387,7 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet )
void OfaMiscTabPage::Reset( const SfxItemSet* rSet )
{
SvtHelpOptions aHelpOptions;
m_pToolTipsCB->Check( aHelpOptions.IsHelpTips() );
m_pExtHelpCB->Check( aHelpOptions.IsHelpTips() && aHelpOptions.IsExtendedHelp() );
m_pToolTipsCB->SaveValue();
m_pExtHelpCB->SaveValue();
SvtMiscOptions aMiscOpt;
......@@ -461,12 +449,6 @@ IMPL_LINK( OfaMiscTabPage, TwoFigureConfigHdl, NumericField*, pEd )
return 0;
}
IMPL_LINK_NOARG(OfaMiscTabPage, HelpCheckHdl_Impl)
{
m_pExtHelpCB->Enable( m_pToolTipsCB->IsChecked() );
return 0;
}
class CanvasSettings
{
public:
......@@ -653,16 +635,12 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
get(m_pAAPointLimit, "aanf");
get(m_pMenuIconsLB, "menuicons");
get(m_pFontShowCB, "showfontpreview");
get(m_pFontHistoryCB, "showfonthistory");
get(m_pUseHardwareAccell, "useaccel");
get(m_pUseAntiAliase, "useaa");
get(m_pUseOpenGL, "useopengl");
get(m_pForceOpenGL, "forceopengl");
get(m_pMousePosLB, "mousepos");
get(m_pMouseMiddleLB, "mousemiddle");
// #i97672#
get(m_pSelectionCB, "trans");
get(m_pSelectionMF, "transmf");
#if defined( UNX )
m_pFontAntiAliasing->SetToggleHdl( LINK( this, OfaViewTabPage, OnAntialiasingToggled ) );
......@@ -674,9 +652,6 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
#endif
// #i97672#
m_pSelectionCB->SetToggleHdl( LINK( this, OfaViewTabPage, OnSelectionToggled ) );
// Set known icon themes
OUString sAutoStr( m_pIconStyleLB->GetEntry( 0 ) );
m_pIconStyleLB->Clear();
......@@ -722,15 +697,12 @@ void OfaViewTabPage::dispose()
m_pAAPointLimit.clear();
m_pMenuIconsLB.clear();
m_pFontShowCB.clear();
m_pFontHistoryCB.clear();
m_pUseHardwareAccell.clear();
m_pUseAntiAliase.clear();
m_pUseOpenGL.clear();
m_pForceOpenGL.clear();
m_pMousePosLB.clear();
m_pMouseMiddleLB.clear();
m_pSelectionCB.clear();
m_pSelectionMF.clear();
SfxTabPage::dispose();
}
......@@ -746,14 +718,6 @@ IMPL_LINK_NOARG( OfaViewTabPage, OnAntialiasingToggled )
}
#endif
// #i97672#
IMPL_LINK_NOARG( OfaViewTabPage, OnSelectionToggled )
{
const bool bSelectionEnabled(m_pSelectionCB->IsChecked());
m_pSelectionMF->Enable(bSelectionEnabled);
return 0;
}
VclPtr<SfxTabPage> OfaViewTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
{
return VclPtr<OfaViewTabPage>::Create(pParent, *rAttrSet);
......@@ -867,12 +831,6 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
bAppearanceChanged = true;
}
if ( m_pFontHistoryCB->IsValueChangedFromSaved() )
{
aFontOpt.EnableFontHistory( m_pFontHistoryCB->IsChecked() );
bModified = true;
}
// #i95644# if disabled, do not use value, see in ::Reset()
if(m_pUseHardwareAccell->IsEnabled())
{
......@@ -897,31 +855,6 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
mpOpenGLConfig->setUseOpenGL(m_pUseOpenGL->IsChecked());
mpOpenGLConfig->setForceOpenGL(m_pForceOpenGL->IsChecked());
// #i97672#
if(m_pSelectionCB->IsEnabled())
{
const bool bNewSelection(m_pSelectionCB->IsChecked());
const sal_uInt16 nNewTransparence((sal_uInt16)m_pSelectionMF->GetValue());
if(bNewSelection != (bool)mpDrawinglayerOpt->IsTransparentSelection())
{
mpDrawinglayerOpt->SetTransparentSelection(m_pSelectionCB->IsChecked());
bModified = true;
bRepaintWindows = true;
}
// #i104150# even read the value when m_pSelectionMF is disabled; it may have been
// modified by enabling-modify-disabling by the user
if(nNewTransparence != mpDrawinglayerOpt->GetTransparentSelectionPercent())
{
mpDrawinglayerOpt->SetTransparentSelectionPercent(nNewTransparence);
bModified = true;
bRepaintWindows = true;
}
}
SvtAccessibilityOptions aAccessibilityOptions;
if( bMenuOptModified )
{
// Set changed settings to the application instance
......@@ -996,7 +929,6 @@ void OfaViewTabPage::Reset( const SfxItemSet* )
SvtMenuOptions aMenuOpt;
m_pMenuIconsLB->SelectEntryPos(aMenuOpt.GetMenuIconsState() == 2 ? 0 : aMenuOpt.GetMenuIconsState() + 1);
m_pMenuIconsLB->SaveValue();
m_pFontHistoryCB->Check( aFontOpt.IsFontHistoryEnabled() );
{ // #i95644# HW accel (unified to disable mechanism)
if(pCanvasSettings->IsHardwareAccelerationAvailable())
......@@ -1029,33 +961,11 @@ void OfaViewTabPage::Reset( const SfxItemSet* )
m_pUseOpenGL->Check(mpOpenGLConfig->useOpenGL());
m_pForceOpenGL->Check(mpOpenGLConfig->forceOpenGL());
{
// #i97672# Selection
// check if transparent selection is possible on this system
const bool bTransparentSelectionPossible(
!GetSettings().GetStyleSettings().GetHighContrastMode()
&& SupportsOperation(OutDevSupport_TransparentRect));
// enter values
if(bTransparentSelectionPossible)
{
m_pSelectionCB->Check(mpDrawinglayerOpt->IsTransparentSelection());
}
else
{
m_pSelectionCB->Enable(false);
}
m_pSelectionMF->SetValue(mpDrawinglayerOpt->GetTransparentSelectionPercent());
m_pSelectionMF->Enable(mpDrawinglayerOpt->IsTransparentSelection() && bTransparentSelectionPossible);
}
#if defined( UNX )
m_pFontAntiAliasing->SaveValue();
m_pAAPointLimit->SaveValue();
#endif
m_pFontShowCB->SaveValue();
m_pFontHistoryCB->SaveValue();
#if defined( UNX )
LINK( this, OfaViewTabPage, OnAntialiasingToggled ).Call( NULL );
......
cui/source/options/optgdlg.hxx
Dosyayı görüntüle @ 0b0fb87f
......@@ -42,7 +42,6 @@ class OfaMiscTabPage : public SfxTabPage
{
using TabPage::DeactivatePage;
private:
VclPtr<CheckBox> m_pToolTipsCB;
VclPtr<CheckBox> m_pExtHelpCB;
VclPtr<FixedImage> m_pFileDlgROImage;
......@@ -63,7 +62,6 @@ private:
DECL_LINK( TwoFigureHdl, NumericField* );
DECL_LINK( TwoFigureConfigHdl, NumericField* );
DECL_LINK(HelpCheckHdl_Impl, void *);
#ifdef WNT
DECL_LINK( OnFileDlgToggled, void* );
#endif
......@@ -97,7 +95,6 @@ private:
VclPtr<ListBox> m_pMenuIconsLB;
VclPtr<CheckBox> m_pFontShowCB;
VclPtr<CheckBox> m_pFontHistoryCB;
VclPtr<CheckBox> m_pUseHardwareAccell;
VclPtr<CheckBox> m_pUseAntiAliase;
......@@ -107,10 +104,6 @@ private:
VclPtr<ListBox> m_pMousePosLB;
VclPtr<ListBox> m_pMouseMiddleLB;
// #i97672#
VclPtr<CheckBox> m_pSelectionCB;
VclPtr<MetricField> m_pSelectionMF;
sal_uInt16 nSizeLB_InitialSelection;
sal_uInt16 nStyleLB_InitialSelection;
......@@ -124,8 +117,6 @@ private:
#if defined( UNX )
DECL_LINK( OnAntialiasingToggled, void* );
#endif
// #i97672#
DECL_LINK( OnSelectionToggled, void* );
public:
OfaViewTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
......
cui/source/options/opthtml.cxx
Dosyayı görüntüle @ 0b0fb87f
......@@ -25,22 +25,6 @@
#include <dialmgr.hxx>
#include <sal/macros.h>
// modus conversion to the positions in the listbox
const sal_uInt16 aPosToExportArr[] =
{
HTML_CFG_MSIE,
HTML_CFG_NS40,
HTML_CFG_WRITER
};
const sal_uInt16 aExportToPosArr[] =
{
1, //HTML 3.2 (removed, map to Netscape Navigator 4.0)
0, //MS Internet Explorer 4.0
2, //StarWriter
1 //Netscape Navigator 4.0
};
OfaHtmlTabPage::OfaHtmlTabPage(vcl::Window* pParent, const SfxItemSet& rSet) :
SfxTabPage( pParent, "OptHtmlPage" , "cui/ui/opthtmlpage.ui", &rSet )
......@@ -55,7 +39,6 @@ SfxTabPage( pParent, "OptHtmlPage" , "cui/ui/opthtmlpage.ui", &rSet )
get(aNumbersEnglishUSCB,"numbersenglishus");
get(aUnknownTagCB,"unknowntag");
get(aIgnoreFontNamesCB,"ignorefontnames");
get(aExportLB,"export");
get(aStarBasicCB,"starbasic");
get(aStarBasicWarningCB,"starbasicwarning");
get(aPrintExtensionCB,"printextension");
......@@ -77,7 +60,6 @@ SfxTabPage( pParent, "OptHtmlPage" , "cui/ui/opthtmlpage.ui", &rSet )
}
}
aExportLB->SetSelectHdl(LINK(this, OfaHtmlTabPage, ExportHdl_Impl));
aStarBasicCB->SetClickHdl(LINK(this, OfaHtmlTabPage, CheckBoxHdl_Impl));
// initialize the characterset listbox
......@@ -101,7 +83,6 @@ void OfaHtmlTabPage::dispose()
aNumbersEnglishUSCB.clear();
aUnknownTagCB.clear();
aIgnoreFontNamesCB.clear();
aExportLB.clear();
aStarBasicCB.clear();
aStarBasicWarningCB.clear();
aPrintExtensionCB.clear();
......@@ -143,9 +124,6 @@ bool OfaHtmlTabPage::FillItemSet( SfxItemSet* )
if(aIgnoreFontNamesCB->IsValueChangedFromSaved())
rHtmlOpt.SetIgnoreFontFamily(aIgnoreFontNamesCB->IsChecked());
if(aExportLB->IsValueChangedFromSaved())
rHtmlOpt.SetExportMode(aPosToExportArr[aExportLB->GetSelectEntryPos()]);
if(aStarBasicCB->IsValueChangedFromSaved())
rHtmlOpt.SetStarBasic(aStarBasicCB->IsChecked());
......@@ -177,14 +155,6 @@ void OfaHtmlTabPage::Reset( const SfxItemSet* )
aNumbersEnglishUSCB->Check(rHtmlOpt.IsNumbersEnglishUS());
aUnknownTagCB->Check(rHtmlOpt.IsImportUnknown());
aIgnoreFontNamesCB->Check(rHtmlOpt.IsIgnoreFontFamily());
sal_uInt16 nExport = rHtmlOpt.GetExportMode();
if( nExport >= SAL_N_ELEMENTS( aExportToPosArr ) )
nExport = 3; // default for bad config entry is NS 4.0
sal_uInt16 nPosArr = aExportToPosArr[ nExport ];
aExportLB->SelectEntryPos( nPosArr );
aExportLB->SaveValue();
ExportHdl_Impl(aExportLB);
aStarBasicCB->Check(rHtmlOpt.IsStarBasic());
aStarBasicWarningCB->Check(rHtmlOpt.IsStarBasicWarning());
......@@ -212,22 +182,6 @@ void OfaHtmlTabPage::Reset( const SfxItemSet* )
aCharSetLB->SelectTextEncoding( rHtmlOpt.GetTextEncoding() );
}
IMPL_LINK(OfaHtmlTabPage, ExportHdl_Impl, ListBox*, pBox)
{
sal_uInt16 nExport = aPosToExportArr[ pBox->GetSelectEntryPos() ];
switch( nExport )
{
case HTML_CFG_MSIE:
case HTML_CFG_NS40 :
case HTML_CFG_WRITER :
aPrintExtensionCB->Enable(true);
break;
default: aPrintExtensionCB->Enable(false);
}
return 0;
}
IMPL_LINK(OfaHtmlTabPage, CheckBoxHdl_Impl, CheckBox*, pBox)
{
aStarBasicWarningCB->Enable(!pBox->IsChecked());
......
cui/source/options/opthtml.hxx
Dosyayı görüntüle @ 0b0fb87f
......@@ -22,7 +22,6 @@
#include <vcl/button.hxx>
#include <vcl/field.hxx>
#include <vcl/fixed.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/group.hxx>
#include <sfx2/tabdlg.hxx>
#include <svx/txencbox.hxx>
......@@ -42,14 +41,12 @@ class OfaHtmlTabPage : public SfxTabPage
VclPtr<CheckBox> aUnknownTagCB;
VclPtr<CheckBox> aIgnoreFontNamesCB;
VclPtr<ListBox> aExportLB;
VclPtr<CheckBox> aStarBasicCB;
VclPtr<CheckBox> aStarBasicWarningCB;
VclPtr<CheckBox> aPrintExtensionCB;
VclPtr<CheckBox> aSaveGrfLocalCB;
VclPtr<SvxTextEncodingBox> aCharSetLB;
DECL_LINK(ExportHdl_Impl, ListBox*);
DECL_LINK(CheckBoxHdl_Impl, CheckBox*);
public:
......
cui/source/options/optmemory.cxx
Dosyayı görüntüle @ 0b0fb87f
......@@ -114,7 +114,6 @@ SfxTabPage::sfxpg OfaMemoryOptionsPage::DeactivatePage( SfxItemSet* _pSet )
OfaMemoryOptionsPage::OfaMemoryOptionsPage(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "OptMemoryPage", "cui/ui/optmemorypage.ui", &rSet)
{
get(m_pUndoEdit, "undo");
get(m_pNfGraphicCache, "graphiccache");
m_pNfGraphicCache->SetMax(std::numeric_limits< long >::max() >> 20);
get(m_pNfGraphicObjectCache, "objectcache");
......@@ -148,7 +147,6 @@ OfaMemoryOptionsPage::~OfaMemoryOptionsPage()
void OfaMemoryOptionsPage::dispose()
{
m_pUndoEdit.clear();
m_pNfGraphicCache.clear();
m_pNfGraphicObjectCache.clear();
m_pTfGraphicObjectTime.clear();
......@@ -170,10 +168,6 @@ bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet* rSet )
std::shared_ptr< comphelper::ConfigurationChanges > batch(
comphelper::ConfigurationChanges::create());
if ( m_pUndoEdit->IsValueChangedFromSaved() )
officecfg::Office::Common::Undo::Steps::set(
m_pUndoEdit->GetValue(), batch);
// GraphicCache
sal_Int32 totalCacheSize = GetNfGraphicCacheVal();
officecfg::Office::Common::Cache::GraphicManager::TotalCacheSize::set(
......@@ -219,9 +213,6 @@ void OfaMemoryOptionsPage::Reset( const SfxItemSet* rSet )
{
const SfxPoolItem* pItem;
m_pUndoEdit->SetValue(officecfg::Office::Common::Undo::Steps::get());
m_pUndoEdit->SaveValue();
// GraphicCache
long n =
officecfg::Office::Common::Cache::GraphicManager::TotalCacheSize::get();
......
cui/source/options/optmemory.hxx
Dosyayı görüntüle @ 0b0fb87f
......@@ -32,8 +32,6 @@ class OfaMemoryOptionsPage : public SfxTabPage
{
using SfxTabPage::DeactivatePage;
private:
VclPtr<NumericField> m_pUndoEdit;
VclPtr<NumericField> m_pNfGraphicCache;
VclPtr<NumericField> m_pNfGraphicObjectCache;
VclPtr<TimeField> m_pTfGraphicObjectTime;
......
cui/uiconfig/ui/optaccessibilitypage.ui
Dosyayı görüntüle @ 0b0fb87f
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property>
<property name="upper">99</property>
<property name="value">1</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<requires lib="gtk+" version="3.0"/>
<object class="GtkBox" id="OptAccessibilityPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
......@@ -96,68 +90,6 @@
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="column_spacing">6</property>
<child>
<object class="GtkCheckButton" id="tiphelptimeout">
<property name="label" translatable="yes">_Help tips disappear after</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>
<accessibility>
<relation type="label-for" target="tiphelptimeoutnf"/>
</accessibility>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">seconds</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="tiphelptimeoutnf">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
<property name="adjustment">adjustment1</property>
<accessibility>
<relation type="label-for" target="tiphelptimeout"/>
</accessibility>
</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">4</property>
</packing>
</child>
</object>
</child>
</object>
......@@ -267,4 +199,11 @@
</packing>
</child>
</object>
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property>
<property name="upper">99</property>
<property name="value">1</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
</interface>
cui/uiconfig/ui/optgeneralpage.ui
Dosyayı görüntüle @ 0b0fb87f
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
<!-- Generated with glade 3.16.1 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="adjustment1">
......@@ -27,41 +27,14 @@
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="grid1">
<object class="GtkCheckButton" id="exthelp">
<property name="label" translatable="yes">_Extended tips</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">6</property>
<property name="column_spacing">18</property>
<child>
<object class="GtkCheckButton" id="tooltips">
<property name="label" translatable="yes">_Tips</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>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="exthelp">
<property name="label" translatable="yes">_Extended tips</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">0</property>
</packing>
</child>
<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>
</child>
</object>
......@@ -80,6 +53,8 @@
<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>
......@@ -112,6 +87,8 @@
<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>
......@@ -125,6 +102,8 @@
<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>
......@@ -145,6 +124,8 @@
<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>
......@@ -186,6 +167,8 @@
<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>
......@@ -218,6 +201,8 @@
<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>
......@@ -233,6 +218,8 @@
<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>
......@@ -253,6 +240,8 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
......@@ -276,14 +265,16 @@
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Interpret as years between </property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">year</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
......@@ -296,6 +287,8 @@
<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>
......@@ -307,6 +300,8 @@
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</object>
......@@ -327,6 +322,8 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">4</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
......@@ -368,6 +365,8 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">5</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</object>
......
cui/uiconfig/ui/opthtmlpage.ui
Dosyayı görüntüle @ 0b0fb87f
This diff is collapsed.
cui/uiconfig/ui/optmemorypage.ui
Dosyayı görüntüle @ 0b0fb87f
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
<!-- Generated with glade 3.16.1 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="adjustment1">
......@@ -29,70 +29,6 @@
<property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="can_focus">False</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="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="column_spacing">12</property>
<child>
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Number of steps:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">undo</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="undo">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
<property name="adjustment">adjustment1</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Undo</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="frame2">
<property name="visible">True</property>
......@@ -123,6 +59,8 @@
<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>
......@@ -137,6 +75,8 @@
<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>
......@@ -151,6 +91,8 @@
<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>
......@@ -163,6 +105,8 @@
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
......@@ -175,6 +119,8 @@
<packing>
<property name="left_attach">2</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
......@@ -186,6 +132,8 @@
<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>
......@@ -199,6 +147,8 @@
<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>
......@@ -210,6 +160,8 @@
<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>
......@@ -221,6 +173,8 @@
<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>
</object>
......@@ -241,7 +195,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">0</property>
</packing>
</child>
<child>
......@@ -271,6 +225,8 @@
<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>
......@@ -285,6 +241,8 @@
<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>
......@@ -305,7 +263,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
<property name="position">1</property>
</packing>
</child>
<child>
......@@ -336,6 +294,8 @@
<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>
......@@ -350,6 +310,8 @@
<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>
......@@ -370,13 +332,12 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
<property name="position">2</property>
</packing>
</child>
</object>
<object class="GtkSizeGroup" id="sizegroup1">
<widgets>
<widget name="label5"/>
<widget name="label6"/>
<widget name="label7"/>
<widget name="label8"/>
......
cui/uiconfig/ui/optviewpage.ui
Dosyayı görüntüle @ 0b0fb87f
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment