This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch Pilot-Pirx-iconset
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/Pilot-Pirx-iconset by this
push:
new d6937f214c Additional files
d6937f214c is described below
commit d6937f214ceed5e455598760eb995bbb45d26267
Author: mseidel <[email protected]>
AuthorDate: Fri May 24 17:31:54 2024 +0200
Additional files
---
.../registry/schema/org/openoffice/Office/Common.xcs | 5 +++++
main/packimages/Package_packimages.mk | 2 +-
main/packimages/pack/makefile.mk | 2 +-
main/scp2/source/ooo/file_ooo.scp | 15 +++++++++++----
main/scp2/source/ooo/module_hidden_ooo.scp | 3 ++-
main/vcl/inc/toolbox.h | 1 +
main/vcl/inc/vcl/settings.hxx | 3 ++-
main/vcl/source/app/settings.cxx | 7 +++++--
main/vcl/source/window/toolbox2.cxx | 11 +++++++----
9 files changed, 35 insertions(+), 14 deletions(-)
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 @@
<desc>Classic - the
OpenOffice.org 2.0 default theme</desc>
</info>
</enumeration>
+ <enumeration oor:value="remixdark">
+ <info>
+ <desc>Remix
(dark)</desc>
+ </info>
+ </enumeration>
</constraints>
<value>auto</value>
</prop>
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..85088e85f6 100644
--- a/main/vcl/inc/toolbox.h
+++ b/main/vcl/inc/toolbox.h
@@ -43,6 +43,7 @@
#define TB_LARGEIMAGESIZE 26
#define TB_LARGEIMAGESIZE_INDUSTRIAL 24
+#define TB_LARGEIMAGESIZE_REMIXDARK 24
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 @@ void StyleSettings::Set3DColors( const Color& rColor )
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
);
}
