[ooo-build-commit] .: patches/dev300
Chris Cheney
ccheney at kemper.freedesktop.org
Thu Mar 25 17:56:22 PDT 2010
patches/dev300/human-icons-add.diff | 210 +++++++++++++++---------------------
1 file changed, 90 insertions(+), 120 deletions(-)
New commits:
commit 15507325a27ba429d6665e4bbc914d42c85f1aba
Author: Chris Cheney <ccheney at ubuntu.com>
Date: Thu Mar 25 19:50:33 2010 -0500
Update Human icon theme patch to work with OOo 3.2
* patches/dev300/human-icons-add.diff: update the patch to work properly
with OOo 3.2 so that it works with the new autoselection code.
diff --git a/patches/dev300/human-icons-add.diff b/patches/dev300/human-icons-add.diff
index 295c375..1f6673f 100644
--- a/patches/dev300/human-icons-add.diff
+++ b/patches/dev300/human-icons-add.diff
@@ -1,9 +1,41 @@
---- officecfg/registry/schema/org/openoffice/Office/Common.xcs 2008-09-26 21:13:11 +0000
-+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs 2008-09-26 21:21:30 +0000
-@@ -5588,6 +5588,11 @@
- <desc>Oxygen - the KDE4 default theme</desc>
- </info>
- </enumeration>
+--- binfilter/bf_svtools/source/config/svt_miscopt.cxx 2010-03-25 20:30:12 +0000
++++ binfilter/bf_svtools/source/config/svt_miscopt.cxx 2010-03-25 21:02:18 +0000
+@@ -268,6 +268,7 @@
+ case STYLE_SYMBOLS_INDUSTRIAL: return SFX_SYMBOLS_STYLE_INDUSTRIAL;
+ case STYLE_SYMBOLS_CRYSTAL: return SFX_SYMBOLS_STYLE_CRYSTAL;
+ case STYLE_SYMBOLS_TANGO: return SFX_SYMBOLS_STYLE_TANGO;
++ case STYLE_SYMBOLS_HUMAN: return SFX_SYMBOLS_STYLE_HUMAN;
+ }
+
+ return SFX_SYMBOLS_STYLE_AUTO;
+@@ -283,6 +284,7 @@
+ case SFX_SYMBOLS_STYLE_INDUSTRIAL: return STYLE_SYMBOLS_INDUSTRIAL;
+ case SFX_SYMBOLS_STYLE_CRYSTAL: return STYLE_SYMBOLS_CRYSTAL;
+ case SFX_SYMBOLS_STYLE_TANGO: return STYLE_SYMBOLS_TANGO;
++ case SFX_SYMBOLS_STYLE_HUMAN: return STYLE_SYMBOLS_HUMAN;
+ }
+
+ return STYLE_SYMBOLS_AUTO;
+
+--- binfilter/inc/bf_svtools/imgdef.hxx 2010-03-25 20:30:12 +0000
++++ binfilter/inc/bf_svtools/imgdef.hxx 2010-03-25 21:03:12 +0000
+@@ -48,7 +48,8 @@
+ SFX_SYMBOLS_STYLE_HICONTRAST,
+ SFX_SYMBOLS_STYLE_INDUSTRIAL,
+ SFX_SYMBOLS_STYLE_CRYSTAL,
+- SFX_SYMBOLS_STYLE_TANGO
++ SFX_SYMBOLS_STYLE_TANGO,
++ SFX_SYMBOLS_STYLE_HUMAN
+ };
+
+ #define SFX_TOOLBOX_CHANGESYMBOLSET 0x0001
+
+--- officecfg/registry/schema/org/openoffice/Office/Common.xcs 2010-03-25 20:30:12 +0000
++++ officecfg/registry/schema/org/openoffice/Office/Common.xcs 2010-03-25 20:58:36 +0000
+@@ -5839,6 +5839,11 @@
+ <desc>Oxygen - the KDE4 default theme</desc>
+ </info>
+ </enumeration>
+ <enumeration oor:value="human">
+ <info>
+ <desc>Human - the Gnome default theme for Ubuntu</desc>
@@ -13,25 +45,24 @@
<value>auto</value>
</prop>
---- solenv/inc/settings.mk 2008-09-26 21:13:11 +0000
-+++ solenv/inc/settings.mk 2008-09-26 21:24:30 +0000
-@@ -989,6 +989,9 @@
- RSCDEFS+= -DDEBUG
- .ENDIF
-
-+# additional image sets
+--- packimages/pack/makefile.mk 2010-03-25 20:30:12 +0000
++++ packimages/pack/makefile.mk 2010-03-25 21:09:53 +0000
+@@ -41,7 +41,7 @@
+ IMAGES := $(COMMONBIN)$/images.zip
+ SORTED_LIST=$(RES)$/img$/sorted.lst
+ # Custom sets, at 24x24 & 16x16 fall-back to industrial preferentially
+-CUSTOM_IMAGE_SETS=hicontrast industrial crystal tango classic oxygen
+CUSTOM_IMAGE_SETS=hicontrast industrial crystal tango classic oxygen human
-+
- # settings for mozilla idl compiler
- XPIDL=xpidl
- XPIDL_LINK=xpt_link
+ CUSTOM_IMAGES+=$(foreach,i,$(CUSTOM_IMAGE_SETS) images_$i)
+ CUSTOM_PREFERRED_FALLBACK_1*=-c $(SOLARSRC)$/ooo_custom_images$/tango
+ CUSTOM_PREFERRED_FALLBACK_2*=-c $(SOLARSRC)$/ooo_custom_images$/industrial
---- svtools/inc/imgdef.hxx 2008-09-26 21:13:11 +0000
-+++ svtools/inc/imgdef.hxx 2008-09-26 21:25:01 +0000
-@@ -46,7 +46,8 @@
+--- svtools/inc/imgdef.hxx 2010-03-25 20:30:12 +0000
++++ svtools/inc/imgdef.hxx 2010-03-25 20:59:24 +0000
+@@ -47,7 +47,8 @@
SFX_SYMBOLS_STYLE_CRYSTAL,
SFX_SYMBOLS_STYLE_TANGO,
- SFX_SYMBOLS_STYLE_CLASSIC,
+ SFX_SYMBOLS_STYLE_CLASSIC,
- SFX_SYMBOLS_STYLE_OXYGEN
+ SFX_SYMBOLS_STYLE_OXYGEN,
+ SFX_SYMBOLS_STYLE_HUMAN
@@ -39,130 +70,69 @@
#define SFX_TOOLBOX_CHANGESYMBOLSET 0x0001
---- svtools/source/config/miscopt.cxx 2008-09-26 21:13:11 +0000
-+++ svtools/source/config/miscopt.cxx 2008-09-26 21:26:12 +0000
-@@ -275,6 +275,7 @@
+--- svtools/source/config/miscopt.cxx 2010-03-25 20:30:12 +0000
++++ svtools/source/config/miscopt.cxx 2010-03-25 21:00:18 +0000
+@@ -317,6 +317,7 @@
case STYLE_SYMBOLS_TANGO: return SFX_SYMBOLS_STYLE_TANGO;
case STYLE_SYMBOLS_CLASSIC: return SFX_SYMBOLS_STYLE_CLASSIC;
- case STYLE_SYMBOLS_OXYGEN: return SFX_SYMBOLS_STYLE_OXYGEN;
+ case STYLE_SYMBOLS_OXYGEN: return SFX_SYMBOLS_STYLE_OXYGEN;
+ case STYLE_SYMBOLS_HUMAN: return SFX_SYMBOLS_STYLE_HUMAN;
}
return SFX_SYMBOLS_STYLE_AUTO;
-@@ -291,6 +292,7 @@
+@@ -334,6 +335,7 @@
case SFX_SYMBOLS_STYLE_TANGO: return STYLE_SYMBOLS_TANGO;
case SFX_SYMBOLS_STYLE_CLASSIC: return STYLE_SYMBOLS_CLASSIC;
- case SFX_SYMBOLS_STYLE_OXYGEN: return STYLE_SYMBOLS_OXYGEN;
+ case SFX_SYMBOLS_STYLE_OXYGEN: return STYLE_SYMBOLS_OXYGEN;
+ case SFX_SYMBOLS_STYLE_HUMAN: return STYLE_SYMBOLS_HUMAN;
}
return STYLE_SYMBOLS_AUTO;
---- vcl/inc/vcl/settings.hxx 2008-09-26 21:13:11 +0000
-+++ vcl/inc/vcl/settings.hxx 2008-09-26 21:13:11 +0000
+--- svx/source/cui/optgdlg.src 2010-03-25 20:30:12 +0000
++++ svx/source/cui/optgdlg.src 2010-03-25 21:14:27 +0000
+@@ -265,6 +265,7 @@
+ < "Tango" ; > ;
+ < "Classic" ; > ;
+ < "Oxygen" ; > ;
++ < "Human" ; > ;
+ };
+ };
+ CheckBox CB_SYSTEM_FONT
+
+--- vcl/inc/vcl/settings.hxx 2010-03-25 20:30:12 +0000
++++ vcl/inc/vcl/settings.hxx 2010-03-25 21:00:57 +0000
@@ -525,7 +525,8 @@
- #define STYLE_SYMBOLS_TANGO ((ULONG)5)
- #define STYLE_SYMBOLS_CLASSIC ((ULONG)6)
- #define STYLE_SYMBOLS_OXYGEN ((ULONG)7)
--#define STYLE_SYMBOLS_THEMES_MAX ((ULONG)8)
-+#define STYLE_SYMBOLS_HUMAN ((ULONG)8)
-+#define STYLE_SYMBOLS_THEMES_MAX ((ULONG)9)
+ #define STYLE_SYMBOLS_TANGO ((ULONG)5)
+ #define STYLE_SYMBOLS_CLASSIC ((ULONG)6)
+ #define STYLE_SYMBOLS_OXYGEN ((ULONG)7)
+-#define STYLE_SYMBOLS_THEMES_MAX ((ULONG)8)
++#define STYLE_SYMBOLS_HUMAN ((ULONG)8)
++#define STYLE_SYMBOLS_THEMES_MAX ((ULONG)9)
#define STYLE_CURSOR_NOBLINKTIME ((ULONG)0xFFFFFFFF)
---- vcl/source/app/settings.cxx 2008-09-26 21:13:11 +0000
-+++ vcl/source/app/settings.cxx 2008-09-26 21:39:55 +0000
-@@ -52,6 +52,11 @@
- #include "tools/postwin.h"
- #endif
-
-+extern "C" {
-+#include <unistd.h>
-+#include <string.h>
-+}
-+
- using namespace rtl;
-
- // =======================================================================
-@@ -701,6 +706,7 @@
+
+--- vcl/source/app/settings.cxx 2010-03-25 20:30:12 +0000
++++ vcl/source/app/settings.cxx 2010-03-25 21:25:20 +0000
+@@ -712,6 +712,7 @@
case STYLE_SYMBOLS_TANGO: return ::rtl::OUString::createFromAscii( "tango" );
case STYLE_SYMBOLS_CLASSIC: return ::rtl::OUString::createFromAscii( "classic" );
- case STYLE_SYMBOLS_OXYGEN: return ::rtl::OUString::createFromAscii( "oxygen" );
+ case STYLE_SYMBOLS_OXYGEN: return ::rtl::OUString::createFromAscii( "oxygen" );
+ case STYLE_SYMBOLS_HUMAN: return ::rtl::OUString::createFromAscii( "human" );
}
return ::rtl::OUString::createFromAscii( "auto" );
-@@ -734,6 +735,8 @@
- return STYLE_SYMBOLS_CLASSIC;
- else if ( rName == ::rtl::OUString::createFromAscii( "oxygen" ) )
- return STYLE_SYMBOLS_OXYGEN;
+@@ -735,6 +736,8 @@
+ return STYLE_SYMBOLS_CLASSIC;
+ else if ( rName == ::rtl::OUString::createFromAscii( "oxygen" ) )
+ return STYLE_SYMBOLS_OXYGEN;
+ else if ( rName == ::rtl::OUString::createFromAscii( "human" ) )
+ return STYLE_SYMBOLS_HUMAN;
-
- return STYLE_SYMBOLS_AUTO;
- }
-@@ -768,22 +764,50 @@
- // -----------------------------------------------------------------------
-
-+ULONG SymbolsStyleOrAuto (ULONG nStyle)
-+{
-+ // if the images*.zip file doesn't exist, fall back to auto
-+ if ( nStyle != STYLE_SYMBOLS_AUTO )
-+ {
-+ char zipfile[100] = "/usr/lib/openoffice/basis-link/share/config/images";
-+ switch ( nStyle )
-+ {
-+ case STYLE_SYMBOLS_DEFAULT: strcat (zipfile, ""); break;
-+ case STYLE_SYMBOLS_HICONTRAST: strcat (zipfile, "_hicontrast"); break;
-+ case STYLE_SYMBOLS_INDUSTRIAL: strcat (zipfile, "_industrial"); break;
-+ case STYLE_SYMBOLS_CRYSTAL: strcat (zipfile, "_crystal"); break;
-+ case STYLE_SYMBOLS_TANGO: strcat (zipfile, "_tango"); break;
-+ case STYLE_SYMBOLS_CLASSIC: strcat (zipfile, "_classic"); break;
-+ case STYLE_SYMBOLS_OXYGEN: strcat (zipfile, "_oxygen"); break;
-+ case STYLE_SYMBOLS_HUMAN: strcat (zipfile, "_human"); break;
-+ }
-+ strcat (zipfile, ".zip");
-+ if ( access( zipfile, R_OK ) )
-+ nStyle = STYLE_SYMBOLS_AUTO;
-+ }
-+ return nStyle;
-+}
-+
-+// -----------------------------------------------------------------------
-+
- ULONG StyleSettings::GetCurrentSymbolsStyle() const
- {
- // style selected in Tools -> Options... -> OpenOffice.org -> View
- ULONG nStyle = GetSymbolsStyle();
-+ nStyle = SymbolsStyleOrAuto(nStyle);
-
- if ( nStyle == STYLE_SYMBOLS_AUTO || ( !CheckSymbolStyle (nStyle) ) )
- {
- // the preferred style can be read from the desktop setting by the desktop native widgets modules
- ULONG nPreferredStyle = GetPreferredSymbolsStyle();
-+ nPreferredStyle = SymbolsStyleOrAuto(nPreferredStyle);
-
- if ( nPreferredStyle == STYLE_SYMBOLS_AUTO || ( !CheckSymbolStyle (nPreferredStyle) ) )
- {
-
- // use a hardcoded desktop-specific fallback if no preferred style has been detected
- static bool sbFallbackDesktopChecked = false;
-- static ULONG snFallbackDesktopStyle = STYLE_SYMBOLS_DEFAULT;
-+ static ULONG snFallbackDesktopStyle = STYLE_SYMBOLS_HUMAN;
-
- if ( !sbFallbackDesktopChecked )
- {
-@@ -793,7 +828,7 @@
- ULONG StyleSettings::GetAutoSymbolsStyle() const
- {
- const ::rtl::OUString& rDesktopEnvironment = Application::GetDesktopEnvironment();
-- ULONG nRet = STYLE_SYMBOLS_DEFAULT;
-+ ULONG nRet = STYLE_SYMBOLS_HUMAN;
- bool bCont = true;
-
- try
-@@ -814,7 +849,7 @@
+ return STYLE_SYMBOLS_AUTO;
+ }
+@@ -830,7 +833,7 @@
{
if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "gnome" ) ||
rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "windows" ) )
@@ -170,5 +140,5 @@
+ nRet = STYLE_SYMBOLS_HUMAN;
else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde" ) )
nRet = STYLE_SYMBOLS_CRYSTAL;
- }
+ else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde4" ) )
More information about the ooo-build-commit
mailing list