Add new icon set

main/cui/source/options/optgdlg.src

@@ -250,6 +250,7 @@ TabPage OFA_TP_VIEW
 			< "High Contrast" ;		> ;
 			< "Industrial" ;		> ;
 			< "Classic" ;			> ;
+			< "Remix (dark)" ;		> ;
 		};
 	};
 	CheckBox CB_SYSTEM_FONT

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>

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
 

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$/
 

main/scp2/source/ooo/file_ooo.scp

@@ -1,22 +1,22 @@
 /**************************************************************
- * 
+ *
  * 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
  * regarding copyright ownership.  The ASF licenses this file
  * 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);

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

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;
 

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

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 );

main/vcl/source/window/toolbox2.cxx

@@ -1,22 +1,22 @@
 /**************************************************************
- * 
+ *
  * 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
  * regarding copyright ownership.  The ASF licenses this file
  * 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 );
         }