summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cui/source/inc/chardlg.hxx2
-rw-r--r--cui/source/tabpages/chardlg.cxx5
-rw-r--r--cui/uiconfig/ui/effectspage.ui39
3 files changed, 35 insertions, 11 deletions
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 5b115c1d28c2..0f94ede6a940 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -207,6 +207,8 @@ private:
VclPtr<FixedText> m_pPositionFT;
VclPtr<ListBox> m_pPositionLB;
+ VclPtr<FixedText> m_pA11yWarningFT;
+
sal_uInt16 m_nHtmlMode;
OUString m_aTransparentColorName;
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 1edfee5c5d9d..3ee76c571dae 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -66,6 +66,7 @@
#include <svl/stritem.hxx>
#include <editeng/charscaleitem.hxx>
#include <editeng/charrotateitem.hxx>
+#include <officecfg/Office/Common.hxx>
#include <svx/svxdlg.hxx>
#include <cuires.hrc>
#include <svl/intitem.hxx>
@@ -1371,6 +1372,7 @@ SvxCharEffectsPage::SvxCharEffectsPage( vcl::Window* pParent, const SfxItemSet&
get(m_pEmphasisLB, "emphasislb");
get(m_pPositionFT, "positionft");
get(m_pPositionLB, "positionlb");
+ get(m_pA11yWarningFT, "a11ywarning");
get(m_pPreviewWin, "preview");
Initialize();
@@ -1405,6 +1407,7 @@ void SvxCharEffectsPage::dispose()
m_pEmphasisLB.clear();
m_pPositionFT.clear();
m_pPositionLB.clear();
+ m_pA11yWarningFT.clear();
SvxCharBasePage::dispose();
}
@@ -1507,6 +1510,8 @@ void SvxCharEffectsPage::Initialize()
m_pPositionFT->Hide();
m_pPositionLB->Hide();
}
+
+ m_pA11yWarningFT->Show(officecfg::Office::Common::Accessibility::IsAutomaticFontColor::get());
}
void SvxCharEffectsPage::UpdatePreview_Impl()
diff --git a/cui/uiconfig/ui/effectspage.ui b/cui/uiconfig/ui/effectspage.ui
index 62fd90f887e4..ae64cf04228f 100644
--- a/cui/uiconfig/ui/effectspage.ui
+++ b/cui/uiconfig/ui/effectspage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
@@ -215,8 +215,8 @@
<object class="GtkLabel" id="fontcolorft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Font color:</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -227,8 +227,8 @@
<object class="GtkLabel" id="effectsft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Effects:</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -239,8 +239,8 @@
<object class="GtkLabel" id="reliefft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Relief:</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -251,8 +251,8 @@
<object class="GtkLabel" id="label46">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Overlining:</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -263,8 +263,8 @@
<object class="GtkLabel" id="label47">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Strikethrough:</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -275,8 +275,8 @@
<object class="GtkLabel" id="label48">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Underlining:</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -287,8 +287,8 @@
<object class="GtkLabel" id="overlinecolorft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Overline color:</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">3</property>
@@ -299,8 +299,8 @@
<object class="GtkLabel" id="underlinecolorft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Underline color:</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">3</property>
@@ -477,8 +477,8 @@
<object class="GtkLabel" id="positionft">
<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="xalign">0</property>
</object>
<packing>
<property name="left_attach">3</property>
@@ -489,8 +489,8 @@
<object class="GtkLabel" id="emphasisft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Emphasis mark:</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -537,6 +537,23 @@
</packing>
</child>
<child>
+ <object class="GtkLabel" id="a11ywarning">
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Accessibility option "Use automatic font color for screen display" is active. Font color attributes are not currently used to display text.</property>
+ <property name="wrap">True</property>
+ <property name="max_width_chars">50</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">10</property>
+ <property name="width">5</property>
+ </packing>
+ </child>
+ <child>
<placeholder/>
</child>
<child>