[Libreoffice-commits] core.git: 3 commits - configure.ac postprocess/CustomTarget_images.mk postprocess/Package_images.mk vcl/qa vcl/source
Bjoern Michaelsen
bjoern.michaelsen at canonical.com
Fri Aug 22 05:09:52 PDT 2014
configure.ac | 16 ++++++++++++----
postprocess/CustomTarget_images.mk | 3 +--
postprocess/Package_images.mk | 3 +--
vcl/qa/cppunit/app/test_IconThemeInfo.cxx | 18 ------------------
vcl/source/app/IconThemeInfo.cxx | 13 +------------
5 files changed, 15 insertions(+), 38 deletions(-)
New commits:
commit cf2c056bf0fbc6d52eaa670022016562d6f15bc3
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Aug 22 13:40:01 2014 +0200
remove special casing for default theme in vcl
Change-Id: I4d7a37ab9b31fcce7704f07d883d6f7806f066ec
diff --git a/vcl/qa/cppunit/app/test_IconThemeInfo.cxx b/vcl/qa/cppunit/app/test_IconThemeInfo.cxx
index 7231438..99083e5 100644
--- a/vcl/qa/cppunit/app/test_IconThemeInfo.cxx
+++ b/vcl/qa/cppunit/app/test_IconThemeInfo.cxx
@@ -53,8 +53,6 @@ class IconThemeInfoTest : public CppUnit::TestFixture
CPPUNIT_TEST(ThemeIdIsDetectedFromFileNameWithUnderscore);
CPPUNIT_TEST(ImagesZipIsNotValid);
CPPUNIT_TEST(ImagesOxygenZipIsValid);
- CPPUNIT_TEST(DefaultZipIsValid);
- CPPUNIT_TEST(GalaxyIsReturnedAsDisplayNameForDefaultZip);
CPPUNIT_TEST(ExceptionIsThrownWhenIdCannotBeDetermined1);
CPPUNIT_TEST(ExceptionIsThrownWhenIdCannotBeDetermined2);
@@ -87,14 +85,6 @@ IconThemeInfoTest::ImagesOxygenZipIsValid()
}
void
-IconThemeInfoTest::DefaultZipIsValid()
-{
- OUString id("file://default.zip");
- bool valid = vcl::IconThemeInfo::UrlCanBeParsed(id);
- CPPUNIT_ASSERT_EQUAL_MESSAGE("default.zip is a valid theme name", true, valid);
-}
-
-void
IconThemeInfoTest::ThemeIdIsDetectedFromFileNameWithUnderscore()
{
OUString fname("images_oxygen.zip");
@@ -130,14 +120,6 @@ IconThemeInfoTest::ExceptionIsThrownWhenIdCannotBeDetermined2()
CPPUNIT_ASSERT_EQUAL_MESSAGE("Exception was thrown", true, thrown);
}
-void
-IconThemeInfoTest::GalaxyIsReturnedAsDisplayNameForDefaultZip()
-{
- OUString id("file://default.zip");
- IconThemeInfo i(id);
- CPPUNIT_ASSERT_EQUAL_MESSAGE("default.zip is displayed as Galaxy", OUString("Galaxy"), i.GetDisplayName());
-}
-
// Put the test suite in the registry
CPPUNIT_TEST_SUITE_REGISTRATION(IconThemeInfoTest);
diff --git a/vcl/source/app/IconThemeInfo.cxx b/vcl/source/app/IconThemeInfo.cxx
index 5e18348..88d517c 100644
--- a/vcl/source/app/IconThemeInfo.cxx
+++ b/vcl/source/app/IconThemeInfo.cxx
@@ -60,7 +60,7 @@ IconThemeInfo::SizeByThemeName(const OUString& themeName)
else if (themeName == "crystal") {
return Size( 22, 22 );
}
- else if (themeName == "default") {
+ else if (themeName == "galaxy") {
return Size( 22, 22 );
}
else {
@@ -76,10 +76,6 @@ IconThemeInfo::UrlCanBeParsed(const OUString& url)
return false;
}
- if (fname == "default.zip") {
- return true;
- }
-
if (!fname.startsWithIgnoreAsciiCase(ICON_THEME_PACKAGE_PREFIX)) {
return false;
}
@@ -94,9 +90,6 @@ IconThemeInfo::UrlCanBeParsed(const OUString& url)
/*static*/ OUString
IconThemeInfo::FileNameToThemeId(const OUString& filename)
{
- if (filename == "default.zip") {
- return OUString("default");
- }
OUString r;
sal_Int32 positionOfLastDot = filename.lastIndexOf(EXTENSION_FOR_ICON_PACKAGES);
if (positionOfLastDot < 0) { // -1 means index not found
@@ -118,10 +111,6 @@ IconThemeInfo::ThemeIdToDisplayName(const OUString& themeId)
throw std::runtime_error("IconThemeInfo::ThemeIdToDisplayName() called with invalid id.");
}
- if (themeId == "default") {
- return OUString("Galaxy");
- }
-
// make the first letter uppercase
OUString r;
sal_Unicode firstLetter = themeId[0];
commit 0bcefcabdd86b11810b64d1166cfb2386717367b
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Aug 22 13:36:16 2014 +0200
remove special casing for obsoleted default theme
Change-Id: I6688251eac8ecb5ea671cae281c2445df773be16
diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk
index e66a015..cbc9cef 100644
--- a/postprocess/CustomTarget_images.mk
+++ b/postprocess/CustomTarget_images.mk
@@ -18,8 +18,7 @@ helpimages_DIR := $(call gb_CustomTarget_get_workdir,helpcontent2/source/auxilia
packimages_CUSTOM_FALLBACKS := -c $(SRCDIR)/icon-themes/tango -c $(SRCDIR)/icon-themes/industrial
$(eval $(call gb_CustomTarget_register_targets,postprocess/images,\
- $(if $(filter default,$(WITH_THEMES)),images.zip) \
- $(foreach theme,$(filter-out default,$(WITH_THEMES)),images_$(theme).zip) \
+ $(foreach theme,$(WITH_THEMES),images_$(theme).zip) \
commandimagelist.ilst \
sorted.lst \
))
diff --git a/postprocess/Package_images.mk b/postprocess/Package_images.mk
index 66fb0cd..54cb84e 100644
--- a/postprocess/Package_images.mk
+++ b/postprocess/Package_images.mk
@@ -10,8 +10,7 @@
$(eval $(call gb_Package_Package,postprocess_images,$(call gb_CustomTarget_get_workdir,postprocess/images)))
$(eval $(call gb_Package_add_files,postprocess_images,$(LIBO_SHARE_FOLDER)/config,\
- $(if $(filter default,$(WITH_THEMES)),images.zip) \
- $(foreach theme,$(filter-out default,$(WITH_THEMES)),images_$(theme).zip) \
+ $(foreach theme,$(WITH_THEMES),images_$(theme).zip) \
))
# vim: set noet sw=4 ts=4:
commit 7524f45e0a2b86dc418f0eb76df89dbdbecfafd3
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Aug 22 13:31:59 2014 +0200
remove superfluous --with-theme=default option
- currently mapped to --with-theme=galaxy for migration
- warns though
Change-Id: Ib40dabd4c54b6cac0b7f3c6f6183b2e4d1545331
diff --git a/configure.ac b/configure.ac
index 03d08f5..ef3abc2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1489,7 +1489,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, *sifr, *tango, *tango_testing.]),
+ Possible choices: *crystal, *galaxy, *hicontrast, human, industrial, *oxygen, *sifr, *tango, *tango_testing.]),
,)
AC_ARG_WITH(helppack-integration,
@@ -11660,7 +11660,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 galaxy hicontrast oxygen tango sifr"
+ with_theme="crystal galaxy hicontrast oxygen tango sifr"
test -z "$ENABLE_RELEASE_BUILD" && with_theme="$with_theme tango_testing"
fi
@@ -11668,14 +11668,22 @@ 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|sifr|tango|tango_testing) : ;;
+ crystal|galaxy|hicontrast|human|industrial|oxygen|sifr|tango|tango_testing) real_theme="$theme" ;;
+ default) real_theme=galaxy ;;
*) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;;
esac
- WITH_THEMES="$WITH_THEMES $theme"
+ WITH_THEMES=`echo "$WITH_THEMES $real_theme"|tr '\ ' '\n'|sort|uniq|tr '\n' '\ '`
done
fi
AC_MSG_RESULT([$WITH_THEMES])
AC_SUBST([WITH_THEMES])
+# FIXME: remove this, and the convenience default->galaxy remapping after a crace period
+for theme in $with_theme; do
+ case $theme in
+ default) AC_MSG_WARN([--with-theme=default is deprecated and will be removed, use --with-theme=galaxy]) ;;
+ *) ;;
+ esac
+done
dnl ===================================================================
dnl Test whether to integrate helppacks into the product's installer
More information about the Libreoffice-commits
mailing list