diff options
| author | Andras Timar <andras.timar@collabora.com> | 2013-10-25 06:38:06 -0700 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2013-10-25 07:32:52 -0700 |
| commit | 7d97ec9a3eba9ceacbea631a56185e40b62fdec7 (patch) | |
| tree | 765bb657349e4b15df04c61f517b9d5309dc42dc /scp2/source/ooo/folderitem_ooo.scp | |
| parent | 1d3661cf91cf45d40373b0034c30eb57b475ec91 (diff) | |
fdo#65102 respect user's choice not to install desktop icon
Using advertised shortcuts -- inspired by Intel AppUp Centre's
requirement -- was not a good idea after all. I revert this,
and I also revert the commit that actually disabled it in
default Windows builds.
This reverts commit aa2450cb51cfc3805c7a596b6b89d70bb133821e.
This reverts commit b40012bd6d0b5387005253f1d3f03929ce4d1ac6.
Diffstat (limited to 'scp2/source/ooo/folderitem_ooo.scp')
| -rw-r--r-- | scp2/source/ooo/folderitem_ooo.scp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/scp2/source/ooo/folderitem_ooo.scp b/scp2/source/ooo/folderitem_ooo.scp index de77ba12141b..ecfc7f234ba4 100644 --- a/scp2/source/ooo/folderitem_ooo.scp +++ b/scp2/source/ooo/folderitem_ooo.scp @@ -20,19 +20,19 @@ FolderItem gid_Folderitem_LibreOffice Name = "%PRODUCTNAME"; - ModuleID = gid_Module_Root_Brand; + ModuleID = gid_Module_Root; #ifdef ENABLE_SILENT_MSI FolderID = PREDEFINED_STARTMENU; - Tooltip = "LibreOffice"; #else FolderID = gid_Folder_Staroffice51; - ALL_LANG(Tooltip, STR_FI_TOOLTIP_SOFFICE); #endif FileID = gid_Brand_File_Bin_Soffice; IconFile = gid_Brand_File_Bin_Soffice; IconID = 0; WkDir = gid_Brand_Dir_Program; Parameter = ""; + Styles = (NON_ADVERTISED); + ALL_LANG(Tooltip, STR_FI_TOOLTIP_SOFFICE); End FolderItemProperty gid_Fip_LibreOffice_AppID @@ -44,18 +44,19 @@ End FolderItem gid_Folderitem_Soffice_Desktop #ifdef ENABLE_SILENT_MSI Name = "%PRODUCTNAME"; - Tooltip = "LibreOffice"; #else Name = "%PRODUCTNAME %PRODUCTVERSION"; - ALL_LANG(Tooltip, STR_FI_TOOLTIP_SOFFICE); #endif - ModuleID = gid_Module_Root_Brand; + ModuleID = gid_Module_Root; FolderID = PREDEFINED_DESKTOP; FileID = gid_Brand_File_Bin_Soffice; IconFile = gid_Brand_File_Bin_Soffice; IconID = 0; + ComponentIDFile = "gid_Brand_File_Desktophelper_Txt"; WkDir = gid_Brand_Dir_Program; Parameter = ""; + Styles = (NON_ADVERTISED,USE_HELPER_FILENAME); + ALL_LANG(Tooltip, STR_FI_TOOLTIP_SOFFICE); ComponentCondition = "CREATEDESKTOPLINK=1"; End |