[Libreoffice-commits] core.git: cui/source cui/uiconfig include/svx reportdesign/source reportdesign/uiconfig sw/source sw/uiconfig
Zolnai Tamás
zolnaitamas2000 at gmail.com
Sun Jun 14 09:57:43 PDT 2015
cui/source/inc/backgrnd.hxx | 1 +
cui/source/tabpages/backgrnd.cxx | 7 +++++++
cui/uiconfig/ui/backgroundpage.ui | 2 +-
include/svx/flagsdef.hxx | 1 +
reportdesign/source/ui/dlg/dlgpage.cxx | 12 +++++++++++-
reportdesign/source/ui/inc/dlgpage.hxx | 3 +++
reportdesign/uiconfig/dbreport/ui/chardialog.ui | 2 +-
sw/source/ui/chrdlg/chardlg.cxx | 5 +++++
sw/source/ui/fmtui/tmpdlg.cxx | 2 ++
sw/uiconfig/swriter/ui/characterproperties.ui | 2 +-
sw/uiconfig/swriter/ui/templatedialog1.ui | 2 +-
11 files changed, 34 insertions(+), 5 deletions(-)
New commits:
commit 3588a04f438b001cb64aa1fd86b28869f2c4e70b
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date: Sun Jun 14 18:50:01 2015 +0200
tdf#89830: Ambiguous naming of character background
Use 'Highlighting' also on Character Dialog.
Change-Id: Ie81d25651e5998a35b4e2646089b8f2c590cfb98
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index a0441bf..c12a33b 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -80,6 +80,7 @@ private:
VclPtr<ListBox> m_pTblLBox;
VclPtr<ListBox> m_pParaLBox;
+ VclPtr<FixedText> m_pBackGroundColorLabelFT;
VclPtr<VclFrame> m_pBackGroundColorFrame;
VclPtr<SvxColorValueSet> m_pBackgroundColorSet;
VclPtr<BackgroundPreviewImpl> m_pPreviewWin1;
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 733dcaf..bc4b6c6 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -357,6 +357,7 @@ SvxBackgroundTabPage::SvxBackgroundTabPage(vcl::Window* pParent, const SfxItemSe
get(m_pTblLBox, "tablelb");
get(m_pParaLBox, "paralb");
+ get(m_pBackGroundColorLabelFT, "background_label");
get(m_pBackGroundColorFrame, "backgroundcolorframe");
get(m_pBackgroundColorSet, "backgroundcolorset");
get(m_pPreviewWin1, "preview1");
@@ -1707,7 +1708,13 @@ void SvxBackgroundTabPage::PageCreated(const SfxAllItemSet& aSet)
if ( nFlags & SvxBackgroundTabFlags::SHOW_PARACTL )
ShowParaControl();
if ( nFlags & SvxBackgroundTabFlags::SHOW_SELECTOR )
+ {
ShowSelector();
+ }
+ if ( nFlags & SvxBackgroundTabFlags::SHOW_HIGHLIGHTING )
+ {
+ m_pBackGroundColorLabelFT->SetText("Highlighting Color");
+ }
}
}
diff --git a/cui/uiconfig/ui/backgroundpage.ui b/cui/uiconfig/ui/backgroundpage.ui
index 6076bab..91c5cb8 100644
--- a/cui/uiconfig/ui/backgroundpage.ui
+++ b/cui/uiconfig/ui/backgroundpage.ui
@@ -221,7 +221,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label5">
+ <object class="GtkLabel" id="background_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Background Color</property>
diff --git a/include/svx/flagsdef.hxx b/include/svx/flagsdef.hxx
index e074520..c3795de 100644
--- a/include/svx/flagsdef.hxx
+++ b/include/svx/flagsdef.hxx
@@ -44,6 +44,7 @@ enum class SvxBackgroundTabFlags
SHOW_SELECTOR = 0x01,
SHOW_PARACTL = 0x02,
SHOW_TBLCTL = 0x08,
+ SHOW_HIGHLIGHTING = 0x10,
};
namespace o3tl
{
diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx
index e4e7628..3e8ff66 100644
--- a/reportdesign/source/ui/dlg/dlgpage.cxx
+++ b/reportdesign/source/ui/dlg/dlgpage.cxx
@@ -60,7 +60,7 @@ ORptPageDialog::ORptPageDialog( vcl::Window* pParent, const SfxItemSet* pAttr, c
AddTabPage("fonteffects", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), 0 );
AddTabPage("position", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), 0 );
AddTabPage("asianlayout", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), 0 );
- AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 );
+ m_nCharBgdId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 );
AddTabPage("alignment", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), 0 );
}
else
@@ -71,6 +71,16 @@ ORptPageDialog::ORptPageDialog( vcl::Window* pParent, const SfxItemSet* pAttr, c
RemoveTabPage("asianlayout");
}
+void ORptPageDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
+{
+ SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
+ if (nId == m_nCharBgdId)
+ {
+ aSet.Put(SfxUInt32Item(SID_FLAG_TYPE,static_cast<sal_uInt32>(SvxBackgroundTabFlags::SHOW_HIGHLIGHTING)));
+ rPage.PageCreated(aSet);
+ }
+}
+
} // namespace rptui
diff --git a/reportdesign/source/ui/inc/dlgpage.hxx b/reportdesign/source/ui/inc/dlgpage.hxx
index 5085aab..1b577a4 100644
--- a/reportdesign/source/ui/inc/dlgpage.hxx
+++ b/reportdesign/source/ui/inc/dlgpage.hxx
@@ -33,9 +33,12 @@ class ORptPageDialog : public SfxTabDialog
private:
ORptPageDialog(const ORptPageDialog&) SAL_DELETED_FUNCTION;
void operator =(const ORptPageDialog&) SAL_DELETED_FUNCTION;
+
+ sal_uInt16 m_nCharBgdId;
public:
ORptPageDialog(vcl::Window* pParent, const SfxItemSet* pAttr, const OUString &rDialog);
+ virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE;
};
} // namespace rptui
diff --git a/reportdesign/uiconfig/dbreport/ui/chardialog.ui b/reportdesign/uiconfig/dbreport/ui/chardialog.ui
index a9a8b5e..47491da 100644
--- a/reportdesign/uiconfig/dbreport/ui/chardialog.ui
+++ b/reportdesign/uiconfig/dbreport/ui/chardialog.ui
@@ -151,7 +151,7 @@
<object class="GtkLabel" id="background">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Background</property>
+ <property name="label" translatable="yes">Highlighting</property>
</object>
<packing>
<property name="position">4</property>
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index 2483fda..35ae0d0 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -125,6 +125,11 @@ void SwCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
aSet.Put (SfxUInt32Item(SID_FLAG_TYPE,SVX_PREVIEW_CHARACTER));
rPage.PageCreated(aSet);
}
+ else if (nId == m_nCharBgdId)
+ {
+ aSet.Put(SfxUInt32Item(SID_FLAG_TYPE,static_cast<sal_uInt32>(SvxBackgroundTabFlags::SHOW_HIGHLIGHTING)));
+ rPage.PageCreated(aSet);
+ }
}
SwCharURLPage::SwCharURLPage(vcl::Window* pParent, const SfxItemSet& rCoreSet)
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index f8d6b72..468b9fe 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -476,6 +476,8 @@ void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
nFlagType |= SvxBackgroundTabFlags::SHOW_PARACTL;
if( SFX_STYLE_FAMILY_CHAR != nType )
nFlagType |= SvxBackgroundTabFlags::SHOW_SELECTOR;
+ if( SFX_STYLE_FAMILY_CHAR == nType )
+ nFlagType |= SvxBackgroundTabFlags::SHOW_HIGHLIGHTING;
aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, static_cast<sal_uInt32>(nFlagType)));
rPage.PageCreated(aSet);
}
diff --git a/sw/uiconfig/swriter/ui/characterproperties.ui b/sw/uiconfig/swriter/ui/characterproperties.ui
index e8c7490..0efad8c 100644
--- a/sw/uiconfig/swriter/ui/characterproperties.ui
+++ b/sw/uiconfig/swriter/ui/characterproperties.ui
@@ -166,7 +166,7 @@
<object class="GtkLabel" id="background">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Background</property>
+ <property name="label" translatable="yes">Highlighting</property>
</object>
<packing>
<property name="position">5</property>
diff --git a/sw/uiconfig/swriter/ui/templatedialog1.ui b/sw/uiconfig/swriter/ui/templatedialog1.ui
index 6436282..9b3da41 100644
--- a/sw/uiconfig/swriter/ui/templatedialog1.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog1.ui
@@ -196,7 +196,7 @@
<object class="GtkLabel" id="background">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Background</property>
+ <property name="label" translatable="yes">Highlighting</property>
</object>
<packing>
<property name="position">5</property>
More information about the Libreoffice-commits
mailing list