diff options
| author | Sahil Gautam <sahil.gautam.extern@allotropia.de> | 2024-12-01 18:49:36 +0530 |
|---|---|---|
| committer | Sahil Gautam <sahil.gautam.extern@allotropia.de> | 2024-12-18 18:16:46 +0100 |
| commit | eaa5a4de85c7b7a8b606614a1dca6cee6badfb4a (patch) | |
| tree | 88923f508ace4fc851b6ec7d92d286184dade492 | |
| parent | 06640b94586c454ffc1fe1605e8f4c5356d73171 (diff) | |
tdf#163620 [API CHANGE] Add UI for libreoffice themes
Instead of Color, we have Light and Dark in the registry. So each theme extension
will specify dark and light color values for each "customizable element" like
DocColor etc. Under appearance we have three radio buttons - light/dark/system. If
system is selected then light/dark colors are switched based on the system's
theme. if explicitly light/dark is selected - that color is used from the
registry.
ColorConfigValue now has three entries nColor, nLightColor, nDarkColor. nColor is
used as a cache for the color being used at the moment. This is to avoid otherwise
expensive function calls + hundreds of modifications in the codebase just to
change nColor. nColor is cached either when the theme is loaded or when changes
are committed in `ColorConfig_Impl::ImplCommit()`.
Now, if Automatic theme is selected then themes is disabled and the application
uses the system colors. If some other scheme is selected like "CustomTheme" etc,
then LibreOffice themes/UI color customization is enabled and the theme colors are
used.
Instead of a scroll window, now we have a combobox for the registry entries and a
single color dropdown to select the color value. This color dropdown is for
convinience in case the user wants to change some specific color that's bothering
him. For themeing, theme extensions should be used.
API CHANGE
+ remove Color in favour of Light and Dark
+ AppBackground has additional two - BackgroundType and Bitmap
+ remove officecfg::Office::Common::Misc::Appearnce in favor of
officecfg::Office::Common::Appearance::ApplicationAppearance
+ move LibreofficeTheme under officecfg::Office::Common::Appearance
UI
+ it looks like https://i.imgur.com/UMxjfuC.png which is a little
different from how the [mockup] on the ticket describes it, and that's
because of lack of time due to upcomming feature freeze.
+ system/light/dark allow the user to switch between light/dark modes
based on either the system theme (system) or by manually specifying
light/dark.
+ ui themeing and color customization is disabled when automatic theme
is selected, and enabled otherwise.
[mockup]: https://bug-attachments.documentfoundation.org/attachment.cgi?id=197469
Change-Id: I1a7f70dfe44b81f863814f87e8d46e146c0e3d5a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174835
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Tested-by: Jenkins
Reviewed-by: Sahil Gautam <sahil.gautam.extern@allotropia.de>
(cherry picked from commit ddeeca35d9630f2d3d3afb83a2ec8f21458f6e19)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178729
29 files changed, 2995 insertions, 486 deletions
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index ef64e0fea5f6..71a53ef3928d 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -199,6 +199,8 @@ $(eval $(call gb_Library_add_exception_objects,cui,\ cui/source/options/optpath \ cui/source/options/optsave \ cui/source/options/optupdt \ + $(call gb_Helper_optional,DESKTOP,\ + cui/source/options/appearance) \ cui/source/options/sdbcdriverenum \ cui/source/options/securityoptions \ cui/source/options/treeopt \ diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk index 953227c874c0..b78aa328667f 100644 --- a/cui/UIConfig_cui.mk +++ b/cui/UIConfig_cui.mk @@ -168,6 +168,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\ cui/uiconfig/ui/pastespecial \ cui/uiconfig/ui/patterntabpage \ cui/uiconfig/ui/percentdialog \ + cui/uiconfig/ui/appearance \ cui/uiconfig/ui/pickbulletpage \ cui/uiconfig/ui/pickgraphicpage \ cui/uiconfig/ui/picknumberingpage \ diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc index 96ab2285b4ee..f197e7c7712f 100644 --- a/cui/inc/strings.hrc +++ b/cui/inc/strings.hrc @@ -401,6 +401,150 @@ // Translatable names of color schemes #define RID_COLOR_SCHEME_LIBREOFFICE_AUTOMATIC NC_("RID_COLOR_SCHEME_LIBREOFFICE_AUTOMATIC", "Automatic") +// Translatable Bitmap Names +#define BMP_FUZZY_LIGHTGREY NC_("BMP_FUZZY_LIGHTGREY", "Fuzzy Lightgrey") +#define BMP_ICE_LIGHT NC_("BMP_ICE_LIGHT", "Ice Light") +#define BMP_PAINTED_WHITE NC_("BMP_PAINTED_WHITE", "Painted White") +#define BMP_TEXTURE_PAPER NC_("BMP_TEXTURE_PAPER", "Texture Paper") +#define BMP_CRUMPLED_PAPER NC_("BMP_CRUMPLED_PAPER", "Crumpled Paper") +#define BMP_MARBLE NC_("BMP_MARBLE", "Marble") +#define BMP_CONCRETE NC_("BMP_CONCRETE", "Concrete") +#define BMP_FUZZY_GREY NC_("BMP_FUZZY_GREY", "Fuzzy Grey") +#define BMP_FUZZY_DARKGREY NC_("BMP_FUZZY_DARKGREY", "Fuzzy Darkgrey") +#define BMP_STONE NC_("BMP_STONE", "Stone") +#define BMP_WHITE_DIFFUSION NC_("BMP_WHITE_DIFFUSION", "White Diffusion") +#define BMP_SAND_LIGHT NC_("BMP_SAND_LIGHT", "Sand Light") +#define BMP_SAND NC_("BMP_SAND", "Sand") +#define BMP_SURFACE NC_("BMP_SURFACE", "Surface") +#define BMP_STUDIO NC_("BMP_STUDIO", "Studio") +#define BMP_INVOICE_PAPER NC_("BMP_INVOICE_PAPER", "Invoice Paper") +#define BMP_PARCHMENT_PAPER NC_("BMP_PARCHMENT_PAPER", "Parchment Paper") +#define BMP_CARDBOARD NC_("BMP_CARDBOARD", "Cardboard") +#define BMP_FENCE NC_("BMP_FENCE", "Fence") +#define BMP_WOODEN_FENCE NC_("BMP_WOODEN_FENCE", "Wooden Fence") +#define BMP_WOOD NC_("BMP_WOOD", "Wood") +#define BMP_WOODEN_BOARD NC_("BMP_WOODEN_BOARD", "Wooden Board") +#define BMP_PAINTED_WOOD NC_("BMP_PAINTED_WOOD", "Painted Wood") +#define BMP_STONES NC_("BMP_STONES", "Stones") +#define BMP_PEBBLE_LIGHT NC_("BMP_PEBBLE_LIGHT", "Pebble Light") +#define BMP_STONE_WALL NC_("BMP_STONE_WALL", "Stone Wall") +#define BMP_STONE_GRAY NC_("BMP_STONE_GRAY", "Stone Gray") +#define BMP_ROCK_WALL NC_("BMP_ROCK_WALL", "Rock Wall") +#define BMP_SURFACE_BLACK NC_("BMP_SURFACE_BLACK", "Surface Black") +#define BMP_BRICK_WALL NC_("BMP_BRICK_WALL", "Brick Wall") +#define BMP_TILES NC_("BMP_TILES", "Tiles") +#define BMP_GRAPH_PAPER NC_("BMP_GRAPH_PAPER", "Graph Paper") +#define BMP_CLOUD NC_("BMP_CLOUD", "Cloud") +#define BMP_POOL NC_("BMP_POOL", "Pool") +#define BMP_SKY NC_("BMP_SKY", "Sky") +#define BMP_CIRCUIT_BOARD NC_("BMP_CIRCUIT_BOARD", "Circuit Board") +#define BMP_COFFEE NC_("BMP_COFFEE", "Coffee") +#define BMP_COLOR_STRIPES NC_("BMP_COLOR_STRIPES", "Color Stripes") +#define BMP_FLORAL NC_("BMP_FLORAL", "Floral") +#define BMP_LEAF NC_("BMP_LEAF", "Leaf") +#define BMP_MAPLE_LEAVES NC_("BMP_MAPLE_LEAVES", "Maple Leaves") +#define BMP_SPACE NC_("BMP_SPACE", "Space") +#define BMP_GIRAFFE NC_("BMP_GIRAFFE", "Giraffe") +#define BMP_TIGER NC_("BMP_TIGER", "Tiger") +#define BMP_ZEBRA NC_("BMP_ZEBRA", "Zebra") + +#define LIGHT_COLOR_LBL NC_("LIGHT_COLOR_LBL", "Light") +#define DARK_COLOR_LBL NC_("DARK_COLOR_LBL", "Dark") + +// Translated Registry Entries +#define REG_DOCCOLOR NC_("REG_DOCCOLOR", "Document background") +#define REG_DOCBOUNDARIES NC_("REG_DOCBOUNDARIES", "Document boundaries") +#define REG_APPBACKGROUND NC_("REG_APPBACKGROUND", "Application background") +#define REG_TABLEBOUNDARIES NC_("REG_TABLEBOUNDARIES", "Table boundaries") +#define REG_FONTCOLOR NC_("REG_FONTCOLOR", "Font color") +#define REG_LINKS NC_("REG_LINKS", "Unvisited links") +#define REG_LINKSVISITED NC_("REG_LINKSVISITED", "Visited links") +#define REG_SPELL NC_("REG_SPELL", "Spelling mistakes") +#define REG_GRAMMAR NC_("REG_GRAMMAR", "Grammar") +#define REG_SMARTTAGS NC_("REG_SMARTTAGS", "Smart tags") +#define REG_SHADOW NC_("REG_SHADOW", "Shadows") +#define REG_WRITERTEXTGRID NC_("REG_WRITERTEXTGRID", "Writer Text grid") +#define REG_WRITERFIELDSHADINGS NC_("REG_WRITERFIELDSHADINGS", "Writer Field shadings") +#define REG_WRITERIDXSHADINGS NC_("REG_WRITERIDXSHADINGS", "Writer Index and table shadings") +#define REG_WRITERDIRECTCURSOR NC_("REG_WRITERDIRECTCURSOR", "Writer Direct cursor") +#define REG_WRITERSCRIPTINDICATOR NC_("REG_WRITERSCRIPTINDICATOR", "Writer Script indicator") +#define REG_WRITERSECTIONBOUNDARIES NC_("REG_WRITERSECTIONBOUNDARIES", "Writer Section boundaries") +#define REG_WRITERHEADERFOOTERMARK NC_("REG_WRITERHEADERFOOTERMARK", "Writer Header and footer delimiter") +#define REG_WRITERPAGEBREAKS NC_("REG_WRITERPAGEBREAKS", "Writer Page and column breaks") +#define REG_WRITERNONPRINTCHARS NC_("REG_WRITERNONPRINTCHARS", "Writer Non-printable characters") +#define REG_HTMLSGML NC_("REG_HTMLSGML", "HTML SGML syntax highlighting") +#define REG_HTMLCOMMENT NC_("REG_HTMLCOMMENT", "HTML Comment highlighting") +#define REG_HTMLKEYWORD NC_("REG_HTMLKEYWORD", "HTML Keyword highlighting") +#define REG_HTMLUNKNOWN NC_("REG_HTMLUNKNOWN", "HTML Text Highlighting") +#define REG_CALCGRID NC_("REG_CALCGRID", "Calc Grid") +#define REG_CALCCELLFOCUS NC_("REG_CALCCELLFOCUS", "Calc Cell focus") +#define REG_CALCPAGEBREAK NC_("REG_CALCPAGEBREAK", "Calc Page break") +#define REG_CALCPAGEBREAKMANUAL NC_("REG_CALCPAGEBREAKMANUAL", "Calc Manual page breaks") +#define REG_CALCPAGEBREAKAUTOMATIC NC_("REG_CALCPAGEBREAKAUTOMATIC", "Calc Automatic page breaks") +#define REG_CALCHIDDENCOLROW NC_("REG_CALCHIDDENCOLROW", "Calc Hidden column/row") +#define REG_CALCTEXTOVERFLOW NC_("REG_CALCTEXTOVERFLOW", "Calc Text overflow indicator") +#define REG_CALCCOMMENTS NC_("REG_CALCCOMMENTS", "Calc Comments") +#define REG_CALCDETECTIVE NC_("REG_CALCDETECTIVE", "Calc Detective") +#define REG_CALCDETECTIVEERROR NC_("REG_CALCDETECTIVEERROR", "Calc Detective error") +#define REG_CALCREFERENCE NC_("REG_CALCREFERENCE", "Calc References") +#define REG_CALCNOTESBACKGROUND NC_("REG_CALCNOTESBACKGROUND", "Calc Notes background") +#define REG_CALCVALUE NC_("REG_CALCVALUE", "Calc Values") +#define REG_CALCFORMULA NC_("REG_CALCFORMULA", "Calc Formulas") +#define REG_CALCTEXT NC_("REG_CALCTEXT", "Calc Text") +#define REG_CALCPROTECTEDBACKGROUND NC_("REG_CALCPROTECTEDBACKGROUND", "Calc Protected cells background") +#define REG_DRAWGRID NC_("REG_DRAWGRID", "Draw Grid") +#define REG_AUTHOR1 NC_("REG_AUTHOR1", "Author1") +#define REG_AUTHOR2 NC_("REG_AUTHOR2", "Author2") +#define REG_AUTHOR3 NC_("REG_AUTHOR3", "Author3") +#define REG_AUTHOR4 NC_("REG_AUTHOR4", "Author4") +#define REG_AUTHOR5 NC_("REG_AUTHOR5", "Author5") +#define REG_AUTHOR6 NC_("REG_AUTHOR6", "Author6") +#define REG_AUTHOR7 NC_("REG_AUTHOR7", "Author7") +#define REG_AUTHOR8 NC_("REG_AUTHOR8", "Author8") +#define REG_AUTHOR9 NC_("REG_AUTHOR9", "Author9") +#define REG_BASICEDITOR NC_("REG_BASICEDITOR", "BASIC Editor") +#define REG_BASICIDENTIFIER NC_("REG_BASICIDENTIFIER", "BASIC Identifier") +#define REG_BASICCOMMENT NC_("REG_BASICCOMMENT", "BASIC Comment") +#define REG_BASICNUMBER NC_("REG_BASICNUMBER", "BASIC Number") +#define REG_BASICSTRING NC_("REG_BASICSTRING", "BASIC String") +#define REG_BASICOPERATOR NC_("REG_BASICOPERATOR", "BASIC Operator") +#define REG_BASICKEYWORD NC_("REG_BASICKEYWORD", "BASIC Keyword") +#define REG_BASICERROR NC_("REG_BASICERROR", "BASIC Error") +#define REG_SQLIDENTIFIER NC_("REG_SQLIDENTIFIER", "SQL Identifier") +#define REG_SQLNUMBER NC_("REG_SQLNUMBER", "SQL Number") +#define REG_SQLSTRING NC_("REG_SQLSTRING", "SQL String") +#define REG_SQLOPERATOR NC_("REG_SQLOPERATOR", "SQL Operator") +#define REG_SQLKEYWORD NC_("REG_SQLKEYWORD", "SQL Keyword") +#define REG_SQLPARAMETER NC_("REG_SQLPARAMETER", "SQL Parameter") +#define REG_SQLCOMMENT NC_("REG_SQLCOMMENT", "SQL Comment") +#define REG_WINDOWCOLOR NC_("REG_WINDOWCOLOR", "Window color") +#define REG_WINDOWTEXTCOLOR NC_("REG_WINDOWTEXTCOLOR", "Window text color") +#define REG_BASECOLOR NC_("REG_BASECOLOR", "Base color") +#define REG_BUTTONCOLOR NC_("REG_BUTTONCOLOR", "Button color") +#define REG_BUTTONTEXTCOLOR NC_("REG_BUTTONTEXTCOLOR", "Button text color") +#define REG_ACCENTCOLOR NC_("REG_ACCENTCOLOR", "Accent color") +#define REG_DISABLEDCOLOR NC_("REG_DISABLEDCOLOR", "Disabled color") +#define REG_DISABLEDTEXTCOLOR NC_("REG_DISABLEDTEXTCOLOR", "Disabled text color") +#define REG_SHADOWCOLOR NC_("REG_SHADOWCOLOR", "Shadow color") +#define REG_SEPARATORCOLOR NC_("REG_SEPARATORCOLOR", "Separator color") +#define REG_FACECOLOR NC_("REG_FACECOLOR", "Face color") +#define REG_ACTIVECOLOR NC_("REG_ACTIVECOLOR", "Active color") +#define REG_ACTIVETEXTCOLOR NC_("REG_ACTIVETEXTCOLOR", "Active text color") +#define REG_ACTIVEBORDERCOLOR NC_("REG_ACTIVEBORDERCOLOR", "Active border color") +#define REG_FIELDCOLOR NC_("REG_FIELDCOLOR", "Field color") +#define REG_MENUBARCOLOR NC_("REG_MENUBARCOLOR", "Menu bar color") +#define REG_MENUBARTEXTCOLOR NC_("REG_MENUBARTEXTCOLOR", "Menu bar text color") +#define REG_MENUBARHIGHLIGHTCOLOR NC_("REG_MENUBARHIGHLIGHTCOLOR", "Menu bar highlight color") +#define REG_MENUBARHIGHLIGHTTEXTCOLOR NC_("REG_MENUBARHIGHLIGHTTEXTCOLOR", "Menu bar highlight text color") +#define REG_MENUCOLOR NC_("REG_MENUCOLOR", "Menu color") +#define REG_MENUTEXTCOLOR NC_("REG_MENUTEXTCOLOR", "Menu text color") +#define REG_MENUHIGHLIGHTCOLOR NC_("REG_MENUHIGHLIGHTCOLOR", "Menu highlight color") +#define REG_MENUHIGHLIGHTTEXTCOLOR NC_("REG_MENUHIGHLIGHTTEXTCOLOR", "Menu highlight text color") +#define REG_MENUBORDERCOLOR NC_("REG_MENUBORDERCOLOR", "Menu border color") +#define REG_INACTIVECOLOR NC_("REG_INACTIVECOLOR", "Inactive color") +#define REG_INACTIVETEXTCOLOR NC_("REG_INACTIVETEXTCOLOR", "Inactive text color") +#define REG_INACTIVEBORDERCOLOR NC_("REG_INACTIVEBORDERCOLOR", "Inactive border color") + // A11Y Options #define STR_NO_ALT_OLE NC_("STR_NO_ALT_OLE", "Check if the OLE object has an alternative name or description.") #define STR_NO_ALT_GRAPHIC NC_("STR_NO_ALT_GRAPHIC", "Check if the Graphic Object has an alternative name or description.") diff --git a/cui/inc/treeopt.hrc b/cui/inc/treeopt.hrc index e79a65eabb89..2b17970e9976 100644 --- a/cui/inc/treeopt.hrc +++ b/cui/inc/treeopt.hrc @@ -39,6 +39,7 @@ const std::pair<TranslateId, sal_uInt16> SID_GENERAL_OPTIONS_RES[] = { NC_("SID_GENERAL_OPTIONS_RES", "Paths"), RID_SFXPAGE_PATH }, { NC_("SID_GENERAL_OPTIONS_RES", "Fonts"), RID_SVX_FONT_SUBSTITUTION }, { NC_("SID_GENERAL_OPTIONS_RES", "Security"), RID_SVXPAGE_INET_SECURITY }, + { NC_("SID_GENERAL_OPTIONS_RES", "Appearance"), RID_SVXPAGE_APPEARANCE }, { NC_("SID_GENERAL_OPTIONS_RES", "Accessibility"), RID_SVXPAGE_ACCESSIBILITYCONFIG }, { NC_("SID_GENERAL_OPTIONS_RES", "Advanced"), RID_SVXPAGE_OPTIONS_JAVA }, { NC_("SID_GENERAL_OPTIONS_RES", "Basic IDE"), RID_SVXPAGE_BASICIDE_OPTIONS }, diff --git a/cui/qa/unit/data/cui-dialogs-test_4.txt b/cui/qa/unit/data/cui-dialogs-test_4.txt index 8d751be0c26b..076b09e0b75b 100644 --- a/cui/qa/unit/data/cui-dialogs-test_4.txt +++ b/cui/qa/unit/data/cui-dialogs-test_4.txt @@ -18,6 +18,7 @@ cui/ui/paratabspage.ui cui/ui/password.ui cui/ui/pastespecial.ui cui/ui/percentdialog.ui +cui/ui/appearance.ui cui/ui/pickbulletpage.ui cui/ui/pickgraphicpage.ui cui/ui/picknumberingpage.ui diff --git a/cui/source/options/appearance.cxx b/cui/source/options/appearance.cxx new file mode 100644 index 000000000000..e2cc7e8896a7 --- /dev/null +++ b/cui/source/options/appearance.cxx @@ -0,0 +1,719 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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/. + */ + +#include "appearance.hxx" +#include <com/sun/star/uno/Sequence.hxx> +#include <dialmgr.hxx> +#include <helpids.h> +#include <officecfg/Office/Common.hxx> +#include <sfx2/objsh.hxx> +#include <strings.hrc> +#include <svtools/colorcfg.hxx> +#include <svtools/restartdialog.hxx> +#include <svx/itemwin.hxx> +#include <svx/svxids.hrc> +#include <tools/debug.hxx> +#include <unotools/resmgr.hxx> +#include <vcl/svapp.hxx> +#include <comphelper/dispatchcommand.hxx> +#include <comphelper/propertyvalue.hxx> +#include <map> + +namespace +{ +struct BitmapData +{ + OUString aTranslatedBitmapLabel; + OUString aBitmapFileName; +}; + +std::vector<BitmapData> m_aBitmapList = { + { CuiResId(BMP_FUZZY_LIGHTGREY), "fuzzy-lightgrey.jpg" }, + { CuiResId(BMP_ICE_LIGHT), "ice-light.jpg" }, + { CuiResId(BMP_PAINTED_WHITE), "painted-white.jpg" }, + { CuiResId(BMP_TEXTURE_PAPER), "texture-paper.jpg" }, + { CuiResId(BMP_CRUMPLED_PAPER), "crumpled-paper.jpg" }, + { CuiResId(BMP_MARBLE), "marble.jpg" }, + { CuiResId(BMP_CONCRETE), "concrete.jpg" }, + { CuiResId(BMP_FUZZY_GREY), "fuzzy-grey.jpg" }, + { CuiResId(BMP_FUZZY_DARKGREY), "fuzzy-darkgrey.jpg" }, + { CuiResId(BMP_STONE), "stone.jpg" }, + { CuiResId(BMP_WHITE_DIFFUSION), "white-diffusion.jpg" }, + { CuiResId(BMP_SAND_LIGHT), "sand-light.jpg" }, + { CuiResId(BMP_SAND), "sand.jpg" }, + { CuiResId(BMP_SURFACE), "surface.jpg" }, + { CuiResId(BMP_STUDIO), "studio.jpg" }, + { CuiResId(BMP_INVOICE_PAPER), "invoice-paper.jpg" }, + { CuiResId(BMP_PARCHMENT_PAPER), "parchment-paper.jpg" }, + { CuiResId(BMP_CARDBOARD), "cardboard.jpg" }, + { CuiResId(BMP_FENCE), "fence.jpg" }, + { CuiResId(BMP_WOODEN_FENCE), "wooden-fence.jpg" }, + { CuiResId(BMP_WOOD), "wood.jpg" }, + { CuiResId(BMP_WOODEN_BOARD), "wooden-board.jpg" }, + { CuiResId(BMP_PAINTED_WOOD), "painted-wood.jpg" }, + { CuiResId(BMP_STONES), "stones.jpg" }, + { CuiResId(BMP_PEBBLE_LIGHT), "pebble-light.jpg" }, + { CuiResId(BMP_STONE_WALL), "stone-wall.jpg" }, + { CuiResId(BMP_STONE_GRAY), "stone-gray.jpg" }, + { CuiResId(BMP_ROCK_WALL), "rock-wall.jpg" }, + { CuiResId(BMP_SURFACE_BLACK), "surface-black.jpg" }, + { CuiResId(BMP_BRICK_WALL), "brick-wall.png" }, + { CuiResId(BMP_TILES), "tiles.jpg" }, + { CuiResId(BMP_GRAPH_PAPER), "graph-paper.png" }, + { CuiResId(BMP_CLOUD), "cloud.jpg" }, + { CuiResId(BMP_POOL), "pool.jpg" }, + { CuiResId(BMP_SKY), "sky.jpg" }, + { CuiResId(BMP_CIRCUIT_BOARD), "circuit-board.jpg" }, + { CuiResId(BMP_COFFEE), "coffee.jpg" }, + { CuiResId(BMP_COLOR_STRIPES), "color-stripes.png" }, + { CuiResId(BMP_FLORAL), "floral.png" }, + { CuiResId(BMP_LEAF), "leaf.jpg" }, + { CuiResId(BMP_MAPLE_LEAVES), "maple-leaves.jpg" }, + { CuiResId(BMP_SPACE), "space.png" }, + { CuiResId(BMP_GIRAFFE), "giraffe.png" }, + { CuiResId(BMP_TIGER), "tiger.jpg" }, + { CuiResId(BMP_ZEBRA), "zebra.png" }, +}; + +std::map<ColorConfigEntry, OUString> m_aRegistryEntries + = { { DOCCOLOR, CuiResId(REG_DOCCOLOR) }, + { DOCBOUNDARIES, CuiResId(REG_DOCBOUNDARIES) }, + { APPBACKGROUND, CuiResId(REG_APPBACKGROUND) }, + { TABLEBOUNDARIES, CuiResId(REG_TABLEBOUNDARIES) }, + { FONTCOLOR, CuiResId(REG_FONTCOLOR) }, + { LINKS, CuiResId(REG_LINKS) }, + { LINKSVISITED, CuiResId(REG_LINKSVISITED) }, + { SPELL, CuiResId(REG_SPELL) }, + { GRAMMAR, CuiResId(REG_GRAMMAR) }, + { SMARTTAGS, CuiResId(REG_SMARTTAGS) }, + { SHADOWCOLOR, CuiResId(REG_SHADOW) }, + { WRITERTEXTGRID, CuiResId(REG_WRITERTEXTGRID) }, + { WRITERFIELDSHADINGS, CuiResId(REG_WRITERFIELDSHADINGS) }, + { WRITERIDXSHADINGS, CuiResId(REG_WRITERIDXSHADINGS) }, + { WRITERDIRECTCURSOR, CuiResId(REG_WRITERDIRECTCURSOR) }, + { WRITERSCRIPTINDICATOR, CuiResId(REG_WRITERSCRIPTINDICATOR) }, + { WRITERSECTIONBOUNDARIES, CuiResId(REG_WRITERSECTIONBOUNDARIES) }, + { WRITERHEADERFOOTERMARK, CuiResId(REG_WRITERHEADERFOOTERMARK) }, + { WRITERPAGEBREAKS, CuiResId(REG_WRITERPAGEBREAKS) }, + { WRITERNONPRINTCHARS, CuiResId(REG_WRITERNONPRINTCHARS) }, + { HTMLSGML, CuiResId(REG_HTMLSGML) }, + { HTMLCOMMENT, CuiResId(REG_HTMLCOMMENT) }, + { HTMLKEYWORD, CuiResId(REG_HTMLKEYWORD) }, + { HTMLUNKNOWN, CuiResId(REG_HTMLUNKNOWN) }, + { CALCGRID, CuiResId(REG_CALCGRID) }, + { CALCCELLFOCUS, CuiResId(REG_CALCCELLFOCUS) }, + { CALCPAGEBREAK, CuiResId(REG_CALCPAGEBREAK) }, + { CALCPAGEBREAKMANUAL, CuiResId(REG_CALCPAGEBREAKMANUAL) }, + { CALCPAGEBREAKAUTOMATIC, CuiResId(REG_CALCPAGEBREAKAUTOMATIC) }, + { CALCHIDDENROWCOL, CuiResId(REG_CALCHIDDENCOLROW) }, + { CALCTEXTOVERFLOW, CuiResId(REG_CALCTEXTOVERFLOW) }, + { CALCCOMMENTS, CuiResId(REG_CALCCOMMENTS) }, + { CALCDETECTIVE, CuiResId(REG_CALCDETECTIVE) }, + { CALCDETECTIVEERROR, CuiResId(REG_CALCDETECTIVEERROR) }, + { CALCREFERENCE, CuiResId(REG_CALCREFERENCE) }, + { CALCNOTESBACKGROUND, CuiResId(REG_CALCNOTESBACKGROUND) }, + { CALCVALUE, CuiResId(REG_CALCVALUE) }, + { CALCFORMULA, CuiResId(REG_CALCFORMULA) }, + { CALCTEXT, CuiResId(REG_CALCTEXT) }, + { CALCPROTECTEDBACKGROUND, CuiResId(REG_CALCPROTECTEDBACKGROUND) }, + { DRAWGRID, CuiResId(REG_DRAWGRID) }, + { AUTHOR1, CuiResId(REG_AUTHOR1) }, + { AUTHOR2, CuiResId(REG_AUTHOR2) }, + { AUTHOR3, CuiResId(REG_AUTHOR3) }, + { AUTHOR4, CuiResId(REG_AUTHOR4) }, + { AUTHOR5, CuiResId(REG_AUTHOR5) }, + { AUTHOR6, CuiResId(REG_AUTHOR6) }, + { AUTHOR7, CuiResId(REG_AUTHOR7) }, + { AUTHOR8, CuiResId(REG_AUTHOR8) }, + { AUTHOR9, CuiResId(REG_AUTHOR9) }, + { BASICEDITOR, CuiResId(REG_BASICEDITOR) }, + { BASICIDENTIFIER, CuiResId(REG_BASICIDENTIFIER) }, + { BASICCOMMENT, CuiResId(REG_BASICCOMMENT) }, + { BASICNUMBER, CuiResId(REG_BASICNUMBER) }, + { BASICSTRING, CuiResId(REG_BASICSTRING) }, + { BASICOPERATOR, CuiResId(REG_BASICOPERATOR) }, + { BASICKEYWORD, CuiResId(REG_BASICKEYWORD) }, + { BASICERROR, CuiResId(REG_BASICERROR) }, + { SQLIDENTIFIER, CuiResId(REG_SQLIDENTIFIER) }, + { SQLNUMBER, CuiResId(REG_SQLNUMBER) }, + { SQLSTRING, CuiResId(REG_SQLSTRING) }, + { SQLOPERATOR, CuiResId(REG_SQLOPERATOR) }, + { SQLKEYWORD, CuiResId(REG_SQLKEYWORD) }, + { SQLPARAMETER, CuiResId(REG_SQLPARAMETER) }, + { SQLCOMMENT, CuiResId(REG_SQLCOMMENT) }, + { WINDOWCOLOR, CuiResId(REG_WINDOWCOLOR) }, + { WINDOWTEXTCOLOR, CuiResId(REG_WINDOWTEXTCOLOR) }, + { BASECOLOR, CuiResId(REG_BASECOLOR) }, + { BUTTONCOLOR, CuiResId(REG_BUTTONCOLOR) }, + { BUTTONTEXTCOLOR, CuiResId(REG_BUTTONTEXTCOLOR) }, + { ACCENTCOLOR, CuiResId(REG_ACCENTCOLOR) }, + { DISABLEDCOLOR, CuiResId(REG_DISABLEDCOLOR) }, + { DISABLEDTEXTCOLOR, CuiResId(REG_DISABLEDTEXTCOLOR) }, + { SHADECOLOR, CuiResId(REG_SHADOWCOLOR) }, + { SEPARATORCOLOR, CuiResId(REG_SEPARATORCOLOR) }, + { FACECOLOR, CuiResId(REG_FACECOLOR) }, + { ACTIVECOLOR, CuiResId(REG_ACTIVECOLOR) }, + { ACTIVETEXTCOLOR, CuiResId(REG_ACTIVETEXTCOLOR) }, + { ACTIVEBORDERCOLOR, CuiResId(REG_ACTIVEBORDERCOLOR) }, + { FIELDCOLOR, CuiResId(REG_FIELDCOLOR) }, + { MENUBARCOLOR, CuiResId(REG_MENUBARCOLOR) }, + { MENUBARTEXTCOLOR, CuiResId(REG_MENUBARTEXTCOLOR) }, + { MENUBARHIGHLIGHTCOLOR, CuiResId(REG_MENUBARHIGHLIGHTCOLOR) }, + { MENUBARHIGHLIGHTTEXTCOLOR, CuiResId(REG_MENUBARHIGHLIGHTTEXTCOLOR) }, + { MENUCOLOR, CuiResId(REG_MENUCOLOR) }, + { MENUTEXTCOLOR, CuiResId(REG_MENUTEXTCOLOR) }, + { MENUHIGHLIGHTCOLOR, CuiResId(REG_MENUHIGHLIGHTCOLOR) }, + { MENUHIGHLIGHTTEXTCOLOR, CuiResId(REG_MENUHIGHLIGHTTEXTCOLOR) }, + { MENUBORDERCOLOR, CuiResId(REG_MENUBORDERCOLOR) }, + { INACTIVECOLOR, CuiResId(REG_INACTIVECOLOR) }, + { INACTIVETEXTCOLOR, CuiResId(REG_INACTIVETEXTCOLOR) }, + { INACTIVEBORDERCOLOR, CuiResId(REG_INACTIVEBORDERCOLOR) } }; +} + +SvxAppearanceTabPage::SvxAppearanceTabPage(weld::Container* pPage, + weld::DialogController* pController, + const SfxItemSet& rSet) + : SfxTabPage(pPage, pController, u"cui/ui/appearance.ui"_ustr, u"AppearanceTabPage"_ustr, &rSet) + , m_bRestartRequired(false) + , pColorConfig(new EditableColorConfig) + , m_xSchemeList(m_xBuilder->weld_combo_box(u"scheme"_ustr)) + , m_xMoreThemesBtn(m_xBuilder->weld_button(u"morethemesbtn"_ustr)) + , m_xAddSchemeBtn(m_xBuilder->weld_button(u"newschemebtn"_ustr)) + , m_xRemoveSchemeBtn(m_xBuilder->weld_button(u"removeschemebtn"_ustr)) + , m_xAppearanceSystem(m_xBuilder->weld_radio_button(u"system"_ustr)) + , m_xAppearanceLight(m_xBuilder->weld_radio_button(u"light"_ustr)) + , m_xAppearanceDark(m_xBuilder->weld_radio_button(u"dark"_ustr)) + , m_xColorEntryBtn(m_xBuilder->weld_combo_box(u"registrydropdown"_ustr)) + , m_xColorChangeBtn((new ColorListBox(m_xBuilder->weld_menu_button(u"colorsdropdownbtn"_ustr), + [this] { return GetFrameWeld(); }))) + , m_xColorLbl(m_xBuilder->weld_label(u"colorlbl"_ustr)) + , m_xShowInDocumentChkBtn(m_xBuilder->weld_check_button(u"showindocumentchkbtn"_ustr)) + , m_xColorRadioBtn(m_xBuilder->weld_radio_button(u"colorradiobtn"_ustr)) + , m_xImageRadioBtn(m_xBuilder->weld_radio_button(u"imageradiobtn"_ustr)) + , m_xStretchedRadioBtn(m_xBuilder->weld_radio_button(u"stretchedradiobtn"_ustr)) + , m_xTiledRadioBtn(m_xBuilder->weld_radio_button(u"tiledradiobtn"_ustr)) + , m_xBitmapDropDownBtn(m_xBuilder->weld_combo_box(u"bitmapdropdown"_ustr)) +{ + InitThemes(); + InitAppearance(); + InitCustomization(); + UpdateControlsState(); +} + +void SvxAppearanceTabPage::UpdateControlsState() +{ + // in case of AUTOMATIC_COLOR_SCHEME, disable all the controls + bool bEnableControls = m_xSchemeList->get_active_id() != AUTOMATIC_COLOR_SCHEME; + m_xAppearanceSystem->set_sensitive(bEnableControls); + m_xAppearanceLight->set_sensitive(bEnableControls); + m_xAppearanceDark->set_sensitive(bEnableControls); + m_xColorEntryBtn->set_sensitive(bEnableControls); + m_xColorChangeBtn->set_sensitive(bEnableControls); + m_xShowInDocumentChkBtn->set_sensitive(bEnableControls); + m_xColorRadioBtn->set_sensitive(bEnableControls); + EnableImageControls(bEnableControls && GetActiveEntry() == static_cast<int>(APPBACKGROUND)); +} + +void SvxAppearanceTabPage::LoadSchemeList() +{ + m_xSchemeList->clear(); + css::uno::Sequence<OUString> aSchemeNames = pColorConfig->GetSchemeNames(); + for (size_t i = 0; i < aSchemeNames.size(); ++i) + { + if (aSchemeNames[i] != AUTOMATIC_COLOR_SCHEME) + m_xSchemeList->insert(i, aSchemeNames[i], nullptr, nullptr, nullptr); + } + m_xSchemeList->insert(0, CuiResId(RID_COLOR_SCHEME_LIBREOFFICE_AUTOMATIC), + &AUTOMATIC_COLOR_SCHEME, nullptr, nullptr); + + if (pColorConfig->GetCurrentSchemeName() == AUTOMATIC_COLOR_SCHEME) + m_xSchemeList->set_active_id(AUTOMATIC_COLOR_SCHEME); + else + m_xSchemeList->set_active_text(pColorConfig->GetCurrentSchemeName()); +} + +SvxAppearanceTabPage::~SvxAppearanceTabPage() +{ + if (m_bRestartRequired) + ::svtools::executeRestartDialog(comphelper::getProcessComponentContext(), GetFrameWeld(), + svtools::RESTART_REASON_THEME_CHANGE); +} + +std::unique_ptr<SfxTabPage> SvxAppearanceTabPage::Create(weld::Container* pPage, + weld::DialogController* pController, + const SfxItemSet* rSet) +{ + return std::make_unique<SvxAppearanceTabPage>(pPage, pController, *rSet); +} + +OUString SvxAppearanceTabPage::GetAllStrings() +{ + OUString sAllStrings; + OUString labels[] = { u"libreofficethemeslb"_ustr, u"optionslb"_ustr, u"appearancelb"_ustr, + u"itemslb"_ustr, u"colorlb"_ustr }; + + for (const auto& label : labels) + { + if (const auto pString = m_xBuilder->weld_label(label)) + sAllStrings += pString->get_label() + " "; + } + + return sAllStrings.replaceAll("_", ""); +} + +bool SvxAppearanceTabPage::FillItemSet(SfxItemSet* /* rSet */) +{ + // commit appearance value + if (eCurrentAppearanceMode != static_cast<Appearance>(MiscSettings::GetAppColorMode())) + { + MiscSettings::SetAppColorMode(static_cast<int>(eCurrentAppearanceMode)); + m_bRestartRequired = true; + } + + // commit ColorConfig + if (pColorConfig->IsModified()) + pColorConfig->Commit(); + + // commit LibreOfficeTheme, enable it if the current scheme is not Automatic + if (m_xSchemeList->get_value_changed_from_saved()) + { + bool bIsLibreOfficeThemeEnabled = m_xSchemeList->get_active_id() != AUTOMATIC_COLOR_SCHEME; + auto pChange(comphelper::ConfigurationChanges::create()); + officecfg::Office::Common::Appearance::LibreOfficeTheme::set(bIsLibreOfficeThemeEnabled, + pChange); + pChange->commit(); + } + + return true; +} + +void SvxAppearanceTabPage::Reset(const SfxItemSet* /* rSet */) +{ + // reset scheme list + LoadSchemeList(); + + m_xSchemeList->set_sensitive( + !officecfg::Office::Common::Appearance::ApplicationAppearance::isReadOnly()); + m_xSchemeList->save_value(); + + UpdateRemoveBtnState(); + + // reset appearance + eCurrentAppearanceMode = static_cast<Appearance>(MiscSettings::GetAppColorMode()); + + // reset ColorConfig + if (pColorConfig) + { + pColorConfig->ClearModified(); + pColorConfig->DisableBroadcast(); + } + pColorConfig.reset(new EditableColorConfig); +} + +IMPL_LINK_NOARG(SvxAppearanceTabPage, ShowInDocumentHdl, weld::Toggleable&, void) +{ + // get selected entry index and ColorConfigValue + size_t nEntry = GetActiveEntry(); + ColorConfigValue aCurrentEntryColor + = pColorConfig->GetColorValue(static_cast<ColorConfigEntry>(nEntry)); + + // set colorconfig value + aCurrentEntryColor.bIsVisible = m_xShowInDocumentChkBtn->get_active(); + pColorConfig->SetColorValue(static_cast<ColorConfigEntry>(nEntry), aCurrentEntryColor); +} + +IMPL_LINK_NOARG(SvxAppearanceTabPage, AppearanceChangeHdl, weld::Toggleable&, void) +{ + if (m_xAppearanceSystem->get_state() == TRISTATE_TRUE) + eCurrentAppearanceMode = Appearance::SYSTEM; + if (m_xAppearanceLight->get_state() == TRISTATE_TRUE) + eCurrentAppearanceMode = Appearance::LIGHT; + if (m_xAppearanceDark->get_state() == TRISTATE_TRUE) + eCurrentAppearanceMode = Appearance::DARK; + // set the extension theme on light/dark + + UpdateColorDropdown(); +} + +IMPL_LINK_NOARG(SvxAppearanceTabPage, ColorEntryChgHdl, weld::ComboBox&, void) +{ + // get selected entry index and ColorConfigValue + size_t nEntry = GetActiveEntry(); + const ColorConfigValue& rCurrentEntryColor + = pColorConfig->GetColorValue(static_cast<ColorConfigEntry>(nEntry)); + + // set automatic colors + m_xColorChangeBtn->SetAutoDisplayColor( + ColorConfig::GetDefaultColor(static_cast<ColorConfigEntry>(nEntry))); + // set values for the entry + if (IsDarkModeEnabled()) + m_xColorChangeBtn->SelectEntry(rCurrentEntryColor.nDarkColor); + else + m_xColorChangeBtn->SelectEntry(rCurrentEntryColor.nLightColor); + + m_xShowInDocumentChkBtn->set_active(rCurrentEntryColor.bIsVisible); + + // load image related settings if supported + if (cNames[nEntry].bCanHaveBitmap) + { + EnableImageControls(true); + m_xImageRadioBtn->set_active(rCurrentEntryColor.bUseBitmapBackground); + m_xStretchedRadioBtn->set_active(rCurrentEntryColor.bIsBitmapStretched); + + // bitmap file name to translated label + size_t i; + for (i = 0; i < m_aBitmapList.size(); ++i) + { + if (rCurrentEntryColor.sBitmapFileName == m_aBitmapList[i].aBitmapFileName) + break; + } + + // if bitmap not in the list then reset to 0 + if (i == m_aBitmapList.size()) + i = 0; + + m_xBitmapDropDownBtn->set_active(i); + } + else + { + m_xColorRadioBtn->set_active(true); + EnableImageControls(false); + } + + // show/hide show in document button + if (!cNames[nEntry].bCanBeVisible) + m_xShowInDocumentChkBtn->hide(); + else + m_xShowInDocumentChkBtn->show(); +} + +IMPL_LINK_NOARG(SvxAppearanceTabPage, ColorValueChgHdl, ColorListBox&, void) +{ + // get the active entry + size_t nEntry = GetActiveEntry(); + ColorConfigValue aCurrentEntryColor + = pColorConfig->GetColorValue(static_cast<ColorConfigEntry>(nEntry)); + + // restart only for the UI colors + if (nEntry >= WINDOWCOLOR) + m_bRestartRequired = true; + + // set the color in pColorConfig + if (IsDarkModeEnabled()) + aCurrentEntryColor.nDarkColor = m_xColorChangeBtn->GetSelectEntryColor(); + else + aCurrentEntryColor.nLightColor = m_xColorChangeBtn->GetSelectEntryColor(); + + // use nColor for caching the value of color in use. This avoids tidious refactoring which IMO + // would use function calls to discriminate between colors. those functions themself call some virtual functions + // making the whole thing super slow (comparatively). + aCurrentEntryColor.nColor = m_xColorChangeBtn->GetSelectEntryColor(); + + pColorConfig->SetColorValue(static_cast<ColorConfigEntry>(nEntry), aCurrentEntryColor); +} + +IMPL_LINK_NOARG(SvxAppearanceTabPage, SchemeChangeHdl, weld::ComboBox&, void) +{ + if (m_xSchemeList->get_active_id() == AUTOMATIC_COLOR_SCHEME) + pColorConfig->LoadScheme(AUTOMATIC_COLOR_SCHEME); + else + pColorConfig->LoadScheme(m_xSchemeList->get_active_text()); + + if (m_xSchemeList->get_value_changed_from_saved()) + m_bRestartRequired = true; + + UpdateControlsState(); + UpdateRemoveBtnState(); +} + +IMPL_LINK_NOARG(SvxAppearanceTabPage, SchemeListToggleHdl, weld::ComboBox&, void) +{ + LoadSchemeList(); +} + +IMPL_LINK(SvxAppearanceTabPage, CheckNameHdl_Impl, AbstractSvxNameDialog&, rDialog, bool) +{ + OUString sName = rDialog.GetName(); + return !sName.isEmpty() && m_xSchemeList->find_text(sName) == -1; +} + +IMPL_STATIC_LINK_NOARG(SvxAppearanceTabPage, MoreThemesHdl, weld::Button&, void) +{ + css::uno::Sequence<css::beans::PropertyValue> aArgs{ comphelper::makePropertyValue( + u"AdditionsTag"_ustr, u"Themes"_ustr) }; + comphelper::dispatchCommand(u".uno:AdditionsDialog"_ustr, aArgs); +} + +IMPL_LINK(SvxAppearanceTabPage, AddRemoveSchemeHdl, weld::Button&, rButton, void) +{ + if (m_xAddSchemeBtn.get() == &rButton) + { + OUString sName; + SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); + ScopedVclPtr<AbstractSvxNameDialog> aNameDlg(pFact->CreateSvxNameDialog( + GetFrameWeld(), sName, CuiResId(RID_CUISTR_COLOR_CONFIG_SAVE2))); + aNameDlg->SetCheckNameHdl(LINK(this, SvxAppearanceTabPage, CheckNameHdl_Impl)); + aNameDlg->SetText(CuiResId(RID_CUISTR_COLOR_CONFIG_SAVE1)); + aNameDlg->SetHelpId(HID_OPTIONS_COLORCONFIG_SAVE_SCHEME); + aNameDlg->SetCheckNameHdl(LINK(this, SvxAppearanceTabPage, CheckNameHdl_Impl)); + if (RET_OK == aNameDlg->Execute()) + { + sName = aNameDlg->GetName(); + pColorConfig->AddScheme(sName); + m_xSchemeList->append_text(sName); + m_xSchemeList->set_active_text(sName); + SchemeChangeHdl(*m_xSchemeList); + } + } + else + { + DBG_ASSERT(m_xSchemeList->get_count() > 1, "don't delete the last scheme"); + std::unique_ptr<weld::MessageDialog> xQuery(Application::CreateMessageDialog( + GetFrameWeld(), VclMessageType::Question, VclButtonsType::YesNo, + CuiResId(RID_CUISTR_COLOR_CONFIG_DELETE))); + xQuery->set_title(CuiResId(RID_CUISTR_COLOR_CONFIG_DELETE_TITLE)); + + if (RET_YES == xQuery->run()) + { + OUString sDeleteScheme(m_xSchemeList->get_active_text()); + m_xSchemeList->remove(m_xSchemeList->get_active()); + m_xSchemeList->set_active(0); + SchemeChangeHdl(*m_xSchemeList); + //first select the new scheme and then delete the old one + pColorConfig->DeleteScheme(sDeleteScheme); + } + } + + // disable remove button if only one scheme available + // or if the selected theme is AUTOMATIC_COLOR_SCHEME + UpdateRemoveBtnState(); +} + +IMPL_LINK_NOARG(SvxAppearanceTabPage, ColorImageToggleHdl, weld::Toggleable&, void) +{ + // get the active entry + size_t nEntry = GetActiveEntry(); + ColorConfigValue aCurrentEntryColor + = pColorConfig->GetColorValue(static_cast<ColorConfigEntry>(nEntry)); + + aCurrentEntryColor.bUseBitmapBackground = !m_xColorRadioBtn->get_active(); + pColorConfig->SetColorValue(static_cast<ColorConfigEntry>(nEntry), aCurrentEntryColor); + m_bRestartRequired = true; +} + +IMPL_LINK_NOARG(SvxAppearanceTabPage, StretchedTiledToggleHdl, weld::Toggleable&, void) +{ + // get the active entry + size_t nEntry = GetActiveEntry(); + ColorConfigValue aCurrentEntryColor + = pColorConfig->GetColorValue(static_cast<ColorConfigEntry>(nEntry)); + + aCurrentEntryColor.bIsBitmapStretched = m_xStretchedRadioBtn->get_active(); + + pColorConfig->SetColorValue(static_cast<ColorConfigEntry>(nEntry), aCurrentEntryColor); + m_bRestartRequired = true; +} + +IMPL_LINK_NOARG(SvxAppearanceTabPage, BitmapChangeHdl, weld::ComboBox&, void) +{ + // get the active entry + size_t nEntry = GetActiveEntry(); + ColorConfigValue aCurrentEntryColor + = pColorConfig->GetColorValue(static_cast<ColorConfigEntry>(nEntry)); + + // save the bitmap file name + aCurrentEntryColor.sBitmapFileName + = m_aBitmapList[m_xBitmapDropDownBtn->get_active()].aBitmapFileName; + + pColorConfig->SetColorValue(static_cast<ColorConfigEntry>(nEntry), aCurrentEntryColor); + m_bRestartRequired = true; +} + +void SvxAppearanceTabPage::InitThemes() +{ + // init schemes combobox + LoadSchemeList(); + + m_xSchemeList->connect_changed(LINK(this, SvxAppearanceTabPage, SchemeChangeHdl)); + m_xSchemeList->connect_popup_toggled(LINK(this, SvxAppearanceTabPage, SchemeListToggleHdl)); + m_xAddSchemeBtn->connect_clicked(LINK(this, SvxAppearanceTabPage, AddRemoveSchemeHdl)); + m_xMoreThemesBtn->connect_clicked(LINK(this, SvxAppearanceTabPage, MoreThemesHdl)); + m_xRemoveSchemeBtn->connect_clicked(LINK(this, SvxAppearanceTabPage, AddRemoveSchemeHdl)); + + UpdateRemoveBtnState(); +} + +void SvxAppearanceTabPage::InitAppearance() +{ + m_xAppearanceSystem->connect_toggled(LINK(this, SvxAppearanceTabPage, AppearanceChangeHdl)); + m_xAppearanceDark->connect_toggled(LINK(this, SvxAppearanceTabPage, AppearanceChangeHdl)); + + Appearance nAppearance = static_cast<Appearance>(MiscSettings::GetAppColorMode()); + switch (nAppearance) + { + case Appearance::SYSTEM: + m_xAppearanceSystem->set_state(TRISTATE_TRUE); + eCurrentAppearanceMode = Appearance::SYSTEM; + break; + case Appearance::LIGHT: + m_xAppearanceLight->set_state(TRISTATE_TRUE); + eCurrentAppearanceMode = Appearance::LIGHT; + break; + case Appearance::DARK: + m_xAppearanceDark->set_state(TRISTATE_TRUE); + eCurrentAppearanceMode = Appearance::DARK; + break; + } +} + +void SvxAppearanceTabPage::InitCustomization() +{ + m_xColorEntryBtn->connect_changed(LINK(this, SvxAppearanceTabPage, ColorEntryChgHdl)); + m_xColorChangeBtn->SetSelectHdl(LINK(this, SvxAppearanceTabPage, ColorValueChgHdl)); + m_xShowInDocumentChkBtn->connect_toggled(LINK(this, SvxAppearanceTabPage, ShowInDocumentHdl)); + m_xBitmapDropDownBtn->connect_changed(LINK(this, SvxAppearanceTabPage, BitmapChangeHdl)); + + m_xColorRadioBtn->connect_toggled(LINK(this, SvxAppearanceTabPage, ColorImageToggleHdl)); + m_xStretchedRadioBtn->connect_toggled( + LINK(this, SvxAppearanceTabPage, StretchedTiledToggleHdl)); + + FillItemsList(); + + m_xColorChangeBtn->SetSlotId(SID_ATTR_CHAR_COLOR); + m_xColorEntryBtn->set_active(DOCCOLOR); + UpdateColorDropdown(); + + m_xShowInDocumentChkBtn->set_active(pColorConfig->GetColorValue(DOCCOLOR).bIsVisible); + m_xShowInDocumentChkBtn->hide(); + + // load bitmap names + for (size_t i = 0; i < m_aBitmapList.size(); ++i) + m_xBitmapDropDownBtn->append_text(m_aBitmapList[i].aTranslatedBitmapLabel); + m_xBitmapDropDownBtn->set_active(0); + + // DOCCOLOR uses color, so image controls are disabled + m_xColorRadioBtn->set_active(true); + EnableImageControls(false); +} + +// disable remove if only one scheme available or if the selected theme is AUTOMATIC_COLOR_SCHEME +void SvxAppearanceTabPage::UpdateRemoveBtnState() +{ + bool bEnableRemoveButton = (m_xSchemeList->get_count() > 1) + && (m_xSchemeList->get_active_id() != AUTOMATIC_COLOR_SCHEME); + m_xRemoveSchemeBtn->set_sensitive(bEnableRemoveButton); +} + +void SvxAppearanceTabPage::EnableImageControls(bool bEnabled) +{ + m_xImageRadioBtn->set_sensitive(bEnabled); + m_xStretchedRadioBtn->set_sensitive(bEnabled); + m_xTiledRadioBtn->set_sensitive(bEnabled); + m_xBitmapDropDownBtn->set_sensitive(bEnabled); +} + +void SvxAppearanceTabPage::UpdateColorDropdown() +{ + switch (eCurrentAppearanceMode) + { + case Appearance::LIGHT: + m_xColorLbl->set_label(CuiResId(LIGHT_COLOR_LBL)); + break; + case Appearance::DARK: + m_xColorLbl->set_label(CuiResId(DARK_COLOR_LBL)); + break; + case Appearance::SYSTEM: + { + if (IsDarkModeEnabled()) + m_xColorLbl->set_label(CuiResId(DARK_COLOR_LBL)); + else + m_xColorLbl->set_label(CuiResId(LIGHT_COLOR_LBL)); + } + break; + } + + // update color to light/dark + size_t nEntry = GetActiveEntry(); + const ColorConfigValue& rCurrentEntryColor + = pColorConfig->GetColorValue(static_cast<ColorConfigEntry>(nEntry)); + + // set automatic colors + m_xColorChangeBtn->SetAutoDisplayColor( + ColorConfig::GetDefaultColor(static_cast<ColorConfigEntry>(nEntry))); + // set values for the entry + if (IsDarkModeEnabled()) + m_xColorChangeBtn->SelectEntry(rCurrentEntryColor.nDarkColor); + else + m_xColorChangeBtn->SelectEntry(rCurrentEntryColor.nLightColor); +} + +bool SvxAppearanceTabPage::IsDarkModeEnabled() +{ + return eCurrentAppearanceMode == Appearance::DARK + || (eCurrentAppearanceMode == Appearance::SYSTEM && MiscSettings::GetUseDarkMode()); +} + +void SvxAppearanceTabPage::FillItemsList() +{ + for (size_t i = DOCCOLOR; i <= SHADOWCOLOR; ++i) + m_xColorEntryBtn->append(OUString(cNames[i].cName), + m_aRegistryEntries[static_cast<ColorConfigEntry>(i)]); + m_xColorEntryBtn->append_separator("SeparatorID"); + + for (size_t i = WRITERTEXTGRID; i <= WRITERNONPRINTCHARS; ++i) + m_xColorEntryBtn->append(OUString(cNames[i].cName), + m_aRegistryEntries[static_cast<ColorConfigEntry>(i)]); + m_xColorEntryBtn->append_separator("SeparatorID"); + + for (size_t i = HTMLSGML; i <= HTMLUNKNOWN; ++i) + m_xColorEntryBtn->append(OUString(cNames[i].cName), + m_aRegistryEntries[static_cast<ColorConfigEntry>(i)]); + m_xColorEntryBtn->append_separator("SeparatorID"); + + for (size_t i = CALCGRID; i <= CALCPROTECTEDBACKGROUND; ++i) + m_xColorEntryBtn->append(OUString(cNames[i].cName), + m_aRegistryEntries[static_cast<ColorConfigEntry>(i)]); + m_xColorEntryBtn->append_separator("SeparatorID"); + + m_xColorEntryBtn->append(OUString(cNames[DRAWGRID].cName), m_aRegistryEntries[DRAWGRID]); + m_xColorEntryBtn->append_separator("SeparatorID"); + + for (size_t i = AUTHOR1; i <= AUTHOR9; ++i) + m_xColorEntryBtn->append(OUString(cNames[i].cName), + m_aRegistryEntries[static_cast<ColorConfigEntry>(i)]); + m_xColorEntryBtn->append_separator("SeparatorID"); + + for (size_t i = BASICEDITOR; i <= BASICERROR; ++i) + m_xColorEntryBtn->append(OUString(cNames[i].cName), + m_aRegistryEntries[static_cast<ColorConfigEntry>(i)]); + m_xColorEntryBtn->append_separator("SeparatorID"); + + for (size_t i = SQLIDENTIFIER; i <= SQLCOMMENT; ++i) + m_xColorEntryBtn->append(OUString(cNames[i].cName), + m_aRegistryEntries[static_cast<ColorConfigEntry>(i)]); + m_xColorEntryBtn->append_separator("SeparatorID"); + + for (size_t i = WINDOWCOLOR; i <= INACTIVEBORDERCOLOR; ++i) + m_xColorEntryBtn->append(OUString(cNames[i].cName), + m_aRegistryEntries[static_cast<ColorConfigEntry>(i)]); +} + +size_t SvxAppearanceTabPage::GetActiveEntry() +{ + OUString sEntryId = m_xColorEntryBtn->get_active_id(); + int nEntry = 0; + for (; nEntry < ColorConfigEntryCount; ++nEntry) + { + if (sEntryId == cNames[nEntry].cName) + break; + } + return nEntry; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/appearance.hxx b/cui/source/options/appearance.hxx new file mode 100644 index 000000000000..05d9a99b52c5 --- /dev/null +++ b/cui/source/options/appearance.hxx @@ -0,0 +1,106 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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/. + */ + +#pragma once + +#include <vcl/weld.hxx> +#include <sfx2/tabdlg.hxx> +#include <svx/colorbox.hxx> +#include <svx/xflasit.hxx> +#include <svx/svxdlg.hxx> +#include <svtools/colorcfg.hxx> + +/* + * SYSTEM ==> the application will use either light or dark colors from a theme based on + * whether the system is in light mode or in dark mode + * + * LIGHT/DARK ==> light/dark theme colors + * + * Note that Appearance settings have nothing to do with the themes, these just specify which one + * of the theme colors (light/dark) should be used and whether the operating system should decide + * that + * + * LibreOffice Themes will be enabled if some theme other than Automatic is selected. + */ + +using namespace svtools; +class SvxAppearanceTabPage : public SfxTabPage +{ +private: + enum class Appearance + { + SYSTEM, + LIGHT, + DARK, + }; + + bool m_bRestartRequired; + Appearance eCurrentAppearanceMode; + std::unique_ptr<EditableColorConfig> pColorConfig; + + std::unique_ptr<weld::ComboBox> m_xSchemeList; + std::unique_ptr<weld::Button> m_xMoreThemesBtn; + std::unique_ptr<weld::Button> m_xAddSchemeBtn; + std::unique_ptr<weld::Button> m_xRemoveSchemeBtn; + std::unique_ptr<weld::RadioButton> m_xAppearanceSystem; + std::unique_ptr<weld::RadioButton> m_xAppearanceLight; + std::unique_ptr<weld::RadioButton> m_xAppearanceDark; + std::unique_ptr<weld::ComboBox> m_xColorEntryBtn; + std::unique_ptr<ColorListBox> m_xColorChangeBtn; + std::unique_ptr<weld::Label> m_xColorLbl; + std::unique_ptr<weld::CheckButton> m_xShowInDocumentChkBtn; + + std::unique_ptr<weld::RadioButton> m_xColorRadioBtn; + std::unique_ptr<weld::RadioButton> m_xImageRadioBtn; + std::unique_ptr<weld::RadioButton> m_xStretchedRadioBtn; + std::unique_ptr<weld::RadioButton> m_xTiledRadioBtn; + + std::unique_ptr<weld::ComboBox> m_xBitmapDropDownBtn; + + DECL_LINK(AppearanceChangeHdl, weld::Toggleable&, void); + DECL_LINK(ColorEntryChgHdl, weld::ComboBox&, void); + DECL_LINK(ColorValueChgHdl, ColorListBox&, void); + DECL_LINK(ShowInDocumentHdl, weld::Toggleable&, void); + DECL_LINK(SchemeChangeHdl, weld::ComboBox&, void); + DECL_LINK(SchemeListToggleHdl, weld::ComboBox&, void); + DECL_STATIC_LINK(SvxAppearanceTabPage, MoreThemesHdl, weld::Button&, void); + DECL_LINK(AddRemoveSchemeHdl, weld::Button&, void); + DECL_LINK(CheckNameHdl_Impl, AbstractSvxNameDialog&, bool); + DECL_LINK(ColorImageToggleHdl, weld::Toggleable&, void); + DECL_LINK(StretchedTiledToggleHdl, weld::Toggleable&, void); + DECL_LINK(BitmapChangeHdl, weld::ComboBox&, void); + + void InitThemes(); + void InitAppearance(); + void InitCustomization(); + void UpdateControlsState(); + void LoadSchemeList(); + + void UpdateRemoveBtnState(); + void EnableImageControls(bool bEnabled); + void UpdateColorDropdown(); + bool IsDarkModeEnabled(); + void FillItemsList(); + size_t GetActiveEntry(); + +public: + SvxAppearanceTabPage(weld::Container* pPage, weld::DialogController* pController, + const SfxItemSet& rSet); + + virtual ~SvxAppearanceTabPage() override; + + static std::unique_ptr<SfxTabPage> + Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet); + + virtual OUString GetAllStrings() override; + virtual bool FillItemSet(SfxItemSet* rSet) override; + virtual void Reset(const SfxItemSet* rSet) override; +}; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 70342ce490b3..90f08e9fbe04 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -34,6 +34,7 @@ #include <treeopt.hrc> #include <helpids.h> +#include "appearance.hxx" #include "cfgchart.hxx" #include "connpoolconfig.hxx" #include "connpooloptions.hxx" @@ -259,6 +260,9 @@ static std::unique_ptr<SfxTabPage> CreateGeneralTabPage(sal_uInt16 nId, weld::Co case RID_SVXPAGE_INET_PROXY: fnCreate = &SvxProxyTabPage::Create; break; case RID_SVXPAGE_INET_SECURITY: fnCreate = &SvxSecurityTabPage::Create; break; case RID_SVXPAGE_INET_MAIL: fnCreate = &SvxEMailTabPage::Create; break; +#if HAVE_FEATURE_DESKTOP + case RID_SVXPAGE_APPEARANCE: fnCreate = &SvxAppearanceTabPage::Create; break; +#endif case RID_OFAPAGE_HTMLOPT: fnCreate = &OfaHtmlTabPage::Create; break; case SID_OPTFILTER_MSOFFICE: fnCreate = &OfaMSFilterTabPage::Create; break; case RID_OFAPAGE_MSFILTEROPT2: fnCreate = &OfaMSFilterTabPage2::Create; break; @@ -305,6 +309,7 @@ constexpr OptionsMapping_Impl OptionsMap_Impl[] { u"ProductName"_ustr, u"Paths"_ustr, RID_SFXPAGE_PATH }, { u"ProductName"_ustr, u"Fonts"_ustr, RID_SVX_FONT_SUBSTITUTION }, { u"ProductName"_ustr, u"Security"_ustr, RID_SVXPAGE_INET_SECURITY }, + { u"ProductName"_ustr, u"Appearance"_ustr, RID_SVXPAGE_APPEARANCE }, { u"ProductName"_ustr, u"Accessibility"_ustr, RID_SVXPAGE_ACCESSIBILITYCONFIG }, { u"ProductName"_ustr, u"Java"_ustr, RID_SVXPAGE_OPTIONS_JAVA }, { u"ProductName"_ustr, u"BasicIDEOptions"_ustr, RID_SVXPAGE_BASICIDE_OPTIONS }, diff --git a/cui/source/options/treeopthelper.cxx b/cui/source/options/treeopthelper.cxx index 294364cafe37..4dde62e5690a 100644 --- a/cui/source/options/treeopthelper.cxx +++ b/cui/source/options/treeopthelper.cxx @@ -53,6 +53,7 @@ static PageIdToFileNameMap_Impl FileMap_Impl[] = { { RID_SVXPAGE_INET_SECURITY, u""_ustr }, // Security + { RID_SVXPAGE_APPEARANCE, u""_ustr }, // Appearance { RID_SVXPAGE_ACCESSIBILITYCONFIG, u""_ustr }, // Accessibility { RID_SVXPAGE_OPTIONS_JAVA, u""_ustr }, // Java { RID_SVXPAGE_BASICIDE_OPTIONS, u""_ustr }, // BasicIDEOptions diff --git a/cui/uiconfig/ui/appearance.ui b/cui/uiconfig/ui/appearance.ui new file mode 100644 index 000000000000..fb47f7663724 --- /dev/null +++ b/cui/uiconfig/ui/appearance.ui @@ -0,0 +1,484 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.40.0 --> +<interface domain="cui"> + <requires lib="gtk+" version="3.20"/> + <object class="GtkImage" id="morethemes_image"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">cmd/sc_additionsdialog.png</property> + </object> + <object class="GtkBox" id="AppearanceTabPage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="border-width">6</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <child> + <object class="GtkFrame" id="libreofficethemes"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-end">12</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">3</property> + <child> + <object class="GtkComboBoxText" id="scheme"> + <property name="visible">True</property> + <property name="can-focus">False</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="morethemesbtn"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes" context="optappearancepage|morethemes">Add more themes.</property> + <property name="image">morethemes_image</property> + <property name="always-show-image">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButtonBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-top">12</property> + <property name="layout-style">spread</property> + <child> + <object class="GtkButton" id="newschemebtn"> + <property name="label" translatable="yes" context="appearancetabpage|newschemebtn">New</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="margin-end">3</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="removeschemebtn"> + <property name="label" translatable="yes" context="appearancetabpage|removeschemebtn">Remove</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="margin-start">3</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="libreofficethemeslb"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-bottom">6</property> + <property name="label" translatable="yes" context="appearancetabpage|libreofficethemeslb">LibreOffice Themes</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkFrame" id="options"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-start">12</property> + <property name="margin-bottom">6</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> + <child> + <!-- n-columns=2 n-rows=1 --> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <child> + <object class="GtkLabel" id="appearancelb"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="valign">start</property> + <property name="margin-end">6</property> + <property name="label" translatable="yes" context="appearancetabpage|appearancelb">Appearance:</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">system</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkRadioButton" id="system"> + <property name="label" translatable="yes" context="appearancetabpage|system">System</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="active">True</property> + <property name="draw-indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="light"> + <property name="label" translatable="yes" context="appearancetabpage|light">Light</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="draw-indicator">True</property> + <property name="group">system</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="dark"> + <property name="label" translatable="yes" context="appearancetabpage|dark">Dark</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="draw-indicator">True</property> + <property name="group">system</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">0</property> + </packing> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="optionslb"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="appearancetabpage|optionslb">Options</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="items"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-start">13</property> + <property name="margin-top">6</property> + <property name="orientation">vertical</property> + <property name="spacing">3</property> + <child> + <!-- n-columns=2 n-rows=7 --> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="row-spacing">3</property> + <property name="column-spacing">6</property> + <child> + <object class="GtkLabel" id="itemslb"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="appearancetabpage|items">Items: </property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">registrydropdown</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="registrydropdown"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="hexpand">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="registrydropdown-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="appearancetabpage|registrycolorslist">registrycolorslist</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="colorradiobtn"> + <property name="label" translatable="yes" context="appearancetabpage|colorradiobtn">Color:</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="halign">start</property> + <property name="active">True</property> + <property name="draw-indicator">True</property> + <property name="group">imageradiobtn</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="colorlbl"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="margin-start">18</property> + <property name="label" translatable="no" context="appearancetabpage|colorlbl">colorlbl</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">colorsdropdownbtn</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">2</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="colorsdropdownbtn"> + <property name="label" translatable="no" context="appearancetabpage|colorsdropdownbtn"></property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="focus-on-click">False</property> + <property name="receives-default">True</property> + <property name="halign">start</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="showindocumentchkbtn"> + <property name="label" translatable="yes" context="appearancetabpage|showindocumentchkbtn">Show in Document</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="draw-indicator">True</property> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">3</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="imageradiobtn"> + <property name="label" translatable="yes" context="appearancetabpage|imageradiobtn">Image:</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="active">True</property> + <property name="draw-indicator">True</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">4</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="bitmapdropdown"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <child internal-child="accessible"> + <object class="AtkObject" id="bitmapdropdown-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="appearancetabpage|bitmapdropdown">bitmapdropdown</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">5</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <child> + <object class="GtkRadioButton" id="stretchedradiobtn"> + <property name="label" translatable="yes" context="appearancetabpage|stretchedradiobtn">Stretched</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="draw-indicator">True</property> + <property name="group">tiledradiobtn</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="tiledradiobtn"> + <property name="label" translatable="yes" context="appearancetabpage|tiledradiobtn">Tiled</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="active">True</property> + <property name="draw-indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">6</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="customizationslb"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="appearancetabpage|customizationslb">Customizations</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> +</interface> diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index 11db3d75398b..7bca2926e948 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -2270,7 +2270,9 @@ void DesktopLOKTest::testPaintPartTileDifferentSchemes() svtools::EditableColorConfig aColorConfig; svtools::ColorConfigValue aValue; aValue.bIsVisible = true; - aValue.nColor = aDarkColor; + // aValue.nColor is just used for cache. please see Change: I1a7f70dfe44b81f863814f87e8d46e146c0e3d5a + aValue.nLightColor = aDarkColor; + aValue.nDarkColor = aDarkColor; aColorConfig.SetColorValue(svtools::DOCCOLOR, aValue); aColorConfig.AddScheme(u"Dark"_ustr); } @@ -2280,7 +2282,8 @@ void DesktopLOKTest::testPaintPartTileDifferentSchemes() svtools::EditableColorConfig aColorConfig; svtools::ColorConfigValue aValue; aValue.bIsVisible = true; - aValue.nColor = COL_WHITE; + aValue.nLightColor = COL_WHITE; + aValue.nDarkColor = COL_WHITE; aColorConfig.SetColorValue(svtools::DOCCOLOR, aValue); aColorConfig.AddScheme(u"Light"_ustr); } diff --git a/include/sfx2/pageids.hxx b/include/sfx2/pageids.hxx index bd85bbf6bb2e..c9b9feb9476e 100644 --- a/include/sfx2/pageids.hxx +++ b/include/sfx2/pageids.hxx @@ -53,6 +53,7 @@ #define RID_SVXPAGE_ACCESSIBILITYCONFIG (RID_SVX_START + 250) #define RID_SVXPAGE_ASIAN_LAYOUT (RID_SVX_START + 246) #define RID_OPTPAGE_CHART_DEFCOLORS (RID_SVX_START + 299) +#define RID_SVXPAGE_APPEARANCE (RID_SVX_START + 247) #define RID_SVXPAGE_BASICIDE_OPTIONS (RID_SVX_START + 209) #define RID_SVXPAGE_LANGTOOL_OPTIONS (RID_SVX_START + 210) #define RID_SVXPAGE_DEEPL_OPTIONS (RID_SVX_START + 211) diff --git a/include/svtools/colorcfg.hxx b/include/svtools/colorcfg.hxx index 5e4e774826d7..c757eeb20abd 100644 --- a/include/svtools/colorcfg.hxx +++ b/include/svtools/colorcfg.hxx @@ -130,16 +130,153 @@ enum ColorConfigEntry : int constexpr OUString AUTOMATIC_COLOR_SCHEME = u"COLOR_SCHEME_LIBREOFFICE_AUTOMATIC"_ustr; constexpr size_t THEME_APPLICATION_COLORS_COUNT = ColorConfigEntryCount - WINDOWCOLOR; +namespace { + struct ColorConfigEntryData_Impl + { + std::u16string_view cName; + bool bCanBeVisible; + bool bCanHaveBitmap; + }; + const ColorConfigEntryData_Impl cNames[] = + { + { std::u16string_view(u"DocColor"), false, false }, + { std::u16string_view(u"DocBoundaries"), false, false }, + { std::u16string_view(u"AppBackground"), false, true }, + { std::u16string_view(u"TableBoundaries"), false, false }, + { std::u16string_view(u"FontColor"), false, false }, + { std::u16string_view(u"Links"), true, false }, + { std::u16string_view(u"LinksVisited"), true, false }, + { std::u16string_view(u"Spell"), false, false }, + { std::u16string_view(u"Grammar"), false, false }, + { std::u16string_view(u"SmartTags"), false, false }, + { std::u16string_view(u"Shadow"), true, false }, + { std::u16string_view(u"WriterTextGrid"), false, false }, + { std::u16string_view(u"WriterFieldShadings"), true, false }, + { std::u16string_view(u"WriterIdxShadings"), true, false }, + { std::u16string_view(u"WriterDirectCursor"), true, false }, + { std::u16string_view(u"WriterScriptIndicator"), false, false }, + { std::u16string_view(u"WriterSectionBoundaries"), false, false }, + { std::u16string_view(u"WriterHeaderFooterMark"), false, false }, + { std::u16string_view(u"WriterPageBreaks"), false, false }, + { std::u16string_view(u"WriterNonPrintChars"), false, false }, + { std::u16string_view(u"HTMLSGML"), false, false }, + { std::u16string_view(u"HTMLComment"), false, false }, + { std::u16string_view(u"HTMLKeyword"), false, false }, + { std::u16string_view(u"HTMLUnknown"), false, false }, + { std::u16string_view(u"CalcGrid"), false, false }, + { std::u16string_view(u"CalcCellFocus"), false, false }, + { std::u16string_view(u"CalcPageBreak"), false, false }, + { std::u16string_view(u"CalcPageBreakManual"), false, false }, + { std::u16string_view(u"CalcPageBreakAutomatic"), false, false }, + { std::u16string_view(u"CalcHiddenColRow"), true, false }, + { std::u16string_view(u"CalcTextOverflow"), true, false }, + { std::u16string_view(u"CalcComments"), false, false }, + { std::u16string_view(u"CalcDetective"), false, false }, + { std::u16string_view(u"CalcDetectiveError"), false, false }, + { std::u16string_view(u"CalcReference"), false, false }, + { std::u16string_view(u"CalcNotesBackground"), false, false }, + { std::u16string_view(u"CalcValue"), false, false }, + { std::u16string_view(u"CalcFormula"), false, false }, + { std::u16string_view(u"CalcText"), false, false }, + { std::u16string_view(u"CalcProtectedBackground"), false, false }, + { std::u16string_view(u"DrawGrid"), true, false }, + { std::u16string_view(u"Author1"), false, false }, + { std::u16string_view(u"Author2"), false, false }, + { std::u16string_view(u"Author3"), false, false }, + { std::u16string_view(u"Author4"), false, false }, + { std::u16string_view(u"Author5"), false, false }, + { std::u16string_view(u"Author6"), false, false }, + { std::u16string_view(u"Author7"), false, false }, + { std::u16string_view(u"Author8"), false, false }, + { std::u16string_view(u"Author9"), false, false }, + { std::u16string_view(u"BASICEditor"), false, false }, + { std::u16string_view(u"BASICIdentifier"), false, false }, + { std::u16string_view(u"BASICComment"), false, false }, + { std::u16string_view(u"BASICNumber"), false, false }, + { std::u16string_view(u"BASICString"), false, false }, + { std::u16string_view(u"BASICOperator"), false, false }, + { std::u16string_view(u"BASICKeyword"), false, false }, + { std::u16string_view(u"BASICError"), false, false }, + { std::u16string_view(u"SQLIdentifier"), false, false }, + { std::u16string_view(u"SQLNumber"), false, false }, + { std::u16string_view(u"SQLString"), false, false }, + { std::u16string_view(u"SQLOperator"), false, false }, + { std::u16string_view(u"SQLKeyword"), false, false }, + { std::u16string_view(u"SQLParameter"), false, false }, + { std::u16string_view(u"SQLComment"), false, false }, + + { std::u16string_view(u"WindowColor"), false, false }, + { std::u16string_view(u"WindowTextColor"), false, false }, + { std::u16string_view(u"BaseColor"), false, false }, + { std::u16string_view(u"ButtonColor"), false, false }, + { std::u16string_view(u"ButtonTextColor"), false, false }, + { std::u16string_view(u"AccentColor"), false, false }, + { std::u16string_view(u"DisabledColor"), false, false }, + { std::u16string_view(u"DisabledTextColor"), false, false }, + { std::u16string_view(u"ShadowColor"), false, false }, + { std::u16string_view(u"SeparatorColor"), false, false }, + { std::u16string_view(u"FaceColor"), false, false }, + { std::u16string_view(u"ActiveColor"), false, false }, + { std::u16string_view(u"ActiveTextColor"), false, false }, + { std::u16string_view(u"ActiveBorderColor"), false, false }, + { std::u16string_view(u"FieldColor"), false, false }, + { std::u16string_view(u"MenuBarColor"), false, false }, + { std::u16string_view(u"MenuBarTextColor"), false, false }, + { std::u16string_view(u"MenuBarHighlightColor"), false, false }, + { std::u16string_view(u"MenuBarHighlightTextColor"), false, false }, + { std::u16string_view(u"MenuColor"), false, false }, + { std::u16string_view(u"MenuTextColor"), false, false }, + { std::u16string_view(u"MenuHighlightColor"), false, false }, + { std::u16string_view(u"MenuHighlightTextColor"), false, false }, + { std::u16string_view(u"MenuBorderColor"), false, false }, + { std::u16string_view(u"InactiveColor"), false, false }, + { std::u16string_view(u"InactiveTextColor"), false, false }, + { std::u16string_view(u"InactiveBorderColor"), false, false } + }; +} + class ColorConfig_Impl; struct ColorConfigValue { - bool bIsVisible; //validity depends on the element type - ::Color nColor; - ColorConfigValue() : bIsVisible(false), nColor(0) {} - ColorConfigValue(const Color& rColor, bool bVisible) : bIsVisible(bVisible), nColor(rColor) {} - bool operator !=(const ColorConfigValue& rCmp) const - { return nColor != rCmp.nColor || bIsVisible != rCmp.bIsVisible;} + bool bIsVisible; // validity depends on the element type + ::Color nColor; // used as a cache for the current color + Color nLightColor; + Color nDarkColor; + + bool bUseBitmapBackground; + bool bIsBitmapStretched; + OUString sBitmapFileName; + + ColorConfigValue() + : bIsVisible(false) + , nColor(0) + , nLightColor(0) + , nDarkColor(0) + , bUseBitmapBackground(false) + , bIsBitmapStretched(false) + { + } + + ColorConfigValue(const Color& rColor, bool bVisible) + : bIsVisible(bVisible) + , nColor(rColor) + , nLightColor(rColor) + , nDarkColor(rColor) + { + } + + bool operator!=(const ColorConfigValue& rCmp) const + { + return + nColor != rCmp.nColor + || nLightColor != rCmp.nLightColor + || nDarkColor != rCmp.nDarkColor + || bIsVisible != rCmp.bIsVisible + || bUseBitmapBackground != rCmp.bUseBitmapBackground + || bIsBitmapStretched != rCmp.bIsBitmapStretched + || sBitmapFileName != rCmp.sBitmapFileName; + } }; class SAL_WARN_UNUSED SVT_DLLPUBLIC ColorConfig final : @@ -161,8 +298,8 @@ public: static Color GetDefaultColor(ColorConfigEntry eEntry, int nMod = -1); static const OUString& GetCurrentSchemeName(); - static void LoadThemeColorsFromRegistry(); - static void SetupTheme(); + void LoadThemeColorsFromRegistry(); + void SetupTheme(); }; class SVT_DLLPUBLIC EditableColorConfig diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx index 272c7ae83247..4c4f77e31c50 100644 --- a/include/vcl/settings.hxx +++ b/include/vcl/settings.hxx @@ -401,7 +401,7 @@ public: SAL_DLLPRIVATE const Color& GetMenuBarRolloverTextColor() const; void SetMenuBarHighlightTextColor( const Color& rColor ); - SAL_DLLPRIVATE const Color& GetMenuBarHighlightTextColor() const; + const Color& GetMenuBarHighlightTextColor() const; void SetMenuHighlightColor( const Color& rColor ); const Color& GetMenuHighlightColor() const; @@ -608,6 +608,7 @@ public: void SetPreferredIconTheme(const OUString&, bool bDarkIconTheme = false); const DialogStyle& GetDialogStyle() const; + const BitmapEx& GetAppBackgroundBitmap() const; // global switch to allow EdgeBlenging; currently possible for ValueSet and ListBox // when activated there using Get/SetEdgeBlending; default is true diff --git a/include/vcl/themecolors.hxx b/include/vcl/themecolors.hxx index fec422adbac9..80f56db5e0e4 100644 --- a/include/vcl/themecolors.hxx +++ b/include/vcl/themecolors.hxx @@ -60,6 +60,13 @@ public: void SetInactiveBorderColor(const Color& rColor) { m_aInactiveBorderColor = rColor; } void SetThemeName(const OUString& rName) { m_sThemeName = rName; } + void SetAppBackBitmapFileName(const OUString& rBitmapStr) + { + m_aAppBackBitmapFileName = rBitmapStr; + } + void SetAppBackBitmapStretched(bool bStretched) { m_bStretched = bStretched; } + void SetAppBackUseBitmap(bool bDrawBitmap) { m_bUseBitmapForAppBack = bDrawBitmap; } + const Color& GetWindowColor() const { return m_aWindowColor; } const Color& GetWindowTextColor() const { return m_aWindowTextColor; } const Color& GetBaseColor() const { return m_aBaseColor; } @@ -89,6 +96,10 @@ public: const Color& GetInactiveBorderColor() const { return m_aInactiveBorderColor; } const OUString& GetThemeName() const { return m_sThemeName; } + const OUString& GetAppBackBitmapFileName() const { return m_aAppBackBitmapFileName; } + bool IsAppBackBitmapStretched() { return m_bStretched; } + bool GetAppBackUseBitmap() { return m_bUseBitmapForAppBack; } + private: Color m_aWindowColor; Color m_aWindowTextColor; @@ -119,6 +130,14 @@ private: Color m_aInactiveBorderColor; OUString m_sThemeName; + + // using values for now as only one element is bitmap customizable. but as the number increases + // we might want to replace these colors with structs similar to `struct ColorConfigValue` + // The actual bitmap object is in StyleSettings because we cannot have non primitive objects in + // static singleton classes as the order of initialization would be undefined. + bool m_bStretched = false; + bool m_bUseBitmapForAppBack = false; + OUString m_aAppBackBitmapFileName = ""; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/officecfg/registry/data/org/openoffice/Office/UI.xcu b/officecfg/registry/data/org/openoffice/Office/UI.xcu index f4e82ec18ecc..90d4d640b8f8 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI.xcu @@ -140,27 +140,48 @@ <node oor:name="COLOR_SCHEME_LIBREOFFICE_AUTOMATIC" oor:op="replace"> <!-- Group_General --> <node oor:name="DocColor"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="DocBoundaries"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="AppBackground"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="BackgroundType"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Bitmap"> <value xsi:nil="true"/> </prop> </node> <node oor:name="TableBoundaries"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="FontColor"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> @@ -168,7 +189,10 @@ <prop oor:name="IsVisible"> <value>false</value> </prop> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> @@ -176,22 +200,34 @@ <prop oor:name="IsVisible"> <value>false</value> </prop> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="Spell"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="Grammar"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="SmartTags"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> @@ -199,12 +235,18 @@ <prop oor:name="IsVisible"> <value>true</value> </prop> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="WriterTextGrid"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> @@ -212,7 +254,10 @@ <prop oor:name="IsVisible"> <value>true</value> </prop> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> @@ -220,7 +265,10 @@ <prop oor:name="IsVisible"> <value>true</value> </prop> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> @@ -228,77 +276,122 @@ <prop oor:name="IsVisible"> <value>true</value> </prop> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="WriterScriptIndicator"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="WriterSectionBoundaries"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="WriterHeaderFooterMark"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="WriterPageBreaks"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="WriterNonPrintChars"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="HTMLSGML"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="HTMLComment"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="HTMLKeyword"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="HTMLUnknown"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="CalcGrid"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="CalcCellFocus"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="CalcPageBreak"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="CalcPageBreakManual"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="CalcPageBreakAutomatic"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> @@ -306,7 +399,10 @@ <prop oor:name="IsVisible"> <value>false</value> </prop> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> @@ -314,52 +410,82 @@ <prop oor:name="IsVisible"> <value>true</value> </prop> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="CalcComments"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="CalcDetective"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="CalcDetectiveError"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="CalcReference"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="CalcNotesBackground"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="CalcValue"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="CalcFormula"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="CalcText"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="CalcProtectedBackground"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> @@ -367,263 +493,419 @@ <prop oor:name="IsVisible"> <value>true</value> </prop> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="Author1"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="Author2"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="Author3"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="Author4"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="Author5"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="Author6"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="Author7"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="Author8"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="Author9"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="BASICEditor"> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="BASICIdentifier"> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="BASICComment"> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="BASICNumber"> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="BASICString"> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="BASICOperator"> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="BASICKeyword"> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="BASICError"> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="SQLIdentifier"> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="SQLNumber"> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="SQLString"> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="SQLOperator"> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="SQLKeyword"> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="SQLParameter"> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="SQLComment"> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <!-- Group Application --> <node oor:name="WindowColor"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="WindowTextColor"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="BaseColor"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="ButtonColor"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="ButtonTextColor"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="AccentColor"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="DisabledColor"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="DisabledTextColor"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="ShadowColor"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="SeparatorColor"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="FaceColor"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="ActiveColor"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="ActiveTextColor"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="ActiveBorderColor"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="FieldColor"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="MenuBarColor"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="MenuBarTextColor"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="MenuBarHighlightColor"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="MenuBarHighlightTextColor"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="MenuColor"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="MenuTextColor"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="MenuHighlightColor"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="MenuHighlightTextColor"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="MenuBorderColor"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="InactiveColor"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="InactiveTextColor"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> <node oor:name="InactiveBorderColor"> - <prop oor:name="Color"> + <prop oor:name="Light"> + <value xsi:nil="true"/> + </prop> + <prop oor:name="Dark"> <value xsi:nil="true"/> </prop> </node> diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 15b592beb095..9727f9ad85ae 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -5158,37 +5158,17 @@ </group> </group> </group> - <group oor:name="Misc"> + <group oor:name="Appearance"> <info> - <desc>Determines the miscellaneous entries for the common group.</desc> + <desc>Specifies appearance settings for the application.</desc> </info> - <prop oor:name="Appearance" oor:type="xs:short" oor:nillable="false"> - <!-- UIHints: Tools Options - General View [Section] Appearance --> + <prop oor:name="LibreOfficeTheme" oor:type="xs:boolean" oor:nillable="false"> <info> - <desc>Specifies the appearance of the user interface.</desc> - <label>Appearance</label> + <desc>Enable UI Themeing in LibreOffice.</desc> </info> - <constraints> - <enumeration oor:value="0"> - <info> - <desc>Automatic, from system settings</desc> - </info> - </enumeration> - <enumeration oor:value="1"> - <info> - <desc>Light</desc> - </info> - </enumeration> - <enumeration oor:value="2"> - <info> - <desc>Dark</desc> - </info> - </enumeration> - </constraints> - <value>0</value> + <value>false</value> </prop> <prop oor:name="ApplicationAppearance" oor:type="xs:short" oor:nillable="false"> - <!-- UIHints: Tools Options - General View [Section] Appearance --> <info> <desc>Specifies the application colors.</desc> <label>Application Colors</label> @@ -5210,8 +5190,13 @@ </info> </enumeration> </constraints> - <value>1</value> + <value>0</value> </prop> + </group> + <group oor:name="Misc"> + <info> + <desc>Determines the miscellaneous entries for the common group.</desc> + </info> <prop oor:name="MaxOpenDocuments" oor:type="xs:int"> <info> <desc>Determines the maximum count of documents, which are allowed to @@ -5334,12 +5319,6 @@ </info> <value>false</value> </prop> - <prop oor:name="LibreOfficeTheme" oor:type="xs:boolean" oor:nillable="false"> - <info> - <desc>Enable LibreOffice Theme.</desc> - </info> - <value>false</value> - </prop> <prop oor:name="WriteLayerStateAsConfigItem" oor:type="xs:boolean" oor:nillable="false"> <info> <desc>If 'true', the config items VisibleLayers, PrintableLayers and diff --git a/officecfg/registry/schema/org/openoffice/Office/UI.xcs b/officecfg/registry/schema/org/openoffice/Office/UI.xcs index afb965c541cb..8c3ae946f1b0 100644 --- a/officecfg/registry/schema/org/openoffice/Office/UI.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/UI.xcs @@ -35,6 +35,11 @@ </info> </prop> </group> + <!-- + TODO: Change the labels of the new light/dark/image/imagedrawmode/type entries once everything is working. + keeping Color so that things don't break right from the get go, and later once everything is working, we can just + remove the Color entry + --> <group oor:name="ColorScheme"> <!-- UIHints: Tools / Options / Star|OpenOffice / Application Colors --> <info> @@ -45,9 +50,14 @@ <info> <desc>Specifies the color settings for the document.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color of the document.</desc> + <desc>Specifies light color for the document.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the document.</desc> </info> </prop> </group> @@ -55,9 +65,14 @@ <info> <desc>Specifies the settings for the documents boundaries.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for of the document boundaries.</desc> + <desc>Specifies light color for the document boundaries.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the document boundaries.</desc> </info> </prop> </group> @@ -65,9 +80,30 @@ <info> <desc>Specifies the settings for the application background.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> + <info> + <desc>Specifies light color for the application background.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> <info> - <desc>Specifies Color of the application background.</desc> + <desc>Specifies dark color for the application background.</desc> + </info> + </prop> + <prop oor:name="BackgroundType" oor:type="xs:boolean"> + <info> + <desc> + Specifies whether to use color or bitmap for the background, + true for bitmap and false for color. + </desc> + </info> + </prop> + <prop oor:name="Bitmap" oor:type="xs:string"> + <info> + <desc> + Specifies bitmap and stretched/tiled for the bitmap + like "wood.jpg;stretched" or "wood.jpg;tiled" + </desc> </info> </prop> </group> @@ -75,9 +111,14 @@ <info> <desc>Specifies the settings for table boundaries.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> + <info> + <desc>Specifies light color for table boundaries.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> <info> - <desc>Specifies the color used for table boundaries.</desc> + <desc>Specifies dark color for table boundaries.</desc> </info> </prop> </group> @@ -85,9 +126,14 @@ <info> <desc>Specifies the settings for the font.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies color of the font.</desc> + <desc>Specifies light color for the font color.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the font color.</desc> </info> </prop> </group> @@ -101,9 +147,14 @@ </info> <value>false</value> </prop> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for unvisited links.</desc> + <desc>Specifies light color for unvisited links.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for unvisited links.</desc> </info> </prop> </group> @@ -117,9 +168,14 @@ </info> <value>false</value> </prop> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> + <info> + <desc>Specifies light color for visited links.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> <info> - <desc>Specifies the color used for visited links.</desc> + <desc>Specifies dark color for visited links.</desc> </info> </prop> </group> @@ -127,9 +183,14 @@ <info> <desc>Specifies the settings for incorrect text found with spellchecking.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color of incorrect text found with AutoSpellcheck.</desc> + <desc>Specifies light color for spellchecking.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for spellchecking.</desc> </info> </prop> </group> @@ -137,9 +198,14 @@ <info> <desc>Specifies the settings for incorrect grammar found with spellchecking.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color of incorrect grammar found with AutoSpellcheck.</desc> + <desc>Specifies light color for the incorrect grammer.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the incorrect grammer.</desc> </info> </prop> </group> @@ -147,9 +213,14 @@ <info> <desc>Specifies the settings for smart tags.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> + <info> + <desc>Specifies light color for the smart tags.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> <info> - <desc>Specifies the color of smart tags.</desc> + <desc>Specifies dark color for the smart tags.</desc> </info> </prop> </group> @@ -163,9 +234,14 @@ </info> <value>true</value> </prop> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for shadows.</desc> + <desc>Specifies light color for the shadow.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the shadow.</desc> </info> </prop> </group> @@ -173,9 +249,14 @@ <info> <desc>Specifies the settings for the text grid in Writer.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for the text grid.</desc> + <desc>Specifies light color for the text grid in writer.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the text grid in writer.</desc> </info> </prop> </group> @@ -189,9 +270,14 @@ </info> <value>true</value> </prop> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> + <info> + <desc>Specifies light color for the field shadings.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> <info> - <desc>Specifies the color used for the field shadings.</desc> + <desc>Specifies dark color for the field shadings.</desc> </info> </prop> </group> @@ -205,9 +291,14 @@ </info> <value>true</value> </prop> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for the index and table shadings.</desc> + <desc>Specifies light color for the index and table shadings in writer.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the index and table shadings in writer.</desc> </info> </prop> </group> @@ -221,9 +312,14 @@ </info> <value>true</value> </prop> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for the direct cursor.</desc> + <desc>Specifies light color for direct cursor.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for direct cursor.</desc> </info> </prop> </group> @@ -231,9 +327,14 @@ <info> <desc>Specifies the settings for script indicators in Writer.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> + <info> + <desc>Specifies light color for the script indicators in Writer.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> <info> - <desc>Specifies the color used for script indicators.</desc> + <desc>Specifies dark color for the script indicators in Writer.</desc> </info> </prop> </group> @@ -241,9 +342,14 @@ <info> <desc>Specifies the settings for section boundaries in Writer.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for section boundaries.</desc> + <desc>Specifies light color for the section boundaries in Writer.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the section boundaries in Writer.</desc> </info> </prop> </group> @@ -251,9 +357,14 @@ <info> <desc>Specifies the settings for the header/footer mark in Writer.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for the header/footer mark.</desc> + <desc>Specifies light color for the header/footer mark in Writer.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the header/footer mark in Writer.</desc> </info> </prop> </group> @@ -261,9 +372,14 @@ <info> <desc>Specifies the settings for the page break mark in Writer.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> + <info> + <desc>Specifies light color for the page break mark in Writer.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> <info> - <desc>Specifies the color used for the page break mark.</desc> + <desc>Specifies dark color for the page break mark in Writer.</desc> </info> </prop> </group> @@ -271,9 +387,14 @@ <info> <desc>Specifies the settings for the non-printable characters in Writer.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for the non-printable characters.</desc> + <desc>Specifies light color for the non-printable characters in Writer.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the non-printable characters in Writer.</desc> </info> </prop> </group> @@ -281,9 +402,14 @@ <info> <desc>Specifies the settings used for SGML in HTML documents.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> + <info> + <desc>Specifies light color for SGML in HTML documents.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> <info> - <desc>Specifies the color used for SGML code.</desc> + <desc>Specifies dark color for SGML in HTML documents.</desc> </info> </prop> </group> @@ -291,9 +417,14 @@ <info> <desc>Specifies the settings used for comments in HTML documents.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for comments.</desc> + <desc>Specifies light color for the comments in HTML documents.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the comments in HTML documents.</desc> </info> </prop> </group> @@ -301,9 +432,14 @@ <info> <desc>Specifies the settings used for keywords in HTML documents.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for keywords.</desc> + <desc>Specifies light color for the keywords in HTML document.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the keywords in HTML documents.</desc> </info> </prop> </group> @@ -311,9 +447,14 @@ <info> <desc>Specifies the settings used for other text in HTML documents.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for other text.</desc> + <desc>Specifies light color for the other text in HTML documents.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the other text in HTML documents.</desc> </info> </prop> </group> @@ -321,9 +462,14 @@ <info> <desc>Specifies the settings used for grid lines in Calc.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> + <info> + <desc>Specifies light color for the grid lines in Calc.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> <info> - <desc>Specifies the color used for the grid.</desc> + <desc>Specifies dark color for the grid lines in Calc.</desc> </info> </prop> </group> @@ -331,9 +477,14 @@ <info> <desc>Specifies the setting to change cell frame, col/row highlight and col/row header color in Calc</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the cell frame color for Calc</desc> + <desc>Specifies light color for the cell frame, col/row highlight and col/row header color in Calc.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for cell frame, col/row highlight and col/row header color in Calc.</desc> </info> </prop> </group> @@ -341,9 +492,14 @@ <info> <desc>Specifies the settings used for page breaks in the page break preview in Calc.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for page breaks in the page break preview.</desc> + <desc>Specifies light color for the page breaks in the page break preview in Calc.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the page breaks in t he page break preview in Calc.</desc> </info> </prop> </group> @@ -351,9 +507,14 @@ <info> <desc>Specifies the settings used for manual breaks in Calc.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for manual page breaks.</desc> + <desc>Specifies light color for the manula page breaks in Calc.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the manual page breaks in Calc.</desc> </info> </prop> </group> @@ -361,9 +522,14 @@ <info> <desc>Specifies the settings used for automatic breaks in Calc.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for automatic page breaks.</desc> + <desc>Specifies light color for the automatic breaks in Calc.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the automatic breaks in Calc.</desc> </info> </prop> </group> @@ -377,9 +543,14 @@ </info> <value>true</value> </prop> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for hidden rows/cols.</desc> + <desc>Specifies light color for the hidden row/cols indicator in Calc.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the hidden row/cols indicator in Calc..</desc> </info> </prop> </group> @@ -393,9 +564,14 @@ </info> <value>true</value> </prop> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for the text overflow indicator.</desc> + <desc>Specifies light color for the text overflow indicator in Calc.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the text overflow indicator in Calc.</desc> </info> </prop> </group> @@ -403,9 +579,14 @@ <info> <desc>Specifies the settings used for the comments indicator in Calc.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> + <info> + <desc>Specifies light color for the comments indicator in Calc.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> <info> - <desc>Specifies the color used for the comments indicator.</desc> + <desc>Specifies dark color for the comments indicator in Calc.</desc> </info> </prop> </group> @@ -413,9 +594,14 @@ <info> <desc>Specifies the settings used for audition arrows in Calc.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for audition arrows to precedent or dependent cells.</desc> + <desc>Specifies light color for the audition arrows in Calc.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the audition arrows in Calc.</desc> </info> </prop> </group> @@ -423,9 +609,14 @@ <info> <desc>Specifies the settings used for audition arrows to cells with errors in Calc.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> + <info> + <desc>Specifies light color for the audition arrows to cells with errors in Calc.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> <info> - <desc>Specifies the color used for audition arrows to cells containing errors.</desc> + <desc>Specifies dark color for the audition arrows to the cells with errors in Calc.</desc> </info> </prop> </group> @@ -433,9 +624,14 @@ <info> <desc>Specifies the settings used for the cursor when editing references in Calc.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> + <info> + <desc>Specifies light color for cursor when editing references in Calc.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> <info> - <desc>Specifies the color used for the cursor when editing references.</desc> + <desc>Specifies dark color for cursor when editing references in Calc.</desc> </info> </prop> </group> @@ -443,9 +639,14 @@ <info> <desc>Specifies the settings used for the background of comments in Calc.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for the background of comments.</desc> + <desc>Specifies light color for background of comments in Calc.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for background of comments in Calc.</desc> </info> </prop> </group> @@ -453,9 +654,14 @@ <info> <desc>Specifies the settings used for values in Calc.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> + <info> + <desc>Specifies light color for the values in Calc.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> <info> - <desc>Specifies the color used for values.</desc> + <desc>Specifies dark color for the values in Calc.</desc> </info> </prop> </group> @@ -463,9 +669,14 @@ <info> <desc>Specifies the settings used for formulas in Calc.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> + <info> + <desc>Specifies light color for the formulas in Calc.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> <info> - <desc>Specifies the color used for formulas.</desc> + <desc>Specifies dark color for the formulas in Calc.</desc> </info> </prop> </group> @@ -473,9 +684,14 @@ <info> <desc>Specifies the settings used for the text in Calc.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for the text.</desc> + <desc>Specifies light color for the text in Calc.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the text in Calc.</desc> </info> </prop> </group> @@ -483,9 +699,14 @@ <info> <desc>Specifies the settings used for the background of protected cells in Calc.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for the background of protected cells.</desc> + <desc>Specifies light color for the background of protected cells in Calc.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the background of protected cells in Calc.</desc> </info> </prop> </group> @@ -499,9 +720,14 @@ </info> <value>true</value> </prop> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> + <info> + <desc>Specifies light color for the grid in Draw/Impress.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> <info> - <desc>Specifies the color used for the grid.</desc> + <desc>Specifies dark color for the grid in Draw/Impress..</desc> </info> </prop> </group> @@ -509,9 +735,14 @@ <info> <desc>Specifies the settings used for the comments of author #1.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for author #1.</desc> + <desc>Specifies light color for the comments of author #1.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the comments of author #1.</desc> </info> </prop> </group> @@ -519,9 +750,14 @@ <info> <desc>Specifies the settings used for the comments of author #2.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for author #2.</desc> + <desc>Specifies light color for the comments of author #2.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the comments of author #2.</desc> </info> </prop> </group> @@ -529,9 +765,14 @@ <info> <desc>Specifies the settings used for the comments of author #3.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> + <info> + <desc>Specifies light color for the comments of author #3.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> <info> - <desc>Specifies the color used for author #3.</desc> + <desc>Specifies dark color for the comments of author #3.</desc> </info> </prop> </group> @@ -539,9 +780,14 @@ <info> <desc>Specifies the settings used for the comments of author #4.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> + <info> + <desc>Specifies light color for the comments of author #4.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> <info> - <desc>Specifies the color used for author #4.</desc> + <desc>Specifies dark color for the comments of author #4.</desc> </info> </prop> </group> @@ -549,9 +795,14 @@ <info> <desc>Specifies the settings used for the comments of author #5.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for author #5.</desc> + <desc>Specifies light color for the comments of author #5.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the comments of author #5.</desc> </info> </prop> </group> @@ -559,9 +810,14 @@ <info> <desc>Specifies the settings used for the comments of author #6.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for author #6.</desc> + <desc>Specifies light color for the comments of author #6.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the comments of author #6.</desc> </info> </prop> </group> @@ -569,9 +825,14 @@ <info> <desc>Specifies the settings used for the comments of author #7.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> + <info> + <desc>Specifies light color for the comments of author #7.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> <info> - <desc>Specifies the color used for author #7.</desc> + <desc>Specifies dark color for the comments of author #7.</desc> </info> </prop> </group> @@ -579,9 +840,14 @@ <info> <desc>Specifies the settings used for the comments of author #8.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for author #8.</desc> + <desc>Specifies light color for the comments of author #8.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the comments of author #8.</desc> </info> </prop> </group> @@ -589,9 +855,14 @@ <info> <desc>Specifies the settings used for the comments of author #9.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for author #9.</desc> + <desc>Specifies light color for the comments of author #9.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the comments of author #9.</desc> </info> </prop> </group> @@ -599,9 +870,14 @@ <info> <desc>Specifies the settings of the BASIC code editor.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> + <info> + <desc>Specifies light color for the BASIC code editor.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> <info> - <desc>Specifies the color used as background in the Basic code editor.</desc> + <desc>Specifies dark color for the BASIC code editor.</desc> </info> </prop> </group> @@ -609,9 +885,14 @@ <info> <desc>Specifies the settings for identifiers in BASIC source code.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for identifiers.</desc> + <desc>Specifies light color for the identifiers in BASIC source code.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the identifiers in BASIC source code.</desc> </info> </prop> </group> @@ -619,9 +900,14 @@ <info> <desc>Specifies the settings for comments in BASIC source code.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for comments.</desc> + <desc>Specifies light color for the comments in BAISC source code.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the comments in BASIC source code.</desc> </info> </prop> </group> @@ -629,9 +915,14 @@ <info> <desc>Specifies the settings for numbers in BASIC source code.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> + <info> + <desc>Specifies light color for the numbers in BASIC source code.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> <info> - <desc>Specifies the color used for numbers.</desc> + <desc>Specifies dark color for the numbers in BASIC source code.</desc> </info> </prop> </group> @@ -639,9 +930,14 @@ <info> <desc>Specifies the settings for strings in BASIC source code.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for strings.</desc> + <desc>Specifies light color for the strings in BASIC source code.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the strings in BASIC source code.</desc> </info> </prop> </group> @@ -649,9 +945,14 @@ <info> <desc>Specifies the settings for operators in BASIC source code.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for operators.</desc> + <desc>Specifies light color for the operators in BASIC source code.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the operators in BASIC source code.</desc> </info> </prop> </group> @@ -659,9 +960,14 @@ <info> <desc>Specifies the settings for keywords in BASIC source code.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> + <info> + <desc>Specifies light color for the keywords in BASIC source code.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> <info> - <desc>Specifies the color used for keywords (reserved expressions).</desc> + <desc>Specifies dark color for the keywords in BASIC source code.</desc> </info> </prop> </group> @@ -669,9 +975,14 @@ <info> <desc>Specifies the settings for errors shown in BASIC source code.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for errors.</desc> + <desc>Specifies light color for the errors shown in BASIC source code.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the errors shown in BASIC source code.</desc> </info> </prop> </group> @@ -679,9 +990,14 @@ <info> <desc>Specifies the settings for SQL identifiers, as used the Query Designer.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for SQL identifiers.</desc> + <desc>Specifies light color for the SQL identifiers.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the SQL identifiers.</desc> </info> </prop> </group> @@ -689,9 +1005,14 @@ <info> <desc>Specifies the settings for SQL numbers, as used the Query Designer.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> + <info> + <desc>Specifies light color for the SQL numbers.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> <info> - <desc>Specifies the color used for SQL numbers.</desc> + <desc>Specifies dark color for the SQL numbers.</desc> </info> </prop> </group> @@ -699,9 +1020,14 @@ <info> <desc>Specifies the settings for SQL strings, as used the Query Designer.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for SQL strings.</desc> + <desc>Specifies light color for the SQL strings.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the SQL strigns.</desc> </info> </prop> </group> @@ -709,9 +1035,14 @@ <info> <desc>Specifies the settings for SQL operators, as used the Query Designer.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for SQL operators.</desc> + <desc>Specifies light color for the SQL operators.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the SQL operators.</desc> </info> </prop> </group> @@ -719,9 +1050,14 @@ <info> <desc>Specifies the settings for SQL keywords, as used the Query Designer.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> + <info> + <desc>Specifies light color for the SQL keywords.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> <info> - <desc>Specifies the color used for SQL keywords.</desc> + <desc>Specifies dark color for the SQL keywords.</desc> </info> </prop> </group> @@ -729,9 +1065,14 @@ <info> <desc>Specifies the settings for SQL parameters, as used the Query Designer.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for SQL parameters.</desc> + <desc>Specifies light color for the SQL parameters.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the SQL parameters.</desc> </info> </prop> </group> @@ -739,9 +1080,14 @@ <info> <desc>Specifies the settings for SQL comments, as used the Query Designer.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the color used for SQL parameters.</desc> + <desc>Specifies light color for the SQL comments.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the SQL comments.</desc> </info> </prop> </group> @@ -750,19 +1096,29 @@ <info> <desc>Allows to overwrite the system window color.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> + <info> + <desc>Specifies light color for the application window.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> <info> - <desc>Specifies the window color.</desc> + <desc>Specifies dark color for the application window.</desc> </info> </prop> </group> <group oor:name="WindowTextColor"> <info> - <desc>Allows to overwrite the system window text color.</desc> + <desc>Allows to overwrite the system window text.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the window text color.</desc> + <desc>Specifies light color for the window text.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the window text.</desc> </info> </prop> </group> @@ -770,9 +1126,14 @@ <info> <desc>Allows to overwrite the system base color.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> + <info> + <desc>Specifies the light base color.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> <info> - <desc>Specifies the base color.</desc> + <desc>Specifies the dark base color.</desc> </info> </prop> </group> @@ -780,9 +1141,14 @@ <info> <desc>Allows to overwrite the system button color.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the button color.</desc> + <desc>Specifies light color for the buttons.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the buttons.</desc> </info> </prop> </group> @@ -790,9 +1156,14 @@ <info> <desc>Allows to overwrite the system button text color.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the button text color.</desc> + <desc>Specifies light color for the button text.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the button text.</desc> </info> </prop> </group> @@ -800,9 +1171,14 @@ <info> <desc>Allows to overwrite the system accent color.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the accent color.</desc> + <desc>Specifies the light accent color.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies the dark accent color.</desc> </info> </prop> </group> @@ -810,9 +1186,14 @@ <info> <desc>Allows to overwrite the system disabled color.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> + <info> + <desc>Specifies the light disabled color.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> <info> - <desc>Specifies the disabled color.</desc> + <desc>Specifies the dark disabled color.</desc> </info> </prop> </group> @@ -820,9 +1201,14 @@ <info> <desc>Allows to overwrite the system disabled text color.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the disabled text color.</desc> + <desc>Specifies light color for the disabled text.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the disabled text.</desc> </info> </prop> </group> @@ -830,9 +1216,14 @@ <info> <desc>Allows to overwrite the widget shadow color.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the widget shadow color.</desc> + <desc>Specifies light color for the shadow.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the shadow.</desc> </info> </prop> </group> @@ -840,9 +1231,14 @@ <info> <desc>Allows to overwrite the separator color.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the separator color.</desc> + <desc>Specifies light color for the separator.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the separator.</desc> </info> </prop> </group> @@ -850,9 +1246,14 @@ <info> <desc>Allows to overwrite the system face color.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the face color.</desc> + <desc>Specifies light color for the face.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the face.</desc> </info> </prop> </group> @@ -860,9 +1261,14 @@ <info> <desc>Allows to overwrite the system active color.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the active color.</desc> + <desc>Specifies the light active color.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies the dark active color.</desc> </info> </prop> </group> @@ -870,9 +1276,14 @@ <info> <desc>Allows to overwrite the system active text color.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the active text color.</desc> + <desc>Specifies light color for the active text.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the active text.</desc> </info> </prop> </group> @@ -880,9 +1291,14 @@ <info> <desc>Allows to overwrite the system active border color.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> + <info> + <desc>Specifies light color for the active border.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> <info> - <desc>Specifies the active border color.</desc> + <desc>Specifies dark color for the active border.</desc> </info> </prop> </group> @@ -890,19 +1306,29 @@ <info> <desc>Allows to overwrite the system field color.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the field color.</desc> + <desc>Specifies light color for the field.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the field.</desc> </info> </prop> </group> <group oor:name="MenuBarColor"> <info> - <desc>Allows to overwrite the system menubar color.</desc> + <desc>Allows to overwrite the system menu bar color.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> + <info> + <desc>Specifies light color for the menu bar.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> <info> - <desc>Specifies the menubar color.</desc> + <desc>Specifies dark color for the menu bar.</desc> </info> </prop> </group> @@ -910,9 +1336,14 @@ <info> <desc>Allows to overwrite the system menubar text color.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> + <info> + <desc>Specifies light color for the menu bar text.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> <info> - <desc>Specifies the menubar text color.</desc> + <desc>Specifies dark color for the menu bar text.</desc> </info> </prop> </group> @@ -920,9 +1351,14 @@ <info> <desc>Allows to overwrite the system menubar highlight color.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the menubar highlight color.</desc> + <desc>Specifies light color for the menu bar highlight.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the menu bar highlight.</desc> </info> </prop> </group> @@ -930,9 +1366,14 @@ <info> <desc>Allows to overwrite the system menubar highlight text color.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> + <info> + <desc>Specifies light color for the menu bar highlight text.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> <info> - <desc>Specifies the menubar highlight text color.</desc> + <desc>Specifies dark color for the menu bar highlight text.</desc> </info> </prop> </group> @@ -940,9 +1381,14 @@ <info> <desc>Allows to overwrite the system menu color.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> + <info> + <desc>Specifies light color for the menu.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> <info> - <desc>Specifies the menu color.</desc> + <desc>Specifies dark color for the menu.</desc> </info> </prop> </group> @@ -950,9 +1396,14 @@ <info> <desc>Allows to overwrite the system menu text color.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the menu text color.</desc> + <desc>Specifies light color for the menu text.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the menu text.</desc> </info> </prop> </group> @@ -960,9 +1411,14 @@ <info> <desc>Allows to overwrite the system menu highlight color.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the menu highlight color.</desc> + <desc>Specifies light color for the menu highlight.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the menu highlight.</desc> </info> </prop> </group> @@ -970,9 +1426,14 @@ <info> <desc>Allows to overwrite the system menu highlight text color.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> + <info> + <desc>Specifies light color for the menu highlight text.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> <info> - <desc>Specifies the menu highlight text color.</desc> + <desc>Specifies dark color for the menu highlight text.</desc> </info> </prop> </group> @@ -980,9 +1441,14 @@ <info> <desc>Allows to overwrite the system menu border color.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the menu border color.</desc> + <desc>Specifies light color for the menu border.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies dark color for the menu border.</desc> </info> </prop> </group> @@ -990,9 +1456,14 @@ <info> <desc>Allows to overwrite the system inactive color.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> <info> - <desc>Specifies the inactive color.</desc> + <desc>Specifies the light inactive color.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> + <info> + <desc>Specifies the dark inactive color.</desc> </info> </prop> </group> @@ -1000,9 +1471,14 @@ <info> <desc>Allows to overwrite the system inactive text color.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> + <info> + <desc>Specifies light color for the inactive text.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> <info> - <desc>Specifies the inactive text color.</desc> + <desc>Specifies dark color for the inactive text.</desc> </info> </prop> </group> @@ -1010,9 +1486,14 @@ <info> <desc>Allows to overwrite the system inactive border color.</desc> </info> - <prop oor:name="Color" oor:type="xs:int"> + <prop oor:name="Light" oor:type="xs:int"> + <info> + <desc>Specifies light color for the inactive border.</desc> + </info> + </prop> + <prop oor:name="Dark" oor:type="xs:int"> <info> - <desc>Specifies the inactive border color.</desc> + <desc>Specifies dark color for the inactive border.</desc> </info> </prop> </group> diff --git a/sc/qa/uitest/calc_tests6/tdf116996.py b/sc/qa/uitest/calc_tests6/tdf116996.py index 98d44ae03d06..6f0475f37cc3 100644 --- a/sc/qa/uitest/calc_tests6/tdf116996.py +++ b/sc/qa/uitest/calc_tests6/tdf116996.py @@ -18,7 +18,7 @@ class tdf116996(UITestCase): xPages = xDialogOpt.getChild("pages") xLOEntry = xPages.getChild('0') # Libreoffice xLOEntry.executeAction("EXPAND", tuple()) - xAdvancedEntry = xLOEntry.getChild('8') + xAdvancedEntry = xLOEntry.getChild('9') xAdvancedEntry.executeAction("SELECT", tuple()) #Libreoffice / Advanced xexperimental = xDialogOpt.getChild("experimental") if get_state_as_dict(xexperimental)['Selected'] != enabled: diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx index 18b213e99abf..45a16089cfe4 100644 --- a/sd/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx @@ -2133,7 +2133,11 @@ CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testThemeViewSeparation) svtools::EditableColorConfig aColorConfig; svtools::ColorConfigValue aValue; aValue.bIsVisible = true; - aValue.nColor = aDarkColor; + // aValue.nColor is just used for caching, so we need to set nDarkColor or nLightColor to specify the light/dark + // color values for an element. Which one will be used is decided based on the application's appearance setting. + // see commit message of Change-Id: I1a7f70dfe44b81f863814f87e8d46e146c0e3d5a + aValue.nDarkColor = aDarkColor; + aValue.nLightColor = aDarkColor; aColorConfig.SetColorValue(svtools::DOCCOLOR, aValue); aColorConfig.AddScheme(u"Dark"_ustr); } @@ -2142,7 +2146,8 @@ CPPUNIT_TEST_FIXTURE(SdTiledRenderingTest, testThemeViewSeparation) svtools::EditableColorConfig aColorConfig; svtools::ColorConfigValue aValue; aValue.bIsVisible = true; - aValue.nColor = COL_WHITE; + aValue.nLightColor = COL_WHITE; + aValue.nDarkColor = COL_WHITE; aColorConfig.SetColorValue(svtools::DOCCOLOR, aValue); aColorConfig.AddScheme(u"Light"_ustr); } diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index fdc4a8e0b3ee..d826cc6c42ee 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -755,10 +755,18 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) svtools::ColorConfigValue aValue; + // aValue.nColor is just used as a cache variable for light/dark color values. It has the dark color if application is in + // dark mode or light color otherwise. see commit message of Change: I1a7f70dfe44b81f863814f87e8d46e146c0e3d5a if(aNewTheme == "Dark") - aValue.nColor = aDefDarkColor; + { + aValue.nLightColor = aDefDarkColor; + aValue.nDarkColor = aDefDarkColor; + } else - aValue.nColor = aDefLightColor; + { + aValue.nLightColor = aDefLightColor; + aValue.nDarkColor = aDefLightColor; + } aColorConfig.SetColorValue(svtools::DOCCOLOR, aValue); break; diff --git a/static/CustomTarget_emscripten_fs_image.mk b/static/CustomTarget_emscripten_fs_image.mk index f7c2d58e41a9..145157a96669 100644 --- a/static/CustomTarget_emscripten_fs_image.mk +++ b/static/CustomTarget_emscripten_fs_image.mk @@ -181,6 +181,7 @@ gb_emscripten_fs_image_files := \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/cui/ui/pastespecial.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/cui/ui/patterntabpage.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/cui/ui/percentdialog.ui \ + $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/cui/ui/appearance.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/cui/ui/pickbulletpage.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/cui/ui/pickgraphicpage.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/cui/ui/picknumberingpage.ui \ diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx index 1065f3fbf876..154862518676 100644 --- a/svtools/source/config/colorcfg.cxx +++ b/svtools/source/config/colorcfg.cxx @@ -49,6 +49,7 @@ using namespace utl; using namespace com::sun::star; const char g_sIsVisible[] = "/IsVisible"; +const char g_sBackgroundType[] = "/BackgroundType"; namespace svtools @@ -105,121 +106,32 @@ namespace { uno::Sequence< OUString> GetPropertyNames(std::u16string_view rScheme) { - struct ColorConfigEntryData_Impl - { - std::u16string_view cName; - bool bCanBeVisible; - }; - static const ColorConfigEntryData_Impl cNames[] = - { - { std::u16string_view(u"/DocColor") ,false }, - { std::u16string_view(u"/DocBoundaries") ,false }, - { std::u16string_view(u"/AppBackground") ,false }, - { std::u16string_view(u"/TableBoundaries") ,false }, - { std::u16string_view(u"/FontColor") ,false }, - { std::u16string_view(u"/Links") ,true }, - { std::u16string_view(u"/LinksVisited") ,true }, - { std::u16string_view(u"/Spell") ,false }, - { std::u16string_view(u"/Grammar") ,false }, - { std::u16string_view(u"/SmartTags") ,false }, - { std::u16string_view(u"/Shadow") , true }, - { std::u16string_view(u"/WriterTextGrid") ,false }, - { std::u16string_view(u"/WriterFieldShadings"),true }, - { std::u16string_view(u"/WriterIdxShadings") ,true }, - { std::u16string_view(u"/WriterDirectCursor") ,true }, - { std::u16string_view(u"/WriterScriptIndicator") ,false }, - { std::u16string_view(u"/WriterSectionBoundaries") ,false }, - { std::u16string_view(u"/WriterHeaderFooterMark") ,false }, - { std::u16string_view(u"/WriterPageBreaks") ,false }, - { std::u16string_view(u"/WriterNonPrintChars") ,false }, - { std::u16string_view(u"/HTMLSGML") ,false }, - { std::u16string_view(u"/HTMLComment") ,false }, - { std::u16string_view(u"/HTMLKeyword") ,false }, - { std::u16string_view(u"/HTMLUnknown") ,false }, - { std::u16string_view(u"/CalcGrid") ,false }, - { std::u16string_view(u"/CalcCellFocus") ,false }, - { std::u16string_view(u"/CalcPageBreak"), false }, - { std::u16string_view(u"/CalcPageBreakManual"), false }, - { std::u16string_view(u"/CalcPageBreakAutomatic"), false }, - { std::u16string_view(u"/CalcHiddenColRow"), true }, - { std::u16string_view(u"/CalcTextOverflow"), true }, - { std::u16string_view(u"/CalcComments"), false }, - { std::u16string_view(u"/CalcDetective") ,false }, - { std::u16string_view(u"/CalcDetectiveError") ,false }, - { std::u16string_view(u"/CalcReference") ,false }, - { std::u16string_view(u"/CalcNotesBackground") ,false }, - { std::u16string_view(u"/CalcValue") ,false }, - { std::u16string_view(u"/CalcFormula") ,false }, - { std::u16string_view(u"/CalcText") ,false }, - { std::u16string_view(u"/CalcProtectedBackground") ,false }, - { std::u16string_view(u"/DrawGrid") ,true }, - { std::u16string_view(u"/Author1"), false }, - { std::u16string_view(u"/Author2"), false }, - { std::u16string_view(u"/Author3"), false }, - { std::u16string_view(u"/Author4"), false }, - { std::u16string_view(u"/Author5"), false }, - { std::u16string_view(u"/Author6"), false }, - { std::u16string_view(u"/Author7"), false }, - { std::u16string_view(u"/Author8"), false }, - { std::u16string_view(u"/Author9"), false }, - { std::u16string_view(u"/BASICEditor"), false }, - { std::u16string_view(u"/BASICIdentifier"), false }, - { std::u16string_view(u"/BASICComment") , false }, - { std::u16string_view(u"/BASICNumber") , false }, - { std::u16string_view(u"/BASICString") , false }, - { std::u16string_view(u"/BASICOperator") , false }, - { std::u16string_view(u"/BASICKeyword") , false }, - { std::u16string_view(u"/BASICError"), false }, - { std::u16string_view(u"/SQLIdentifier"), false }, - { std::u16string_view(u"/SQLNumber"), false }, - { std::u16string_view(u"/SQLString"), false }, - { std::u16string_view(u"/SQLOperator"), false }, - { std::u16string_view(u"/SQLKeyword"), false }, - { std::u16string_view(u"/SQLParameter"), false }, - { std::u16string_view(u"/SQLComment"), false }, - - { std::u16string_view(u"/WindowColor") ,false }, - { std::u16string_view(u"/WindowTextColor") ,false }, - { std::u16string_view(u"/BaseColor") ,false }, - { std::u16string_view(u"/ButtonColor") ,false }, - { std::u16string_view(u"/ButtonTextColor") ,false }, - { std::u16string_view(u"/AccentColor") ,false }, - { std::u16string_view(u"/DisabledColor") ,false }, - { std::u16string_view(u"/DisabledTextColor") ,false }, - { std::u16string_view(u"/ShadowColor") ,false }, - { std::u16string_view(u"/SeparatorColor") ,false }, - { std::u16string_view(u"/FaceColor") ,false }, - { std::u16string_view(u"/ActiveColor") ,false }, - { std::u16string_view(u"/ActiveTextColor") ,false }, - { std::u16string_view(u"/ActiveBorderColor") ,false }, - { std::u16string_view(u"/FieldColor") ,false }, - { std::u16string_view(u"/MenuBarColor") ,false }, - { std::u16string_view(u"/MenuBarTextColor") ,false }, - { std::u16string_view(u"/MenuBarHighlightColor") ,false }, - { std::u16string_view(u"/MenuBarHighlightTextColor") ,false }, - { std::u16string_view(u"/MenuColor") ,false }, - { std::u16string_view(u"/MenuTextColor") ,false }, - { std::u16string_view(u"/MenuHighlightColor") ,false }, - { std::u16string_view(u"/MenuHighlightTextColor") ,false }, - { std::u16string_view(u"/MenuBorderColor") ,false }, - { std::u16string_view(u"/InactiveColor") ,false }, - { std::u16string_view(u"/InactiveTextColor") ,false }, - { std::u16string_view(u"/InactiveBorderColor") ,false } - }; - - uno::Sequence<OUString> aNames(2 * ColorConfigEntryCount); + // this assums that all the entries will have at max 3 properties. this + // might not be the case as more and more UI elements support the bitmap + // background property. If that happens we might want to increase it to + // 5 * ColorConfigEntryCount; shouldn't be a problem now + uno::Sequence<OUString> aNames(3 * ColorConfigEntryCount); OUString* pNames = aNames.getArray(); int nIndex = 0; OUString sBase = "ColorSchemes/" + utl::wrapConfigurationElementName(rScheme); for(sal_Int32 i = 0; i < ColorConfigEntryCount; ++i) { - OUString sBaseName = sBase + cNames[i].cName; - pNames[nIndex++] = sBaseName + "/Color"; - if(cNames[i].bCanBeVisible) + // every property has two entries, one for light color and one + // for dark color. and an optional visibility entry based on + // cNames[nIndex].bCanBeVisible + OUString sBaseName = sBase + "/" + cNames[i].cName; + pNames[nIndex++] = sBaseName + "/Light"; + pNames[nIndex++] = sBaseName + "/Dark"; + + if (cNames[i].bCanHaveBitmap) { - pNames[nIndex++] = sBaseName + g_sIsVisible; + pNames[nIndex++] = sBaseName + "/BackgroundType"; + pNames[nIndex++] = sBaseName + "/Bitmap"; } + + if(cNames[i].bCanBeVisible) + pNames[nIndex++] = sBaseName + g_sIsVisible; } aNames.realloc(nIndex); return aNames; @@ -258,7 +170,7 @@ void ColorConfig_Impl::Load(const OUString& rScheme) } m_sLoadedScheme = sScheme; - // in cases like theme change/extension removal, use AUTOMATIC_COLOR_SCHEME as fallback. + // in cases like theme not found or extension removal, use AUTOMATIC_COLOR_SCHEME as fallback. if (!ThemeColors::IsAutomaticTheme(sScheme)) { uno::Sequence<OUString> aSchemes = GetSchemeNames(); @@ -283,18 +195,67 @@ void ColorConfig_Impl::Load(const OUString& rScheme) sal_Int32 nIndex = 0; for(int i = 0; i < ColorConfigEntryCount && aColors.getLength() > nIndex; ++i) { - if(pColors[nIndex].hasValue()) - { - Color nTmp; - pColors[nIndex] >>= nTmp; - m_aConfigValues[i].nColor = nTmp; - } + // light color value + Color nTmp; + pColors[nIndex] >>= nTmp; + m_aConfigValues[i].nLightColor = nTmp; + + if (!pColors[nIndex].hasValue()) + m_aConfigValues[i].nLightColor = COL_AUTO; + ++nIndex; + + // dark color value + pColors[nIndex] >>= nTmp; + m_aConfigValues[i].nDarkColor = nTmp; + + if (!pColors[nIndex].hasValue()) + m_aConfigValues[i].nDarkColor = COL_AUTO; + ++nIndex; + + bool bIsDarkMode + = MiscSettings::GetAppColorMode() == 2 + || (MiscSettings::GetAppColorMode() == 0 && MiscSettings::GetUseDarkMode()); + + // based on the appearance (light/dark) cache the value of the appropriate color in nColor. + // this way we don't have to add hunderds of function calls in the codebase and it will be fast. + if (bIsDarkMode) + m_aConfigValues[i].nColor = m_aConfigValues[i].nDarkColor; else - m_aConfigValues[i].nColor = COL_AUTO; - nIndex++; + m_aConfigValues[i].nColor = m_aConfigValues[i].nLightColor; + if(nIndex >= aColors.getLength()) break; - //test for visibility property + + m_aConfigValues[i].bUseBitmapBackground = false; + + // for entries that support bitmap background customization + if (pColorNames[nIndex].endsWith(g_sBackgroundType)) + { + // use bitmap for background + bool bUseBitmapBackground = false; + pColors[nIndex++] >>= bUseBitmapBackground; + m_aConfigValues[i].bUseBitmapBackground = bUseBitmapBackground; + + OUString aBitmapStr = ""; + pColors[nIndex++] >>= aBitmapStr; + + // stretched or tiled + bool bIsBitmapStretched = aBitmapStr.endsWith("stretched"); + m_aConfigValues[i].bIsBitmapStretched = bIsBitmapStretched; + + // bitmap file name + int nNameEnding = aBitmapStr.indexOf(";"); + std::u16string_view aBitmapFileName; + if (aBitmapStr.isEmpty()) + aBitmapFileName = u""; + else + aBitmapFileName = aBitmapStr.subView(0, nNameEnding); + + m_aConfigValues[i].sBitmapFileName = aBitmapFileName; + } + + // we check if the property ends with "/IsVisible" because not all entries are visible + // see cNames[nIndex].bCanBeVisible if(pColorNames[nIndex].endsWith(g_sIsVisible)) m_aConfigValues[i].bIsVisible = Any2Bool(pColors[nIndex++]); } @@ -364,17 +325,40 @@ void ColorConfig_Impl::ImplCommit() beans::PropertyValue* pPropValues = aPropValues.getArray(); const OUString* pColorNames = aColorNames.getConstArray(); sal_Int32 nIndex = 0; - for(int i = 0; i < ColorConfigEntryCount && aColorNames.getLength() > nIndex; ++i) + for(int i = 0; i < ColorConfigEntryCount && nIndex < aColorNames.getLength(); ++i) { + // light color value pPropValues[nIndex].Name = pColorNames[nIndex]; - //save automatic colors as void value - if(m_aConfigValues[i].nColor != COL_AUTO) - pPropValues[nIndex].Value <<= m_aConfigValues[i].nColor; + if(m_aConfigValues[i].nLightColor != COL_AUTO) //save automatic colors as void value + pPropValues[nIndex].Value <<= m_aConfigValues[i].nLightColor; + nIndex++; + // dark color value + pPropValues[nIndex].Name = pColorNames[nIndex]; + if(m_aConfigValues[i].nDarkColor != COL_AUTO) //save automatic colors as void value + pPropValues[nIndex].Value <<= m_aConfigValues[i].nDarkColor; nIndex++; + if(nIndex >= aColorNames.getLength()) break; - //test for visibility property + + if (pColorNames[nIndex].endsWith(g_sBackgroundType)) + { + pPropValues[nIndex].Name = pColorNames[nIndex]; + pPropValues[nIndex].Value <<= m_aConfigValues[i].bUseBitmapBackground; + + ++nIndex; // Bitmap + OUString aBitmapStr = m_aConfigValues[i].sBitmapFileName + ";"; + aBitmapStr += m_aConfigValues[i].bIsBitmapStretched ? std::u16string_view(u"stretched") + : std::u16string_view(u"tiled"); + + pPropValues[nIndex].Name = pColorNames[nIndex]; + pPropValues[nIndex].Value <<= aBitmapStr; + ++nIndex; + } + + // we check if the property ends with "/IsVisible" because not all entries are visible + // see cNames[nIndex].bCanBeVisible if(pColorNames[nIndex].endsWith(g_sIsVisible)) { pPropValues[nIndex].Name = pColorNames[nIndex]; @@ -451,41 +435,47 @@ void ColorConfig::LoadThemeColorsFromRegistry() { ThemeColors& rThemeColors = ThemeColors::GetThemeColors(); - rThemeColors.SetWindowColor(m_pImpl->GetColorConfigValue(svtools::WINDOWCOLOR).nColor); - rThemeColors.SetWindowTextColor(m_pImpl->GetColorConfigValue(svtools::WINDOWTEXTCOLOR).nColor); - rThemeColors.SetBaseColor(m_pImpl->GetColorConfigValue(svtools::BASECOLOR).nColor); - rThemeColors.SetButtonColor(m_pImpl->GetColorConfigValue(svtools::BUTTONCOLOR).nColor); - rThemeColors.SetButtonTextColor(m_pImpl->GetColorConfigValue(svtools::BUTTONTEXTCOLOR).nColor); - rThemeColors.SetAccentColor(m_pImpl->GetColorConfigValue(svtools::ACCENTCOLOR).nColor); - rThemeColors.SetDisabledColor(m_pImpl->GetColorConfigValue(svtools::DISABLEDCOLOR).nColor); - rThemeColors.SetDisabledTextColor(m_pImpl->GetColorConfigValue(svtools::DISABLEDTEXTCOLOR).nColor); - rThemeColors.SetShadeColor(m_pImpl->GetColorConfigValue(svtools::SHADECOLOR).nColor); - rThemeColors.SetSeparatorColor(m_pImpl->GetColorConfigValue(svtools::SEPARATORCOLOR).nColor); - rThemeColors.SetFaceColor(m_pImpl->GetColorConfigValue(svtools::FACECOLOR).nColor); - rThemeColors.SetActiveColor(m_pImpl->GetColorConfigValue(svtools::ACTIVECOLOR).nColor); - rThemeColors.SetActiveTextColor(m_pImpl->GetColorConfigValue(svtools::ACTIVETEXTCOLOR).nColor); - rThemeColors.SetActiveBorderColor(m_pImpl->GetColorConfigValue(svtools::ACTIVEBORDERCOLOR).nColor); - rThemeColors.SetFieldColor(m_pImpl->GetColorConfigValue(svtools::FIELDCOLOR).nColor); - rThemeColors.SetMenuBarColor(m_pImpl->GetColorConfigValue(svtools::MENUBARCOLOR).nColor); - rThemeColors.SetMenuBarTextColor(m_pImpl->GetColorConfigValue(svtools::MENUBARTEXTCOLOR).nColor); - rThemeColors.SetMenuBarHighlightColor(m_pImpl->GetColorConfigValue(svtools::MENUBARHIGHLIGHTCOLOR).nColor); - rThemeColors.SetMenuBarHighlightTextColor(m_pImpl->GetColorConfigValue(svtools::MENUBARHIGHLIGHTTEXTCOLOR).nColor); - rThemeColors.SetMenuColor(m_pImpl->GetColorConfigValue(svtools::MENUCOLOR).nColor); - rThemeColors.SetMenuTextColor(m_pImpl->GetColorConfigValue(svtools::MENUTEXTCOLOR).nColor); - rThemeColors.SetMenuHighlightColor(m_pImpl->GetColorConfigValue(svtools::MENUHIGHLIGHTCOLOR).nColor); - rThemeColors.SetMenuHighlightTextColor(m_pImpl->GetColorConfigValue(svtools::MENUHIGHLIGHTTEXTCOLOR).nColor); - rThemeColors.SetMenuBorderColor(m_pImpl->GetColorConfigValue(svtools::MENUBORDERCOLOR).nColor); - rThemeColors.SetInactiveColor(m_pImpl->GetColorConfigValue(svtools::INACTIVECOLOR).nColor); - rThemeColors.SetInactiveTextColor(m_pImpl->GetColorConfigValue(svtools::INACTIVETEXTCOLOR).nColor); - rThemeColors.SetInactiveBorderColor(m_pImpl->GetColorConfigValue(svtools::INACTIVEBORDERCOLOR).nColor); + rThemeColors.SetWindowColor(GetColorValue(svtools::WINDOWCOLOR).nColor); + rThemeColors.SetWindowTextColor(GetColorValue(svtools::WINDOWTEXTCOLOR).nColor); + rThemeColors.SetBaseColor(GetColorValue(svtools::BASECOLOR).nColor); + rThemeColors.SetButtonColor(GetColorValue(svtools::BUTTONCOLOR).nColor); + rThemeColors.SetButtonTextColor(GetColorValue(svtools::BUTTONTEXTCOLOR).nColor); + rThemeColors.SetAccentColor(GetColorValue(svtools::ACCENTCOLOR).nColor); + rThemeColors.SetDisabledColor(GetColorValue(svtools::DISABLEDCOLOR).nColor); + rThemeColors.SetDisabledTextColor(GetColorValue(svtools::DISABLEDTEXTCOLOR).nColor); + rThemeColors.SetShadeColor(GetColorValue(svtools::SHADECOLOR).nColor); + rThemeColors.SetSeparatorColor(GetColorValue(svtools::SEPARATORCOLOR).nColor); + rThemeColors.SetFaceColor(GetColorValue(svtools::FACECOLOR).nColor); + rThemeColors.SetActiveColor(GetColorValue(svtools::ACTIVECOLOR).nColor); + rThemeColors.SetActiveTextColor(GetColorValue(svtools::ACTIVETEXTCOLOR).nColor); + rThemeColors.SetActiveBorderColor(GetColorValue(svtools::ACTIVEBORDERCOLOR).nColor); + rThemeColors.SetFieldColor(GetColorValue(svtools::FIELDCOLOR).nColor); + rThemeColors.SetMenuBarColor(GetColorValue(svtools::MENUBARCOLOR).nColor); + rThemeColors.SetMenuBarTextColor(GetColorValue(svtools::MENUBARTEXTCOLOR).nColor); + rThemeColors.SetMenuBarHighlightColor(GetColorValue(svtools::MENUBARHIGHLIGHTCOLOR).nColor); + rThemeColors.SetMenuBarHighlightTextColor(GetColorValue(svtools::MENUBARHIGHLIGHTTEXTCOLOR).nColor); + rThemeColors.SetMenuColor(GetColorValue(svtools::MENUCOLOR).nColor); + rThemeColors.SetMenuTextColor(GetColorValue(svtools::MENUTEXTCOLOR).nColor); + rThemeColors.SetMenuHighlightColor(GetColorValue(svtools::MENUHIGHLIGHTCOLOR).nColor); + rThemeColors.SetMenuHighlightTextColor(GetColorValue(svtools::MENUHIGHLIGHTTEXTCOLOR).nColor); + rThemeColors.SetMenuBorderColor(GetColorValue(svtools::MENUBORDERCOLOR).nColor); + rThemeColors.SetInactiveColor(GetColorValue(svtools::INACTIVECOLOR).nColor); + rThemeColors.SetInactiveTextColor(GetColorValue(svtools::INACTIVETEXTCOLOR).nColor); + rThemeColors.SetInactiveBorderColor(GetColorValue(svtools::INACTIVEBORDERCOLOR).nColor); rThemeColors.SetThemeName(GetCurrentSchemeName()); + // as more controls support it, we might want to have ColorConfigValue entries in ThemeColors + // instead of just colors. for now that seems overkill for just one control. + rThemeColors.SetAppBackBitmapFileName(m_pImpl->GetColorConfigValue(svtools::APPBACKGROUND).sBitmapFileName); + rThemeColors.SetAppBackUseBitmap(m_pImpl->GetColorConfigValue(svtools::APPBACKGROUND).bUseBitmapBackground); + rThemeColors.SetAppBackBitmapStretched(m_pImpl->GetColorConfigValue(svtools::APPBACKGROUND).bIsBitmapStretched); + ThemeColors::SetThemeLoaded(true); } void ColorConfig::SetupTheme() { - if (!officecfg::Office::Common::Misc::LibreOfficeTheme::get() + if (!officecfg::Office::Common::Appearance::LibreOfficeTheme::get() || ThemeColors::IsAutomaticTheme(GetCurrentSchemeName())) { ThemeColors::SetThemeLoaded(false); @@ -532,12 +522,73 @@ ColorConfig::~ColorConfig() } } +static Color lcl_GetDefaultUIColor(ColorConfigEntry eEntry) +{ + const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); + switch (eEntry) + { + case WINDOWCOLOR: + return rStyleSettings.GetWindowColor(); + case WINDOWTEXTCOLOR: + return rStyleSettings.GetWindowTextColor(); + case BASECOLOR: + return rStyleSettings.GetFieldColor(); + case BUTTONCOLOR: + return rStyleSettings.GetDialogColor(); + case BUTTONTEXTCOLOR: + return rStyleSettings.GetButtonTextColor(); + case ACCENTCOLOR: + return rStyleSettings.GetAccentColor(); + case DISABLEDCOLOR: + return rStyleSettings.GetDisableColor(); + case DISABLEDTEXTCOLOR: + case SHADECOLOR: + return rStyleSettings.GetShadowColor(); + case SEPARATORCOLOR: + return rStyleSettings.GetSeparatorColor(); + case FACECOLOR: + return rStyleSettings.GetFaceColor(); + case ACTIVECOLOR: + return rStyleSettings.GetActiveColor(); + case ACTIVETEXTCOLOR: + return rStyleSettings.GetActiveTextColor(); + case ACTIVEBORDERCOLOR: + return rStyleSettings.GetActiveBorderColor(); + case FIELDCOLOR: + return rStyleSettings.GetFieldColor(); + case MENUBARCOLOR: + return rStyleSettings.GetMenuBarColor(); + case MENUBARTEXTCOLOR: + return rStyleSettings.GetMenuBarTextColor(); + case MENUBARHIGHLIGHTCOLOR: + return rStyleSettings.GetAccentColor(); + case MENUBARHIGHLIGHTTEXTCOLOR: + return rStyleSettings.GetMenuBarHighlightTextColor(); + case MENUCOLOR: + return rStyleSettings.GetMenuColor(); + case MENUTEXTCOLOR: + return rStyleSettings.GetMenuTextColor(); + case MENUHIGHLIGHTCOLOR: + return rStyleSettings.GetMenuHighlightColor(); + case MENUHIGHLIGHTTEXTCOLOR: + return rStyleSettings.GetMenuHighlightTextColor(); + case MENUBORDERCOLOR: + return rStyleSettings.GetMenuBorderColor(); + case INACTIVECOLOR: + case INACTIVETEXTCOLOR: + case INACTIVEBORDERCOLOR: + return rStyleSettings.GetShadowColor(); + default: + return COL_AUTO; + } +} + Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry, int nMod) { // the actual value of default color doesn't matter for colors in Group_Application // and this is just to prevent index out of bound error. if (eEntry >= WINDOWCOLOR) - return COL_GRAY; + return lcl_GetDefaultUIColor(eEntry); enum ColorType { clLight = 0, clDark, diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index eaa1630cd084..e438a891490f 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -180,6 +180,8 @@ class SAL_DLLPUBLIC_RTTI SwViewShell : public sw::Ring<SwViewShell> // PaintDesktop split. This pars is also used by PreviewPage. void PaintDesktop_(const SwRegionRects &rRegion); + static bool DrawAppBackgroundBitmap(vcl::RenderContext* rRenderContext, const SwRect& rRect); + bool CheckInvalidForPaint( const SwRect & ); // Direct Paint or rather // trigger an action. diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx index 1846c1b535a2..0f0cd9ed3403 100644 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx @@ -1230,7 +1230,11 @@ static void addDarkLightThemes(const Color& rDarkColor, const Color& rLightColor svtools::EditableColorConfig aColorConfig; svtools::ColorConfigValue aValue; aValue.bIsVisible = true; - aValue.nColor = rDarkColor; + // aValue.nColor is just used for caching, so we need to set nDarkColor or nLightColor to specify the light/dark + // color values for an element. which one to use is decided based on the application's appearance setting. + // see commit message of Change: I1a7f70dfe44b81f863814f87e8d46e146c0e3d5a + aValue.nLightColor = rDarkColor; + aValue.nDarkColor = rDarkColor; aColorConfig.SetColorValue(svtools::DOCCOLOR, aValue); aColorConfig.AddScheme(u"Dark"_ustr); } @@ -1239,7 +1243,8 @@ static void addDarkLightThemes(const Color& rDarkColor, const Color& rLightColor svtools::EditableColorConfig aColorConfig; svtools::ColorConfigValue aValue; aValue.bIsVisible = true; - aValue.nColor = rLightColor; + aValue.nLightColor = rLightColor; + aValue.nDarkColor = rLightColor; aColorConfig.SetColorValue(svtools::DOCCOLOR, aValue); aColorConfig.AddScheme(u"Light"_ustr); } diff --git a/sw/qa/uitest/options/tdf131581.py b/sw/qa/uitest/options/tdf131581.py index 97d2bba9ec7e..3353aaca9abd 100644 --- a/sw/qa/uitest/options/tdf131581.py +++ b/sw/qa/uitest/options/tdf131581.py @@ -21,7 +21,7 @@ class tdf131581(UITestCase): xPages = xDialogOpt.getChild("pages") xLOEntry = xPages.getChild('0') xLOEntry.executeAction("EXPAND", tuple()) - xAdvancedEntry = xLOEntry.getChild('8') + xAdvancedEntry = xLOEntry.getChild('9') xAdvancedEntry.executeAction("SELECT", tuple()) xExpertBtn = xDialogOpt.getChild("expertconfig") diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 2cf0e92b8192..4af997226abc 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <vcl/themecolors.hxx> #include <officecfg/Office/Common.hxx> #include <config_wasm_strip.h> @@ -1747,9 +1748,30 @@ void SwViewShell::PaintDesktop(const vcl::RenderContext& rRenderContext, const S PaintDesktop_(aRegion); } +bool SwViewShell::DrawAppBackgroundBitmap(vcl::RenderContext* rRenderContext, const SwRect& rRect) +{ + if (Application::IsHeadlessModeEnabled() + || !ThemeColors::GetThemeColors().GetAppBackUseBitmap()) + return false; + + const BitmapEx& aAppBackImg + = Application::GetSettings().GetStyleSettings().GetAppBackgroundBitmap(); + if (aAppBackImg.IsEmpty()) + return false; + + Wallpaper aWallpaper(aAppBackImg); + aWallpaper.SetStyle(WallpaperStyle::Tile); + + rRenderContext->DrawWallpaper(rRect.SVRect(), aWallpaper); + return true; +} + // PaintDesktop is split in two, this part is also used by PreviewPage void SwViewShell::PaintDesktop_(const SwRegionRects &rRegion) { + if (DrawAppBackgroundBitmap(GetOut(), rRegion.GetOrigin())) + return; + // OD 2004-04-23 #116347# GetOut()->Push( vcl::PushFlags::FILLCOLOR|vcl::PushFlags::LINECOLOR ); GetOut()->SetLineColor(); diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index fadb31337c97..6c69bda88a37 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <vcl/themecolors.hxx> #include <config_folders.h> #include <officecfg/Office/Common.hxx> @@ -250,6 +251,8 @@ struct ImplStyleData Size maListBoxPreviewDefaultLogicSize = getInitListBoxPreviewDefaultLogicSize(); // on-demand calculated in GetListBoxPreviewDefaultPixelSize() Size mutable maListBoxPreviewDefaultPixelSize; + BitmapEx mutable maAppBackgroundBitmap; // cache AppBackground bitmap + OUString mutable maAppBackgroundBitmapFileName; // cache AppBackground bitmap file name bool operator==(const ImplStyleData& rSet) const; }; @@ -1956,6 +1959,49 @@ StyleSettings::GetDialogStyle() const return mxData->maDialogStyle; } +static BitmapEx readBitmapEx(const OUString& rPath) +{ + OUString aPath(rPath); + rtl::Bootstrap::expandMacros(aPath); + + // import the image + Graphic aGraphic; + if (GraphicFilter::LoadGraphic(aPath, OUString(), aGraphic) != ERRCODE_NONE) + return BitmapEx(); + return aGraphic.GetBitmapEx(); +} + +static void setupAppBackgroundBitmap(OUString& rAppBackBitmapFileName, BitmapEx& rAppBackBitmap) +{ + if (Application::IsHeadlessModeEnabled() + || !ThemeColors::GetThemeColors().GetAppBackUseBitmap()) + return; + + OUString sAppBackgroundBitmap = ThemeColors::GetThemeColors().GetAppBackBitmapFileName(); + if (rAppBackBitmapFileName == sAppBackgroundBitmap) + return; + + rAppBackBitmapFileName = sAppBackgroundBitmap; + + if (!rAppBackBitmapFileName.isEmpty()) + { + rAppBackBitmap = readBitmapEx("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/gallery/backgrounds/" + + rAppBackBitmapFileName); + } + + if (rAppBackBitmap.IsEmpty()) + { + SAL_WARN("vcl.app", "Failed to load AppBackground bitmap file: " << rAppBackBitmapFileName); + ThemeColors::GetThemeColors().SetAppBackUseBitmap(false); + } +} + +BitmapEx const& StyleSettings::GetAppBackgroundBitmap() const +{ + setupAppBackgroundBitmap(mxData->maAppBackgroundBitmapFileName, mxData->maAppBackgroundBitmap); + return mxData->maAppBackgroundBitmap; +} + void StyleSettings::SetEdgeBlending(sal_uInt16 nCount) { @@ -2195,7 +2241,9 @@ bool ImplStyleData::operator==(const ImplStyleData& rSet) const (mnListBoxMaximumLineCount == rSet.mnListBoxMaximumLineCount) && (mnColorValueSetColumnCount == rSet.mnColorValueSetColumnCount) && (maListBoxPreviewDefaultLogicSize == rSet.maListBoxPreviewDefaultLogicSize) && - (mbPreviewUsesCheckeredBackground == rSet.mbPreviewUsesCheckeredBackground); + (mbPreviewUsesCheckeredBackground == rSet.mbPreviewUsesCheckeredBackground) && + (maAppBackgroundBitmapFileName == rSet.maAppBackgroundBitmapFileName) && + (maAppBackgroundBitmap == rSet.maAppBackgroundBitmap); } ImplMiscData::ImplMiscData() : @@ -2266,13 +2314,13 @@ bool MiscSettings::GetEnableLocalizedDecimalSep() const int MiscSettings::GetDarkMode() { - return officecfg::Office::Common::Misc::Appearance::get(); + return officecfg::Office::Common::Appearance::ApplicationAppearance::get(); } void MiscSettings::SetDarkMode(int nMode) { std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create()); - officecfg::Office::Common::Misc::Appearance::set(nMode, batch); + officecfg::Office::Common::Appearance::ApplicationAppearance::set(nMode, batch); batch->commit(); vcl::Window *pWin = Application::GetFirstTopLevelWindow(); @@ -2295,13 +2343,13 @@ int MiscSettings::GetAppColorMode() { if (comphelper::IsFuzzing()) return 0; - return officecfg::Office::Common::Misc::ApplicationAppearance::get(); + return officecfg::Office::Common::Appearance::ApplicationAppearance::get(); } void MiscSettings::SetAppColorMode(int nMode) { std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create()); - officecfg::Office::Common::Misc::ApplicationAppearance::set(nMode, batch); + officecfg::Office::Common::Appearance::ApplicationAppearance::set(nMode, batch); batch->commit(); } diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx index 8b96d7a321c0..5d99e23d039f 100644 --- a/vcl/unx/gtk3/gtkframe.cxx +++ b/vcl/unx/gtk3/gtkframe.cxx @@ -1367,7 +1367,7 @@ void GtkSalFrame::SetColorScheme(GVariant* variant) guint32 color_scheme; - switch (officecfg::Office::Common::Misc::Appearance::get()) + switch (MiscSettings::GetAppColorMode()) { default: case 0: // Auto |