Kaydet (Commit) 37676d16 authored tarafından Andras Timar's avatar Andras Timar

only one launcher icon for silent MSI

üst 5fc21e87
...@@ -8468,6 +8468,7 @@ if test "z$enable_silent_msi" = "z" -o "z$enable_silent_msi" = "zno" ; then ...@@ -8468,6 +8468,7 @@ if test "z$enable_silent_msi" = "z" -o "z$enable_silent_msi" = "zno" ; then
else else
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
ENABLE_SILENT_MSI="TRUE" ENABLE_SILENT_MSI="TRUE"
SCPDEFS="$SCPDEFS -DENABLE_SILENT_MSI"
fi fi
AC_SUBST(ENABLE_SILENT_MSI) AC_SUBST(ENABLE_SILENT_MSI)
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "macros.inc" #include "macros.inc"
#ifndef ENABLE_SILENT_MSI
FolderItem gid_Folderitem_Sbase FolderItem gid_Folderitem_Sbase
Name = "%PRODUCTNAME Base"; Name = "%PRODUCTNAME Base";
ModuleID = gid_Module_Prg_Base_Bin; ModuleID = gid_Module_Prg_Base_Bin;
...@@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Sbase ...@@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Sbase
Styles = (NOWEB, NON_ADVERTISED); Styles = (NOWEB, NON_ADVERTISED);
ALL_LANG(Tooltip, STR_FI_TOOLTIP_BASE); ALL_LANG(Tooltip, STR_FI_TOOLTIP_BASE);
End End
#endif
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "macros.inc" #include "macros.inc"
#ifndef ENABLE_SILENT_MSI
FolderItem gid_Folderitem_Scalc FolderItem gid_Folderitem_Scalc
Name = "%PRODUCTNAME Calc"; Name = "%PRODUCTNAME Calc";
ModuleID = gid_Module_Prg_Calc_Bin; ModuleID = gid_Module_Prg_Calc_Bin;
...@@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Scalc ...@@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Scalc
Styles = (NOWEB, NON_ADVERTISED); Styles = (NOWEB, NON_ADVERTISED);
ALL_LANG(Tooltip, STR_FI_TOOLTIP_CALC); ALL_LANG(Tooltip, STR_FI_TOOLTIP_CALC);
End End
#endif
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "macros.inc" #include "macros.inc"
#ifndef ENABLE_SILENT_MSI
FolderItem gid_Folderitem_Sdraw FolderItem gid_Folderitem_Sdraw
Name = "%PRODUCTNAME Draw"; Name = "%PRODUCTNAME Draw";
ModuleID = gid_Module_Prg_Draw_Bin; ModuleID = gid_Module_Prg_Draw_Bin;
...@@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Sdraw ...@@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Sdraw
Styles = (NOWEB, NON_ADVERTISED); Styles = (NOWEB, NON_ADVERTISED);
ALL_LANG(Tooltip, STR_FI_TOOLTIP_DRAW); ALL_LANG(Tooltip, STR_FI_TOOLTIP_DRAW);
End End
#endif
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "macros.inc" #include "macros.inc"
#ifndef ENABLE_SILENT_MSI
FolderItem gid_Folderitem_Simpress FolderItem gid_Folderitem_Simpress
Name = "%PRODUCTNAME Impress"; Name = "%PRODUCTNAME Impress";
ModuleID = gid_Module_Prg_Impress_Bin; ModuleID = gid_Module_Prg_Impress_Bin;
...@@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Simpress ...@@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Simpress
Styles = (NOWEB, NON_ADVERTISED); Styles = (NOWEB, NON_ADVERTISED);
ALL_LANG(Tooltip, STR_FI_TOOLTIP_IMPRESS); ALL_LANG(Tooltip, STR_FI_TOOLTIP_IMPRESS);
End End
#endif
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "macros.inc" #include "macros.inc"
#ifndef ENABLE_SILENT_MSI
FolderItem gid_Folderitem_Smath FolderItem gid_Folderitem_Smath
Name = "%PRODUCTNAME Math"; Name = "%PRODUCTNAME Math";
ModuleID = gid_Module_Prg_Math_Bin; ModuleID = gid_Module_Prg_Math_Bin;
...@@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Smath ...@@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Smath
Styles = (NOWEB, NON_ADVERTISED); Styles = (NOWEB, NON_ADVERTISED);
ALL_LANG(Tooltip, STR_FI_TOOLTIP_MATH); ALL_LANG(Tooltip, STR_FI_TOOLTIP_MATH);
End End
#endif
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "macros.inc" #include "macros.inc"
#ifndef ENABLE_SILENT_MSI
FolderItem gid_Folderitem_Swriter FolderItem gid_Folderitem_Swriter
Name = "%PRODUCTNAME Writer"; Name = "%PRODUCTNAME Writer";
ModuleID = gid_Module_Prg_Wrt_Bin; ModuleID = gid_Module_Prg_Wrt_Bin;
...@@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Swriter ...@@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Swriter
Styles = (NOWEB, NON_ADVERTISED); Styles = (NOWEB, NON_ADVERTISED);
ALL_LANG(Tooltip, STR_FI_TOOLTIP_WRITER); ALL_LANG(Tooltip, STR_FI_TOOLTIP_WRITER);
End End
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment