commit 59c0682c46e52aa18bdbee4c14ef05af9329de33
author Yousuf Philips <philipz85@hotmail.com> Mon Jun 05 17:35:16 2017 +0400
committer Yousuf Philips <philipz85@hotmail.com> Tue Jun 06 04:26:33 2017 +0200
tree 9c8db460a84c03ee3023b6b7fb32f8b62a1636c8
parent 200a566cf106fc724b99c373f16da0058163b28d

tdf#94632 Enable sifr dark and set fallback

Change-Id: If77b33acf4f8d3e2e9c38b3e5ef359a1fc966910
Reviewed-on: https://gerrit.libreoffice.org/38387
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>

configure.ac

diff --git a/configure.ac b/configure.ac
index 24df149..652fdc0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1577,7 +1577,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,
@@ -11062,7 +11062,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

@@ -11070,7 +11070,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

vcl/source/app/IconThemeInfo.cxx

diff --git a/vcl/source/app/IconThemeInfo.cxx b/vcl/source/app/IconThemeInfo.cxx
index 88171e9..6abae73 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;

vcl/source/image/ImplImageTree.cxx

diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx
index 576d6c0..dd9b196 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