diff options
| author | Andras Timar <andras.timar@collabora.com> | 2015-10-08 10:43:12 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-02-20 00:07:42 +0100 |
| commit | 2bb0ab225bf98df11d55dba90f0a0293ad528dcf (patch) | |
| tree | 93d379bca42d7c16be1240b4a3beda5efc788585 /instsetoo_native | |
| parent | a7bccddf0eedc7b1922ec31fcde60eb3651f4565 (diff) | |
Collabora Office branding
(cherry picked from commit c276d5ba1491dc237812cdf3d877a4ecec2ee1dc)
(cherry picked from commit c085f9176bda7bad0234d0087ff87f27086fc333)
Change-Id: I9e79c07aa3cbb70076d9bab07294062df4be02c6
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/CustomTarget_setup.mk | 8 | ||||
| -rw-r--r-- | instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp | bin | 115906 -> 30078 bytes | |||
| -rw-r--r-- | instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp | bin | 202314 -> 152310 bytes | |||
| -rw-r--r-- | instsetoo_native/util/openoffice.lst.in | 23 |
4 files changed, 16 insertions, 15 deletions
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index 2b9429c3c9f6..4664781b7ce3 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -41,7 +41,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ && echo 'InstallMode=<installmode>' \ && echo 'ProductKey=$(PRODUCTNAME) $(PRODUCTVERSION)' \ $(if $(ENABLE_RELEASE_BUILD),\ - && echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr "[:upper:]" "[:lower:]"),$(shell echo $(PRODUCTNAME) | sed -e 's/ /%20/g'))/4', \ + && echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr "[:upper:]" "[:lower:]" | tr -d " "),$(shell echo $(PRODUCTNAME) | tr -d " "))/4', \ && echo 'UserInstallation=$$ORIGIN/..') \ ) > $@ @@ -123,9 +123,9 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ && echo 'NativeProgress=false' \ && echo 'ProgressBarColor=0,0,0' \ && echo 'ProgressFrameColor=102,102,102' \ - && echo 'ProgressPosition=35,153' \ - && echo 'ProgressSize=444,8' \ - && echo 'ProgressTextBaseline=145' \ + && echo 'ProgressPosition=26,235' \ + && echo 'ProgressSize=460,6' \ + && echo 'ProgressTextBaseline=230' \ && echo 'ProgressTextColor=255,255,255' \ && echo 'URE_BOOTSTRAP=$${ORIGIN}/$(call gb_Helper_get_rcfile,fundamental)' \ && echo 'SecureUserConfig=true' \ diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp Binary files differindex e267d49ab73e..dca3b6a86f20 100644 --- a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp +++ b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp Binary files differindex b824ddf35d9d..4a445365f0cb 100644 --- a/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp +++ b/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 82db358ce49a..6d0008b58c32 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -7,20 +7,20 @@ Globals UREPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@ URELAYERVERSION 1 REFERENCEOOOMAJORMINOR 4.1 - WINDOWSBASISROOTNAME LibreOffice @LIBO_VERSION_MAJOR@ - UNIXBASISROOTNAME libreoffice@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ + WINDOWSBASISROOTNAME Collabora Office @LIBO_VERSION_MAJOR@ + UNIXBASISROOTNAME collaboraoffice@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ HIDELICENSEDIALOG 0 PACKAGEPREFIX - BASISPACKAGEPREFIX libobasis - UREPACKAGEPREFIX libreoffice + BASISPACKAGEPREFIX collaboraofficebasis + UREPACKAGEPREFIX collaboraoffice SOLSUREPACKAGEPREFIX libreoffice REGISTRATION_HOST https://registration.libreoffice.org/RegistrationWeb REGISTRATIONURL http://survey.libreoffice.org/user/index.php PROGRESSBARCOLOR 0,0,0 - PROGRESSSIZE 444,8 - PROGRESSPOSITION 35,153 + PROGRESSSIZE 460,6 + PROGRESSPOSITION 26,235 PROGRESSFRAMECOLOR 102,102,102 - PROGRESSTEXTBASELINE 145 + PROGRESSTEXTBASELINE 230 PROGRESSTEXTCOLOR 255,255,255 NATIVEPROGRESS false REGISTRYLAYERNAME Layers @@ -30,6 +30,7 @@ Globals UPDATE_DATABASE_LISTNAME finals_instsetoo.txt PACKAGEMAP package_names.txt,package_names_ext.txt WINDOWSPATCHLEVEL @LIBO_VERSION_PATCH@ + OOOVENDOR Collabora Productivity Ltd. OOODOWNLOADNAME 1 STARTCENTER_HIDE_EXTERNAL_LINKS 0 64BITPRODUCT @WINDOWS_X64@ @@ -44,7 +45,7 @@ LibreOffice { variables { - PRODUCTNAME @PRODUCTNAME@ + PRODUCTNAME Collabora Office PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ PRODUCTEXTENSION -@LIBO_VERSION_PATCH@ POSTVERSIONEXTENSION @@ -76,9 +77,9 @@ LibreOffice active 1 compression 5 script setup_osl - downloadname LibreOffice_{productversion}_{os}_install_{languages} - langpackdownloadname LibreOffice_{productversion}_languagepack_{os}_install_{languages} - helppackdownloadname LibreOffice_{productversion}_helppack_{os}_install_{languages} + downloadname CollaboraOffice_{productversion}_{os}_install_{languages} + langpackdownloadname CollaboraOffice_{productversion}_languagepack_{os}_install_{languages} + helppackdownloadname CollaboraOffice_{productversion}_helppack_{os}_install_{languages} include {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{extensionsdir},{licensepath},{packinfopath} } } |
