[ooo-build-commit] Branch 'ooo-build-3-1-1' - patches/dev300
Chris Cheney
ccheney at kemper.freedesktop.org
Sun Oct 11 18:26:35 PDT 2009
patches/dev300/human-icons-add.diff | 179 +++++++++---------------------------
1 file changed, 45 insertions(+), 134 deletions(-)
New commits:
commit 872a05fa740b5ecb6c8c6d7e0bef62ea2e1e800c
Author: Chris Cheney <ccheney at ubuntu.com>
Date: Sun Oct 11 20:24:50 2009 -0500
Update Human icon theme to work with optional-icon-themes.
* patches/dev300/human-icons-add.diff: Update for use with
optional-icon-themes.diff
diff --git a/patches/dev300/human-icons-add.diff b/patches/dev300/human-icons-add.diff
index c449549..1d4196a 100644
--- a/patches/dev300/human-icons-add.diff
+++ b/patches/dev300/human-icons-add.diff
@@ -1,9 +1,10 @@
---- 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>
+=== modified file 'officecfg/registry/schema/org/openoffice/Office/Common.xcs'
+--- officecfg/registry/schema/org/openoffice/Office/Common.xcs 2009-10-11 20:36:10 +0000
++++ officecfg/registry/schema/org/openoffice/Office/Common.xcs 2009-10-11 21:08:29 +0000
+@@ -5696,6 +5696,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 +14,13 @@
<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
-+CUSTOM_IMAGE_SETS=hicontrast industrial crystal tango classic oxygen human
-+
- # settings for mozilla idl compiler
- XPIDL=xpidl
- XPIDL_LINK=xpt_link
-
---- 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 @@
+=== modified file 'svtools/inc/imgdef.hxx'
+--- svtools/inc/imgdef.hxx 2009-10-11 20:36:10 +0000
++++ svtools/inc/imgdef.hxx 2009-10-11 21:11:14 +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,151 +28,73 @@
#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 @@
+=== modified file 'svtools/source/config/miscopt.cxx'
+--- svtools/source/config/miscopt.cxx 2009-10-11 20:36:10 +0000
++++ svtools/source/config/miscopt.cxx 2009-10-11 21:13:30 +0000
+@@ -276,6 +276,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 @@
+@@ -293,6 +294,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;
---- svx/source/dialog/optgdlg.cxx 2008-09-26 21:13:11 +0000
-+++ svx/source/dialog/optgdlg.cxx 2008-09-26 21:29:24 +0000
-@@ -798,6 +798,7 @@
- case STYLE_SYMBOLS_CLASSIC: aAutoStr += aIconStyleLB.GetEntry( 5 ); break;
- case STYLE_SYMBOLS_HICONTRAST: aAutoStr += aIconStyleLB.GetEntry( 6 ); break;
- case STYLE_SYMBOLS_OXYGEN: aAutoStr += aIconStyleLB.GetEntry( 7 ); break;
-+ case STYLE_SYMBOLS_HUMAN: aAutoStr += aIconStyleLB.GetEntry( 8 ); break;
- }
-
- aIconStyleLB.RemoveEntry( 0 );
-@@ -880,6 +881,7 @@
- case 5: eSet = SFX_SYMBOLS_STYLE_TANGO; break;
- case 6: eSet = SFX_SYMBOLS_STYLE_CLASSIC; break;
- case 7: eSet = SFX_SYMBOLS_STYLE_OXYGEN; break;
-+ case 8: eSet = SFX_SYMBOLS_STYLE_HUMAN; break;
- default:
- DBG_ERROR( "OfaViewTabPage::FillItemSet(): This state of aIconStyleLB should not be possible!" );
- }
-@@ -1052,6 +1054,7 @@
- case SFX_SYMBOLS_STYLE_TANGO: nStyleLB_InitialSelection = 5; break;
- case SFX_SYMBOLS_STYLE_CLASSIC: nStyleLB_InitialSelection = 6; break;
- case SFX_SYMBOLS_STYLE_OXYGEN: nStyleLB_InitialSelection = 7; break;
-+ case SFX_SYMBOLS_STYLE_HUMAN: nStyleLB_InitialSelection = 8; break;
- default: nStyleLB_InitialSelection = 0; break;
- }
- }
-
---- svx/source/dialog/optgdlg.src 2008-09-26 21:13:11 +0000
-+++ svx/source/dialog/optgdlg.src 2008-09-26 21:31:34 +0000
-@@ -251,6 +251,7 @@
+=== modified file 'svx/source/dialog/optgdlg.src'
+--- svx/source/dialog/optgdlg.src 2009-10-11 20:36:10 +0000
++++ svx/source/dialog/optgdlg.src 2009-10-11 21:20:23 +0000
+@@ -252,6 +252,7 @@
< "Tango" ; > ;
< "Classic" ; > ;
- < "Oxygen" ; > ;
+ < "Oxygen" ; > ;
+ < "Human" ; > ;
};
};
CheckBox CB_SYSTEM_FONT
---- vcl/inc/vcl/settings.hxx 2008-09-26 21:13:11 +0000
-+++ vcl/inc/vcl/settings.hxx 2008-09-26 21:32:25 +0000
-@@ -519,7 +519,8 @@
+=== modified file 'vcl/inc/vcl/settings.hxx'
+--- vcl/inc/vcl/settings.hxx 2009-10-11 20:36:10 +0000
++++ vcl/inc/vcl/settings.hxx 2009-10-11 21:24:08 +0000
+@@ -520,7 +520,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)7)
+-#define STYLE_SYMBOLS_THEMES_MAX ((ULONG)8)
+#define STYLE_SYMBOLS_HUMAN ((ULONG)8)
-+#define STYLE_SYMBOLS_THEMES_MAX ((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 @@
+=== modified file 'vcl/source/app/settings.cxx'
+--- vcl/source/app/settings.cxx 2009-10-11 20:36:10 +0000
++++ vcl/source/app/settings.cxx 2009-10-11 21:55:35 +0000
+@@ -710,6 +710,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;
+@@ -733,6 +734,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;
- }
-@@ -756,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 )
- {
- // 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 )
- {
+ return STYLE_SYMBOLS_AUTO;
+ }
+@@ -782,7 +785,7 @@
// use a hardcoded desktop-specific fallback if no preferred style has been detected
static bool sbFallbackDesktopChecked = false;
@@ -192,7 +103,7 @@
if ( !sbFallbackDesktopChecked )
{
-@@ -793,7 +828,7 @@
+@@ -807,7 +810,7 @@
ULONG StyleSettings::GetAutoSymbolsStyle() const
{
const ::rtl::OUString& rDesktopEnvironment = Application::GetDesktopEnvironment();
@@ -201,7 +112,7 @@
bool bCont = true;
try
-@@ -814,7 +849,7 @@
+@@ -828,7 +831,7 @@
{
if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "gnome" ) ||
rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "windows" ) )
@@ -209,5 +120,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