diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2022-03-30 19:57:10 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2022-03-31 11:43:41 +0200 |
commit | 5dd4802c73dac4c3bd5c609562ce994d3b51e6a9 (patch) | |
tree | f95e35fb52309884563a69c6c3b5c9c38a0a8d10 /cui/qa | |
parent | 6c0dca63cd93c393b12bdbd2ce777c275a9279ff (diff) |
sd theme: add UI (area dialog) for shape fill color
SvxColorTabPage::FillItemSet() has to produce a color item that has the
theme index, which means SvxColorTabPage::SelectValSetHdl_Impl() has to
change the current color to an svx::NamedThemedColor.
The rest is just fallout from this, now that the current color has
theming metadata.
Change-Id: If0018c651239ba74f45745e69e41ff7040ac9b97
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132327
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'cui/qa')
-rw-r--r-- | cui/qa/uitest/tabpages/tpcolor.py | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/cui/qa/uitest/tabpages/tpcolor.py b/cui/qa/uitest/tabpages/tpcolor.py new file mode 100644 index 000000000000..e6ae91adaac3 --- /dev/null +++ b/cui/qa/uitest/tabpages/tpcolor.py @@ -0,0 +1,69 @@ +# +# 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 +from uitest.uihelper.common import select_by_text + + +# Test for cui/source/tabpages/tpcolor.cxx. +class Test(UITestCase): + + def testSvxColorTabPageTheme(self): + # Given an Impress document with a theme: + with self.ui_test.create_doc_in_start_center("impress") as component: + template = self.xUITest.getTopFocusWindow() + self.ui_test.close_dialog_through_button(template.getChild("close")) + doc = self.xUITest.getTopFocusWindow() + editWin = doc.getChild("impress_win") + # Set theme colors. + drawPage = component.getDrawPages().getByIndex(0) + master = drawPage.MasterPage + theme = mkPropertyValues({ + "Name": "nameA", + "ColorSchemeName": "colorSetA", + "ColorScheme": tuple([ + 0x000000, # dk1 + 0x000000, # lt1 + 0x000000, # dk2 + 0x000000, # lt2 + 0x0000ff, # accent1 + 0x000000, # accent2 + 0x000000, # accent3 + 0x000000, # accent4 + 0x000000, # accent5 + 0x000000, # accent6 + 0x000000, # hlink + 0x000000, # folHlink + ]) + }) + master.Theme = theme + # Select the title shape. + editWin.executeAction("TYPE", mkPropertyValues({"KEYCODE": "TAB"})) + + # When using right click -> Area to refer to a theme for shape fill: + with self.ui_test.execute_dialog_through_command(".uno:FormatArea") as xDialog: + tabControl = xDialog.getChild("tabcontrol") + # Area + select_pos(tabControl, "0") + # Color + btnColor = xDialog.getChild("btncolor") + btnColor.executeAction("CLICK", tuple()) + paletteSelector = xDialog.getChild("paletteselector") + select_by_text(paletteSelector, "Theme colors") + colorSelector = xDialog.getChild("colorset") + colorSelector.executeAction("CHOOSE", mkPropertyValues({"POS": "4"})) + + # Then make sure the doc model is updated accordingly: + shape = drawPage.getByIndex(0) + # Without the accompanying fix in place, this test would have failed with: + # AssertionError: -1 != 4 + # i.e. the theme metadata of the selected fill color was lost. + self.assertEqual(shape.FillColorTheme, 4) + + +# vim: set shiftwidth=4 softtabstop=4 expandtab: |