summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-01-27 13:04:36 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-01-27 15:36:43 +0000
commit3d033a8457180d9e4ccc2b1c1568d79087805209 (patch)
tree8e231b70c2e7cbdc8b625cfdd60700392e0ac31d
parenta43f6eeae3affb4c1573e6b2b11872b38c2e54b0 (diff)
move accessibility options .ui to right place and adapt code
getting rid a pile of custom widget moving code Change-Id: I68879f9ebaf28629c4759315b318b390a985a544
-rw-r--r--cui/AllLangResTarget_cui.mk1
-rw-r--r--cui/UI_cui.mk1
-rw-r--r--cui/source/inc/helpid.hrc1
-rw-r--r--cui/source/options/optaccessibility.cxx122
-rw-r--r--cui/source/options/optaccessibility.hrc71
-rw-r--r--cui/source/options/optaccessibility.hxx21
-rw-r--r--cui/source/options/optaccessibility.src128
-rw-r--r--cui/uiconfig/ui/optaccessibilitypage.ui (renamed from sw/uiconfig/swriter/ui/libaccessibility.ui)96
8 files changed, 112 insertions, 329 deletions
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 92231f661410..fb9c10aa430f 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -81,7 +81,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/options/doclinkdialog.src \
cui/source/options/fontsubs.src \
cui/source/options/internationaloptions.src \
- cui/source/options/optaccessibility.src \
cui/source/options/optasian.src \
cui/source/options/optchart.src \
cui/source/options/optcolor.src \
diff --git a/cui/UI_cui.mk b/cui/UI_cui.mk
index d2d7d8b4ceaa..9a6e8969a1b8 100644
--- a/cui/UI_cui.mk
+++ b/cui/UI_cui.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_UI_add_uifiles,cui,\
cui/uiconfig/ui/numberingpositionpage \
cui/uiconfig/ui/objectnamedialog \
cui/uiconfig/ui/objecttitledescdialog \
+ cui/uiconfig/ui/optaccessibilitypage \
cui/uiconfig/ui/personalization_tab \
cui/uiconfig/ui/pickbulletpage \
cui/uiconfig/ui/pickgraphicpage \
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index c783861abec8..9dc68df56f6e 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -43,7 +43,6 @@
#define HID_LNGDLG_NUM_PREBREAK "CUI_HID_LNGDLG_NUM_PREBREAK"
#define HID_OPTIONS_COLORCONFIG "CUI_HID_OPTIONS_COLORCONFIG"
#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME "CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME"
-#define HID_OPTIONS_ACCESSIBILITYCONFIG "CUI_HID_OPTIONS_ACCESSIBILITYCONFIG"
#define HID_OPTIONS_COLORCONFIG_COLORLIST_WIN "CUI_HID_OPTIONS_COLORCONFIG_COLORLIST_WIN"
#define HID_OPTIONS_COLORCONFIG_NAME_SCHEME "CUI_HID_OPTIONS_COLORCONFIG_NAME_SCHEME"
#define HID_OPTIONS_PATHS_SELECTFOLDER "CUI_HID_OPTIONS_PATHS_SELECTFOLDER"
diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx
index 47736e475155..47a2f5c14aea 100644
--- a/cui/source/options/optaccessibility.cxx
+++ b/cui/source/options/optaccessibility.cxx
@@ -18,21 +18,12 @@
*/
#include <optaccessibility.hxx>
-#include <optaccessibility.hrc>
#include <dialmgr.hxx>
#include <cuires.hrc>
#include <svtools/accessibilityoptions.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
-static void MovePosY( Window& _rWin, long _nDelta )
-{
- Point aPoint = _rWin.GetPosPixel();
- aPoint.Y() += _nDelta;
-
- _rWin.SetPosPixel( aPoint );
-}
-
struct SvxAccessibilityOptionsTabPage_Impl
{
SvtAccessibilityOptions m_aConfig;
@@ -40,66 +31,29 @@ struct SvxAccessibilityOptionsTabPage_Impl
: m_aConfig(){}
};
-SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage( Window* pParent, const SfxItemSet& rSet )
- :SfxTabPage(pParent, CUI_RES( RID_SVXPAGE_ACCESSIBILITYCONFIG ), rSet)
- ,m_aMiscellaneousLabel (this, CUI_RES(FL_MISCELLANEOUS ))
- ,m_aAccessibilityTool (this, CUI_RES(CB_ACCESSIBILITY_TOOL ))
- ,m_aTextSelectionInReadonly (this, CUI_RES(CB_TEXTSELECTION ))
- ,m_aAnimatedGraphics (this, CUI_RES(CB_ANIMATED_GRAPHICS ))
- ,m_aAnimatedTexts (this, CUI_RES(CB_ANIMATED_TEXTS ))
- ,m_aTipHelpCB (this, CUI_RES(CB_TIPHELP ))
- ,m_aTipHelpNF (this, CUI_RES(NF_TIPHELP ))
- ,m_aTipHelpFT (this, CUI_RES(FT_TIPHELP ))
- ,m_aHCOptionsLabel (this, CUI_RES(FL_HC_OPTIONS ))
- ,m_aAutoDetectHC (this, CUI_RES(CB_AUTO_DETECT_HC ))
- ,m_aAutomaticFontColor (this, CUI_RES(CB_AUTOMATIC_FONT_COLOR))
- ,m_aPagePreviews (this, CUI_RES(CB_PAGE_PREVIEWS ))
- ,m_pImpl(new SvxAccessibilityOptionsTabPage_Impl)
+SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage(Window* pParent,
+ const SfxItemSet& rSet)
+ : SfxTabPage(pParent, "OptAccessibilityPage",
+ "cui/ui/optaccessibilitypage.ui", rSet)
+ , m_pImpl(new SvxAccessibilityOptionsTabPage_Impl)
{
- FreeResource();
- m_aTipHelpCB.SetClickHdl(LINK(this, SvxAccessibilityOptionsTabPage, TipHelpHdl));
+ get(m_pAccessibilityTool, "acctool");
+ 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");
- long nHeightDelta = 0; // to correct positions _under_ m_aAccessibilityTool
+ m_pTipHelpCB->SetClickHdl(LINK(this, SvxAccessibilityOptionsTabPage, TipHelpHdl));
#ifdef UNX
- {
- // UNIX: read the gconf2 setting instead to use the checkbox
- m_aAccessibilityTool.Hide();
- nHeightDelta = -( ROWA_2 - ROWA_1 );
- }
-#else
- // calculate the height of the checkbox. Do we need two (default in resource) or only one line
- String aText = m_aAccessibilityTool.GetText();
- long nWidth = m_aAccessibilityTool.GetTextWidth( aText );
- long nCtrlWidth = m_aAccessibilityTool.GetSizePixel().Width() - ( COL2 - COL1 );
- if ( nWidth > nCtrlWidth )
- {
- long nDelta = 2 * RSC_CD_FIXEDLINE_HEIGHT + LINESPACE - RSC_CD_CHECKBOX_HEIGHT;
- nHeightDelta = nDelta;
- Size aSize = m_aAccessibilityTool.LogicToPixel( Size( 0, nDelta ), MAP_APPFONT );
- nDelta = aSize.Height();
- aSize = m_aAccessibilityTool.GetSizePixel();
- aSize.Height() += nDelta;
- m_aAccessibilityTool.SetSizePixel( aSize );
- }
+ // UNIX: read the gconf2 setting instead to use the checkbox
+ m_pAccessibilityTool->Hide();
#endif
-
- if( nHeightDelta )
- { //adjust positions of controls under m_aAccessibilityTool
- Size aSize = m_aAccessibilityTool.LogicToPixel( Size( 0, nHeightDelta ), MAP_APPFONT );
- nHeightDelta = aSize.Height();
-
- MovePosY( m_aTextSelectionInReadonly, nHeightDelta );
- MovePosY( m_aAnimatedGraphics, nHeightDelta );
- MovePosY( m_aAnimatedTexts, nHeightDelta );
- MovePosY( m_aTipHelpCB, nHeightDelta );
- MovePosY( m_aTipHelpNF, nHeightDelta );
- MovePosY( m_aTipHelpFT, nHeightDelta );
- MovePosY( m_aHCOptionsLabel, nHeightDelta );
- MovePosY( m_aAutoDetectHC, nHeightDelta );
- MovePosY( m_aAutomaticFontColor, nHeightDelta );
- MovePosY( m_aPagePreviews, nHeightDelta );
- }
}
SvxAccessibilityOptionsTabPage::~SvxAccessibilityOptionsTabPage()
@@ -116,14 +70,14 @@ sal_Bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet& )
{
//aConfig.Set... from controls
- m_pImpl->m_aConfig.SetIsForPagePreviews( m_aPagePreviews.IsChecked() );
- m_pImpl->m_aConfig.SetIsHelpTipsDisappear( m_aTipHelpCB.IsChecked() );
- m_pImpl->m_aConfig.SetHelpTipSeconds( (short)m_aTipHelpNF.GetValue() );
- m_pImpl->m_aConfig.SetIsAllowAnimatedGraphics( m_aAnimatedGraphics.IsChecked() );
- m_pImpl->m_aConfig.SetIsAllowAnimatedText( m_aAnimatedTexts.IsChecked() );
- m_pImpl->m_aConfig.SetIsAutomaticFontColor( m_aAutomaticFontColor.IsChecked() );
- m_pImpl->m_aConfig.SetSelectionInReadonly( m_aTextSelectionInReadonly.IsChecked());
- m_pImpl->m_aConfig.SetAutoDetectSystemHC( m_aAutoDetectHC.IsChecked());
+ 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() );
+ m_pImpl->m_aConfig.SetSelectionInReadonly( m_pTextSelectionInReadonly->IsChecked());
+ m_pImpl->m_aConfig.SetAutoDetectSystemHC( m_pAutoDetectHC->IsChecked());
if(m_pImpl->m_aConfig.IsModified())
m_pImpl->m_aConfig.Commit();
@@ -131,7 +85,7 @@ sal_Bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet& )
AllSettings aAllSettings = Application::GetSettings();
MiscSettings aMiscSettings = aAllSettings.GetMiscSettings();
#ifndef UNX
- aMiscSettings.SetEnableATToolSupport( m_aAccessibilityTool.IsChecked() );
+ aMiscSettings.SetEnableATToolSupport(m_pAccessibilityTool->IsChecked());
#endif
aAllSettings.SetMiscSettings(aMiscSettings);
Application::MergeSystemSettings( aAllSettings );
@@ -144,32 +98,32 @@ void SvxAccessibilityOptionsTabPage::Reset( const SfxItemSet& )
{
//set controls from aConfig.Get...
- m_aPagePreviews.Check( m_pImpl->m_aConfig.GetIsForPagePreviews() );
+ m_pPagePreviews->Check( m_pImpl->m_aConfig.GetIsForPagePreviews() );
EnableTipHelp( m_pImpl->m_aConfig.GetIsHelpTipsDisappear() );
- m_aTipHelpNF.SetValue( m_pImpl->m_aConfig.GetHelpTipSeconds() );
- m_aAnimatedGraphics.Check( m_pImpl->m_aConfig.GetIsAllowAnimatedGraphics() );
- m_aAnimatedTexts.Check( m_pImpl->m_aConfig.GetIsAllowAnimatedText() );
- m_aAutomaticFontColor.Check( m_pImpl->m_aConfig.GetIsAutomaticFontColor() );
- m_aTextSelectionInReadonly.Check( m_pImpl->m_aConfig.IsSelectionInReadonly() );
- m_aAutoDetectHC.Check( m_pImpl->m_aConfig.GetAutoDetectSystemHC() );
+ 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() );
+ m_pTextSelectionInReadonly->Check( m_pImpl->m_aConfig.IsSelectionInReadonly() );
+ m_pAutoDetectHC->Check( m_pImpl->m_aConfig.GetAutoDetectSystemHC() );
AllSettings aAllSettings = Application::GetSettings();
MiscSettings aMiscSettings = aAllSettings.GetMiscSettings();
- m_aAccessibilityTool.Check( aMiscSettings.GetEnableATToolSupport() );
+ m_pAccessibilityTool->Check(aMiscSettings.GetEnableATToolSupport());
}
IMPL_LINK(SvxAccessibilityOptionsTabPage, TipHelpHdl, CheckBox*, pBox)
{
sal_Bool bChecked = pBox->IsChecked();
- m_aTipHelpNF.Enable(bChecked);
+ m_pTipHelpNF->Enable(bChecked);
return 0;
}
void SvxAccessibilityOptionsTabPage::EnableTipHelp(sal_Bool bCheck)
{
- m_aTipHelpCB.Check(bCheck);
- m_aTipHelpNF.Enable(bCheck);
+ m_pTipHelpCB->Check(bCheck);
+ m_pTipHelpNF->Enable(bCheck);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optaccessibility.hrc b/cui/source/options/optaccessibility.hrc
deleted file mode 100644
index e80f40bc8c8f..000000000000
--- a/cui/source/options/optaccessibility.hrc
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _SVX_OPTACCESSIBILITY_HRC
-#define _SVX_OPTACCESSIBILITY_HRC
-
-#include <svtools/controldims.hrc>
-
-// defines for positions and sizes
-
-#define GB_WIDTH 248
-#define CB_WIDTH 240
-#define EDIT_WIDTH 25
-
-#define COL0 6
-#define COL1 (COL0+6)
-#define COL2 (COL1+10)
-#define COL3 (COL1+(CB_WIDTH * 2/3))
-#define COL4 (COL3+EDIT_WIDTH+RSC_SP_CTRL_DESC_X)
-
-#define UNIT_WIDTH (COL1+CB_WIDTH-COL4)
-
-#define ROWSPACE RSC_SP_CTRL_DESC_Y
-#define LINESPACE 1
-#define GROUPSPACE RSC_SP_CTRL_DESC_Y + 2
-#define ROWA_0 3
-#define ROWA_1 ( ROWA_0 + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE )
-#define ROWA_2 ( ROWA_1 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE )
-#define ROWA_3 ( ROWA_2 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE )
-#define ROWA_4 ( ROWA_3 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE )
-#define ROWA_5 ( ROWA_4 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE )
-
-#define ROWB_0 ( ROWA_5 + RSC_CD_TEXTBOX_HEIGHT + ROWSPACE + GROUPSPACE )
-#define ROWB_1 ( ROWB_0 + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE )
-#define ROWB_2 ( ROWB_1 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE )
-#define ROWB_3 ( ROWB_2 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE )
-
-#define OFFS_TEXTBOX_FIXEDTEXT(base) (base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)
-#define DIFF(v1,v2) (v2-v1)
-#define SUM(v1,v2) (v2+v1)
-
-#define FL_MISCELLANEOUS 1
-#define CB_PAGE_PREVIEWS 2
-#define FL_HC_OPTIONS 3
-#define CB_TIPHELP 4
-#define NF_TIPHELP 5
-#define FT_TIPHELP 6
-#define CB_ANIMATED_GRAPHICS 7
-#define CB_ANIMATED_TEXTS 8
-#define CB_AUTOMATIC_FONT_COLOR 9
-#define CB_SYSTEM_FONT 10
-#define CB_ACCESSIBILITY_TOOL 11
-#define CB_TEXTSELECTION 12
-#define CB_AUTO_DETECT_HC 13
-
-#endif
-
diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx
index 5fc241ee541d..52d6fb6f27d8 100644
--- a/cui/source/options/optaccessibility.hxx
+++ b/cui/source/options/optaccessibility.hxx
@@ -25,18 +25,15 @@
struct SvxAccessibilityOptionsTabPage_Impl;
class SvxAccessibilityOptionsTabPage : public SfxTabPage
{
- FixedLine m_aMiscellaneousLabel; // FL_MISCELLANEOUS
- CheckBox m_aAccessibilityTool; // CB_ACCESSIBILITY_TOOL
- CheckBox m_aTextSelectionInReadonly; // CB_TEXTSELECTION
- CheckBox m_aAnimatedGraphics; // CB_ANIMATED_GRAPHICS
- CheckBox m_aAnimatedTexts; // CB_ANIMATED_TEXTS
- CheckBox m_aTipHelpCB; // CB_TIPHELP
- NumericField m_aTipHelpNF; // NF_TIPHELP
- FixedText m_aTipHelpFT; // FT_TIPHELP
- FixedLine m_aHCOptionsLabel; // FL_HC_OPTIONS
- CheckBox m_aAutoDetectHC; // CB_AUTO_DETECT_HC
- CheckBox m_aAutomaticFontColor; // CB_AUTOMATIC_FONT_COLOR
- CheckBox m_aPagePreviews; // CB_PAGEPREVIEWS
+ CheckBox* m_pAccessibilityTool;
+ CheckBox* m_pTextSelectionInReadonly;
+ CheckBox* m_pAnimatedGraphics;
+ CheckBox* m_pAnimatedTexts;
+ CheckBox* m_pTipHelpCB;
+ NumericField* m_pTipHelpNF;
+ CheckBox* m_pAutoDetectHC;
+ CheckBox* m_pAutomaticFontColor;
+ CheckBox* m_pPagePreviews;
DECL_LINK(TipHelpHdl, CheckBox*);
void EnableTipHelp(sal_Bool bCheck);
diff --git a/cui/source/options/optaccessibility.src b/cui/source/options/optaccessibility.src
deleted file mode 100644
index f20351de2777..000000000000
--- a/cui/source/options/optaccessibility.src
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "optaccessibility.hrc"
-#include <sfx2/sfx.hrc>
-#include "helpid.hrc"
-#include <cuires.hrc>
-
-TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
-{
- HelpId = HID_OPTIONS_ACCESSIBILITYCONFIG ;
- Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
- SVLook = TRUE ;
- Hide = TRUE ;
- FixedLine FL_MISCELLANEOUS
- {
- Pos = MAP_APPFONT ( COL0, ROWA_0 ) ;
- Size = MAP_APPFONT ( GB_WIDTH , RSC_CD_FIXEDLINE_HEIGHT ) ;
- Text [ en-US ] = "Miscellaneous options";
- };
- CheckBox CB_ACCESSIBILITY_TOOL
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ACCESSIBILITY_TOOL";
- TabStop = TRUE ;
- Pos = MAP_APPFONT( COL1, ROWA_1 );
- Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
- WordBreak = TRUE;
- Text [ en-US ] = "Support ~assistive technology tools (program restart required)";
- };
- CheckBox CB_TEXTSELECTION
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_TEXTSELECTION";
- TabStop = TRUE ;
- Pos = MAP_APPFONT( COL1, ROWA_2 );
- Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
- Text [ en-US ] = "Use te~xt selection cursor in read-only text documents";
- };
- CheckBox CB_ANIMATED_GRAPHICS
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ANIMATED_GRAPHICS";
- TabStop = TRUE ;
- Pos = MAP_APPFONT( COL1, ROWA_3 );
- Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
- Text [ en-US ] = "Allow animated ~graphics";
- };
- CheckBox CB_ANIMATED_TEXTS
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ANIMATED_TEXTS";
- TabStop = TRUE ;
- Pos = MAP_APPFONT( COL1, ROWA_4 );
- Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
- Text [ en-US ] = "Allow animated ~text";
- };
- CheckBox CB_TIPHELP
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_TIPHELP";
- TabStop = TRUE ;
- Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT( ROWA_5 ) );
- Size = MAP_APPFONT( DIFF(COL2,COL3), RSC_CD_CHECKBOX_HEIGHT );
- Text [ en-US ] = "~Help tips disappear after ";
- };
- NumericField NF_TIPHELP
- {
- HelpID = "cui:NumericField:RID_SVXPAGE_ACCESSIBILITYCONFIG:NF_TIPHELP";
- TabStop = TRUE ;
- Border = TRUE ;
- Pos = MAP_APPFONT( COL3, ROWA_5 );
- Size = MAP_APPFONT( EDIT_WIDTH, RSC_CD_TEXTBOX_HEIGHT );
- Minimum = 1;
- Maximum = 99;
- First = 1 ;
- Last = 99 ;
- Spin = TRUE ;
- Repeat = TRUE ;
- };
- FixedText FT_TIPHELP
- {
- Pos = MAP_APPFONT( COL4, OFFS_TEXTBOX_FIXEDTEXT( ROWA_5 ) );
- Size = MAP_APPFONT( UNIT_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT );
- Text [ en-US ] = "seconds";
- };
- FixedLine FL_HC_OPTIONS
- {
- Pos = MAP_APPFONT ( COL0, ROWB_0 ) ;
- Size = MAP_APPFONT ( GB_WIDTH , RSC_CD_FIXEDLINE_HEIGHT ) ;
- Text [ en-US ] = "Options for high contrast appearance";
- };
- CheckBox CB_AUTO_DETECT_HC
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_AUTO_DETECT_HC";
- TabStop = TRUE ;
- Pos = MAP_APPFONT( COL1, ROWB_1 );
- Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
- Text [ en-US ] = "Automatically ~detect high contrast mode of operating system";
- };
- CheckBox CB_AUTOMATIC_FONT_COLOR
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_AUTOMATIC_FONT_COLOR";
- TabStop = TRUE ;
- Pos = MAP_APPFONT( COL1, ROWB_2 );
- Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
- Text [ en-US ] = "Use automatic font ~color for screen display";
- };
- CheckBox CB_PAGE_PREVIEWS
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_PAGE_PREVIEWS";
- TabStop = TRUE ;
- Pos = MAP_APPFONT( COL1, ROWB_3 );
- Size = MAP_APPFONT( CB_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
- Text [ en-US ] = "~Use system colors for page previews";
- };
-};
diff --git a/sw/uiconfig/swriter/ui/libaccessibility.ui b/cui/uiconfig/ui/optaccessibilitypage.ui
index a64f829a2a53..10758b6e0116 100644
--- a/sw/uiconfig/swriter/ui/libaccessibility.ui
+++ b/cui/uiconfig/ui/optaccessibilitypage.ui
@@ -1,11 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <object class="GtkBox" id="accessibility">
+ <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>
+ <object class="GtkBox" id="OptAccessibilityPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
@@ -16,6 +23,7 @@
<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="GtkBox" id="box2">
@@ -24,13 +32,12 @@
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkCheckButton" id="checkbutton1">
- <property name="label" translatable="yes">Use te~xt selection cursor in read-only text documents</property>
- <property name="use_action_appearance">False</property>
+ <object class="GtkCheckButton" id="acctool">
+ <property name="label" translatable="yes">Support _assistive technology tools (program restart required)</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -41,13 +48,12 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="checkbutton2">
- <property name="label" translatable="yes">Allow animated ~graphics</property>
- <property name="use_action_appearance">False</property>
+ <object class="GtkCheckButton" id="textselinreadonly">
+ <property name="label" translatable="yes">Use te_xt selection cursor in read-only text documents</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -58,13 +64,12 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="checkbutton3">
- <property name="label" translatable="yes">Allow animated ~text</property>
- <property name="use_action_appearance">False</property>
+ <object class="GtkCheckButton" id="animatedgraphics">
+ <property name="label" translatable="yes">Allow animated _graphics</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -75,19 +80,38 @@
</packing>
</child>
<child>
+ <object class="GtkCheckButton" id="animatedtext">
+ <property name="label" translatable="yes">Allow animated _text</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="expand">False</property>
+ <property name="fill">True</property>
+ <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="checkbutton4">
- <property name="label" translatable="yes">~Help tips disappear after</property>
- <property name="use_action_appearance">False</property>
+ <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_action_appearance">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>
@@ -110,10 +134,14 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="spinbutton1">
+ <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>
@@ -126,7 +154,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">4</property>
</packing>
</child>
</object>
@@ -138,6 +166,9 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Miscellaneous options</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -157,6 +188,7 @@
<object class="GtkAlignment" id="alignment2">
<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="GtkBox" id="box3">
@@ -165,13 +197,12 @@
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkCheckButton" id="checkbutton5">
- <property name="label" translatable="yes">Automatically ~detect high contrast mode of operating system</property>
- <property name="use_action_appearance">False</property>
+ <object class="GtkCheckButton" id="autodetecthc">
+ <property name="label" translatable="yes">Automatically _detect high contrast mode of operating system</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -182,13 +213,12 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="checkbutton6">
- <property name="label" translatable="yes">Use automatically font ~color for screen display</property>
- <property name="use_action_appearance">False</property>
+ <object class="GtkCheckButton" id="autofontcolor">
+ <property name="label" translatable="yes">Use automatic font _color for screen display</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -199,13 +229,12 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="checkbutton7">
- <property name="label" translatable="yes">~Use system colors for page previews</property>
- <property name="use_action_appearance">False</property>
+ <object class="GtkCheckButton" id="systempagepreviewcolor">
+ <property name="label" translatable="yes">_Use system colors for page previews</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -224,6 +253,9 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Options for high contrast appearance</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>