From 4b27695fea841d54f7f6407b873bbd33709eeab5 Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Fri, 31 Aug 2012 15:43:46 +0200 Subject: add "Tango Testing" icon theme It is enabled by default for dev build. It will be used for reworking the Tango theme by the design team. The them was requested by Stefan Knorr (Astron) The two intial icons are from Alexander Wilms Change-Id: I9205a3164352442a2cdc02e75e58b15b327dfbd3 --- configure.in | 31 +++++++++++---------- cui/source/options/optgdlg.src | 1 + icon-themes/README | 18 ++++++++---- icon-themes/tango_testing/cmd/sc_insertgraphic.png | Bin 0 -> 681 bytes icon-themes/tango_testing/cmd/sc_insertsection.png | Bin 0 -> 259 bytes .../schema/org/openoffice/Office/Common.xcs | 5 ++++ scp2/source/ooo/file_ooo.scp | 9 ++++++ scp2/source/ooo/module_hidden_ooo.scp | 3 ++ vcl/inc/vcl/settings.hxx | 5 ++-- vcl/source/app/settings.cxx | 3 ++ 10 files changed, 52 insertions(+), 23 deletions(-) create mode 100644 icon-themes/tango_testing/cmd/sc_insertgraphic.png create mode 100644 icon-themes/tango_testing/cmd/sc_insertsection.png diff --git a/configure.in b/configure.in index e14fb662877d..4e87f1a28697 100644 --- a/configure.in +++ b/configure.in @@ -1153,7 +1153,7 @@ AC_ARG_WITH(vba-package-format, 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.]), + Possible choices: *crystal, *default (galaxy), *hicontrast, human, industrial, *oxygen, *tango, *tango_testing.]), ,) AC_ARG_WITH(helppack-integration, @@ -2074,6 +2074,19 @@ AC_ARG_WITH(check-jobs, Default value is the same as 'max-jobs'. Useful because the subsequent tests are very lighweight.]), ,) +dnl =================================================================== +dnl Test whether build target is Release Build +dnl =================================================================== +AC_MSG_CHECKING([whether build target is Release Build]) +if test "$enable_release_build" = "" -o "$enable_release_build" = "no"; then + AC_MSG_RESULT([no]) + ENABLE_RELEASE_BUILD="FALSE" +else + AC_MSG_RESULT([yes]) + ENABLE_RELEASE_BUILD="TRUE" +fi +AC_SUBST(ENABLE_RELEASE_BUILD) + dnl =================================================================== dnl MacOSX build and runtime environment options dnl =================================================================== @@ -10396,12 +10409,13 @@ 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" + test "$ENABLE_RELEASE_BUILD" = "FALSE" && with_theme="$with_theme tango_testing" fi WITH_THEMES="" for theme in $with_theme; do case $theme in - crystal|default|galaxy|hicontrast|human|industrial|oxygen|tango) : ;; + crystal|default|galaxy|hicontrast|human|industrial|oxygen|tango|tango_testing) : ;; *) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;; esac WITH_THEMES="$WITH_THEMES $theme" @@ -10862,19 +10876,6 @@ else fi AC_SUBST(ENABLE_ONLINE_UPDATE) -dnl =================================================================== -dnl Test whether build target is Release Build -dnl =================================================================== -AC_MSG_CHECKING([whether build target is Release Build]) -if test "$enable_release_build" = "" -o "$enable_release_build" = "no"; then - AC_MSG_RESULT([no]) - ENABLE_RELEASE_BUILD="FALSE" -else - AC_MSG_RESULT([yes]) - ENABLE_RELEASE_BUILD="TRUE" -fi -AC_SUBST(ENABLE_RELEASE_BUILD) - dnl =================================================================== dnl Test whether to create MSI with LIMITUI=1 (silent install) dnl =================================================================== diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src index 67abcf0aa2d2..4d0267d80c85 100644 --- a/cui/source/options/optgdlg.src +++ b/cui/source/options/optgdlg.src @@ -267,6 +267,7 @@ TabPage OFA_TP_VIEW < "Oxygen" ; > ; < "Classic" ; > ; < "Human" ; > ; + < "Tango Testing" ; > ; }; }; CheckBox CB_SYSTEM_FONT diff --git a/icon-themes/README b/icon-themes/README index 90887157614e..4fa769bb780e 100644 --- a/icon-themes/README +++ b/icon-themes/README @@ -24,20 +24,24 @@ How to add a new image set: - Create a directory for it here (let's call it e.g. new_set) -- Add its name (new_set) to WITH_THEMES variable + FIXME: It is important to use an underscore '_' to delimit more words. + 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 gid to the Files section of gid_Module_Root_Brand in scp2/source/ooo/module_hidden_ooo.scp and add a corresponding File entry to scp2/source/ooo/file_ooo.scp (see for example gid_Brand_File_ImagesCrystal_Zip) -- Add a vcl constant for it in vcl/inc/settings.hxx, e.g. +- Add a vcl constant for it in vcl/inc/vcl/settings.hxx, e.g. #define STYLE_SYMBOLS_NEW_SET ((ULONG)5) - Map the vcl constant to its real name in - ::rtl::OUString StyleSettings::GetCurrentSymbolsStyleName() const + ::rtl::OUString StyleSettings::ImplSymbolsStyleToName( sal_uLong nStyle ) const and - ULONG StyleSettings::ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) const + sal_uLong StyleSettings::ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) const both in vcl/source/app/settings.cxx, e.g. case STYLE_SYMBOLS_NEW_SET: return ::rtl::OUString::createFromAscii( "new_set" ); and @@ -50,7 +54,8 @@ How to add a new image set: < "New set" ; > ; both in cui/source/options/optgdlg.src -- Add all known localizations of the new item to svx/source/dialog/localize.sdf, e.g. +- FIXME: is this step still needed? + Add all known localizations of the new item to svx/source/dialog/localize.sdf, e.g. svx source\dialog\optgdlg.src 0 stringlist OFA_TP_VIEW.LB_ICONSTYLE 6 0 cs New set 2002-02-02 02:02:02 the check box item will not be visible in the other localizations otherwise, see http://www.openoffice.org/issues/show_bug.cgi?id=74982 @@ -61,7 +66,8 @@ How to add a new image set: ULONG StyleSettings::GetCurrentSymbolsStyle() const in vcl/source/app/settings.cxx -- The fallback for particular icons is defined in CUSTOM_PREFERRED_FALLBACK_1 +- The fallback for particular icons is defined be packimages_CUSTOM_FALLBACK_1 + in packimages/CustomTarget_images.mk How to add a new icon for a new command: diff --git a/icon-themes/tango_testing/cmd/sc_insertgraphic.png b/icon-themes/tango_testing/cmd/sc_insertgraphic.png new file mode 100644 index 000000000000..597237c99aec Binary files /dev/null and b/icon-themes/tango_testing/cmd/sc_insertgraphic.png differ diff --git a/icon-themes/tango_testing/cmd/sc_insertsection.png b/icon-themes/tango_testing/cmd/sc_insertsection.png new file mode 100644 index 000000000000..2afb75744a0f Binary files /dev/null and b/icon-themes/tango_testing/cmd/sc_insertsection.png differ diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 2c27fdfa75a0..829532062a4a 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -6726,6 +6726,11 @@ Human - the Gnome default theme for Ubuntu + + + Tango Testing - used for testing by the design team + + auto diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 2d1765bfa32b..c0f831d91538 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -1291,6 +1291,15 @@ File gid_File_ImagesTango_Zip End #endif +#ifdef THEME_TANGO_TESTING +File gid_File_ImagesTangoTesting_Zip + TXT_FILE_BODY; + Dir = gid_Brand_Dir_Share_Config; + Name = "images_tango_testing.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 a530774b0e22..26ec6d6556c9 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -726,6 +726,9 @@ Module gid_Module_Root_Files_Images #endif #ifdef THEME_TANGO gid_File_ImagesTango_Zip +#endif +#ifdef THEME_TANGO_TESTING + gid_File_ImagesTangoTesting_Zip #endif ); End diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx index b8713d536d29..e6832af11ace 100644 --- a/vcl/inc/vcl/settings.hxx +++ b/vcl/inc/vcl/settings.hxx @@ -375,8 +375,9 @@ private: #define STYLE_SYMBOLS_TANGO ((sal_uLong)5) #define STYLE_SYMBOLS_OXYGEN ((sal_uLong)6) #define STYLE_SYMBOLS_CLASSIC ((sal_uLong)7) -#define STYLE_SYMBOLS_HUMAN ((sal_uLong)8) -#define STYLE_SYMBOLS_THEMES_MAX ((sal_uLong)9) +#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_MENUIMAGES_OFF ((sal_uInt16)0) #define STYLE_MENUIMAGES_ON ((sal_uInt16)1) diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 421b65df383a..c68f0256c040 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -508,6 +508,7 @@ void StyleSettings::Set3DColors( const Color& rColor ) case STYLE_SYMBOLS_OXYGEN: return ::rtl::OUString("oxygen"); case STYLE_SYMBOLS_CLASSIC: return ::rtl::OUString("classic"); case STYLE_SYMBOLS_HUMAN: return ::rtl::OUString("human"); + case STYLE_SYMBOLS_TANGO_TESTING: return ::rtl::OUString("tango_testing"); } return ::rtl::OUString("auto"); @@ -533,6 +534,8 @@ sal_uLong StyleSettings::ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) return STYLE_SYMBOLS_CLASSIC; else if ( rName == ::rtl::OUString("human") ) return STYLE_SYMBOLS_HUMAN; + else if ( rName == ::rtl::OUString("tango_testing") ) + return STYLE_SYMBOLS_TANGO_TESTING; return STYLE_SYMBOLS_AUTO; } -- cgit