[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - configure.ac vcl/source

[Yousuf Philips]

 configure.ac                       |    6 +++---
 vcl/source/app/IconThemeInfo.cxx   |    5 +++++
 vcl/source/image/ImplImageTree.cxx |    2 ++
 3 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit c0b412f4ad331ea66ff937fd96432796bd1ef5eb
Author: Yousuf Philips <philipz85 at hotmail.com>
Date:   Mon Jun 5 17:35:16 2017 +0400

    tdf#94632 Enable sifr dark and set fallback
    
    Change-Id: If77b33acf4f8d3e2e9c38b3e5ef359a1fc966910
    Reviewed-on: https://gerrit.libreoffice.org/38387
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Yousuf Philips <philipz85 at hotmail.com>
    (cherry picked from commit 59c0682c46e52aa18bdbee4c14ef05af9329de33)
    Reviewed-on: https://gerrit.libreoffice.org/38426
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/configure.ac b/configure.ac
index e7dabc0fc655..0d3c3a81a064 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1573,7 +1573,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: *breeze, *breeze_dark, crystal, *galaxy, *hicontrast, oxygen, *sifr, *tango, *tango_testing.]),
+         Possible choices: *breeze, *breeze_dark, crystal, *galaxy, *hicontrast, oxygen, *sifr, *sifr_dark, *tango, *tango_testing.]),
 ,)
 
 libo_FUZZ_ARG_WITH(helppack-integration,
@@ -11185,7 +11185,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="breeze breeze_dark galaxy hicontrast sifr tango"
+    with_theme="breeze breeze_dark galaxy hicontrast sifr sifr_dark tango"
     test -z "$ENABLE_RELEASE_BUILD" && with_theme="$with_theme tango_testing"
 fi
 
@@ -11193,7 +11193,7 @@ WITH_THEMES=""
 if test "x$with_theme" != "xno"; then
     for theme in $with_theme; do
         case $theme in
-        breeze|breeze_dark|crystal|elementary|galaxy|hicontrast|oxygen|sifr|tango|tango_testing) real_theme="$theme" ;;
+        breeze|breeze_dark|crystal|elementary|galaxy|hicontrast|oxygen|sifr|sifr_dark|tango|tango_testing) real_theme="$theme" ;;
         default) real_theme=galaxy ;;
         *) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;;
         esac
diff --git a/vcl/source/app/IconThemeInfo.cxx b/vcl/source/app/IconThemeInfo.cxx
index 88171e985bc3..6abae73f4826 100644
--- a/vcl/source/app/IconThemeInfo.cxx
+++ b/vcl/source/app/IconThemeInfo.cxx
@@ -25,6 +25,8 @@ static const OUStringLiteral TANGO_TESTING_ID("tango_testing");
 static const OUStringLiteral TANGO_TESTING_DISPLAY_NAME("Tango Testing");
 static const OUStringLiteral BREEZE_DARK_ID("breeze_dark");
 static const OUStringLiteral BREEZE_DARK_DISPLAY_NAME("Breeze Dark");
+static const OUStringLiteral SIFR_DARK_ID("sifr_dark");
+static const OUStringLiteral SIFR_DARK_DISPLAY_NAME("Sifr Dark");
 
 OUString
 filename_from_url(const OUString& url)
@@ -132,6 +134,9 @@ IconThemeInfo::ThemeIdToDisplayName(const OUString& themeId)
     else if (themeId.equalsIgnoreAsciiCase(BREEZE_DARK_ID)) {
         return BREEZE_DARK_DISPLAY_NAME;
     }
+    else if (themeId.equalsIgnoreAsciiCase(SIFR_DARK_ID)) {
+        return SIFR_DARK_DISPLAY_NAME;
+    }
 
     // make the first letter uppercase
     OUString r;
diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx
index 576d6c0c0d28..dd9b196c4d05 100644
--- a/vcl/source/image/ImplImageTree.cxx
+++ b/vcl/source/image/ImplImageTree.cxx
@@ -264,6 +264,8 @@ OUString ImplImageTree::fallbackStyle(const OUString& rsStyle)
         sResult = "galaxy";
     else if (rsStyle == "sifr" || rsStyle == "breeze_dark")
         sResult = "breeze";
+    else if (rsStyle == "sifr_dark" )
+        sResult = "breeze_dark";
     else if (rsStyle == "helpimg")
         sResult = "";
     else