diff --git a/main/cui/source/options/optgdlg.src b/main/cui/source/options/optgdlg.src
index d0ea28c759..e23d1960b3 100644
--- a/main/cui/source/options/optgdlg.src
+++ b/main/cui/source/options/optgdlg.src
@@ -250,6 +250,7 @@ TabPage OFA_TP_VIEW
< "High Contrast" ; > ;
< "Industrial" ; > ;
< "Classic" ; > ;
+ < "Remix (dark)" ; > ;
};
};
CheckBox CB_SYSTEM_FONT
diff --git a/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 7c6853a142..5e92348eb2 100644
--- a/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/main/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5262,6 +5262,11 @@
Classic - the OpenOffice.org 2.0 default theme
+
+
+ Remix (dark)
+
+
auto
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_alignhorizontalcenter.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_alignhorizontalcenter.png
new file mode 100644
index 0000000000..9314d0ecf7
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_alignhorizontalcenter.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_bold.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_bold.png
new file mode 100644
index 0000000000..6931929c94
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_bold.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_centerpara.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_centerpara.png
new file mode 100644
index 0000000000..9314d0ecf7
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_centerpara.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_controlcodes.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_controlcodes.png
new file mode 100644
index 0000000000..3eaf5b47b9
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_controlcodes.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_copy.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_copy.png
new file mode 100644
index 0000000000..bca2b07753
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_copy.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_cut.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_cut.png
new file mode 100644
index 0000000000..82764ef635
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_cut.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_decrementindent.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_decrementindent.png
new file mode 100644
index 0000000000..6090a7e497
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_decrementindent.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_defaultbullet.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_defaultbullet.png
new file mode 100644
index 0000000000..c2f3298902
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_defaultbullet.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_defaultnumbering.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_defaultnumbering.png
new file mode 100644
index 0000000000..a24056fe1a
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_defaultnumbering.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_editdoc.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_editdoc.png
new file mode 100644
index 0000000000..cd1c894ce5
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_editdoc.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_exportdirecttopdf.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_exportdirecttopdf.png
new file mode 100644
index 0000000000..a9aa6538d4
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_exportdirecttopdf.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_formatpaintbrush.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_formatpaintbrush.png
new file mode 100644
index 0000000000..2f5442803f
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_formatpaintbrush.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_helpindex.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_helpindex.png
new file mode 100644
index 0000000000..a54bdd2b80
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_helpindex.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_hyperlinkdialog.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_hyperlinkdialog.png
new file mode 100644
index 0000000000..e5ccffa2e8
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_hyperlinkdialog.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_incrementindent.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_incrementindent.png
new file mode 100644
index 0000000000..0b74fc1559
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_incrementindent.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_inserttable.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_inserttable.png
new file mode 100644
index 0000000000..61b2e91b6c
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_inserttable.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_italic.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_italic.png
new file mode 100644
index 0000000000..aace708d2a
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_italic.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_justifypara.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_justifypara.png
new file mode 100644
index 0000000000..0f97983b92
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_justifypara.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_leftpara.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_leftpara.png
new file mode 100644
index 0000000000..0045bc9de0
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_leftpara.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_navigator.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_navigator.png
new file mode 100644
index 0000000000..fd47236d2f
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_navigator.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_open.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_open.png
new file mode 100644
index 0000000000..36c3692c8e
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_open.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_paste.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_paste.png
new file mode 100644
index 0000000000..dea4646cb9
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_paste.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_printdefault.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_printdefault.png
new file mode 100644
index 0000000000..be30b7df20
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_printdefault.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_printpreview.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_printpreview.png
new file mode 100644
index 0000000000..e198f0e1a9
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_printpreview.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_redo.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_redo.png
new file mode 100644
index 0000000000..c51eb9bc1d
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_redo.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_rightpara.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_rightpara.png
new file mode 100644
index 0000000000..dc81b405f4
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_rightpara.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_save.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_save.png
new file mode 100644
index 0000000000..729e3ec06a
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_save.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_searchdialog.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_searchdialog.png
new file mode 100644
index 0000000000..51167081b0
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_searchdialog.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_sendmail.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_sendmail.png
new file mode 100644
index 0000000000..a987df1be3
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_sendmail.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_sortascending.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_sortascending.png
new file mode 100644
index 0000000000..efdfb6b4c4
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_sortascending.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_symbolcatalogue.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_symbolcatalogue.png
new file mode 100644
index 0000000000..9bb20ab0ca
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_symbolcatalogue.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_toggleanchortype.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_toggleanchortype.png
new file mode 100644
index 0000000000..67777781c9
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_toggleanchortype.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_underline.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_underline.png
new file mode 100644
index 0000000000..96f4db36d5
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_underline.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_undo.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_undo.png
new file mode 100644
index 0000000000..6b8a92a19a
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_undo.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_zoom.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_zoom.png
new file mode 100644
index 0000000000..80e6ecaa9d
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_zoom.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/lc_zoomtoolbox.png b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_zoomtoolbox.png
new file mode 100644
index 0000000000..80e6ecaa9d
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/lc_zoomtoolbox.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_alignhorizontalcenter.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_alignhorizontalcenter.png
new file mode 100644
index 0000000000..d9e39e2b72
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_alignhorizontalcenter.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_bold.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_bold.png
new file mode 100644
index 0000000000..356b6a8271
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_bold.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_centerpara.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_centerpara.png
new file mode 100644
index 0000000000..d9e39e2b72
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_centerpara.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_controlcodes.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_controlcodes.png
new file mode 100644
index 0000000000..75dbf0e659
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_controlcodes.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_copy.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_copy.png
new file mode 100644
index 0000000000..d8300313aa
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_copy.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_cut.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_cut.png
new file mode 100644
index 0000000000..121bbe9a0e
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_cut.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_decrementindent.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_decrementindent.png
new file mode 100644
index 0000000000..3daa05ec0c
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_decrementindent.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_defaultbullet.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_defaultbullet.png
new file mode 100644
index 0000000000..729dc701d7
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_defaultbullet.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_defaultnumbering.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_defaultnumbering.png
new file mode 100644
index 0000000000..89e1158934
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_defaultnumbering.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_editdoc.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_editdoc.png
new file mode 100644
index 0000000000..07e43191a3
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_editdoc.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_exportdirecttopdf.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_exportdirecttopdf.png
new file mode 100644
index 0000000000..9e4da12fc4
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_exportdirecttopdf.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_formatpaintbrush.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_formatpaintbrush.png
new file mode 100644
index 0000000000..3fc83a4c17
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_formatpaintbrush.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_helpindex.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_helpindex.png
new file mode 100644
index 0000000000..ea895e1c73
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_helpindex.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_hyperlinkdialog.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_hyperlinkdialog.png
new file mode 100644
index 0000000000..77fcca628e
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_hyperlinkdialog.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_incrementindent.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_incrementindent.png
new file mode 100644
index 0000000000..cbef464797
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_incrementindent.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_inserttable.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_inserttable.png
new file mode 100644
index 0000000000..8681cd89a0
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_inserttable.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_italic.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_italic.png
new file mode 100644
index 0000000000..edb98cfe79
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_italic.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_justifypara.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_justifypara.png
new file mode 100644
index 0000000000..94c261b940
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_justifypara.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_leftpara.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_leftpara.png
new file mode 100644
index 0000000000..9d10ba0f3b
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_leftpara.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_navigator.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_navigator.png
new file mode 100644
index 0000000000..1911855cfc
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_navigator.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_open.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_open.png
new file mode 100644
index 0000000000..c408b40fa7
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_open.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_paste.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_paste.png
new file mode 100644
index 0000000000..4f3dce0ff1
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_paste.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_printdefault.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_printdefault.png
new file mode 100644
index 0000000000..eb718875ee
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_printdefault.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_printpreview.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_printpreview.png
new file mode 100644
index 0000000000..d55aea3315
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_printpreview.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_redo.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_redo.png
new file mode 100644
index 0000000000..973065775a
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_redo.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_rightpara.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_rightpara.png
new file mode 100644
index 0000000000..bd70ffb94a
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_rightpara.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_save.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_save.png
new file mode 100644
index 0000000000..604c4bd887
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_save.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_searchdialog.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_searchdialog.png
new file mode 100644
index 0000000000..781e3fb2c6
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_searchdialog.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_sendmail.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_sendmail.png
new file mode 100644
index 0000000000..6ff01c794a
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_sendmail.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_sortascending.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_sortascending.png
new file mode 100644
index 0000000000..3ca14fc4d5
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_sortascending.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_symbolcatalogue.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_symbolcatalogue.png
new file mode 100644
index 0000000000..d805fb0cbb
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_symbolcatalogue.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_toggleanchortype.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_toggleanchortype.png
new file mode 100644
index 0000000000..01ec33d9ea
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_toggleanchortype.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_underline.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_underline.png
new file mode 100644
index 0000000000..c918d58cc7
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_underline.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_undo.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_undo.png
new file mode 100644
index 0000000000..479e535fa0
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_undo.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_zoom.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_zoom.png
new file mode 100644
index 0000000000..fe58063ae6
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_zoom.png differ
diff --git a/main/ooo_custom_images/remixdark/res/commandimagelist/sc_zoomtoolbox.png b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_zoomtoolbox.png
new file mode 100644
index 0000000000..fe58063ae6
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/commandimagelist/sc_zoomtoolbox.png differ
diff --git a/main/ooo_custom_images/remixdark/res/foldercl.png b/main/ooo_custom_images/remixdark/res/foldercl.png
new file mode 100644
index 0000000000..fb633e3a14
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/foldercl.png differ
diff --git a/main/ooo_custom_images/remixdark/res/folderop.png b/main/ooo_custom_images/remixdark/res/folderop.png
new file mode 100644
index 0000000000..c408b40fa7
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/folderop.png differ
diff --git a/main/ooo_custom_images/remixdark/res/helpimg/tip.png b/main/ooo_custom_images/remixdark/res/helpimg/tip.png
new file mode 100644
index 0000000000..ea6f529a1e
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/helpimg/tip.png differ
diff --git a/main/ooo_custom_images/remixdark/res/helpimg/tip_small.png b/main/ooo_custom_images/remixdark/res/helpimg/tip_small.png
new file mode 100644
index 0000000000..97b385101c
Binary files /dev/null and b/main/ooo_custom_images/remixdark/res/helpimg/tip_small.png differ
diff --git a/main/ooo_custom_images/remixdark/svtools/res/helpagent.png b/main/ooo_custom_images/remixdark/svtools/res/helpagent.png
new file mode 100644
index 0000000000..715bcb058e
Binary files /dev/null and b/main/ooo_custom_images/remixdark/svtools/res/helpagent.png differ
diff --git a/main/ooo_custom_images/remixdark/svx/res/cropmarkers.png b/main/ooo_custom_images/remixdark/svx/res/cropmarkers.png
new file mode 100644
index 0000000000..6fbfd425b6
Binary files /dev/null and b/main/ooo_custom_images/remixdark/svx/res/cropmarkers.png differ
diff --git a/main/ooo_custom_images/remixdark/svx/res/slidecontrol.png b/main/ooo_custom_images/remixdark/svx/res/slidecontrol.png
new file mode 100644
index 0000000000..a73a6f71fe
Binary files /dev/null and b/main/ooo_custom_images/remixdark/svx/res/slidecontrol.png differ
diff --git a/main/ooo_custom_images/remixdark/svx/res/slidezoomin_11.png b/main/ooo_custom_images/remixdark/svx/res/slidezoomin_11.png
new file mode 100644
index 0000000000..7938383e37
Binary files /dev/null and b/main/ooo_custom_images/remixdark/svx/res/slidezoomin_11.png differ
diff --git a/main/ooo_custom_images/remixdark/svx/res/slidezoomout_11.png b/main/ooo_custom_images/remixdark/svx/res/slidezoomout_11.png
new file mode 100644
index 0000000000..ed5b671c95
Binary files /dev/null and b/main/ooo_custom_images/remixdark/svx/res/slidezoomout_11.png differ
diff --git a/main/ooo_custom_images/remixdark/sw/res/all_left.png b/main/ooo_custom_images/remixdark/sw/res/all_left.png
new file mode 100644
index 0000000000..15968fae64
Binary files /dev/null and b/main/ooo_custom_images/remixdark/sw/res/all_left.png differ
diff --git a/main/ooo_custom_images/remixdark/sw/res/all_right.png b/main/ooo_custom_images/remixdark/sw/res/all_right.png
new file mode 100644
index 0000000000..3de0839a62
Binary files /dev/null and b/main/ooo_custom_images/remixdark/sw/res/all_right.png differ
diff --git a/main/ooo_custom_images/remixdark/sw/res/one_left.png b/main/ooo_custom_images/remixdark/sw/res/one_left.png
new file mode 100644
index 0000000000..cfa10ada0f
Binary files /dev/null and b/main/ooo_custom_images/remixdark/sw/res/one_left.png differ
diff --git a/main/ooo_custom_images/remixdark/sw/res/one_right.png b/main/ooo_custom_images/remixdark/sw/res/one_right.png
new file mode 100644
index 0000000000..4e221e6ea1
Binary files /dev/null and b/main/ooo_custom_images/remixdark/sw/res/one_right.png differ
diff --git a/main/ooo_custom_images/remixdark/sw/res/point.png b/main/ooo_custom_images/remixdark/sw/res/point.png
new file mode 100644
index 0000000000..d3c0299bde
Binary files /dev/null and b/main/ooo_custom_images/remixdark/sw/res/point.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-16-01.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-16-01.png
new file mode 100644
index 0000000000..113c013a8b
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-16-01.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-16-02.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-16-02.png
new file mode 100644
index 0000000000..684128f9a8
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-16-02.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-16-03.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-16-03.png
new file mode 100644
index 0000000000..bed635b948
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-16-03.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-16-04.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-16-04.png
new file mode 100644
index 0000000000..e1fe282bf9
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-16-04.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-16-05.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-16-05.png
new file mode 100644
index 0000000000..7545e34942
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-16-05.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-16-06.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-16-06.png
new file mode 100644
index 0000000000..34b837d6a7
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-16-06.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-16-07.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-16-07.png
new file mode 100644
index 0000000000..769425f0a0
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-16-07.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-16-08.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-16-08.png
new file mode 100644
index 0000000000..b6830a589a
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-16-08.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-16-09.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-16-09.png
new file mode 100644
index 0000000000..8f2dba21bb
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-16-09.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-16-10.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-16-10.png
new file mode 100644
index 0000000000..620482e7fa
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-16-10.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-16-11.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-16-11.png
new file mode 100644
index 0000000000..54f19f0ab1
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-16-11.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-16-12.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-16-12.png
new file mode 100644
index 0000000000..0117f65d9e
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-16-12.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-32-01.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-32-01.png
new file mode 100644
index 0000000000..b6824d917b
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-32-01.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-32-02.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-32-02.png
new file mode 100644
index 0000000000..8656193748
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-32-02.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-32-03.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-32-03.png
new file mode 100644
index 0000000000..6be16d698f
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-32-03.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-32-04.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-32-04.png
new file mode 100644
index 0000000000..23b7bd034c
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-32-04.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-32-05.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-32-05.png
new file mode 100644
index 0000000000..0d92b1a8c1
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-32-05.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-32-06.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-32-06.png
new file mode 100644
index 0000000000..9e6594774d
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-32-06.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-32-07.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-32-07.png
new file mode 100644
index 0000000000..cb8a6bfb29
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-32-07.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-32-08.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-32-08.png
new file mode 100644
index 0000000000..7b931881c5
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-32-08.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-32-09.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-32-09.png
new file mode 100644
index 0000000000..e98f568652
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-32-09.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-32-10.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-32-10.png
new file mode 100644
index 0000000000..29bdb4a5fc
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-32-10.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-32-11.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-32-11.png
new file mode 100644
index 0000000000..9ff83885e4
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-32-11.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-32-12.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-32-12.png
new file mode 100644
index 0000000000..82c5b7c59d
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-32-12.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-64-01.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-64-01.png
new file mode 100644
index 0000000000..44029da14e
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-64-01.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-64-02.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-64-02.png
new file mode 100644
index 0000000000..15a52896e4
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-64-02.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-64-03.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-64-03.png
new file mode 100644
index 0000000000..51983bbe6e
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-64-03.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-64-04.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-64-04.png
new file mode 100644
index 0000000000..eecf03e594
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-64-04.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-64-05.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-64-05.png
new file mode 100644
index 0000000000..137465a78c
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-64-05.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-64-06.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-64-06.png
new file mode 100644
index 0000000000..728e27d3eb
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-64-06.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-64-07.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-64-07.png
new file mode 100644
index 0000000000..5dff96aee2
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-64-07.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-64-08.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-64-08.png
new file mode 100644
index 0000000000..b067be1398
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-64-08.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-64-09.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-64-09.png
new file mode 100644
index 0000000000..2d38d0bfb4
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-64-09.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-64-10.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-64-10.png
new file mode 100644
index 0000000000..4537cbd142
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-64-10.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-64-11.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-64-11.png
new file mode 100644
index 0000000000..268ba18aed
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-64-11.png differ
diff --git a/main/ooo_custom_images/remixdark/vcl/res/spinner-64-12.png b/main/ooo_custom_images/remixdark/vcl/res/spinner-64-12.png
new file mode 100644
index 0000000000..f1a6c7c6dc
Binary files /dev/null and b/main/ooo_custom_images/remixdark/vcl/res/spinner-64-12.png differ
diff --git a/main/packimages/Package_packimages.mk b/main/packimages/Package_packimages.mk
index 24a953fc76..c9faf6fb03 100644
--- a/main/packimages/Package_packimages.mk
+++ b/main/packimages/Package_packimages.mk
@@ -22,7 +22,7 @@
$(eval $(call gb_Package_Package,packimages_packimages,$(WORKDIR)/CustomTarget/packimages,packimages))
# Custom sets, at 24x24 & 16x16 fall-back to industrial preferentially
-CUSTOM_IMAGE_SETS := hicontrast industrial classic
+CUSTOM_IMAGE_SETS := hicontrast industrial classic remixdark
CUSTOM_PREFERRED_FALLBACK_1 := -c $(SRCDIR)/ooo_custom_images/industrial
CLASSIC_TARBALL=$(SRCDIR)/ooo_custom_images/classic/classic_images.tar.gz
diff --git a/main/packimages/pack/makefile.mk b/main/packimages/pack/makefile.mk
index 860e4b8779..8b8163ed08 100644
--- a/main/packimages/pack/makefile.mk
+++ b/main/packimages/pack/makefile.mk
@@ -43,7 +43,7 @@ VERBOSESWITCH=
IMAGES := $(COMMONBIN)$/images.zip
SORTED_LIST=$(RES)$/img$/sorted.lst
# Custom sets, at 24x24 & 16x16 fall-back to Galaxy preferentially
-CUSTOM_IMAGE_SETS=hicontrast industrial classic
+CUSTOM_IMAGE_SETS=hicontrast industrial classic remixdark
CUSTOM_IMAGES+=$(foreach,i,$(CUSTOM_IMAGE_SETS) images_$i)
CUSTOM_PREFERRED_FALLBACK_1*=-c $(SOLARSRC)$/default_images$/
diff --git a/main/scp2/source/ooo/file_ooo.scp b/main/scp2/source/ooo/file_ooo.scp
index f58145771a..09b3c87a1f 100644
--- a/main/scp2/source/ooo/file_ooo.scp
+++ b/main/scp2/source/ooo/file_ooo.scp
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -1785,6 +1785,13 @@ File gid_File_ImagesClassic_Zip
Styles = (PACKED);
End
+File gid_File_ImagesRemixDark_Zip
+ TXT_FILE_BODY;
+ Dir = gid_Dir_Share_Config;
+ Name = "images_remixdark.zip";
+ Styles = (PACKED);
+End
+
File gid_File_Share_Registry_Lingucomponent_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
diff --git a/main/scp2/source/ooo/module_hidden_ooo.scp b/main/scp2/source/ooo/module_hidden_ooo.scp
index 8878189f6b..f1ff846c07 100644
--- a/main/scp2/source/ooo/module_hidden_ooo.scp
+++ b/main/scp2/source/ooo/module_hidden_ooo.scp
@@ -730,7 +730,8 @@ Module gid_Module_Root_Files_Images
Files = (gid_File_Images_Zip,
gid_File_ImagesHicontrast_Zip,
gid_File_ImagesIndustrial_Zip,
- gid_File_ImagesClassic_Zip);
+ gid_File_ImagesClassic_Zip,
+ gid_File_ImagesRemixDark_Zip);
End
#ifndef WITHOUT_FONTS
diff --git a/main/vcl/inc/toolbox.h b/main/vcl/inc/toolbox.h
index 0f1725f391..b7a04809cb 100644
--- a/main/vcl/inc/toolbox.h
+++ b/main/vcl/inc/toolbox.h
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -43,6 +43,7 @@
#define TB_LARGEIMAGESIZE 26
#define TB_LARGEIMAGESIZE_INDUSTRIAL 24
+#define TB_LARGEIMAGESIZE_REMIXDARK 26
class Window;
diff --git a/main/vcl/inc/vcl/settings.hxx b/main/vcl/inc/vcl/settings.hxx
index d3286eed5c..e1fc6695fc 100644
--- a/main/vcl/inc/vcl/settings.hxx
+++ b/main/vcl/inc/vcl/settings.hxx
@@ -498,7 +498,8 @@ private:
#define STYLE_SYMBOLS_HICONTRAST ((sal_uLong)2)
#define STYLE_SYMBOLS_INDUSTRIAL ((sal_uLong)3)
#define STYLE_SYMBOLS_CLASSIC ((sal_uLong)4)
-#define STYLE_SYMBOLS_THEMES_MAX ((sal_uLong)5)
+#define STYLE_SYMBOLS_REMIXDARK ((sal_uLong)5)
+#define STYLE_SYMBOLS_THEMES_MAX ((sal_uLong)6)
#define STYLE_CURSOR_NOBLINKTIME ((sal_uLong)0xFFFFFFFF)
class VCL_DLLPUBLIC StyleSettings
diff --git a/main/vcl/source/app/settings.cxx b/main/vcl/source/app/settings.cxx
index 7dd675dd47..15570836e6 100644
--- a/main/vcl/source/app/settings.cxx
+++ b/main/vcl/source/app/settings.cxx
@@ -725,6 +725,7 @@ ::rtl::OUString StyleSettings::ImplSymbolsStyleToName( sal_uLong nStyle ) const
case STYLE_SYMBOLS_HICONTRAST: return ::rtl::OUString::createFromAscii( "hicontrast" );
case STYLE_SYMBOLS_INDUSTRIAL: return ::rtl::OUString::createFromAscii( "industrial" );
case STYLE_SYMBOLS_CLASSIC: return ::rtl::OUString::createFromAscii( "classic" );
+ case STYLE_SYMBOLS_REMIXDARK: return ::rtl::OUString::createFromAscii( "remixdark" );
}
return ::rtl::OUString::createFromAscii( "auto" );
@@ -742,6 +743,8 @@ sal_uLong StyleSettings::ImplNameToSymbolsStyle( const ::rtl::OUString &rName )
return STYLE_SYMBOLS_INDUSTRIAL;
else if ( rName == ::rtl::OUString::createFromAscii( "classic" ) )
return STYLE_SYMBOLS_CLASSIC;
+ else if ( rName == ::rtl::OUString::createFromAscii( "remixdark" ) )
+ return STYLE_SYMBOLS_REMIXDARK;
return STYLE_SYMBOLS_AUTO;
}
@@ -820,7 +823,7 @@ sal_uLong StyleSettings::GetAutoSymbolsStyle() const
{
}
- // falback to any existing style
+ // fallback to any existing style
if ( ! CheckSymbolStyle (nRet) )
{
for ( sal_uLong n = 0 ; n <= STYLE_SYMBOLS_THEMES_MAX ; n++ )
@@ -869,7 +872,7 @@ void StyleSettings::SetStandardStyles()
Color StyleSettings::GetFaceGradientColor() const
{
// compute a brighter face color that can be used in gradients
- // for a convex look (eg toolbars)
+ // for a convex look (e.g. toolbars)
sal_uInt16 h, s, b;
GetFaceColor().RGBtoHSB( h, s, b );
diff --git a/main/vcl/source/window/toolbox2.cxx b/main/vcl/source/window/toolbox2.cxx
index 8c14f217ec..a3a7303cc1 100644
--- a/main/vcl/source/window/toolbox2.cxx
+++ b/main/vcl/source/window/toolbox2.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -988,6 +988,9 @@ const Size& ToolBox::GetDefaultImageSize() const
case STYLE_SYMBOLS_INDUSTRIAL:
aLargeButtonSize = Size( TB_LARGEIMAGESIZE_INDUSTRIAL, TB_LARGEIMAGESIZE_INDUSTRIAL );
break;
+ case STYLE_SYMBOLS_REMIXDARK:
+ aLargeButtonSize = Size( TB_LARGEIMAGESIZE_REMIXDARK, TB_LARGEIMAGESIZE_REMIXDARK );
+ break;
default:
aLargeButtonSize = Size( TB_LARGEIMAGESIZE, TB_LARGEIMAGESIZE );
}