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) <heinzlesspam at gmail dot com> The two intial icons are from Alexander Wilms <alexander dot wilms at zoho dot com> Change-Id: I9205a3164352442a2cdc02e75e58b15b327dfbd3
This commit is contained in:
31
configure.in
31
configure.in
@@ -1153,7 +1153,7 @@ AC_ARG_WITH(vba-package-format,
|
|||||||
AC_ARG_WITH(theme,
|
AC_ARG_WITH(theme,
|
||||||
AS_HELP_STRING([--with-theme="theme1 theme2..."],
|
AS_HELP_STRING([--with-theme="theme1 theme2..."],
|
||||||
[Choose which themes to include. By default those themes with an '*' are included.
|
[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,
|
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.]),
|
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 ===================================================================
|
||||||
dnl MacOSX build and runtime environment options
|
dnl MacOSX build and runtime environment options
|
||||||
dnl ===================================================================
|
dnl ===================================================================
|
||||||
@@ -10396,12 +10409,13 @@ AC_MSG_CHECKING([which themes to include])
|
|||||||
# if none given use default subset of available themes
|
# if none given use default subset of available themes
|
||||||
if test "x$with_theme" = "x" -o "x$with_theme" = "xyes"; then
|
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"
|
||||||
|
test "$ENABLE_RELEASE_BUILD" = "FALSE" && with_theme="$with_theme tango_testing"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
WITH_THEMES=""
|
WITH_THEMES=""
|
||||||
for theme in $with_theme; do
|
for theme in $with_theme; do
|
||||||
case $theme in
|
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]) ;;
|
*) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;;
|
||||||
esac
|
esac
|
||||||
WITH_THEMES="$WITH_THEMES $theme"
|
WITH_THEMES="$WITH_THEMES $theme"
|
||||||
@@ -10862,19 +10876,6 @@ else
|
|||||||
fi
|
fi
|
||||||
AC_SUBST(ENABLE_ONLINE_UPDATE)
|
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 ===================================================================
|
||||||
dnl Test whether to create MSI with LIMITUI=1 (silent install)
|
dnl Test whether to create MSI with LIMITUI=1 (silent install)
|
||||||
dnl ===================================================================
|
dnl ===================================================================
|
||||||
|
@@ -267,6 +267,7 @@ TabPage OFA_TP_VIEW
|
|||||||
< "Oxygen" ; > ;
|
< "Oxygen" ; > ;
|
||||||
< "Classic" ; > ;
|
< "Classic" ; > ;
|
||||||
< "Human" ; > ;
|
< "Human" ; > ;
|
||||||
|
< "Tango Testing" ; > ;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
CheckBox CB_SYSTEM_FONT
|
CheckBox CB_SYSTEM_FONT
|
||||||
|
@@ -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)
|
- 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
|
- 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
|
scp2/source/ooo/module_hidden_ooo.scp and add a corresponding File entry
|
||||||
to scp2/source/ooo/file_ooo.scp (see for example
|
to scp2/source/ooo/file_ooo.scp (see for example
|
||||||
gid_Brand_File_ImagesCrystal_Zip)
|
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)
|
#define STYLE_SYMBOLS_NEW_SET ((ULONG)5)
|
||||||
|
|
||||||
- Map the vcl constant to its real name in
|
- Map the vcl constant to its real name in
|
||||||
::rtl::OUString StyleSettings::GetCurrentSymbolsStyleName() const
|
::rtl::OUString StyleSettings::ImplSymbolsStyleToName( sal_uLong nStyle ) const
|
||||||
and
|
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.
|
both in vcl/source/app/settings.cxx, e.g.
|
||||||
case STYLE_SYMBOLS_NEW_SET: return ::rtl::OUString::createFromAscii( "new_set" );
|
case STYLE_SYMBOLS_NEW_SET: return ::rtl::OUString::createFromAscii( "new_set" );
|
||||||
and
|
and
|
||||||
@@ -50,7 +54,8 @@ How to add a new image set:
|
|||||||
< "New set" ; > ;
|
< "New set" ; > ;
|
||||||
both in cui/source/options/optgdlg.src
|
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
|
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
|
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
|
ULONG StyleSettings::GetCurrentSymbolsStyle() const in
|
||||||
vcl/source/app/settings.cxx
|
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:
|
How to add a new icon for a new command:
|
||||||
|
BIN
icon-themes/tango_testing/cmd/sc_insertgraphic.png
Normal file
BIN
icon-themes/tango_testing/cmd/sc_insertgraphic.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 681 B |
BIN
icon-themes/tango_testing/cmd/sc_insertsection.png
Normal file
BIN
icon-themes/tango_testing/cmd/sc_insertsection.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 259 B |
@@ -6726,6 +6726,11 @@
|
|||||||
<desc>Human - the Gnome default theme for Ubuntu</desc>
|
<desc>Human - the Gnome default theme for Ubuntu</desc>
|
||||||
</info>
|
</info>
|
||||||
</enumeration>
|
</enumeration>
|
||||||
|
<enumeration oor:value="tango_testing">
|
||||||
|
<info>
|
||||||
|
<desc>Tango Testing - used for testing by the design team</desc>
|
||||||
|
</info>
|
||||||
|
</enumeration>
|
||||||
</constraints>
|
</constraints>
|
||||||
<value>auto</value>
|
<value>auto</value>
|
||||||
</prop>
|
</prop>
|
||||||
|
@@ -1291,6 +1291,15 @@ File gid_File_ImagesTango_Zip
|
|||||||
End
|
End
|
||||||
#endif
|
#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
|
#ifdef THEME_HUMAN
|
||||||
File gid_File_ImagesHuman_Zip
|
File gid_File_ImagesHuman_Zip
|
||||||
TXT_FILE_BODY;
|
TXT_FILE_BODY;
|
||||||
|
@@ -726,6 +726,9 @@ Module gid_Module_Root_Files_Images
|
|||||||
#endif
|
#endif
|
||||||
#ifdef THEME_TANGO
|
#ifdef THEME_TANGO
|
||||||
gid_File_ImagesTango_Zip
|
gid_File_ImagesTango_Zip
|
||||||
|
#endif
|
||||||
|
#ifdef THEME_TANGO_TESTING
|
||||||
|
gid_File_ImagesTangoTesting_Zip
|
||||||
#endif
|
#endif
|
||||||
);
|
);
|
||||||
End
|
End
|
||||||
|
@@ -375,8 +375,9 @@ private:
|
|||||||
#define STYLE_SYMBOLS_TANGO ((sal_uLong)5)
|
#define STYLE_SYMBOLS_TANGO ((sal_uLong)5)
|
||||||
#define STYLE_SYMBOLS_OXYGEN ((sal_uLong)6)
|
#define STYLE_SYMBOLS_OXYGEN ((sal_uLong)6)
|
||||||
#define STYLE_SYMBOLS_CLASSIC ((sal_uLong)7)
|
#define STYLE_SYMBOLS_CLASSIC ((sal_uLong)7)
|
||||||
#define STYLE_SYMBOLS_HUMAN ((sal_uLong)8)
|
#define STYLE_SYMBOLS_HUMAN ((sal_uLong)8)
|
||||||
#define STYLE_SYMBOLS_THEMES_MAX ((sal_uLong)9)
|
#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_OFF ((sal_uInt16)0)
|
||||||
#define STYLE_MENUIMAGES_ON ((sal_uInt16)1)
|
#define STYLE_MENUIMAGES_ON ((sal_uInt16)1)
|
||||||
|
@@ -508,6 +508,7 @@ void StyleSettings::Set3DColors( const Color& rColor )
|
|||||||
case STYLE_SYMBOLS_OXYGEN: return ::rtl::OUString("oxygen");
|
case STYLE_SYMBOLS_OXYGEN: return ::rtl::OUString("oxygen");
|
||||||
case STYLE_SYMBOLS_CLASSIC: return ::rtl::OUString("classic");
|
case STYLE_SYMBOLS_CLASSIC: return ::rtl::OUString("classic");
|
||||||
case STYLE_SYMBOLS_HUMAN: return ::rtl::OUString("human");
|
case STYLE_SYMBOLS_HUMAN: return ::rtl::OUString("human");
|
||||||
|
case STYLE_SYMBOLS_TANGO_TESTING: return ::rtl::OUString("tango_testing");
|
||||||
}
|
}
|
||||||
|
|
||||||
return ::rtl::OUString("auto");
|
return ::rtl::OUString("auto");
|
||||||
@@ -533,6 +534,8 @@ sal_uLong StyleSettings::ImplNameToSymbolsStyle( const ::rtl::OUString &rName )
|
|||||||
return STYLE_SYMBOLS_CLASSIC;
|
return STYLE_SYMBOLS_CLASSIC;
|
||||||
else if ( rName == ::rtl::OUString("human") )
|
else if ( rName == ::rtl::OUString("human") )
|
||||||
return STYLE_SYMBOLS_HUMAN;
|
return STYLE_SYMBOLS_HUMAN;
|
||||||
|
else if ( rName == ::rtl::OUString("tango_testing") )
|
||||||
|
return STYLE_SYMBOLS_TANGO_TESTING;
|
||||||
|
|
||||||
return STYLE_SYMBOLS_AUTO;
|
return STYLE_SYMBOLS_AUTO;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user