cui/qa/uitest/dialogs/chardlg.py | 49 +++++++++++++++++++++++++++++++++++++++
cui/source/inc/chardlg.hxx | 3 ++
cui/source/tabpages/chardlg.cxx | 40 +++++++++++++++++++++++++++++++
cui/uiconfig/ui/effectspage.ui | 30 +++++++++++++++++++++++
include/svx/flagsdef.hxx | 1
sd/source/ui/dlg/dlgchar.cxx | 2 +
6 files changed, 124 insertions(+), 1 deletion(-)
New commits:
commit b4554b8eddd048532269df610e89ae739c46fab7
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Fri Nov 22 17:12:04 2019 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri Nov 22 18:33:39 2019 +0100
cui: add UI for semi-transparent shape text
- Make font color only work with the RGB color, otherwise the preview
would be white for e.g. half-transparent red.
- Add label and widget to see already set transparency.
- Add a flag to show these only for Draw/Impress and leave Writer/Calc
unchanged.
- Update returned item set to contain transparency in case the widget
changes.
Change-Id: If77771076ff4b10a4a5d468a6583809a94deb57e
Reviewed-on: https://gerrit.libreoffice.org/83520
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/cui/qa/uitest/dialogs/chardlg.py b/cui/qa/uitest/dialogs/chardlg.py
new file mode 100644
index 000000000000..59cf10d18c29
--- /dev/null
+++ b/cui/qa/uitest/dialogs/chardlg.py
@@ -0,0 +1,49 @@
+#
+# 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/.
+#
+
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.framework import UITestCase
+from uitest.uihelper.common import select_pos
+
+# Test for cui/source/tabpages/chardlg.cxx.
+class Test(UITestCase):
+
+ def testSvxCharEffectsPage(self):
+ # Start Impress.
+ self.ui_test.create_doc_in_start_center("impress")
+ template = self.xUITest.getTopFocusWindow()
+ self.ui_test.close_dialog_through_button(template.getChild("cancel"))
+ doc = self.xUITest.getTopFocusWindow()
+ editWin = doc.getChild("impress_win")
+ # Select the title shape.
+ editWin.executeAction("TYPE", mkPropertyValues({"KEYCODE": "TAB"}))
+ editWin.executeAction("TYPE", mkPropertyValues({"TEXT": "t"}))
+ self.xUITest.executeCommand(".uno:SelectAll")
+
+ # Now use Format -> Character.
+ self.ui_test.execute_dialog_through_command(".uno:FontDialog")
+ xDialog = self.xUITest.getTopFocusWindow()
+ xTabs = xDialog.getChild("tabcontrol")
+ # Select RID_SVXPAGE_CHAR_EFFECTS.
+ select_pos(xTabs, "1")
+ xFontTransparency = xDialog.getChild("fonttransparencymtr")
+ for _ in range(5):
+ xFontTransparency.executeAction("UP", tuple())
+ self.ui_test.close_dialog_through_button(xDialog.getChild("ok"))
+
+ # Verify the result.
+ component = self.ui_test.get_component()
+ drawPage = component.getDrawPages().getByIndex(0)
+ shape = drawPage.getByIndex(0)
+
+ # Without the accompanying fix in place, this test would have failed
with:
+ # AssertionError: 100 != 5
+ # i.e. the dialog did not set transparency to 5%, instead it left the
character color at
+ # COL_AUTO.
+ self.assertEqual(shape.CharTransparence, 5)
+ self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 0b08d7e8f9a1..aa8196ca68c5 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -170,6 +170,8 @@ private:
std::unique_ptr<weld::Label> m_xFontColorFT;
std::unique_ptr<ColorListBox> m_xFontColorLB;
+ std::unique_ptr<weld::Label> m_xFontTransparencyFT;
+ std::unique_ptr<weld::MetricSpinButton> m_xFontTransparencyMtr;
std::unique_ptr<weld::Label> m_xEffectsFT;
std::unique_ptr<weld::ComboBox> m_xEffectsLB;
std::unique_ptr<weld::Label> m_xReliefFT;
@@ -205,6 +207,7 @@ private:
DECL_LINK(CbClickHdl_Impl, weld::ToggleButton&, void);
DECL_LINK(TristClickHdl_Impl, weld::ToggleButton&, void);
DECL_LINK(ColorBoxSelectHdl_Impl, ColorListBox&, void);
+ DECL_LINK(ModifyFontTransparencyHdl_Impl, weld::MetricSpinButton&, void);
public:
SvxCharEffectsPage(weld::Container* pPage, weld::DialogController*
pController, const SfxItemSet& rSet);
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 18987cc0a5cf..64b9f26c3b3a 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -1314,6 +1314,9 @@ SvxCharEffectsPage::SvxCharEffectsPage(weld::Container*
pPage, weld::DialogContr
, m_bUnderlineColorDisabled(false)
, m_xFontColorFT(m_xBuilder->weld_label("fontcolorft"))
, m_xFontColorLB(new
ColorListBox(m_xBuilder->weld_menu_button("fontcolorlb"),
pController->getDialog()))
+ , m_xFontTransparencyFT(m_xBuilder->weld_label("fonttransparencyft"))
+ , m_xFontTransparencyMtr(
+ m_xBuilder->weld_metric_spin_button("fonttransparencymtr",
FieldUnit::PERCENT))
, m_xEffectsFT(m_xBuilder->weld_label("effectsft"))
, m_xEffectsLB(m_xBuilder->weld_combo_box("effectslb"))
, m_xReliefFT(m_xBuilder->weld_label("reliefft"))
@@ -1365,6 +1368,7 @@ SvxCharEffectsPage::~SvxCharEffectsPage()
{
m_xUnderlineColorLB.reset();
m_xOverlineColorLB.reset();
+ m_xFontTransparencyMtr.reset();
m_xFontColorLB.reset();
}
@@ -1388,6 +1392,8 @@ void SvxCharEffectsPage::Initialize()
}
m_xFontColorLB->SetSelectHdl(LINK(this, SvxCharEffectsPage,
ColorBoxSelectHdl_Impl));
+ m_xFontTransparencyMtr->connect_value_changed(
+ LINK(this, SvxCharEffectsPage, ModifyFontTransparencyHdl_Impl));
// handler
Link<weld::ComboBox&,void> aLink = LINK( this, SvxCharEffectsPage,
SelectListBoxHdl_Impl );
@@ -1553,7 +1559,19 @@ void SvxCharEffectsPage::ResetColor_Impl( const
SfxItemSet& rSet )
m_aPreviewWin.Invalidate();
- m_xFontColorLB->SelectEntry(aColor);
+ Color aRGBColor = aColor;
+ if (aRGBColor.GetTransparency())
+ {
+ aRGBColor.SetTransparency(0);
+ }
+ m_xFontColorLB->SelectEntry(aRGBColor);
+
+ if (m_xFontTransparencyMtr->get_visible() && aColor != COL_AUTO)
+ {
+ double fTransparency = aColor.GetTransparency() * 100.0 / 255;
+
m_xFontTransparencyMtr->set_value(basegfx::fround(fTransparency),
+ FieldUnit::PERCENT);
+ }
m_aOrigFontColor = aColor;
m_bOrigFontColor = true;
@@ -1574,6 +1592,14 @@ bool SvxCharEffectsPage::FillItemSetColor_Impl(
SfxItemSet& rSet )
if (bChanged)
{
aSelectedColor = m_xFontColorLB->GetSelectEntryColor();
+
+ if (m_xFontTransparencyMtr->get_value_changed_from_saved())
+ {
+ double fTransparency
+ = m_xFontTransparencyMtr->get_value(FieldUnit::PERCENT) *
255.0 / 100;
+
aSelectedColor.SetTransparency(static_cast<sal_uInt8>(basegfx::fround(fTransparency)));
+ }
+
if (m_bOrigFontColor)
bChanged = aSelectedColor != m_aOrigFontColor;
if (m_bEnableNoneFontColor && bChanged && aSelectedColor ==
COL_NONE_COLOR)
@@ -1647,6 +1673,11 @@ IMPL_LINK(SvxCharEffectsPage, ColorBoxSelectHdl_Impl,
ColorListBox&, rBox, void)
UpdatePreview_Impl();
}
+IMPL_LINK_NOARG(SvxCharEffectsPage, ModifyFontTransparencyHdl_Impl,
weld::MetricSpinButton&, void)
+{
+ m_bNewFontColor = true;
+}
+
DeactivateRC SvxCharEffectsPage::DeactivatePage( SfxItemSet* _pSet )
{
if ( _pSet )
@@ -2049,6 +2080,7 @@ void SvxCharEffectsPage::ChangesApplied()
m_xShadowBtn->save_state();
m_xBlinkingBtn->save_state();
m_xHiddenBtn->save_state();
+ m_xFontTransparencyMtr->save_value();
}
bool SvxCharEffectsPage::FillItemSet( SfxItemSet* rSet )
@@ -2412,6 +2444,12 @@ void SvxCharEffectsPage::PageCreated(const
SfxAllItemSet& aSet)
if ( ( nFlags & SVX_PREVIEW_CHARACTER ) == SVX_PREVIEW_CHARACTER )
// the writer uses SID_ATTR_BRUSH as font background
m_bPreviewBackgroundToCharacter = true;
+ if ((nFlags & SVX_ENABLE_CHAR_TRANSPARENCY) !=
SVX_ENABLE_CHAR_TRANSPARENCY)
+ {
+ // Only show these in case client code explicitly wants this.
+ m_xFontTransparencyFT->hide();
+ m_xFontTransparencyMtr->hide();
+ }
}
}
diff --git a/cui/uiconfig/ui/effectspage.ui b/cui/uiconfig/ui/effectspage.ui
index 9a5cb1a89fe1..581b28912c16 100644
--- a/cui/uiconfig/ui/effectspage.ui
+++ b/cui/uiconfig/ui/effectspage.ui
@@ -585,6 +585,31 @@
</packing>
</child>
<child>
+ <object class="GtkLabel" id="fonttransparencyft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="effectspage|fonttransparencyft">_Transparency:</property>
+ <property name="use_underline">True</property>
+ <property
name="mnemonic_widget">fonttransparencymtr</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="fonttransparencymtr">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
+ <property name="adjustment">adjustmentPercent</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
<placeholder/>
</child>
</object>
@@ -636,4 +661,9 @@
<widget name="fontcolorlb"/>
</widgets>
</object>
+ <object class="GtkAdjustment" id="adjustmentPercent">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
</interface>
diff --git a/include/svx/flagsdef.hxx b/include/svx/flagsdef.hxx
index 1b09540e7198..750e5c9326fc 100644
--- a/include/svx/flagsdef.hxx
+++ b/include/svx/flagsdef.hxx
@@ -67,6 +67,7 @@ namespace o3tl
#define SVX_RELATIVE_MODE 0x02
// flags for SvxCharEffectsPage
#define SVX_ENABLE_FLASH 0x04
+#define SVX_ENABLE_CHAR_TRANSPARENCY 0x08
// Default values for Number Format Category List and Preview
diff --git a/sd/source/ui/dlg/dlgchar.cxx b/sd/source/ui/dlg/dlgchar.cxx
index d2c349c30545..8dc836ad01a6 100644
--- a/sd/source/ui/dlg/dlgchar.cxx
+++ b/sd/source/ui/dlg/dlgchar.cxx
@@ -56,6 +56,8 @@ void SdCharDlg::PageCreated(const OString& rId, SfxTabPage
&rPage)
}
else if (rId == "RID_SVXPAGE_CHAR_EFFECTS")
{
+ // Opt in for character transparency.
+ aSet.Put(SfxUInt32Item(SID_FLAG_TYPE, SVX_ENABLE_CHAR_TRANSPARENCY));
rPage.PageCreated(aSet);
}
else if (rId == "RID_SVXPAGE_BACKGROUND")
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
