[Libreoffice-commits] core.git: configure.ac cui/uiconfig icon-themes/README include/vcl officecfg/registry scp2/source vcl/source
Issa Alkurtass
ialkurtass at kacst.edu.sa
Sat Jun 15 09:37:38 PDT 2013
configure.ac | 8 ++++----
cui/uiconfig/ui/optviewpage.ui | 1 +
icon-themes/README | 2 +-
include/vcl/settings.hxx | 5 +++--
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 5 +++++
scp2/source/ooo/file_ooo.scp | 9 +++++++++
scp2/source/ooo/module_hidden_ooo.scp | 3 +++
vcl/source/app/settings.cxx | 3 +++
8 files changed, 29 insertions(+), 7 deletions(-)
New commits:
commit 16613995dd9489e190e74eadae357a7b6c45c594
Author: Issa Alkurtass <ialkurtass at kacst.edu.sa>
Date: Sat Jun 15 14:47:10 2013 +0200
Enable Sifr theme
Change-Id: I3adcc90fe7621c11e77b05d4394b8d55ad223469
diff --git a/configure.ac b/configure.ac
index 5bca1f5..7d0ae76 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1249,7 +1249,7 @@ AC_ARG_WITH(galleries,
AC_ARG_WITH(theme,
AS_HELP_STRING([--with-theme="theme1 theme2..."],
[Choose which themes to include. By default those themes with an '*' are included.
- Possible choices: *crystal, *default (galaxy), *hicontrast, human, industrial, *oxygen, *tango, *tango_testing.]),
+ Possible choices: *crystal, *default (galaxy), *hicontrast, human, industrial, *oxygen, *sifr, *tango, *tango_testing.]),
,)
AC_ARG_WITH(helppack-integration,
@@ -10695,7 +10695,7 @@ dnl ===================================================================
AC_MSG_CHECKING([which themes to include])
# if none given use default subset of available themes
if test "x$with_theme" = "x" -o "x$with_theme" = "xyes"; then
- with_theme="crystal default hicontrast oxygen tango"
+ with_theme="crystal default hicontrast oxygen tango sifr"
test "$ENABLE_RELEASE_BUILD" = "FALSE" && with_theme="$with_theme tango_testing"
fi
@@ -10703,7 +10703,7 @@ WITH_THEMES=""
if test "x$with_theme" != "xno"; then
for theme in $with_theme; do
case $theme in
- crystal|default|galaxy|hicontrast|human|industrial|oxygen|tango|tango_testing) : ;;
+ crystal|default|galaxy|hicontrast|human|industrial|oxygen|sifr|tango|tango_testing) : ;;
*) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;;
esac
WITH_THEMES="$WITH_THEMES $theme"
@@ -11869,7 +11869,7 @@ if test "$enable_mpl_subset" = "yes"; then
fi
for theme in $WITH_THEMES; do
case $theme in
- crystal|default|hicontrast|human|oxygen)
+ crystal|default|hicontrast|human|oxygen|sifr)
AC_MSG_ERROR([need to disable icon themes from '$WITH_THEMES': $theme present, use --with-theme=tango]) ;;
*) : ;;
esac
diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui
index 2cc72b1..b537723 100644
--- a/cui/uiconfig/ui/optviewpage.ui
+++ b/cui/uiconfig/ui/optviewpage.ui
@@ -119,6 +119,7 @@
<item translatable="yes">Oxygen</item>
<item translatable="yes">Classic</item>
<item translatable="yes">Human</item>
+ <item translatable="yes">Sifr</item>
<item translatable="yes">Tango Testing</item>
</items>
</object>
diff --git a/icon-themes/README b/icon-themes/README
index 1358cd4..84f3f85 100644
--- a/icon-themes/README
+++ b/icon-themes/README
@@ -28,7 +28,7 @@ How to add a new image set:
scp2 compilation crashes when using a dash '-'.
It evidently splits the name into two strings.
-- Add its name (new_set) to WITH_THEMES variable in configure.in
+- Add its name (new_set) to WITH_THEMES variable in configure.ac
- Add its gid to the Files section of gid_Module_Root_Brand in
scp2/source/ooo/module_hidden_ooo.scp and add a corresponding File entry
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 4a7cdf8..2c4d6ba 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -418,8 +418,9 @@ private:
#define STYLE_SYMBOLS_OXYGEN ((sal_uLong)6)
#define STYLE_SYMBOLS_CLASSIC ((sal_uLong)7)
#define STYLE_SYMBOLS_HUMAN ((sal_uLong)8)
-#define STYLE_SYMBOLS_TANGO_TESTING ((sal_uLong)9)
-#define STYLE_SYMBOLS_THEMES_MAX ((sal_uLong)10)
+#define STYLE_SYMBOLS_SIFR ((sal_uLong)9)
+#define STYLE_SYMBOLS_TANGO_TESTING ((sal_uLong)10)
+#define STYLE_SYMBOLS_THEMES_MAX ((sal_uLong)11)
#define STYLE_MENUIMAGES_OFF ((sal_uInt16)0)
#define STYLE_MENUIMAGES_ON ((sal_uInt16)1)
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index f20d0bd..a50e335 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5617,6 +5617,11 @@
<desc>Tango Testing - used for testing by the design team</desc>
</info>
</enumeration>
+ <enumeration oor:value="sifr">
+ <info>
+ <desc>Sifr - an adaptation of the Gnome symbolic theme</desc>
+ </info>
+ </enumeration>
</constraints>
<value>auto</value>
</prop>
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index c0f10e2..a191c49 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -845,6 +845,15 @@ File gid_File_ImagesTangoTesting_Zip
End
#endif
+#ifdef THEME_SIFR
+File gid_File_ImagesSifr_Zip
+ TXT_FILE_BODY;
+ Dir = gid_Brand_Dir_Share_Config;
+ Name = "images_sifr.zip";
+ Styles = (PACKED);
+End
+#endif
+
#ifdef THEME_HUMAN
File gid_File_ImagesHuman_Zip
TXT_FILE_BODY;
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 59ab1d4..bc3eda5 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -400,6 +400,9 @@ Module gid_Module_Root_Files_Images
#ifdef THEME_HUMAN
gid_File_ImagesHuman_Zip,
#endif
+#ifdef THEME_SIFR
+ gid_File_ImagesSifr_Zip
+#endif
#ifdef THEME_TANGO
gid_File_ImagesTango_Zip
#endif
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 63f056e..0df08a4 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -547,6 +547,7 @@ OUString StyleSettings::ImplSymbolsStyleToName( sal_uLong nStyle ) const
case STYLE_SYMBOLS_OXYGEN: return OUString("oxygen");
case STYLE_SYMBOLS_CLASSIC: return OUString("classic");
case STYLE_SYMBOLS_HUMAN: return OUString("human");
+ case STYLE_SYMBOLS_SIFR: return OUString("sifr");
case STYLE_SYMBOLS_TANGO_TESTING: return OUString("tango_testing");
}
@@ -573,6 +574,8 @@ sal_uLong StyleSettings::ImplNameToSymbolsStyle( const OUString &rName ) const
return STYLE_SYMBOLS_CLASSIC;
else if ( rName == OUString("human") )
return STYLE_SYMBOLS_HUMAN;
+ else if ( rName == OUString("sifr") )
+ return STYLE_SYMBOLS_SIFR;
else if ( rName == OUString("tango_testing") )
return STYLE_SYMBOLS_TANGO_TESTING;
More information about the Libreoffice-commits
mailing list