[ooo-build-commit] 2 commits - bin/setup.in bin/unpack configure.in download.in patches/dev300
Jan Holesovsky
kendy at kemper.freedesktop.org
Thu Jun 18 15:46:31 PDT 2009
bin/setup.in | 1
bin/unpack | 7 +
configure.in | 2
download.in | 5
patches/dev300/apply | 51 ++++----
patches/dev300/human-icons-add.diff | 59 +++++-----
patches/dev300/kde4-oxygen-icons.diff | 195 ++++++++++++++++++++++++++++++++++
patches/dev300/kde4-vcl-prj.diff | 8 -
8 files changed, 269 insertions(+), 59 deletions(-)
New commits:
commit 169e4ea6c5ff9160b18d1cb855879393d20de3e7
Author: Roman Shtylman <shtylman at gmail.com>
Date: Thu Jun 18 14:04:53 2009 -0400
updated kde4 patches location to before UbuntuOnly
* patches/dev300/apply: moved KDE4 section location
* patches/dev300/human-icons-add.diff: fixed to apply cleanly
* patches/dev300/kde4-oxygen-icons.diff: fixed to apply cleanly
* patches/dev300/kde4-vcl-prj.diff: updated apply errors
diff --git a/patches/dev300/apply b/patches/dev300/apply
index c8f9e06..3579865 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2069,6 +2069,32 @@ connectivity-workben-postgresql.diff
gcc-4.3-postgresql.diff
sdbc-postgresql-config_office.diff
+[ KDE4 ]
+SectionOwner => jholesov
+SectionIssue => i#90618
+
+# KDE4 support by Eric Bischoff, Bernhard Rosenkraenzer and Roman Shtylman
+kde4-configure.diff
+kde4-buildfix-connectivity.diff
+
+kde4-shell-prj.diff
+kde4-shell-source.diff
+
+kde4-fpicker-prj.diff
+kde4-fpicker-source.diff
+
+kde4-scp2.diff
+
+kde4-plugin-detection.diff
+kde4-vcl-prj.diff
+kde4-vcl-source.diff
+
+kde4-oxygen-icons.diff
+
+[ KDE4Experimental ]
+# Not yet ported to co-exist with the KDE3 stuff
+kde4-kab.diff
+
[ ArkOnly ]
SectionOwner => brosenk
@@ -2764,33 +2790,6 @@ sw-source-filter-xml-xmltbli-uninitializedvalue.diff, fridrich
chart2-es-eje-Y.diff, i#83821, rengelha
-[ KDE4 ]
-SectionOwner => jholesov
-SectionIssue => i#90618
-
-# KDE4 support by Eric Bischoff, Bernhard Rosenkraenzer and Roman Shtylman
-kde4-configure.diff
-kde4-buildfix-connectivity.diff
-
-kde4-shell-prj.diff
-kde4-shell-source.diff
-
-kde4-fpicker-prj.diff
-kde4-fpicker-source.diff
-
-kde4-scp2.diff
-
-kde4-plugin-detection.diff
-kde4-vcl-prj.diff
-kde4-vcl-source.diff
-
-kde4-oxygen-icons.diff
-
-[ KDE4Experimental ]
-# Not yet ported to co-exist with the KDE3 stuff
-kde4-kab.diff
-
-
[ UnstableLibwpd ]
config_office-testing.diff
libwpd-testing.diff
diff --git a/patches/dev300/human-icons-add.diff b/patches/dev300/human-icons-add.diff
index f0a2b28..c449549 100644
--- a/patches/dev300/human-icons-add.diff
+++ b/patches/dev300/human-icons-add.diff
@@ -1,9 +1,9 @@
--- 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>Classic - the OpenOffice.org 2.0 default theme</desc>
- </info>
- </enumeration>
+ <desc>Oxygen - the KDE4 default theme</desc>
+ </info>
+ </enumeration>
+ <enumeration oor:value="human">
+ <info>
+ <desc>Human - the Gnome default theme for Ubuntu</desc>
@@ -20,7 +20,7 @@
.ENDIF
+# additional image sets
-+CUSTOM_IMAGE_SETS=hicontrast industrial crystal tango classic human
++CUSTOM_IMAGE_SETS=hicontrast industrial crystal tango classic oxygen human
+
# settings for mozilla idl compiler
XPIDL=xpidl
@@ -29,11 +29,11 @@
--- 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 @@
- SFX_SYMBOLS_STYLE_INDUSTRIAL,
SFX_SYMBOLS_STYLE_CRYSTAL,
SFX_SYMBOLS_STYLE_TANGO,
-- SFX_SYMBOLS_STYLE_CLASSIC
-+ SFX_SYMBOLS_STYLE_CLASSIC,
+ SFX_SYMBOLS_STYLE_CLASSIC,
+- SFX_SYMBOLS_STYLE_OXYGEN
++ SFX_SYMBOLS_STYLE_OXYGEN,
+ SFX_SYMBOLS_STYLE_HUMAN
};
@@ -42,17 +42,17 @@
--- 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 @@
- case STYLE_SYMBOLS_CRYSTAL: return SFX_SYMBOLS_STYLE_CRYSTAL;
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_HUMAN: return SFX_SYMBOLS_STYLE_HUMAN;
}
return SFX_SYMBOLS_STYLE_AUTO;
@@ -291,6 +292,7 @@
- case SFX_SYMBOLS_STYLE_CRYSTAL: return STYLE_SYMBOLS_CRYSTAL;
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_HUMAN: return STYLE_SYMBOLS_HUMAN;
}
@@ -61,26 +61,26 @@
--- 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_TANGO: aAutoStr += aIconStyleLB.GetEntry( 4 ); break;
case STYLE_SYMBOLS_CLASSIC: aAutoStr += aIconStyleLB.GetEntry( 5 ); break;
case STYLE_SYMBOLS_HICONTRAST: aAutoStr += aIconStyleLB.GetEntry( 6 ); break;
-+ case STYLE_SYMBOLS_HUMAN: aAutoStr += aIconStyleLB.GetEntry( 7 ); 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 4: eSet = SFX_SYMBOLS_STYLE_CRYSTAL; break;
case 5: eSet = SFX_SYMBOLS_STYLE_TANGO; break;
case 6: eSet = SFX_SYMBOLS_STYLE_CLASSIC; break;
-+ case 7: eSet = SFX_SYMBOLS_STYLE_HUMAN; 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_CRYSTAL: nStyleLB_InitialSelection = 4; break;
case SFX_SYMBOLS_STYLE_TANGO: nStyleLB_InitialSelection = 5; break;
case SFX_SYMBOLS_STYLE_CLASSIC: nStyleLB_InitialSelection = 6; break;
-+ case SFX_SYMBOLS_STYLE_HUMAN: nStyleLB_InitialSelection = 7; break;
+ case SFX_SYMBOLS_STYLE_OXYGEN: nStyleLB_InitialSelection = 7; break;
++ case SFX_SYMBOLS_STYLE_HUMAN: nStyleLB_InitialSelection = 8; break;
default: nStyleLB_InitialSelection = 0; break;
}
}
@@ -88,9 +88,9 @@
--- 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 @@
- < "Crystal" ; > ;
< "Tango" ; > ;
< "Classic" ; > ;
+ < "Oxygen" ; > ;
+ < "Human" ; > ;
};
};
@@ -98,13 +98,13 @@
--- vcl/inc/vcl/settings.hxx 2008-09-26 21:13:11 +0000
+++ vcl/inc/vcl/settings.hxx 2008-09-26 21:32:25 +0000
-@@ -516,7 +516,8 @@
- #define STYLE_SYMBOLS_CRYSTAL ((ULONG)4)
+@@ -519,7 +519,8 @@
#define STYLE_SYMBOLS_TANGO ((ULONG)5)
#define STYLE_SYMBOLS_CLASSIC ((ULONG)6)
--#define STYLE_SYMBOLS_THEMES_MAX ((ULONG)6)
-+#define STYLE_SYMBOLS_HUMAN ((ULONG)7)
-+#define STYLE_SYMBOLS_THEMES_MAX ((ULONG)7)
+ #define STYLE_SYMBOLS_OXYGEN ((ULONG)7)
+-#define STYLE_SYMBOLS_THEMES_MAX ((ULONG)7)
++#define STYLE_SYMBOLS_HUMAN ((ULONG)8)
++#define STYLE_SYMBOLS_THEMES_MAX ((ULONG)8)
#define STYLE_CURSOR_NOBLINKTIME ((ULONG)0xFFFFFFFF)
@@ -124,23 +124,23 @@
// =======================================================================
@@ -701,6 +706,7 @@
- case STYLE_SYMBOLS_CRYSTAL: return ::rtl::OUString::createFromAscii( "crystal" );
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_HUMAN: return ::rtl::OUString::createFromAscii( "human" );
}
return ::rtl::OUString::createFromAscii( "auto" );
-@@ -722,6 +728,8 @@
- return STYLE_SYMBOLS_TANGO;
- else if ( rName == ::rtl::OUString::createFromAscii( "classic" ) )
- return STYLE_SYMBOLS_CLASSIC;
+@@ -734,6 +735,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;
+
+ return STYLE_SYMBOLS_AUTO;
}
-@@ -756,22 +764,49 @@
+@@ -756,22 +764,50 @@
// -----------------------------------------------------------------------
@@ -158,6 +158,7 @@
+ 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");
diff --git a/patches/dev300/kde4-oxygen-icons.diff b/patches/dev300/kde4-oxygen-icons.diff
index 27a5461..65f3e53 100644
--- a/patches/dev300/kde4-oxygen-icons.diff
+++ b/patches/dev300/kde4-oxygen-icons.diff
@@ -3,9 +3,9 @@ index 6645930..a36dc74 100644
--- officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5727,6 +5727,11 @@ Dymamic border coloring means that when the mouse is hovered over a control, and
- <desc>Human - the Gnome default theme for Ubuntu</desc>
- </info>
- </enumeration>
+ <desc>Classic - the OpenOffice.org 2.0 default theme</desc>
+ </info>
+ </enumeration>
+ <enumeration oor:value="oxygen">
+ <info>
+ <desc>Oxygen - the KDE4 default theme</desc>
@@ -77,13 +77,11 @@ diff --git scp2/source/ooo/module_hidden_ooo.scp scp2/source/ooo/module_hidden_o
index 51942be..e311c74 100644
--- scp2/source/ooo/module_hidden_ooo.scp
+++ scp2/source/ooo/module_hidden_ooo.scp
-@@ -857,6 +857,9 @@ Module gid_Module_Root_Files_Images
+@@ -857,6 +857,7 @@ Module gid_Module_Root_Files_Images
Styles = (HIDDEN_ROOT);
Files = (gid_File_Images_Zip,
gid_File_ImagesCrystal_Zip,
-+ #ifdef ENABLE_KDE4
+ gid_File_ImagesOxygen_Zip,
-+ #endif
gid_File_ImagesHicontrast_Zip,
gid_File_ImagesIndustrial_Zip,
gid_File_ImagesTango_Zip,
@@ -91,13 +89,12 @@ diff --git svtools/inc/imgdef.hxx svtools/inc/imgdef.hxx
index 6698e0e..1d38b88 100644
--- svtools/inc/imgdef.hxx
+++ svtools/inc/imgdef.hxx
-@@ -47,7 +47,8 @@ enum SfxSymbolsStyle
+@@ -47,5 +47,6 @@ enum SfxSymbolsStyle
SFX_SYMBOLS_STYLE_CRYSTAL,
SFX_SYMBOLS_STYLE_TANGO,
- SFX_SYMBOLS_STYLE_CLASSIC,
-- SFX_SYMBOLS_STYLE_HUMAN
-+ SFX_SYMBOLS_STYLE_HUMAN,
-+ SFX_SYMBOLS_STYLE_OXYGEN
+- SFX_SYMBOLS_STYLE_CLASSIC
++ SFX_SYMBOLS_STYLE_CLASSIC,
++ SFX_SYMBOLS_STYLE_OXYGEN
};
#define SFX_TOOLBOX_CHANGESYMBOLSET 0x0001
@@ -105,18 +102,16 @@ diff --git svtools/source/config/miscopt.cxx svtools/source/config/miscopt.cxx
index 99a225c..03239dc 100644
--- svtools/source/config/miscopt.cxx
+++ svtools/source/config/miscopt.cxx
-@@ -308,6 +308,7 @@ static sal_Int16 implSymbolsStyleFromVCL( ULONG nStyle )
+@@ -308,5 +308,6 @@ static sal_Int16 implSymbolsStyleFromVCL( ULONG nStyle )
case STYLE_SYMBOLS_TANGO: return SFX_SYMBOLS_STYLE_TANGO;
case STYLE_SYMBOLS_CLASSIC: return SFX_SYMBOLS_STYLE_CLASSIC;
- case STYLE_SYMBOLS_HUMAN: return SFX_SYMBOLS_STYLE_HUMAN;
+ case STYLE_SYMBOLS_OXYGEN: return SFX_SYMBOLS_STYLE_OXYGEN;
}
return SFX_SYMBOLS_STYLE_AUTO;
-@@ -325,6 +326,7 @@ static ULONG implSymbolsStyleToVCL( sal_Int16 nStyle )
+@@ -325,5 +326,6 @@ static ULONG implSymbolsStyleToVCL( sal_Int16 nStyle )
case SFX_SYMBOLS_STYLE_TANGO: return STYLE_SYMBOLS_TANGO;
case SFX_SYMBOLS_STYLE_CLASSIC: return STYLE_SYMBOLS_CLASSIC;
- case SFX_SYMBOLS_STYLE_HUMAN: return STYLE_SYMBOLS_HUMAN;
+ case SFX_SYMBOLS_STYLE_OXYGEN: return STYLE_SYMBOLS_OXYGEN;
}
@@ -125,22 +120,35 @@ diff --git svx/source/dialog/optgdlg.cxx svx/source/dialog/optgdlg.cxx
index d8f1ce8..0409846 100644
--- svx/source/dialog/optgdlg.cxx
+++ svx/source/dialog/optgdlg.cxx
-@@ -818,6 +818,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) :
+@@ -818,5 +818,6 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) :
case STYLE_SYMBOLS_CLASSIC: aAutoStr += aIconStyleLB.GetEntry( 5 ); break;
case STYLE_SYMBOLS_HICONTRAST: aAutoStr += aIconStyleLB.GetEntry( 6 ); break;
- case STYLE_SYMBOLS_HUMAN: aAutoStr += aIconStyleLB.GetEntry( 7 ); break;
-+ case STYLE_SYMBOLS_OXYGEN: aAutoStr += aIconStyleLB.GetEntry( 8 ); break;
++ case STYLE_SYMBOLS_OXYGEN: aAutoStr += aIconStyleLB.GetEntry( 7 ); break;
}
aIconStyleLB.RemoveEntry( 0 );
+@@ -880,5 +881,6 @@
+ case 5: eSet = SFX_SYMBOLS_STYLE_TANGO; break;
+ case 6: eSet = SFX_SYMBOLS_STYLE_CLASSIC; break;
++ case 7: eSet = SFX_SYMBOLS_STYLE_OXYGEN; break;
+ default:
+ DBG_ERROR( "OfaViewTabPage::FillItemSet(): This state of aIconStyleLB should not be possible!" );
+ }
+@@ -1052,5 +1054,6 @@
+ 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;
+ default: nStyleLB_InitialSelection = 0; break;
+ }
+ }
+
diff --git svx/source/dialog/optgdlg.src svx/source/dialog/optgdlg.src
index 824b264..1cc912e 100644
--- svx/source/dialog/optgdlg.src
+++ svx/source/dialog/optgdlg.src
-@@ -259,6 +259,7 @@ TabPage OFA_TP_VIEW
+@@ -259,5 +259,6 @@ TabPage OFA_TP_VIEW
< "Tango" ; > ;
< "Classic" ; > ;
- < "Human" ; > ;
+ < "Oxygen" ; > ;
};
};
@@ -149,13 +157,12 @@ diff --git vcl/inc/vcl/settings.hxx vcl/inc/vcl/settings.hxx
index 2cba172..19848c8 100644
--- vcl/inc/vcl/settings.hxx
+++ vcl/inc/vcl/settings.hxx
-@@ -519,7 +519,8 @@ private:
+@@ -519,6 +519,7 @@ private:
#define STYLE_SYMBOLS_TANGO ((ULONG)5)
#define STYLE_SYMBOLS_CLASSIC ((ULONG)6)
- #define STYLE_SYMBOLS_HUMAN ((ULONG)7)
--#define STYLE_SYMBOLS_THEMES_MAX ((ULONG)7)
-+#define STYLE_SYMBOLS_OXYGEN ((ULONG)8)
-+#define STYLE_SYMBOLS_THEMES_MAX ((ULONG)8)
+-#define STYLE_SYMBOLS_THEMES_MAX ((ULONG)6)
++#define STYLE_SYMBOLS_OXYGEN ((ULONG)7)
++#define STYLE_SYMBOLS_THEMES_MAX ((ULONG)7)
#define STYLE_CURSOR_NOBLINKTIME ((ULONG)0xFFFFFFFF)
@@ -163,31 +170,20 @@ diff --git vcl/source/app/settings.cxx vcl/source/app/settings.cxx
index f6fcb3e..6ec27f7 100644
--- vcl/source/app/settings.cxx
+++ vcl/source/app/settings.cxx
-@@ -711,6 +711,7 @@ void StyleSettings::Set3DColors( const Color& rColor )
+@@ -711,5 +711,6 @@ void StyleSettings::Set3DColors( const Color& rColor )
case STYLE_SYMBOLS_TANGO: return ::rtl::OUString::createFromAscii( "tango" );
case STYLE_SYMBOLS_CLASSIC: return ::rtl::OUString::createFromAscii( "classic" );
- case STYLE_SYMBOLS_HUMAN: return ::rtl::OUString::createFromAscii( "human" );
+ case STYLE_SYMBOLS_OXYGEN: return ::rtl::OUString::createFromAscii( "oxygen" );
}
return ::rtl::OUString::createFromAscii( "auto" );
-@@ -734,6 +735,8 @@ ULONG StyleSettings::ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) cons
+@@ -734,4 +735,6 @@ ULONG StyleSettings::ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) cons
return STYLE_SYMBOLS_CLASSIC;
- else if ( rName == ::rtl::OUString::createFromAscii( "human" ) )
- return STYLE_SYMBOLS_HUMAN;
+ else if ( rName == ::rtl::OUString::createFromAscii( "oxygen" ) )
+ return STYLE_SYMBOLS_OXYGEN;
return STYLE_SYMBOLS_AUTO;
}
-@@ -783,6 +786,7 @@ ULONG SymbolsStyleOrAuto (ULONG nStyle)
- case STYLE_SYMBOLS_TANGO: strcat (zipfile, "_tango"); break;
- case STYLE_SYMBOLS_CLASSIC: strcat (zipfile, "_classic"); break;
- case STYLE_SYMBOLS_HUMAN: strcat (zipfile, "_human"); break;
-+ case STYLE_SYMBOLS_OXYGEN: strcat (zipfile, "_oxygen"); break;
- }
- strcat (zipfile, ".zip");
- if ( access( zipfile, R_OK ) )
@@ -856,6 +860,8 @@ ULONG StyleSettings::GetAutoSymbolsStyle() const
nRet = STYLE_SYMBOLS_HUMAN;
else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde" ) )
diff --git a/patches/dev300/kde4-vcl-prj.diff b/patches/dev300/kde4-vcl-prj.diff
index f195744..745c21c 100644
--- a/patches/dev300/kde4-vcl-prj.diff
+++ b/patches/dev300/kde4-vcl-prj.diff
@@ -2,8 +2,7 @@ diff --git vcl/prj/build.lst vcl/prj/build.lst
index eeda7e6..e60416f 100644
--- vcl/prj/build.lst
+++ vcl/prj/build.lst
-@@ -7,15 +7,16 @@ vc vcl\unx\gtk\app nmake - u vc__gtka vc_inc NULL
- vc vcl\unx\gtk\window nmake - u vc__gtkw vc_inc NULL
+@@ -28,6 +28,7 @@
vc vcl\unx\gtk\gdi nmake - u vc__gtkg vc_inc NULL
vc vcl\unx\headless nmake - u vc__hl vc_inc NULL
vc vcl\unx\kde nmake - u vc__kde vc_inc NULL
@@ -11,12 +10,11 @@ index eeda7e6..e60416f 100644
vc vcl\aqua\source\a11y nmake - u vc__aquy vc_inc NULL
vc vcl\aqua\source\app nmake - u vc__appa vc_inc NULL
vc vcl\aqua\source\gdi nmake - u vc__gdia vc_inc NULL
- vc vcl\aqua\source\res nmake - u vc__resa NULL
- vc vcl\aqua\source\window nmake - u vc__wina vc_inc NULL
- vc vcl\mac\source\app nmake - m vc__appm vc_inc NULL
+@@ -37,6 +38,6 @@
vc vcl\mac\source\gdi nmake - m vc__gdim vc_inc NULL
vc vcl\mac\source\window nmake - m vc__winm vc_inc NULL
vc vcl\mac\source\src nmake - m vc__srcm vc_inc NULL
-vc vcl\util nmake - all vc_util vc__plug.u vc__aquy.u vc__appa.u vc__appm.m vc__appu.u vc__appw.w vc__appp.p vc__gdia.u vc__gdim.m vc__gdiu.u vc__gdiw.w vc__gdip.p vc__srcm.m vc__srcw.w vc__srcp.p vc__wina.u vc__winm.m vc__winu.u vc__winw.w vc__winp.p vc__gtka.u vc__gtky.u vc__gtkw.u vc__gtkg.u vc__kde.u vc__hl.u vc_app vc_ctrl vc_gdi vc_hlp vc_src vc_win vc_glyphs vc_components NULL
+vc vcl\util nmake - all vc_util vc__plug.u vc__aquy.u vc__appa.u vc__appm.m vc__appu.u vc__appw.w vc__appp.p vc__gdia.u vc__gdim.m vc__gdiu.u vc__gdiw.w vc__gdip.p vc__srcm.m vc__srcw.w vc__srcp.p vc__wina.u vc__winm.m vc__winu.u vc__winw.w vc__winp.p vc__gtka.u vc__gtky.u vc__gtkw.u vc__gtkg.u vc__kde.u vc__kde4.u vc__hl.u vc_app vc_ctrl vc_gdi vc_hlp vc_src vc_win vc_glyphs vc_components NULL
vc vcl\util\linksvp nmake - u vc_lsvp vc_util NULL
+ vc vcl\workben nmake - all vc_wrkb vc_util vc_salmain NULL
commit 3201dc3eb702fe9b4a07b56df7c2d550e8beec80
Author: Roman Shtylman <shtylman at gmail.com>
Date: Wed Jun 17 17:51:14 2009 -0400
oxygen icons for kde4 integration
* bin/setup.in:
* bin/unpack:
* configure.in:
* download.in:
* patches/dev300/apply:
* patches/dev300/kde4-oxygen-icons.diff:
diff --git a/bin/setup.in b/bin/setup.in
index cfcf91d..35f7354 100644
--- a/bin/setup.in
+++ b/bin/setup.in
@@ -70,6 +70,7 @@ export GNUCP=@GNUCP@
GNUPATCH=@GNUPATCH@
GNUTAR=@GNUTAR@
DRINK="@DRINK@"
+OXYGEN_IMAGES_TAR='@OXYGEN_IMAGES_TAR@'
if test -f "$TOOLSDIR/distro-configs/Common.conf" ; then
COMMON_OPTIONS="`cat $TOOLSDIR/distro-configs/Common.conf | xargs`";
diff --git a/bin/unpack b/bin/unpack
index 39b713b..013c8f7 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -841,4 +841,11 @@ if test "x$LIGHTPROOF_EXTENSION" != "x"; then
$GNUCP -a $SRCDIR/$LIGHTPROOF_EXTENSION -d $OOBUILDDIR/extras/source/extensions || exit 1
fi
+if test "x$OXYGEN_IMAGES_TAR" != "x"; then
+ check_tarball $SRCDIR/$OXYGEN_IMAGES_TAR
+ echo "Copying $OXYGEN_IMAGES_TAR into external_images"
+ mkdir -p $OOBUILDDIR/external_images || exit 1
+ $GNUCP -a $SRCDIR/$OXYGEN_IMAGES_TAR $OOBUILDDIR/external_images/ooo_oxygen_images.tar.gz || exit 1
+fi
+
fi # PIECES hack
diff --git a/configure.in b/configure.in
index 3baef52..c97f803 100644
--- a/configure.in
+++ b/configure.in
@@ -755,6 +755,7 @@ else
OOO_WIDGET_FLAGS="--disable-kde"
fi
if test "$enable_kde4" != "no"; then
+ OXYGEN_IMAGES_TAR=ooo_oxygen_images-2009-06-17.tar.gz
if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin"; then
OOO_WIDGET_FLAGS="$OOO_WIDGET_FLAGS --enable-kde4"
widget_sets="$widget_sets kde4"
@@ -762,6 +763,7 @@ if test "$enable_kde4" != "no"; then
else
OOO_WIDGET_FLAGS="$OOO_WIDGET_FLAGS --disable-kde4"
fi
+AC_SUBST(OXYGEN_IMAGES_TAR)
if test "$enable_gtk" != "no"; then
if test "z$with_win32" = "z" -a "z`uname -s`" != "zDarwin"; then
OOO_WIDGET_FLAGS="--enable-gtk $OOO_WIDGET_FLAGS"
diff --git a/download.in b/download.in
index 8137564..3b58f3c 100755
--- a/download.in
+++ b/download.in
@@ -54,6 +54,7 @@ sub trim($)
'extras-.*' => '@MIRROR@/SRC680',
'ooo_custom_images.*' => '@MIRROR@/SRC680',
'ooo_crystal_images.*' => '@MIRROR@/SRC680',
+ 'ooo_oxygen_images-*' => '@MIRROR@/DEV300',
'ooo-cli-prebuilt-*' => '@MIRROR@/DEV300',
'mdbtools.*' => '@MIRROR@/SRC680',
'libpixman-.*' => '@MIRROR@/SRC680',
@@ -397,6 +398,10 @@ if ('@LIGHTPROOF_EXTENSION@' ne '') {
push @files, ( '@LIGHTPROOF_EXTENSION@' );
}
+if ('@OXYGEN_IMAGES_TAR@' ne '') {
+ push @files, ( '@OXYGEN_IMAGES_TAR@' );
+}
+
$suntemplang = trim('@SUNTEMPLATES_LANG@');
@templang = split (/ /, $suntemplang);
foreach (@templang) {
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3776545..c8f9e06 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2784,6 +2784,8 @@ kde4-plugin-detection.diff
kde4-vcl-prj.diff
kde4-vcl-source.diff
+kde4-oxygen-icons.diff
+
[ KDE4Experimental ]
# Not yet ported to co-exist with the KDE3 stuff
kde4-kab.diff
diff --git a/patches/dev300/kde4-oxygen-icons.diff b/patches/dev300/kde4-oxygen-icons.diff
new file mode 100644
index 0000000..27a5461
--- /dev/null
+++ b/patches/dev300/kde4-oxygen-icons.diff
@@ -0,0 +1,199 @@
+diff --git officecfg/registry/schema/org/openoffice/Office/Common.xcs officecfg/registry/schema/org/openoffice/Office/Common.xcs
+index 6645930..a36dc74 100644
+--- officecfg/registry/schema/org/openoffice/Office/Common.xcs
++++ officecfg/registry/schema/org/openoffice/Office/Common.xcs
+@@ -5727,6 +5727,11 @@ Dymamic border coloring means that when the mouse is hovered over a control, and
+ <desc>Human - the Gnome default theme for Ubuntu</desc>
+ </info>
+ </enumeration>
++ <enumeration oor:value="oxygen">
++ <info>
++ <desc>Oxygen - the KDE4 default theme</desc>
++ </info>
++ </enumeration>
+ </constraints>
+ <value>auto</value>
+ </prop>
+diff --git packimages/pack/makefile.mk packimages/pack/makefile.mk
+index a9e1089..2a29b04 100644
+--- packimages/pack/makefile.mk
++++ packimages/pack/makefile.mk
+@@ -41,13 +41,14 @@ RSCCUSTOMIMG*=$(PRJ)
+ 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
++CUSTOM_IMAGE_SETS=hicontrast industrial crystal tango classic oxygen
+ 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
+
+ CRYSTAL_TARBALL=$(SOLARSRC)$/external_images$/ooo_crystal_images-1.tar.gz
+ CLASSIC_TARBALL=$(SOLARSRC)$/ooo_custom_images$/classic/classic_images.tar.gz
++OXYGEN_TARBALL=$(SOLARSRC)$/external_images$/ooo_oxygen_images.tar.gz
+
+ ALLTAR : $(IMAGES) $(CUSTOM_IMAGES) $(COMMONBIN)$/images_brand.zip
+
+@@ -88,6 +89,14 @@ $(MISC)$/crystal.flag : $(CRYSTAL_TARBALL)
+ chmod -R g+w $(MISC)$/crystal
+ .ENDIF
+ @$(TYPE) $@ || echo "ERROR: unpacking $(CRYSTAL_TARBALL) failed"
++
++# unpack the Oxygen icon set
++$(MISC)$/oxygen.flag : $(OXYGEN_TARBALL)
++ cd $(MISC) && gzip -d -c $(OXYGEN_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f)
++.IF "$(GUI)"=="UNX"
++ chmod -R g+w $(MISC)$/oxygen
++.ENDIF
++ @$(TYPE) $@ || echo "ERROR: unpacking $(OXYGEN_TARBALL) failed"
+
+ # unpack the classic icon set
+ $(MISC)$/classic.flag : $(CLASSIC_TARBALL)
+@@ -104,3 +113,5 @@ images_crystal : $(MISC)$/crystal.flag $(RES)$/img$/commandimagelist.ilst
+
+ images_classic : $(MISC)$/classic.flag $(RES)$/img$/commandimagelist.ilst
+
++images_oxygen : $(MISC)$/oxygen.flag $(RES)$/img$/commandimagelist.ilst
++
+diff --git scp2/source/ooo/file_ooo.scp scp2/source/ooo/file_ooo.scp
+index 1c7465f..5857d16 100644
+--- scp2/source/ooo/file_ooo.scp
++++ scp2/source/ooo/file_ooo.scp
+@@ -2917,6 +2917,13 @@ File gid_File_ImagesCrystal_Zip
+ Styles = (PACKED);
+ End
+
++File gid_File_ImagesOxygen_Zip
++ TXT_FILE_BODY;
++ Dir = gid_Dir_Share_Config;
++ Name = "images_oxygen.zip";
++ Styles = (PACKED);
++End
++
+ File gid_File_ImagesHicontrast_Zip
+ TXT_FILE_BODY;
+ Dir = gid_Dir_Share_Config;
+diff --git scp2/source/ooo/module_hidden_ooo.scp scp2/source/ooo/module_hidden_ooo.scp
+index 51942be..e311c74 100644
+--- scp2/source/ooo/module_hidden_ooo.scp
++++ scp2/source/ooo/module_hidden_ooo.scp
+@@ -857,6 +857,9 @@ Module gid_Module_Root_Files_Images
+ Styles = (HIDDEN_ROOT);
+ Files = (gid_File_Images_Zip,
+ gid_File_ImagesCrystal_Zip,
++ #ifdef ENABLE_KDE4
++ gid_File_ImagesOxygen_Zip,
++ #endif
+ gid_File_ImagesHicontrast_Zip,
+ gid_File_ImagesIndustrial_Zip,
+ gid_File_ImagesTango_Zip,
+diff --git svtools/inc/imgdef.hxx svtools/inc/imgdef.hxx
+index 6698e0e..1d38b88 100644
+--- svtools/inc/imgdef.hxx
++++ svtools/inc/imgdef.hxx
+@@ -47,7 +47,8 @@ enum SfxSymbolsStyle
+ SFX_SYMBOLS_STYLE_CRYSTAL,
+ SFX_SYMBOLS_STYLE_TANGO,
+ SFX_SYMBOLS_STYLE_CLASSIC,
+- SFX_SYMBOLS_STYLE_HUMAN
++ SFX_SYMBOLS_STYLE_HUMAN,
++ SFX_SYMBOLS_STYLE_OXYGEN
+ };
+
+ #define SFX_TOOLBOX_CHANGESYMBOLSET 0x0001
+diff --git svtools/source/config/miscopt.cxx svtools/source/config/miscopt.cxx
+index 99a225c..03239dc 100644
+--- svtools/source/config/miscopt.cxx
++++ svtools/source/config/miscopt.cxx
+@@ -308,6 +308,7 @@ static sal_Int16 implSymbolsStyleFromVCL( ULONG nStyle )
+ case STYLE_SYMBOLS_TANGO: return SFX_SYMBOLS_STYLE_TANGO;
+ case STYLE_SYMBOLS_CLASSIC: return SFX_SYMBOLS_STYLE_CLASSIC;
+ case STYLE_SYMBOLS_HUMAN: return SFX_SYMBOLS_STYLE_HUMAN;
++ case STYLE_SYMBOLS_OXYGEN: return SFX_SYMBOLS_STYLE_OXYGEN;
+ }
+
+ return SFX_SYMBOLS_STYLE_AUTO;
+@@ -325,6 +326,7 @@ static ULONG implSymbolsStyleToVCL( sal_Int16 nStyle )
+ case SFX_SYMBOLS_STYLE_TANGO: return STYLE_SYMBOLS_TANGO;
+ case SFX_SYMBOLS_STYLE_CLASSIC: return STYLE_SYMBOLS_CLASSIC;
+ case SFX_SYMBOLS_STYLE_HUMAN: return STYLE_SYMBOLS_HUMAN;
++ case SFX_SYMBOLS_STYLE_OXYGEN: return STYLE_SYMBOLS_OXYGEN;
+ }
+
+ return STYLE_SYMBOLS_AUTO;
+diff --git svx/source/dialog/optgdlg.cxx svx/source/dialog/optgdlg.cxx
+index d8f1ce8..0409846 100644
+--- svx/source/dialog/optgdlg.cxx
++++ svx/source/dialog/optgdlg.cxx
+@@ -818,6 +818,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) :
+ case STYLE_SYMBOLS_CLASSIC: aAutoStr += aIconStyleLB.GetEntry( 5 ); break;
+ case STYLE_SYMBOLS_HICONTRAST: aAutoStr += aIconStyleLB.GetEntry( 6 ); break;
+ case STYLE_SYMBOLS_HUMAN: aAutoStr += aIconStyleLB.GetEntry( 7 ); break;
++ case STYLE_SYMBOLS_OXYGEN: aAutoStr += aIconStyleLB.GetEntry( 8 ); break;
+ }
+
+ aIconStyleLB.RemoveEntry( 0 );
+diff --git svx/source/dialog/optgdlg.src svx/source/dialog/optgdlg.src
+index 824b264..1cc912e 100644
+--- svx/source/dialog/optgdlg.src
++++ svx/source/dialog/optgdlg.src
+@@ -259,6 +259,7 @@ TabPage OFA_TP_VIEW
+ < "Tango" ; > ;
+ < "Classic" ; > ;
+ < "Human" ; > ;
++ < "Oxygen" ; > ;
+ };
+ };
+ CheckBox CB_SYSTEM_FONT
+diff --git vcl/inc/vcl/settings.hxx vcl/inc/vcl/settings.hxx
+index 2cba172..19848c8 100644
+--- vcl/inc/vcl/settings.hxx
++++ vcl/inc/vcl/settings.hxx
+@@ -519,7 +519,8 @@ private:
+ #define STYLE_SYMBOLS_TANGO ((ULONG)5)
+ #define STYLE_SYMBOLS_CLASSIC ((ULONG)6)
+ #define STYLE_SYMBOLS_HUMAN ((ULONG)7)
+-#define STYLE_SYMBOLS_THEMES_MAX ((ULONG)7)
++#define STYLE_SYMBOLS_OXYGEN ((ULONG)8)
++#define STYLE_SYMBOLS_THEMES_MAX ((ULONG)8)
+
+ #define STYLE_CURSOR_NOBLINKTIME ((ULONG)0xFFFFFFFF)
+
+diff --git vcl/source/app/settings.cxx vcl/source/app/settings.cxx
+index f6fcb3e..6ec27f7 100644
+--- vcl/source/app/settings.cxx
++++ vcl/source/app/settings.cxx
+@@ -711,6 +711,7 @@ void StyleSettings::Set3DColors( const Color& rColor )
+ case STYLE_SYMBOLS_TANGO: return ::rtl::OUString::createFromAscii( "tango" );
+ case STYLE_SYMBOLS_CLASSIC: return ::rtl::OUString::createFromAscii( "classic" );
+ case STYLE_SYMBOLS_HUMAN: return ::rtl::OUString::createFromAscii( "human" );
++ case STYLE_SYMBOLS_OXYGEN: return ::rtl::OUString::createFromAscii( "oxygen" );
+ }
+
+ return ::rtl::OUString::createFromAscii( "auto" );
+@@ -734,6 +735,8 @@ ULONG StyleSettings::ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) cons
+ return STYLE_SYMBOLS_CLASSIC;
+ else if ( rName == ::rtl::OUString::createFromAscii( "human" ) )
+ return STYLE_SYMBOLS_HUMAN;
++ else if ( rName == ::rtl::OUString::createFromAscii( "oxygen" ) )
++ return STYLE_SYMBOLS_OXYGEN;
+
+ return STYLE_SYMBOLS_AUTO;
+ }
+@@ -783,6 +786,7 @@ ULONG SymbolsStyleOrAuto (ULONG nStyle)
+ case STYLE_SYMBOLS_TANGO: strcat (zipfile, "_tango"); break;
+ case STYLE_SYMBOLS_CLASSIC: strcat (zipfile, "_classic"); break;
+ case STYLE_SYMBOLS_HUMAN: strcat (zipfile, "_human"); break;
++ case STYLE_SYMBOLS_OXYGEN: strcat (zipfile, "_oxygen"); break;
+ }
+ strcat (zipfile, ".zip");
+ if ( access( zipfile, R_OK ) )
+@@ -856,6 +860,8 @@ ULONG StyleSettings::GetAutoSymbolsStyle() const
+ nRet = STYLE_SYMBOLS_HUMAN;
+ else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde" ) )
+ nRet = STYLE_SYMBOLS_CRYSTAL;
++ else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde4" ) )
++ nRet = STYLE_SYMBOLS_OXYGEN;
+ }
+
+ return nRet;
More information about the ooo-build-commit
mailing list