[Libreoffice-commits] .: 14 commits - desktop/prj desktop/source desktop/zipintro framework/source sfx2/inc sfx2/source
Michael Meeks
mmeeks at kemper.freedesktop.org
Mon Oct 11 07:24:35 PDT 2010
desktop/prj/d.lst | 21 +--
desktop/source/splash/makefile.mk | 12 --
desktop/source/splash/splash.cxx | 168 +++-------------------------
desktop/source/splash/splash.hxx | 7 -
desktop/zipintro/makefile.mk | 102 ++++-------------
framework/source/services/backingwindow.cxx | 12 +-
framework/source/services/fwk_services.src | 20 ---
sfx2/inc/sfx2/app.hxx | 2
sfx2/source/dialog/about.cxx | 69 -----------
sfx2/source/dialog/makefile.mk | 12 --
10 files changed, 69 insertions(+), 356 deletions(-)
New commits:
commit 75fd7e32b25cc975988ed63af0542bc184584c15
Author: Michael Meeks <michael.meeks at novell.com>
Date: Mon Oct 11 15:17:49 2010 +0100
deliver the images.
diff --git a/desktop/prj/d.lst b/desktop/prj/d.lst
index 7ed21d6..cda9361 100644
--- a/desktop/prj/d.lst
+++ b/desktop/prj/d.lst
@@ -110,6 +110,7 @@ mkdir: %COMMON_DEST%\pck%_EXT%\brand_dev
..\%__SRC%\bin\brand\intro.zip %COMMON_DEST%\pck%_EXT%\brand\intro.zip
..\%__SRC%\bin\brand_dev\intro.zip %COMMON_DEST%\pck%_EXT%\brand_dev\intro.zip
+..\%__SRC%\bin\shell\shell.zip %COMMON_DEST%\pck%_EXT%\shell.zip
..\%__SRC%\bin\guiloader.exe %_DEST%\bin%_EXT%\testtool.exe
commit d5f976e7ada4e4b990a092e0dd954f511bdfbe84
Author: Michael Meeks <michael.meeks at novell.com>
Date: Mon Oct 11 13:35:03 2010 +0100
package the shell pieces up into a zip archive
diff --git a/desktop/zipintro/makefile.mk b/desktop/zipintro/makefile.mk
index 8c7fd11..73bc37f 100644
--- a/desktop/zipintro/makefile.mk
+++ b/desktop/zipintro/makefile.mk
@@ -32,8 +32,6 @@ TARGET=zipintro
.INCLUDE : settings.mk
-DEFAULT_FLAVOURS=brand brand_dev
-
ZIP1LIST= \
$(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/intro.png $(INTRO_BITMAPS)) \
$(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/about.png $(ABOUT_BITMAPS)) \
@@ -44,15 +42,28 @@ ZIP2LIST= \
$(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand_dev$/about.png $(ABOUT_BITMAPS)) \
$(MISC)$/$(RSCDEFIMG)$/brand_dev$/intro-pt_BR.png \
$(MISC)$/$(RSCDEFIMG)$/brand_dev$/about-pt_BR.png
+ZIP3LIST= \
+ $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_left.png \
+ $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_right.png \
+ $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_space.png \
+ $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_rtl_left.png \
+ $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_rtl_right.png \
+ $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_left-pt_BR.png \
+ $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_right-pt_BR.png
ZIP1TARGET=brand
ZIP1DEPS=$(ZIP1LIST)
ZIP2TARGET=brand_dev
ZIP2DEPS=$(ZIP2LIST)
+ZIP3TARGET=shell
+ZIP3DEPS=$(ZIP1LIST)
.INCLUDE : target.mk
-ALLTAR : $(foreach,i,$(DEFAULT_FLAVOURS) $(COMMONBIN)$/$i$/intro.zip)
+ALLTAR : \
+ $(COMMONBIN)$/brand$/intro.zip \
+ $(COMMONBIN)$/brand_dev$/intro.zip \
+ $(COMMONBIN)$/shell/shell.zip
$(COMMONBIN)$/brand_dev$/intro.zip : $(COMMONBIN)$/brand_dev.zip
@@-$(MKDIR) $(@:d)
@@ -62,6 +73,10 @@ $(COMMONBIN)$/brand$/intro.zip : $(COMMONBIN)$/brand.zip
@@-$(MKDIR) $(@:d)
@$(COPY) $< $@
+$(COMMONBIN)$/shell$/shell.zip : $(COMMONBIN)$/shell.zip
+ @@-$(MKDIR) $(@:d)
+ @$(COPY) $< $@
+
$(MISC)$/%.bmp : $(SOLARSRC)$/%.bmp
@@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@
commit bca616748fafbb53f95861b7b4b18884781bc8d0
Author: Michael Meeks <michael.meeks at novell.com>
Date: Mon Oct 11 13:13:54 2010 +0100
remove obsolete includes
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index 1724016..7e9c613 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_desktop.hxx"
-#include <introbmpnames.hxx>
#include "splash.hxx"
#include <stdio.h>
#include <unotools/bootstrap.hxx>
diff --git a/sfx2/source/dialog/about.cxx b/sfx2/source/dialog/about.cxx
index 0c062f7..55c6be7 100644
--- a/sfx2/source/dialog/about.cxx
+++ b/sfx2/source/dialog/about.cxx
@@ -29,7 +29,6 @@
#include "precompiled_sfx2.hxx"
// include ---------------------------------------------------------------
-#include <aboutbmpnames.hxx>
#include <vcl/svapp.hxx>
#include <vcl/msgbox.hxx>
commit 3d265f9c26ec13b38af940a5d3d475db8ffd03df
Author: Michael Meeks <michael.meeks at novell.com>
Date: Mon Oct 11 12:46:39 2010 +0100
Switch to using installed branding images for the backing items.
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index e0844f1..a4b512a 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -408,7 +408,9 @@ void BackingWindow::initBackground()
if( !! maBackgroundMiddle )
aMiddleSize = maBackgroundMiddle.GetSizePixel();
// load middle segment
- maBackgroundMiddle = BitmapEx( FwkResId( BMP_BACKING_BACKGROUND_MIDDLE ) );
+
+ Application::LoadBrandBitmap ("shell/backing_space", maBackgroundMiddle);
+
// and scale it to previous size
if( aMiddleSize.Width() && aMiddleSize.Height() )
maBackgroundMiddle.Scale( aMiddleSize );
@@ -416,13 +418,13 @@ void BackingWindow::initBackground()
if( GetSettings().GetLayoutRTL() )
{
// replace images by RTL versions
- maBackgroundLeft = BitmapEx( FwkResId( BMP_BACKING_BACKGROUND_RTL_RIGHT ) );
- maBackgroundRight = BitmapEx( FwkResId( BMP_BACKING_BACKGROUND_RTL_LEFT) );
+ Application::LoadBrandBitmap ("shell/backing_rtl_right", maBackgroundLeft);
+ Application::LoadBrandBitmap ("shell/backing_rtl_left", maBackgroundRight);
}
else
{
- maBackgroundLeft = BitmapEx( FwkResId( BMP_BACKING_BACKGROUND_LEFT ) );
- maBackgroundRight = BitmapEx( FwkResId( BMP_BACKING_BACKGROUND_RIGHT ) );
+ Application::LoadBrandBitmap ("shell/backing_left", maBackgroundLeft);
+ Application::LoadBrandBitmap ("shell/backing_right", maBackgroundRight);
}
maToolbox.SetItemImage( nItemId_Extensions, BitmapEx( FwkResId( BMP_BACKING_EXT ) ) );
maToolbox.SetItemImage( nItemId_Info, BitmapEx( FwkResId( BMP_BACKING_INFO ) ) );
diff --git a/framework/source/services/fwk_services.src b/framework/source/services/fwk_services.src
index ea22db1..15d735d 100644
--- a/framework/source/services/fwk_services.src
+++ b/framework/source/services/fwk_services.src
@@ -73,26 +73,6 @@ Window DLG_BACKING
Resource RES_BACKING_IMAGES
{
- Bitmap BMP_BACKING_BACKGROUND_LEFT
- {
- File = "backing.png";
- };
- Bitmap BMP_BACKING_BACKGROUND_MIDDLE
- {
- File = "backing_space.png";
- };
- Bitmap BMP_BACKING_BACKGROUND_RIGHT
- {
- File = "backing_right.png";
- };
- Bitmap BMP_BACKING_BACKGROUND_RTL_LEFT
- {
- File = "backing_rtl_left.png";
- };
- Bitmap BMP_BACKING_BACKGROUND_RTL_RIGHT
- {
- File = "backing_rtl_right.png";
- };
Bitmap BMP_BACKING_EXT
{
File = "extension.png";
commit f8b3faf2e1e2f81a54338bc5a2fa5e76725e7622
Author: Michael Meeks <michael.meeks at novell.com>
Date: Mon Oct 11 12:24:51 2010 +0100
push branded image finding down into vcl
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index f898a3c..1724016 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -36,7 +36,6 @@
#include <tools/urlobj.hxx>
#include <tools/stream.hxx>
#include <sfx2/sfx.hrc>
-#include <sfx2/app.hxx>
#include <vcl/svapp.hxx>
#include <vcl/salnativewidgets.hxx>
@@ -422,15 +421,15 @@ void SplashScreen::SetScreenBitmap(BitmapEx &rBitmap)
aResBuf.append( OString::valueOf( nHeight ));
aStrBuf.append( aResBuf.getStr() );
- if (SfxApplication::LoadBrandBitmap (aStrBuf.makeStringAndClear(), rBitmap))
+ if (Application::LoadBrandBitmap (aStrBuf.makeStringAndClear(), rBitmap))
return;
aStrBuf.append( "intro_" );
aStrBuf.append( aResBuf.getStr() );
- if (SfxApplication::LoadBrandBitmap (aResBuf.makeStringAndClear(), rBitmap))
+ if (Application::LoadBrandBitmap (aResBuf.makeStringAndClear(), rBitmap))
return;
- SfxApplication::LoadBrandBitmap ("intro", rBitmap);
+ Application::LoadBrandBitmap ("intro", rBitmap);
}
void SplashScreen::determineProgressRatioValues(
diff --git a/sfx2/source/appl/brand.cxx b/sfx2/source/appl/brand.cxx
deleted file mode 100644
index df8d704..0000000
--- a/sfx2/source/appl/brand.cxx
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Initial Developer of the Original Code is
- * Novell, Inc.
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Michael Meeks <michael.meeks at novell.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sfx2.hxx"
-
-#include <rtl/ustring.hxx>
-#include <rtl/bootstrap.hxx>
-#include <rtl/locale.hxx>
-#include <osl/process.h>
-#include <tools/urlobj.hxx>
-#include <tools/stream.hxx>
-#include <vcl/pngread.hxx>
-#include <sfx2/app.hxx>
-
-namespace {
- static bool loadPng(const char *pPath, const rtl::OUString &rName, BitmapEx &rBitmap)
- {
- rtl::OUString uri = rtl::OUString::createFromAscii( pPath ) + rName;
- rtl::Bootstrap::expandMacros( uri );
- INetURLObject aObj( uri );
- SvFileStream aStrm( aObj.PathToFileName(), STREAM_STD_READ );
- if ( !aStrm.GetError() ) {
- vcl::PNGReader aReader( aStrm );
- rBitmap = aReader.Read();
- return !rBitmap.IsEmpty();
- }
- else
- return false;
- }
-}
-
-bool SfxApplication::LoadBrandBitmap (const char* pName, BitmapEx &rBitmap)
-{
- // TODO - if we want more flexibility we could add a branding path
- // in an rc file perhaps fallback to "about.bmp"
- rtl::OUString aBaseName = ( rtl::OUString::createFromAscii( "/" ) +
- rtl::OUString::createFromAscii( pName ) );
- rtl::OUString aPng( RTL_CONSTASCII_USTRINGPARAM(".png") );
-
- rtl_Locale *pLoc = NULL;
- osl_getProcessLocale (&pLoc);
- rtl::OLocale aLoc( pLoc );
-
- rtl::OUString aName = aBaseName + aPng;
- rtl::OUString aLocaleName = ( aBaseName + rtl::OUString::createFromAscii ("-") +
- aLoc.getLanguage() +
- rtl::OUString::createFromAscii ("_") +
- aLoc.getCountry() + aPng );
-
- return ( loadPng ("$BRAND_BASE_DIR/program/edition", aLocaleName, rBitmap) ||
- loadPng ("$BRAND_BASE_DIR/program", aLocaleName, rBitmap) ||
- loadPng ("$BRAND_BASE_DIR/program/edition", aName, rBitmap) ||
- loadPng ("$BRAND_BASE_DIR/program", aName, rBitmap) );
-}
diff --git a/sfx2/source/appl/makefile.mk b/sfx2/source/appl/makefile.mk
index 3c7c3f4..72ac94a 100644
--- a/sfx2/source/appl/makefile.mk
+++ b/sfx2/source/appl/makefile.mk
@@ -88,7 +88,6 @@ SFX_OBJECTS = \
$(SLO)$/appserv.obj \
$(SLO)$/appuno.obj \
$(SLO)$/appbaslib.obj \
- $(SLO)$/brand.obj \
$(SLO)$/childwin.obj \
$(SLO)$/fileobj.obj \
$(SLO)$/helpdispatch.obj \
diff --git a/sfx2/source/dialog/about.cxx b/sfx2/source/dialog/about.cxx
index d0392d2..0c062f7 100644
--- a/sfx2/source/dialog/about.cxx
+++ b/sfx2/source/dialog/about.cxx
@@ -41,6 +41,7 @@
#include <unotools/bootstrap.hxx>
#include <com/sun/star/uno/Any.h>
#include <unotools/configmgr.hxx>
+#include <vcl/svapp.hxx>
#include <vcl/graph.hxx>
#include <svtools/filter.hxx>
@@ -64,7 +65,7 @@
Image SfxApplication::GetApplicationLogo()
{
BitmapEx aBitmap;
- LoadBrandBitmap ("about", aBitmap);
+ Application::LoadBrandBitmap ("about", aBitmap);
return Image( aBitmap );
}
commit dfb332887c145201e3f58dbc3781ccd7994b2633
Author: Michael Meeks <michael.meeks at novell.com>
Date: Fri Oct 8 20:32:45 2010 +0100
deliver new branding too ...
diff --git a/desktop/prj/d.lst b/desktop/prj/d.lst
index 48ae58c..7ed21d6 100644
--- a/desktop/prj/d.lst
+++ b/desktop/prj/d.lst
@@ -107,6 +107,7 @@ mkdir: %_DEST%\bin%_EXT%\odf4ms
mkdir: %COMMON_DEST%\pck%_EXT%\brand
mkdir: %COMMON_DEST%\pck%_EXT%\brand_dev
+
..\%__SRC%\bin\brand\intro.zip %COMMON_DEST%\pck%_EXT%\brand\intro.zip
..\%__SRC%\bin\brand_dev\intro.zip %COMMON_DEST%\pck%_EXT%\brand_dev\intro.zip
commit 674794c065468d289c5e4085d8f0e458add4a7ab
Author: Michael Meeks <michael.meeks at novell.com>
Date: Fri Oct 8 20:28:10 2010 +0100
simplify branding packaging
diff --git a/desktop/zipintro/makefile.mk b/desktop/zipintro/makefile.mk
index 6ca9eff..8c7fd11 100644
--- a/desktop/zipintro/makefile.mk
+++ b/desktop/zipintro/makefile.mk
@@ -37,12 +37,12 @@ DEFAULT_FLAVOURS=brand brand_dev
ZIP1LIST= \
$(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/intro.png $(INTRO_BITMAPS)) \
$(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/about.png $(ABOUT_BITMAPS)) \
- $(MISC)$/$(RSCDEFIMG)$/brand$/intro-pt_BR.png \
+ $(MISC)$/$(RSCDEFIMG)$/brand$/intro-pt_BR.png \
$(MISC)$/$(RSCDEFIMG)$/brand$/about-pt_BR.png
ZIP2LIST= \
$(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand_dev$/intro.png $(INTRO_BITMAPS)) \
$(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand_dev$/about.png $(ABOUT_BITMAPS)) \
- $(MISC)$/$(RSCDEFIMG)$/brand_dev$/intro-pt_BR.png \
+ $(MISC)$/$(RSCDEFIMG)$/brand_dev$/intro-pt_BR.png \
$(MISC)$/$(RSCDEFIMG)$/brand_dev$/about-pt_BR.png
ZIP1TARGET=brand
commit 6c1b6df9c9c5817fa214d12b4946599e40d5b914
Author: Michael Meeks <michael.meeks at novell.com>
Date: Mon Oct 11 11:54:44 2010 +0100
remove over-complex about + intro name lists
diff --git a/desktop/source/splash/makefile.mk b/desktop/source/splash/makefile.mk
index ae97a60..b28b343 100644
--- a/desktop/source/splash/makefile.mk
+++ b/desktop/source/splash/makefile.mk
@@ -72,15 +72,3 @@ SHL1STDLIBS= \
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-
-$(SLO)$/splash.obj : $(INCCOM)$/introbmpnames.hxx
-
-.INCLUDE .IGNORE : $(MISC)$/intro_bmp_names.mk
-
-.IF "$(INTRO_BITMAPS:f)"!="$(LASTTIME_INTRO_BITMAPS)"
-DO_PHONY=.PHONY
-.ENDIF # "$(INTRO_BITMAPS:f)"!="$(LASTTIME_INTRO_BITMAPS)"
-
-$(INCCOM)$/introbmpnames.hxx $(DO_PHONY):
- echo const char INTRO_BITMAP_STRINGLIST[]=$(EMQ)"$(INTRO_BITMAPS:f:t",")$(EMQ)"$(EMQ); > $@
- echo LASTTIME_INTRO_BITMAPS=$(INTRO_BITMAPS:f) > $(MISC)$/intro_bmp_names.mk
diff --git a/sfx2/source/dialog/makefile.mk b/sfx2/source/dialog/makefile.mk
index 4c56cd6..b53e3ae 100755
--- a/sfx2/source/dialog/makefile.mk
+++ b/sfx2/source/dialog/makefile.mk
@@ -113,15 +113,3 @@ $(INCCOM)$/cuilib.hxx: makefile.mk
.ENDIF
$(SLO)$/sfxdlg.obj : $(INCCOM)$/cuilib.hxx
-
-$(SLO)$/about.obj : $(INCCOM)$/aboutbmpnames.hxx
-
-.INCLUDE .IGNORE : $(MISC)$/about_bmp_names.mk
-
-.IF "$(ABOUT_BITMAPS:f)"!="$(LASTTIME_ABOUT_BITMAPS)"
-DO_PHONY=.PHONY
-.ENDIF # "$(ABOUT_BITMAPS:f)"!="$(LASTTIME_ABOUT_BITMAPS)"
-
-$(INCCOM)$/aboutbmpnames.hxx $(DO_PHONY):
- echo const char ABOUT_BITMAP_STRINGLIST[]=$(EMQ)"$(ABOUT_BITMAPS:f:t",")$(EMQ)"$(EMQ); > $@
- echo LASTTIME_ABOUT_BITMAPS=$(ABOUT_BITMAPS:f) > $(MISC)$/about_bmp_names.mk
commit 28e5598c67d26e2074d0d01c19d54241a1480510
Author: Michael Meeks <michael.meeks at novell.com>
Date: Mon Oct 11 11:52:13 2010 +0100
re-write branded image location code in new module, and share with splash
diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index fd5f906..3a8f005 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -318,6 +318,8 @@ public:
SAL_DLLPRIVATE ResMgr* GetOffResManager_Impl();
//#endif
+ /* loads a branded bitmap - that can be overridden per locale */
+ static bool LoadBrandBitmap (const char* pName, BitmapEx &rBitmap);
/** loads the application logo as used in the about dialog and impress slideshow pause screen */
static Image GetApplicationLogo();
};
diff --git a/sfx2/source/appl/brand.cxx b/sfx2/source/appl/brand.cxx
new file mode 100644
index 0000000..df8d704
--- /dev/null
+++ b/sfx2/source/appl/brand.cxx
@@ -0,0 +1,79 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ * Novell, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Michael Meeks <michael.meeks at novell.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_sfx2.hxx"
+
+#include <rtl/ustring.hxx>
+#include <rtl/bootstrap.hxx>
+#include <rtl/locale.hxx>
+#include <osl/process.h>
+#include <tools/urlobj.hxx>
+#include <tools/stream.hxx>
+#include <vcl/pngread.hxx>
+#include <sfx2/app.hxx>
+
+namespace {
+ static bool loadPng(const char *pPath, const rtl::OUString &rName, BitmapEx &rBitmap)
+ {
+ rtl::OUString uri = rtl::OUString::createFromAscii( pPath ) + rName;
+ rtl::Bootstrap::expandMacros( uri );
+ INetURLObject aObj( uri );
+ SvFileStream aStrm( aObj.PathToFileName(), STREAM_STD_READ );
+ if ( !aStrm.GetError() ) {
+ vcl::PNGReader aReader( aStrm );
+ rBitmap = aReader.Read();
+ return !rBitmap.IsEmpty();
+ }
+ else
+ return false;
+ }
+}
+
+bool SfxApplication::LoadBrandBitmap (const char* pName, BitmapEx &rBitmap)
+{
+ // TODO - if we want more flexibility we could add a branding path
+ // in an rc file perhaps fallback to "about.bmp"
+ rtl::OUString aBaseName = ( rtl::OUString::createFromAscii( "/" ) +
+ rtl::OUString::createFromAscii( pName ) );
+ rtl::OUString aPng( RTL_CONSTASCII_USTRINGPARAM(".png") );
+
+ rtl_Locale *pLoc = NULL;
+ osl_getProcessLocale (&pLoc);
+ rtl::OLocale aLoc( pLoc );
+
+ rtl::OUString aName = aBaseName + aPng;
+ rtl::OUString aLocaleName = ( aBaseName + rtl::OUString::createFromAscii ("-") +
+ aLoc.getLanguage() +
+ rtl::OUString::createFromAscii ("_") +
+ aLoc.getCountry() + aPng );
+
+ return ( loadPng ("$BRAND_BASE_DIR/program/edition", aLocaleName, rBitmap) ||
+ loadPng ("$BRAND_BASE_DIR/program", aLocaleName, rBitmap) ||
+ loadPng ("$BRAND_BASE_DIR/program/edition", aName, rBitmap) ||
+ loadPng ("$BRAND_BASE_DIR/program", aName, rBitmap) );
+}
diff --git a/sfx2/source/appl/makefile.mk b/sfx2/source/appl/makefile.mk
index 72ac94a..3c7c3f4 100644
--- a/sfx2/source/appl/makefile.mk
+++ b/sfx2/source/appl/makefile.mk
@@ -88,6 +88,7 @@ SFX_OBJECTS = \
$(SLO)$/appserv.obj \
$(SLO)$/appuno.obj \
$(SLO)$/appbaslib.obj \
+ $(SLO)$/brand.obj \
$(SLO)$/childwin.obj \
$(SLO)$/fileobj.obj \
$(SLO)$/helpdispatch.obj \
diff --git a/sfx2/source/dialog/about.cxx b/sfx2/source/dialog/about.cxx
index 5c4b22e..d0392d2 100644
--- a/sfx2/source/dialog/about.cxx
+++ b/sfx2/source/dialog/about.cxx
@@ -60,73 +60,12 @@
#define WELCOME_URL DEFINE_CONST_UNICODE( "http://www.openoffice.org/welcome/credits.html" )
-// class AboutDialog -----------------------------------------------------
-static bool impl_loadBitmap(
- const rtl::OUString &rPath, const rtl::OUString &rBmpFileName,
- Image &rLogo )
-{
- rtl::OUString uri( rPath );
- rtl::Bootstrap::expandMacros( uri );
- INetURLObject aObj( uri );
- aObj.insertName( rBmpFileName );
- SvFileStream aStrm( aObj.PathToFileName(), STREAM_STD_READ );
- if ( !aStrm.GetError() )
- {
- // Use graphic class to also support more graphic formats (bmp,png,...)
- Graphic aGraphic;
-
- GraphicFilter* pGF = GraphicFilter::GetGraphicFilter();
- pGF->ImportGraphic( aGraphic, String(), aStrm, GRFILTER_FORMAT_DONTKNOW );
-
- // Default case, we load the intro bitmap from a seperate file
- // (e.g. staroffice_intro.bmp or starsuite_intro.bmp)
- BitmapEx aBmp = aGraphic.GetBitmapEx();
- rLogo = Image( aBmp );
- return true;
- }
- return false;
-}
-
/** loads the application logo as used in the about dialog and impress slideshow pause screen */
Image SfxApplication::GetApplicationLogo()
{
- Image aAppLogo;
-
- rtl::OUString aAbouts( RTL_CONSTASCII_USTRINGPARAM( ABOUT_BITMAP_STRINGLIST ) );
- bool bLoaded = false;
- sal_Int32 nIndex = 0;
- do
- {
- bLoaded = impl_loadBitmap(
- rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program" ),
- aAbouts.getToken( 0, ',', nIndex ), aAppLogo );
- }
- while ( !bLoaded && ( nIndex >= 0 ) );
-
- // fallback to "about.bmp"
- if ( !bLoaded )
- {
- bLoaded = impl_loadBitmap(
- rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program/edition" ),
- rtl::OUString::createFromAscii( "about.png" ), aAppLogo );
- if ( !bLoaded )
- bLoaded = impl_loadBitmap(
- rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program/edition" ),
- rtl::OUString::createFromAscii( "about.bmp" ), aAppLogo );
- }
-
- if ( !bLoaded )
- {
- bLoaded = impl_loadBitmap(
- rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program" ),
- rtl::OUString::createFromAscii( "about.png" ), aAppLogo );
- if ( !bLoaded )
- bLoaded = impl_loadBitmap(
- rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program" ),
- rtl::OUString::createFromAscii( "about.bmp" ), aAppLogo );
- }
-
- return aAppLogo;
+ BitmapEx aBitmap;
+ LoadBrandBitmap ("about", aBitmap);
+ return Image( aBitmap );
}
AboutDialog::AboutDialog( Window* pParent, const ResId& rId, const String& rVerStr ) :
commit 6a2210fa79446c2c2246e512b6037f3e04be4af3
Author: Michael Meeks <michael.meeks at novell.com>
Date: Mon Oct 11 11:50:10 2010 +0100
clean cut/paste brand location code
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index 0285434..f898a3c 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -36,6 +36,7 @@
#include <tools/urlobj.hxx>
#include <tools/stream.hxx>
#include <sfx2/sfx.hrc>
+#include <sfx2/app.hxx>
#include <vcl/svapp.hxx>
#include <vcl/salnativewidgets.hxx>
@@ -43,7 +44,7 @@
#include <rtl/bootstrap.hxx>
#include <rtl/logfile.hxx>
#include <rtl/locale.hxx>
-#include <rtl/ustrbuf.hxx>
+#include <rtl/strbuf.hxx>
#include <rtl/math.hxx>
#include <vcl/graph.hxx>
#include <svtools/filter.hxx>
@@ -184,7 +185,8 @@ SplashScreen::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::sta
aArguments[1] >>= _sAppName;
// start to determine bitmap and all other required value
- initBitmap();
+ if ( _bShowLogo )
+ SetScreenBitmap (_aIntroBmp);
Size aSize = _aIntroBmp.GetSizePixel();
SetOutputSizePixel( aSize );
_vdev.SetOutputSizePixel( aSize );
@@ -390,116 +392,7 @@ void SplashScreen::loadConfig()
}
}
-void SplashScreen::initBitmap()
-{
- if ( _bShowLogo )
- {
- OUString sExecutePath;
- ::rtl::Bootstrap::get(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "BRAND_BASE_DIR" ) ),
- sExecutePath );
- sExecutePath += OUString( RTL_CONSTASCII_USTRINGPARAM( "/program/" ) );
-
- bool haveBitmap = false;
-
- // Try all bitmaps in INTRO_BITMAP_NAMES
- sal_Int32 nIndex = 0;
- OUString aIntroBitmapFiles( RTL_CONSTASCII_USTRINGPARAM( INTRO_BITMAP_STRINGLIST ));
- do
- {
- haveBitmap = loadBitmap( sExecutePath, aIntroBitmapFiles.getToken( 0, ',', nIndex ) );
- }
- while ( !haveBitmap && ( nIndex >= 0 ) );
-
- if (!haveBitmap) {
- rtl::OUString edition(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "${BRAND_BASE_DIR}/program/edition")));
- rtl::Bootstrap::expandMacros(edition);
- haveBitmap = findBitmap(edition);
- }
- if (!haveBitmap) {
- findBitmap(sExecutePath);
- }
- }
-}
-
-bool SplashScreen::loadOneBitmap(
- rtl::OUString const & path, const rtl::OUString &rBmpFileName )
-{
- if ( rBmpFileName.getLength() == 0 )
- return false;
-
- INetURLObject aObj( path, INET_PROT_FILE );
- aObj.insertName( rBmpFileName );
-
- SvFileStream aStrm( aObj.PathToFileName(), STREAM_STD_READ );
- if ( !aStrm.GetError() )
- {
- // Use graphic class to also support more graphic formats (bmp,png,...)
- Graphic aGraphic;
-
- GraphicFilter* pGF = GraphicFilter::GetGraphicFilter();
- pGF->ImportGraphic( aGraphic, String(), aStrm, GRFILTER_FORMAT_DONTKNOW );
-
- // Default case, we load the intro bitmap from a seperate file
- // (e.g. staroffice_intro.bmp or starsuite_intro.bmp)
- _aIntroBmp = aGraphic.GetBitmapEx();
- return true;
- }
-
- return false;
-}
-
-// Look for locale specific bitmap variants
-bool SplashScreen::loadBitmap(
- rtl::OUString const & path, const rtl::OUString &rBmpFileName )
-{
- sal_Int32 nExt = rBmpFileName.lastIndexOf ('.');
- if( nExt > 0 )
- {
- rtl::OUString aBase = rBmpFileName.copy( 0, nExt );
- rtl::OUString aExt = rBmpFileName.copy( nExt );
-
- rtl_Locale *pLoc = NULL;
- osl_getProcessLocale (&pLoc);
- rtl::OLocale aLoc( pLoc );
-
- rtl::OUString aName;
- aName = aBase + rtl::OUString::createFromAscii ("-") +
- aLoc.getLanguage() + rtl::OUString::createFromAscii ("_") +
- aLoc.getCountry() + aExt;
-
- if( loadOneBitmap( path, aName ) )
- return true;
- }
- return loadOneBitmap( path, rBmpFileName );
-}
-
-bool SplashScreen::findBitmap(rtl::OUString const & path) {
- bool haveBitmap = false;
- if ( _bFullScreenSplash )
- {
- haveBitmap = findScreenBitmap(path);
- if ( haveBitmap )
- _eBitmapMode = BM_FULLSCREEN;
- else
- haveBitmap = findAppBitmap(path);
- }
- if ( !haveBitmap )
- {
- haveBitmap = loadBitmap(
- path, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("intro.png")));
- if ( !haveBitmap )
- haveBitmap = loadBitmap(
- path, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("intro.bmp")));
- }
-
- return haveBitmap;
-}
-
-bool SplashScreen::findScreenBitmap(rtl::OUString const & path)
+void SplashScreen::SetScreenBitmap(BitmapEx &rBitmap)
{
sal_Int32 nWidth( 0 );
sal_Int32 nHeight( 0 );
@@ -515,70 +408,29 @@ bool SplashScreen::findScreenBitmap(rtl::OUString const & path)
}
// create file name from screen resolution information
- OUStringBuffer aStrBuf( 128 );
- aStrBuf.appendAscii( "intro_" );
+ OStringBuffer aStrBuf( 128 );
+ OStringBuffer aResBuf( 32 );
+ aStrBuf.append( "intro_" );
if ( _sAppName.getLength() > 0 )
{
- aStrBuf.append( _sAppName );
- aStrBuf.appendAscii( "_" );
+ aStrBuf.append( OString( _sAppName, _sAppName.getLength(),
+ RTL_TEXTENCODING_UTF8 ) );
+ aStrBuf.append( "_" );
}
- aStrBuf.append( OUString::valueOf( nWidth ));
- aStrBuf.appendAscii( "x" );
- aStrBuf.append( OUString::valueOf( nHeight ));
-
- OUString aRootIntroFileName = aStrBuf.makeStringAndClear();
- OUString aBmpFileName = aRootIntroFileName + OUString::createFromAscii(".png");
+ aResBuf.append( OString::valueOf( nWidth ));
+ aResBuf.append( "x" );
+ aResBuf.append( OString::valueOf( nHeight ));
- bool haveBitmap = loadBitmap( path, aBmpFileName );
- if ( !haveBitmap )
- {
- aBmpFileName = aRootIntroFileName + OUString::createFromAscii(".bmp");
- haveBitmap = loadBitmap( path, aBmpFileName );
- }
-
- if ( !haveBitmap )
- {
- aStrBuf.appendAscii( "intro_" );
- aStrBuf.appendAscii( "_" );
- aStrBuf.append( OUString::valueOf( nWidth ));
- aStrBuf.appendAscii( "x" );
- aStrBuf.append( OUString::valueOf( nHeight ));
-
- aRootIntroFileName = aStrBuf.makeStringAndClear();
- aBmpFileName = aRootIntroFileName + OUString::createFromAscii(".png");
+ aStrBuf.append( aResBuf.getStr() );
+ if (SfxApplication::LoadBrandBitmap (aStrBuf.makeStringAndClear(), rBitmap))
+ return;
- haveBitmap = loadBitmap( path, aBmpFileName );
- if ( !haveBitmap )
- {
- aBmpFileName = aRootIntroFileName + OUString::createFromAscii(".bmp");
- haveBitmap = loadBitmap( path, aBmpFileName );
- }
- }
- return haveBitmap;
-}
+ aStrBuf.append( "intro_" );
+ aStrBuf.append( aResBuf.getStr() );
+ if (SfxApplication::LoadBrandBitmap (aResBuf.makeStringAndClear(), rBitmap))
+ return;
-bool SplashScreen::findAppBitmap(rtl::OUString const & path)
-{
- bool haveBitmap = false;
-
- if ( _sAppName.getLength() > 0 )
- {
- OUStringBuffer aStrBuf( 128 );
- aStrBuf.appendAscii( "intro_" );
- aStrBuf.appendAscii( "_" );
- aStrBuf.append( _sAppName );
-
- OUString aRootIntroFileName = aStrBuf.makeStringAndClear();
-
- OUString aBmpFileName = aRootIntroFileName + OUString::createFromAscii( ".png" );
- haveBitmap = loadBitmap( path, aBmpFileName );
- if ( !haveBitmap )
- {
- aBmpFileName = aRootIntroFileName + OUString::createFromAscii( ".bmp" );
- haveBitmap = loadBitmap( path, aBmpFileName );
- }
- }
- return haveBitmap;
+ SfxApplication::LoadBrandBitmap ("intro", rBitmap);
}
void SplashScreen::determineProgressRatioValues(
diff --git a/desktop/source/splash/splash.hxx b/desktop/source/splash/splash.hxx
index 6657d10..52e8682 100644
--- a/desktop/source/splash/splash.hxx
+++ b/desktop/source/splash/splash.hxx
@@ -71,15 +71,8 @@ private:
DECL_LINK( AppEventListenerHdl, VclWindowEvent * );
virtual ~SplashScreen();
void loadConfig();
- void initBitmap();
void updateStatus();
- bool findScreenBitmap(rtl::OUString const & path);
- bool findAppBitmap(rtl::OUString const & path);
- bool findBitmap(rtl::OUString const & path);
- bool loadBitmap(
- rtl::OUString const & path, const rtl::OUString &rBmpFileName );
- bool loadOneBitmap(
- rtl::OUString const & path, const rtl::OUString &rBmpFileName );
+ void SetScreenBitmap(BitmapEx &rBitmap);
void determineProgressRatioValues( double& rXRelPos, double& rYRelPos, double& rRelWidth, double& rRelHeight );
static SplashScreen *_pINSTANCE;
commit 6541d84896e72c4dd10bc04014dc8db786463dc9
Author: Michael Meeks <michael.meeks at novell.com>
Date: Sat Oct 9 19:17:49 2010 +0100
pack broffice artwork, and deliver correctly.
diff --git a/desktop/prj/d.lst b/desktop/prj/d.lst
index 182012c..48ae58c 100644
--- a/desktop/prj/d.lst
+++ b/desktop/prj/d.lst
@@ -105,14 +105,9 @@ mkdir: %_DEST%\bin%_EXT%\odf4ms
..\%__SRC%\misc\nswrapper.sh %_DEST%\bin%_EXT%\nswrapper
..\%__SRC%\misc\mozwrapper.sh %_DEST%\bin%_EXT%\mozwrapper
-mkdir: %COMMON_DEST%\pck%_EXT%\openoffice_dev
-mkdir: %COMMON_DEST%\pck%_EXT%\openoffice_dev_nologo
-mkdir: %COMMON_DEST%\pck%_EXT%\openoffice_nologo
-mkdir: %COMMON_DEST%\pck%_EXT%\broffice_dev
-mkdir: %COMMON_DEST%\pck%_EXT%\broffice
-mkdir: %COMMON_DEST%\pck%_EXT%\broffice_dev_nologo
-mkdir: %COMMON_DEST%\pck%_EXT%\broffice_nologo
-..\%__SRC%\bin\brand\intro.zip %COMMON_DEST%\pck%_EXT%\intro.zip
+mkdir: %COMMON_DEST%\pck%_EXT%\brand
+mkdir: %COMMON_DEST%\pck%_EXT%\brand_dev
+..\%__SRC%\bin\brand\intro.zip %COMMON_DEST%\pck%_EXT%\brand\intro.zip
..\%__SRC%\bin\brand_dev\intro.zip %COMMON_DEST%\pck%_EXT%\brand_dev\intro.zip
..\%__SRC%\bin\guiloader.exe %_DEST%\bin%_EXT%\testtool.exe
diff --git a/desktop/zipintro/makefile.mk b/desktop/zipintro/makefile.mk
index 48fec2f..6ca9eff 100644
--- a/desktop/zipintro/makefile.mk
+++ b/desktop/zipintro/makefile.mk
@@ -36,14 +36,14 @@ DEFAULT_FLAVOURS=brand brand_dev
ZIP1LIST= \
$(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/intro.png $(INTRO_BITMAPS)) \
- $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/intro-pt_BR.png \
$(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/about.png $(ABOUT_BITMAPS)) \
- $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/about-pt_BR.png
+ $(MISC)$/$(RSCDEFIMG)$/brand$/intro-pt_BR.png \
+ $(MISC)$/$(RSCDEFIMG)$/brand$/about-pt_BR.png
ZIP2LIST= \
$(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand_dev$/intro.png $(INTRO_BITMAPS)) \
- $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand_dev$/intro-pt_BR.png \
$(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand_dev$/about.png $(ABOUT_BITMAPS)) \
- $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand_dev$/about-pt_BR.png
+ $(MISC)$/$(RSCDEFIMG)$/brand_dev$/intro-pt_BR.png \
+ $(MISC)$/$(RSCDEFIMG)$/brand_dev$/about-pt_BR.png
ZIP1TARGET=brand
ZIP1DEPS=$(ZIP1LIST)
commit ad7468c29ea72cabc58fdd358fb6d05133a40c0c
Author: Michael Meeks <michael.meeks at novell.com>
Date: Fri Oct 8 21:48:31 2010 +0100
add a per-language preferred name first ...
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index db46035..0285434 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -42,6 +42,7 @@
#include <com/sun/star/registry/XRegistryKey.hpp>
#include <rtl/bootstrap.hxx>
#include <rtl/logfile.hxx>
+#include <rtl/locale.hxx>
#include <rtl/ustrbuf.hxx>
#include <rtl/math.hxx>
#include <vcl/graph.hxx>
@@ -424,7 +425,7 @@ void SplashScreen::initBitmap()
}
}
-bool SplashScreen::loadBitmap(
+bool SplashScreen::loadOneBitmap(
rtl::OUString const & path, const rtl::OUString &rBmpFileName )
{
if ( rBmpFileName.getLength() == 0 )
@@ -451,6 +452,31 @@ bool SplashScreen::loadBitmap(
return false;
}
+// Look for locale specific bitmap variants
+bool SplashScreen::loadBitmap(
+ rtl::OUString const & path, const rtl::OUString &rBmpFileName )
+{
+ sal_Int32 nExt = rBmpFileName.lastIndexOf ('.');
+ if( nExt > 0 )
+ {
+ rtl::OUString aBase = rBmpFileName.copy( 0, nExt );
+ rtl::OUString aExt = rBmpFileName.copy( nExt );
+
+ rtl_Locale *pLoc = NULL;
+ osl_getProcessLocale (&pLoc);
+ rtl::OLocale aLoc( pLoc );
+
+ rtl::OUString aName;
+ aName = aBase + rtl::OUString::createFromAscii ("-") +
+ aLoc.getLanguage() + rtl::OUString::createFromAscii ("_") +
+ aLoc.getCountry() + aExt;
+
+ if( loadOneBitmap( path, aName ) )
+ return true;
+ }
+ return loadOneBitmap( path, rBmpFileName );
+}
+
bool SplashScreen::findBitmap(rtl::OUString const & path) {
bool haveBitmap = false;
if ( _bFullScreenSplash )
diff --git a/desktop/source/splash/splash.hxx b/desktop/source/splash/splash.hxx
index 2090a64..6657d10 100644
--- a/desktop/source/splash/splash.hxx
+++ b/desktop/source/splash/splash.hxx
@@ -78,6 +78,8 @@ private:
bool findBitmap(rtl::OUString const & path);
bool loadBitmap(
rtl::OUString const & path, const rtl::OUString &rBmpFileName );
+ bool loadOneBitmap(
+ rtl::OUString const & path, const rtl::OUString &rBmpFileName );
void determineProgressRatioValues( double& rXRelPos, double& rYRelPos, double& rRelWidth, double& rRelHeight );
static SplashScreen *_pINSTANCE;
diff --git a/desktop/zipintro/makefile.mk b/desktop/zipintro/makefile.mk
index 224cd86..48fec2f 100644
--- a/desktop/zipintro/makefile.mk
+++ b/desktop/zipintro/makefile.mk
@@ -36,10 +36,14 @@ DEFAULT_FLAVOURS=brand brand_dev
ZIP1LIST= \
$(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/intro.png $(INTRO_BITMAPS)) \
- $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/about.png $(ABOUT_BITMAPS))
+ $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/intro-pt_BR.png \
+ $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/about.png $(ABOUT_BITMAPS)) \
+ $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/about-pt_BR.png
ZIP2LIST= \
$(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand_dev$/intro.png $(INTRO_BITMAPS)) \
- $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand_dev$/about.png $(ABOUT_BITMAPS))
+ $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand_dev$/intro-pt_BR.png \
+ $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand_dev$/about.png $(ABOUT_BITMAPS)) \
+ $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand_dev$/about-pt_BR.png
ZIP1TARGET=brand
ZIP1DEPS=$(ZIP1LIST)
commit f0be581e92627787094618eb93bcb11252de0290
Author: Michael Meeks <michael.meeks at novell.com>
Date: Fri Oct 8 20:32:45 2010 +0100
deliver new branding too ...
diff --git a/desktop/prj/d.lst b/desktop/prj/d.lst
index 92a4853..182012c 100644
--- a/desktop/prj/d.lst
+++ b/desktop/prj/d.lst
@@ -112,14 +112,8 @@ mkdir: %COMMON_DEST%\pck%_EXT%\broffice_dev
mkdir: %COMMON_DEST%\pck%_EXT%\broffice
mkdir: %COMMON_DEST%\pck%_EXT%\broffice_dev_nologo
mkdir: %COMMON_DEST%\pck%_EXT%\broffice_nologo
-..\%__SRC%\bin\intro\intro.zip %COMMON_DEST%\pck%_EXT%\intro.zip
-..\%__SRC%\bin\dev\intro.zip %COMMON_DEST%\pck%_EXT%\openoffice_dev\intro.zip
-..\%__SRC%\bin\dev_nologo\intro.zip %COMMON_DEST%\pck%_EXT%\openoffice_dev_nologo\intro.zip
-..\%__SRC%\bin\nologo\intro.zip %COMMON_DEST%\pck%_EXT%\openoffice_nologo\intro.zip
-..\%__SRC%\bin\dev_broffice\intro.zip %COMMON_DEST%\pck%_EXT%\broffice_dev\intro.zip
-..\%__SRC%\bin\broffice\intro.zip %COMMON_DEST%\pck%_EXT%\broffice\intro.zip
-..\%__SRC%\bin\nologo_dev_broffice\intro.zip %COMMON_DEST%\pck%_EXT%\broffice_dev_nologo\intro.zip
-..\%__SRC%\bin\nologo_broffice\intro.zip %COMMON_DEST%\pck%_EXT%\broffice_nologo\intro.zip
+..\%__SRC%\bin\brand\intro.zip %COMMON_DEST%\pck%_EXT%\intro.zip
+..\%__SRC%\bin\brand_dev\intro.zip %COMMON_DEST%\pck%_EXT%\brand_dev\intro.zip
..\%__SRC%\bin\guiloader.exe %_DEST%\bin%_EXT%\testtool.exe
commit 3f95601882144fcf2c81924bb3b4300ed17a8a8f
Author: Michael Meeks <michael.meeks at novell.com>
Date: Fri Oct 8 20:28:10 2010 +0100
simplify branding packaging
diff --git a/desktop/zipintro/makefile.mk b/desktop/zipintro/makefile.mk
index fef106d..224cd86 100644
--- a/desktop/zipintro/makefile.mk
+++ b/desktop/zipintro/makefile.mk
@@ -29,99 +29,32 @@ PRJ=..
PRJNAME=desktop
TARGET=zipintro
-# --- Settings -----------------------------------------------------------
.INCLUDE : settings.mk
-DEFAULT_FLAVOURS=dev dev_nologo nologo broffice dev_broffice nologo_broffice nologo_dev_broffice intro
+DEFAULT_FLAVOURS=brand brand_dev
ZIP1LIST= \
- $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/dev$/introabout$/intro.png $(INTRO_BITMAPS)) \
- $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.png $(ABOUT_BITMAPS))
+ $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/intro.png $(INTRO_BITMAPS)) \
+ $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/about.png $(ABOUT_BITMAPS))
ZIP2LIST= \
- $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/dev_nologo$/introabout$/intro.png $(INTRO_BITMAPS)) \
- $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.png $(ABOUT_BITMAPS))
-ZIP3LIST= \
- $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/nologo$/introabout$/intro.png $(INTRO_BITMAPS)) \
- $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.png $(ABOUT_BITMAPS))
-ZIP4LIST= \
- $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/intro.png $(INTRO_BITMAPS)) \
- $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.png $(ABOUT_BITMAPS))
-ZIP5LIST= \
- $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/dev_broffice$/introabout$/intro.png $(INTRO_BITMAPS)) \
- $(null,$(ABOUT_BITMAPS) $(MISC)$/ooo_custom_images$/broffice$/introabout$/about.png $(ABOUT_BITMAPS))
-ZIP6LIST= \
- $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/broffice$/introabout$/intro.png $(INTRO_BITMAPS)) \
- $(null,$(ABOUT_BITMAPS) $(MISC)$/ooo_custom_images$/broffice$/introabout$/about.png $(ABOUT_BITMAPS))
-ZIP7LIST= \
- $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/nologo_broffice$/introabout$/intro.png $(INTRO_BITMAPS)) \
- $(null,$(ABOUT_BITMAPS) $(MISC)$/ooo_custom_images$/broffice$/introabout$/about.png $(ABOUT_BITMAPS))
-ZIP8LIST= \
- $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/dev_nologo_broffice$/introabout$/intro.png $(INTRO_BITMAPS)) \
- $(null,$(ABOUT_BITMAPS) $(MISC)$/ooo_custom_images$/broffice$/introabout$/about.png $(ABOUT_BITMAPS))
+ $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand_dev$/intro.png $(INTRO_BITMAPS)) \
+ $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand_dev$/about.png $(ABOUT_BITMAPS))
-ZIP1TARGET=dev_intro
+ZIP1TARGET=brand
ZIP1DEPS=$(ZIP1LIST)
-
-ZIP2TARGET=dev_nologo_intro
+ZIP2TARGET=brand_dev
ZIP2DEPS=$(ZIP2LIST)
-ZIP3TARGET=nologo_intro
-ZIP3DEPS=$(ZIP3LIST)
-
-ZIP4TARGET=intro_intro
-ZIP4DEPS=$(ZIP4LIST)
-
-ZIP5TARGET=dev_broffice_intro
-ZIP5DEPS=$(ZIP5LIST)
-
-ZIP6TARGET=broffice_intro
-ZIP6DEPS=$(ZIP6LIST)
-
-ZIP7TARGET=nologo_broffice_intro
-ZIP7DEPS=$(ZIP7LIST)
-
-ZIP8TARGET=nologo_dev_broffice_intro
-ZIP8DEPS=$(ZIP8LIST)
-
.INCLUDE : target.mk
ALLTAR : $(foreach,i,$(DEFAULT_FLAVOURS) $(COMMONBIN)$/$i$/intro.zip)
-# now duplicate for deliver...
-# Because of issue 78837 we cannot use a % rule here (Commented out below)
-# but have to write individual rules.
-#$(COMMONBIN)$/%$/intro.zip : $(COMMONBIN)$/%_intro.zip
-
-$(COMMONBIN)$/dev$/intro.zip : $(COMMONBIN)$/dev_intro.zip
- @@-$(MKDIR) $(@:d)
- @$(COPY) $< $@
-
-$(COMMONBIN)$/dev_nologo$/intro.zip : $(COMMONBIN)$/dev_nologo_intro.zip
- @@-$(MKDIR) $(@:d)
- @$(COPY) $< $@
-
-$(COMMONBIN)$/nologo$/intro.zip : $(COMMONBIN)$/nologo_intro.zip
- @@-$(MKDIR) $(@:d)
- @$(COPY) $< $@
-
-$(COMMONBIN)$/broffice$/intro.zip : $(COMMONBIN)$/broffice_intro.zip
+$(COMMONBIN)$/brand_dev$/intro.zip : $(COMMONBIN)$/brand_dev.zip
@@-$(MKDIR) $(@:d)
@$(COPY) $< $@
-$(COMMONBIN)$/dev_broffice$/intro.zip : $(COMMONBIN)$/dev_broffice_intro.zip
- @@-$(MKDIR) $(@:d)
- @$(COPY) $< $@
-
-$(COMMONBIN)$/nologo_broffice$/intro.zip : $(COMMONBIN)$/nologo_broffice_intro.zip
- @@-$(MKDIR) $(@:d)
- @$(COPY) $< $@
-
-$(COMMONBIN)$/nologo_dev_broffice$/intro.zip : $(COMMONBIN)$/nologo_dev_broffice_intro.zip
- @@-$(MKDIR) $(@:d)
- @$(COPY) $< $@
-
-$(COMMONBIN)$/intro$/intro.zip : $(COMMONBIN)$/intro_intro.zip
+$(COMMONBIN)$/brand$/intro.zip : $(COMMONBIN)$/brand.zip
@@-$(MKDIR) $(@:d)
@$(COPY) $< $@
More information about the Libreoffice-commits
mailing list