VirtualBox

Changeset 64173 in vbox for trunk/src


Ignore:
Timestamp:
Oct 7, 2016 8:10:25 AM (8 years ago)
Author:
vboxsync
Message:

Windows Additions installer: Added an option to disable creating start menu entries. Untested.

Location:
trunk/src/VBox/Additions/WINNT/Installer
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/WINNT/Installer/Languages/English.nsh

    r50401 r64173  
    44
    55;
    6 ; Copyright (C) 2006-2014 Oracle Corporation
     6; Copyright (C) 2006-2016 Oracle Corporation
    77;
    88; This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    3636LangString VBOX_COMPONENT_MAIN ${LANG_ENGLISH}                      "VirtualBox Guest Additions"
    3737LangString VBOX_COMPONENT_MAIN_DESC ${LANG_ENGLISH}                 "VirtualBox Guest Additions main files"
     38
    3839LangString VBOX_COMPONENT_AUTOLOGON ${LANG_ENGLISH}                 "Auto-Logon support"
    3940LangString VBOX_COMPONENT_AUTOLOGON_DESC ${LANG_ENGLISH}            "Enables automatic log-on support for guests"
    4041LangString VBOX_COMPONENT_AUTOLOGON_WARN_3RDPARTY ${LANG_ENGLISH}   "Another installed application already provides automatic log-on support.$\r$\nIf you replace this support with that provided by VirtualBox the system could become unstable.$\r$\nAre you sure you wish to proceed?"
     42
    4143LangString VBOX_COMPONENT_D3D  ${LANG_ENGLISH}                      "Direct3D Support (Experimental)"
    4244LangString VBOX_COMPONENT_D3D_DESC  ${LANG_ENGLISH}                 "Enables Direct3D support for guests (Experimental)"
    … …  
    4749LangString VBOX_COMPONENT_D3D_INVALID ${LANG_ENGLISH}               "The setup detected a corrupt/invalid DirectX installation.$\r$\n$\r$\nIn order to get Direct3D support working, consulting the VirtualBox manual is highly recommended.$\r$\n$\r$\nContinue anyway?"
    4850LangString VBOX_COMPONENT_D3D_INVALID_MANUAL ${LANG_ENGLISH}        "Shall the VirtualBox manual be displayed now to look for a solution?"
     51
     52LangString VBOX_COMPONENT_STARTMENU ${LANG_ENGLISH}                 "Start menu entries"
     53LangString VBOX_COMPONENT_STARTMENU_DESC ${LANG_ENGLISH}            "Creates entries in the start menu"
    4954
    5055LangString VBOX_WFP_WARN_REPLACE ${LANG_ENGLISH}                    "In order to make ${PRODUCT_NAME} work correctly some system files have been replaced.$\r$\nIf the Windows File Protection service offers to restore the original files you should cancel the request to retain the newly installed functionality."

  • trunk/src/VBox/Additions/WINNT/Installer/Languages/French.nsh

    r50419 r64173  
    3636LangString VBOX_COMPONENT_MAIN ${LANG_FRENCH}                       "Additions invité VirtualBox"
    3737LangString VBOX_COMPONENT_MAIN_DESC ${LANG_FRENCH}                  "Fichiers prinipaux des Additions invité VirtualBox"
     38
    3839LangString VBOX_COMPONENT_AUTOLOGON ${LANG_FRENCH}                  "Support identification automatique"
    3940LangString VBOX_COMPONENT_AUTOLOGON_DESC ${LANG_FRENCH}             "Active l'identification automatique dans l'invité"
    4041LangString VBOX_COMPONENT_AUTOLOGON_WARN_3RDPARTY ${LANG_FRENCH}    "Un composant permettant l'identification automatique est déjà installé.$\r$\nSi vous le remplacé avec le composant issue de VirtualBox, cela pourrait déstabiliser le système.$\r$\nDésirez-vous cependant continuer?"
     42
    4143LangString VBOX_COMPONENT_D3D  ${LANG_FRENCH}                       "Support Direct3D pour invités (experimental)"
    4244LangString VBOX_COMPONENT_D3D_DESC  ${LANG_FRENCH}                  "Active le support Direct3D pour invités (experimental)"
    … …  
    4749LangString VBOX_COMPONENT_D3D_INVALID ${LANG_FRENCH}                "Le programme d'installation a détecté une installation DirectX corrompue ou invalide.$\r$\n$\r$\nAfin d'assurer le bon fonctionnement du support DirectX, nous conseillons de réinstaller le moteur d'exécution DirectX.$\r$\n$\r$\nDésirez-vous cependant continuer?"
    4850LangString VBOX_COMPONENT_D3D_INVALID_MANUAL ${LANG_FRENCH}         "Voulez-vous voir le manuel d'utilisateur VirtualBox pour chercher une solution?"
     51
     52LangString VBOX_COMPONENT_STARTMENU ${LANG_FRENCH}                  "Start menu entries"
     53LangString VBOX_COMPONENT_STARTMENU_DESC ${LANG_FRENCH}             "Creates entries in the start menu"
    4954
    5055LangString VBOX_WFP_WARN_REPLACE ${LANG_FRENCH}                     "Le programme d'installation vient de remplacer certains fichiers systèmes afin de faire fonctionner correctement ${PRODUCT_NAME}.$\r$\nPour le cas qu'un avertissement de la Protection de fichiers Windows apparaisse, veuiller l'annuler sans restaurer les fichiers originaux!"

  • trunk/src/VBox/Additions/WINNT/Installer/Languages/German.nsh

    r50401 r64173  
    44
    55;
    6 ; Copyright (C) 2006-2014 Oracle Corporation
     6; Copyright (C) 2006-2016 Oracle Corporation
    77;
    88; This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    3636LangString VBOX_COMPONENT_MAIN ${LANG_GERMAN}                       "VirtualBox Guest Additions"
    3737LangString VBOX_COMPONENT_MAIN_DESC ${LANG_GERMAN}                  "Hauptkomponenten der VirtualBox Guest Additions"
     38
    3839LangString VBOX_COMPONENT_AUTOLOGON ${LANG_GERMAN}                  "Unterstützung für automatisches Anmelden"
    3940LangString VBOX_COMPONENT_AUTOLOGON_DESC ${LANG_GERMAN}             "Ermöglicht automatisches Anmelden von Benutzern"
    4041LangString VBOX_COMPONENT_AUTOLOGON_WARN_3RDPARTY ${LANG_GERMAN}    "Es ist bereits eine Komponente für das automatische Anmelden installiert.$\r$\nFalls Sie diese Komponente nun mit der von VirtualBox ersetzen, könnte das System instabil werden.$\r$\nDennoch installieren?"
     42
    4143LangString VBOX_COMPONENT_D3D  ${LANG_GERMAN}                       "Direct3D-Unterstützung (Experimentell)"
    4244LangString VBOX_COMPONENT_D3D_DESC  ${LANG_GERMAN}                  "Ermöglicht Direct3D-Unterstützung für Gäste (Experimentell)"
    … …  
    4749LangString VBOX_COMPONENT_D3D_INVALID ${LANG_GERMAN}                "Das Setup hat eine ungültige/beschädigte DirectX-Installation festgestellt.$\r$\n$\r$\nUm die Direct3D-Unterstützung installieren zu können wird empfohlen, zuerst das VirtualBox Benutzerhandbuch zu konsultieren.$\r$\n$\r$\nMit der Installation jetzt trotzdem fortfahren?"
    4850LangString VBOX_COMPONENT_D3D_INVALID_MANUAL ${LANG_GERMAN}         "Soll nun das VirtualBox-Handbuch angezeigt werden um nach einer Lösung zu suchen?"
     51
     52LangString VBOX_COMPONENT_STARTMENU ${LANG_GERMAN}                  "Startmenü-Einträge"
     53LangString VBOX_COMPONENT_STARTMENU_DESC ${LANG_GERMAN}             "Erstellt Einträge im Startmenü"
    4954
    5055LangString VBOX_WFP_WARN_REPLACE ${LANG_GERMAN}                     "Das Setup hat gerade Systemdateien ersetzt um die ${PRODUCT_NAME} korrekt installieren zu können.$\r$\nFalls nun ein Warn-Dialog des Windows-Dateischutzes erscheint, diesen bitte abbrechen und die Dateien nicht wiederherstellen lassen!"

  • trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi

    r56203 r64173  
    55
    66;
    7 ; Copyright (C) 2012-2014 Oracle Corporation
     7; Copyright (C) 2012-2016 Oracle Corporation
    88;
    99; This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    234234Var g_bNoGuestDrv                       ; Cmd line: Do not install the VBoxGuest driver
    235235Var g_bNoMouseDrv                       ; Cmd line: Do not install the VBoxMouse driver
     236Var g_bNoStartMenuEntries               ; Cmd line: Do not create start menu entries
    236237Var g_bWithAutoLogon                    ; Cmd line: Install VBoxGINA / VBoxCredProv for auto logon support
    237238Var g_bWithD3D                          ; Cmd line: Install Direct3D support
    … …  
    343344      ${Case} '/no_mousedrv' ; Not officially documented
    344345        StrCpy $g_bNoMouseDrv "true"
     346        ${Break}
     347
     348      ${Case} '/no_startmenuentries' ; Not officially documented
     349        StrCpy $g_bNoStartMenuEntries "true"
    345350        ${Break}
    346351
    … …  
    889894  ;Assign language strings to sections
    890895  !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
    891     !insertmacro MUI_DESCRIPTION_TEXT ${SEC01} $(VBOX_COMPONENT_MAIN_DESC)
    892     !insertmacro MUI_DESCRIPTION_TEXT ${SEC02} $(VBOX_COMPONENT_AUTOLOGON_DESC)
    893   !if $%VBOX_WITH_CROGL% == "1"
    894     !insertmacro MUI_DESCRIPTION_TEXT ${SEC03} $(VBOX_COMPONENT_D3D_DESC)
    895   !endif
     896    !insertmacro MUI_DESCRIPTION_TEXT   ${SEC01} $(VBOX_COMPONENT_MAIN_DESC)
     897    !insertmacro MUI_DESCRIPTION_TEXT   ${SEC02} $(VBOX_COMPONENT_AUTOLOGON_DESC)
     898    !if $%VBOX_WITH_CROGL% == "1"
     899      !insertmacro MUI_DESCRIPTION_TEXT ${SEC03} $(VBOX_COMPONENT_D3D_DESC)
     900    !endif
     901    !insertmacro MUI_DESCRIPTION_TEXT   ${SEC04} $(VBOX_COMPONENT_STARTMENU_DESC)
    896902  !insertmacro MUI_FUNCTION_DESCRIPTION_END
    897903!endif ; USE_MUI
    … …  
    903909SectionEnd
    904910
     911; Start menu entries. Enabled by default and can be disabled by the user.
     912Section /o $(VBOX_COMPONENT_STARTMENU) SEC04
    905913Section -StartMenu
    906914
    … …  
    10881096  StrCpy $g_bNoGuestDrv "false"
    10891097  StrCpy $g_bNoMouseDrv "false"
     1098  StrCpy $g_bStartMenuEntries "false"
    10901099  StrCpy $g_bWithAutoLogon "false"
    10911100  StrCpy $g_bWithD3D "false"
    … …  
    11771186  Call CheckForInstalledComponents
    11781187
    1179   ; Set section bits
     1188  ;
     1189  ; Section 02
     1190  ;
    11801191  ${If} $g_bWithAutoLogon == "true" ; Auto-logon support
    11811192    !insertmacro SelectSection ${SEC02}
    11821193  ${EndIf}
     1194
     1195  ;
     1196  ; Section 03
     1197  ;
    11831198!if $%VBOX_WITH_CROGL% == "1"
    11841199  ${If} $g_bWithD3D == "true" ; D3D support
    … …  
    11981213  ${EndIf}
    11991214
     1215  ;
     1216  ; Section 04
     1217  ;
     1218  ${If} $g_bNoStartMenuEntries == "false" ; Start menu entries
     1219    !insertmacro SelectSection ${SEC04}
     1220  ${EndIf}
     1221
    12001222!ifdef USE_MUI
    12011223  ; Display language selection dialog (will be hidden in silent mode!)
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette