Skip to content
Permalink
Browse files

Make the Windows install create desktop shortcuts again.

Created sub-features for desktop shortcuts. Will require
new translations.

Fixes #1282
  • Loading branch information...
hacst committed Sep 21, 2014
1 parent b4f0c66 commit 9f5b01b9ec87dfd8b51fdc39d52f61c618f6dd6d
@@ -5,6 +5,16 @@
<!-- Mumble -->
<Fragment>
<DirectoryRef Id="INSTALLDIR">
<Component Id="MumbleDesktopShortcutComponent" Guid="$(var.MumbleDesktopShortcutGuid)" KeyPath="yes">
<Shortcut Id="MumbleDesktopShortcut"
Directory="DesktopFolder"
Name="Mumble"
WorkingDirectory="INSTALLDIR"
Target="[INSTALLDIR]mumble.exe">
<ShortcutProperty Key="System.AppUserModel.ID" Value="net.sourceforge.mumble.Mumble" />
</Shortcut>
</Component>

<Component Id="mumble.exe" Guid="$(var.MumbleExeGuid)">
<File Id="mumble.exe" Source="$(var.SourceDir)\release\mumble.exe" KeyPath="yes">
<Shortcut Id="MumbleShortcut" Directory="ApplicationProgramsFolder" Name="Mumble" WorkingDirectory="INSTALLDIR">
@@ -44,9 +54,19 @@
</Component>
<?endif ?>

<Component Id="MurmurDesktopShortcutComponent" Guid="$(var.MurmurDesktopShortcutGuid)" KeyPath="yes">
<Shortcut Id="MurmurDesktopShortcut"
Directory="DesktopFolder"
Name="Murmur"
WorkingDirectory="INSTALLDIR"
Target="[INSTALLDIR]murmur.exe"
Icon="murmur.ico"
IconIndex="0" />
</Component>

<Component Id="murmur.exe">
<File Id="murmur.exe" Source="$(var.SourceDir)\release\murmur.exe" KeyPath="yes">
<Shortcut Id="MurmurShortcut" Directory="ApplicationProgramsFolder" Name="Murmur" WorkingDirectory="INSTALLDIR" Icon="murmur.ico" IconIndex="0" Advertise="yes" />
<Shortcut Id="MurmurShortcut" Directory="ApplicationProgramsFolder" Name="Murmur" WorkingDirectory="INSTALLDIR" Icon="murmur.ico" IconIndex="0" />
</File>
</Component>
<Component Id="murmur.ini" NeverOverwrite="yes">
@@ -129,7 +129,7 @@
<?endif ?>
</ComponentGroup>

<Feature Id="Mumble" Title="!(loc.MUMBLE_SEC_MUMBLE)" Description="!(loc.DESC_SectionMumble)" Level="1" AllowAdvertise="no" ConfigurableDirectory="INSTALLDIR">
<Feature Id="Mumble" Title="!(loc.MUMBLE_SEC_MUMBLE)" Description="!(loc.DESC_SectionMumble)" Level="1" AllowAdvertise="no" ConfigurableDirectory="INSTALLDIR" Display="expand">
<?ifndef StaticBuild ?>
<?ifdef SndFileDir ?>
<ComponentRef Id="libsndfile1.dll" />
@@ -159,10 +159,13 @@
<?ifdef G15 ?>
<ComponentRef Id="mumble_g15_helper.exe" />
<?endif ?>


<Feature Id="MumbleDesktopShortcutFeature" Title="!(loc.MUMBLE_SEC_DesktopShortcut)" Description="!(loc.DESC_DesktopShortcut)" InstallDefault="followParent" AllowAdvertise="no">
<ComponentRef Id="MumbleDesktopShortcutComponent" />
</Feature>
</Feature>

<Feature Id="Murmur" Title="!(loc.MUMBLE_SEC_MURMUR)" Description="!(loc.DESC_SectionMurmur)" Level="1000" ConfigurableDirectory="INSTALLDIR">
<Feature Id="Murmur" Title="!(loc.MUMBLE_SEC_MURMUR)" Description="!(loc.DESC_SectionMurmur)" Level="1000" ConfigurableDirectory="INSTALLDIR" Display="expand">
<?ifndef StaticBuild ?>
<?ifdef IceDir ?>
<ComponentRef Id="bzip2.dll" />
@@ -177,6 +180,11 @@
<ComponentRef Id="murmur.exe" />
<ComponentRef Id="murmur.ini" />
<ComponentRef Id="Murmur.ice" />

<Feature Id="MurmurDesktopShortcutFeature" Title="!(loc.MUMBLE_SEC_DesktopShortcut)" Description="!(loc.DESC_DesktopShortcut)" InstallDefault="followParent" AllowAdvertise="no">
<ComponentRef Id="MurmurDesktopShortcutComponent" />
</Feature>

</Feature>

<Feature Id="Libraries" Title="Required Libraries" Display="hidden" AllowAdvertise="no" Absent="disallow" Level="1">
@@ -15,6 +15,8 @@
<?endif?>

<?define MumbleExeGuid = A08F7909-1116-4AC8-9422-051FA1A1BE19 ?>
<?define MumbleDesktopShortcutGuid = 4448BE21-1AA1-41B8-887E-B3E07B28EFAE ?>
<?define MurmurDesktopShortcutGuid = 02936CED-6588-4B7E-880F-241A4CF5E7D3 ?>
<?define LicenseTextGuid = 87C7967B-5E4B-41DD-83F5-A9E9E8AD3B39 ?>
<?define ReadMeTextGuid = 15878902-B819-4E77-8C1D-0A915D79660B ?>
<?define ApplicationProgramsFolderRemovalComponentGuid = 0AE1745D-FF86-4D61-BAF3-44248D21D263 ?>
@@ -32,7 +32,9 @@
<String Id="DESC_SectionMumble11X">Mumble klient k připojení na starší servery.</String>
<String Id="DESC_SectionMurmur">Server pro Mumble. Obsahuje všechno co je třeba k rozběhnutí vlastního serveru.</String>
<String Id="DESC_SectionBonjour">Bonjour zapne ohlášení a zpřístupění Murmur serverů na vaší LAN. Toto stáhne a spustí Bonjour instalátor.</String>

<String Id="MUMBLE_SEC_DesktopShortcut">Desktop shortcut</String>
<String Id="DESC_DesktopShortcut">Creates a shortcut on the desktop</String>

<!-- Uninstall sections -->
<String Id="MUMBLE_UNSEC_BASE">Mumble a Murmur</String>
<String Id="MUMBLE_UNSEC_ALL">Nastavení a Databáze</String>
@@ -31,6 +31,8 @@
<String Id="DESC_SectionMumble11X">Mumble-klienten til at oprette forbindelse til ældre servere.</String>
<String Id="DESC_SectionMurmur">Serveren for Mumble. Inkluderer alt hvad der er nødvendigt for at køre din egen server.</String>
<String Id="DESC_SectionBonjour">Bonjour annoncerer og opdager Murmur-servere på dit LAN-netværk. Dette vil downloade og køre Bonjour-installationsprogrammet.</String>
<String Id="MUMBLE_SEC_DesktopShortcut">Desktop shortcut</String>
<String Id="DESC_DesktopShortcut">Creates a shortcut on the desktop</String>

<!-- Uninstall sections -->
<String Id="MUMBLE_UNSEC_BASE">Mumble og Murmur</String>
@@ -32,7 +32,9 @@
<String Id="DESC_SectionMumble11X">De Mumble client om verbinding te maken met oudere (versie)servers.</String>
<String Id="DESC_SectionMurmur">De server voor Mumble. Bevat alles om je eigen server te maken.</String>
<String Id="DESC_SectionBonjour">Bonjour ontdekt en geeft aan of er Murmur servers op uw netwerk aanwezig zijn. Dit downloadt en installeert de Bonjour installatie.</String>

<String Id="MUMBLE_SEC_DesktopShortcut">Desktop shortcut</String>
<String Id="DESC_DesktopShortcut">Creates a shortcut on the desktop</String>

<!-- Uninstall sections -->
<String Id="MUMBLE_UNSEC_BASE">Mumble en Murmur</String>
<String Id="MUMBLE_UNSEC_ALL">Voorkeuren en databases</String>
@@ -32,6 +32,8 @@
<String Id="DESC_SectionMumble11X">The Mumble client for connecting to older servers.</String>
<String Id="DESC_SectionMurmur">The server for Mumble. Includes everything needed to run your own server.</String>
<String Id="DESC_SectionBonjour">Bonjour enables announcement and discovery of Murmur servers on your LAN. This will download and run the Bonjour installer.</String>
<String Id="MUMBLE_SEC_DesktopShortcut">Desktop shortcut</String>
<String Id="DESC_DesktopShortcut">Creates a shortcut on the desktop</String>

<!-- Uninstall sections -->
<String Id="MUMBLE_UNSEC_BASE">Mumble and Murmur</String>
@@ -32,7 +32,9 @@
<String Id="DESC_SectionMumble11X">Client Mumble pour se connecter aux anciens serveurs</String>
<String Id="DESC_SectionMurmur">Le serveur pour Mumble. Inclut tout ce dont vous avez besoin pour installer votre propre serveur.</String>
<String Id="DESC_SectionBonjour">Bonjour permet d'annoncer et de découvrir les serveurs Murmur sur votre réseau local. Télécharge et lance le programme d'installation de Bonjour.</String>

<String Id="MUMBLE_SEC_DesktopShortcut">Desktop shortcut</String>
<String Id="DESC_DesktopShortcut">Creates a shortcut on the desktop</String>

<!-- Uninstall sections -->
<String Id="MUMBLE_UNSEC_BASE">Mumble et Murmur</String>
<String Id="MUMBLE_UNSEC_ALL">Préférences et Bases de données</String>
@@ -31,7 +31,9 @@
<String Id="DESC_SectionMumble11X">Der Mumble Client, welchen Sie zum Verbinden mit einem älteren Server benötigen.</String>
<String Id="DESC_SectionMurmur">Der Server für Mumble. Beinhaltet alles, was Sie zum Starten ihres eigenen Servers benötigen.</String>
<String Id="DESC_SectionBonjour">Bonjour ermöglicht das Bekanntmachen und Finden von Murmur Servern im LAN. Diese Option lädt Bonjour herunter und startet die Installationsroutine.</String>

<String Id="MUMBLE_SEC_DesktopShortcut">Desktop shortcut</String>
<String Id="DESC_DesktopShortcut">Erzeugt einen shortcut auf dem Desktop</String>

<!-- Uninstall sections -->
<String Id="MUMBLE_UNSEC_BASE">Mumble und Murmur</String>
<String Id="MUMBLE_UNSEC_ALL">Einstellungen und Datenbanken</String>
@@ -32,7 +32,9 @@
<String Id="DESC_SectionMumble11X">Client di Mumble, quello di cui hai bisogno per connetterti ai server vecchi</String>
<String Id="DESC_SectionMurmur">Il server per Mumble. Include tutto ciò di cui hai bisogno per eseguire il tuo server</String>
<String Id="DESC_SectionBonjour">Bonjour abilita la possibilità di trovare un server Murmur all'interno della tua rete LAN. Questa funzione scaricherà e installerà Bonjour</String>

<String Id="MUMBLE_SEC_DesktopShortcut">Desktop shortcut</String>
<String Id="DESC_DesktopShortcut">Creates a shortcut on the desktop</String>

<!-- Uninstall sections -->
<String Id="MUMBLE_UNSEC_BASE">Mumble e Murmur</String>
<String Id="MUMBLE_UNSEC_ALL">Preferenze e Dati</String>
@@ -32,7 +32,9 @@
<String Id="DESC_SectionMumble11X">古いサーバに接続するための Mumble クライアントです。</String>
<String Id="DESC_SectionMurmur">Mumbe のためのサーバ。サーバを実行するために必要なファイルを含みます。</String>
<String Id="DESC_SectionBonjour">Bonjour を使用すると LAN 上の Murmur サーバの通知と探索が可能です。これを選択すると Bonjour のインストーラがダウンロードされ実行されます。</String>

<String Id="MUMBLE_SEC_DesktopShortcut">Desktop shortcut</String>
<String Id="DESC_DesktopShortcut">Creates a shortcut on the desktop</String>

<!-- Uninstall sections -->
<String Id="MUMBLE_UNSEC_BASE">Mumble と Murmur</String>
<String Id="MUMBLE_UNSEC_ALL">設定 と データベース</String>
@@ -31,7 +31,9 @@
<String Id="DESC_SectionMumble11X">Bakoverkompatibel klient for bruk mot eldre servere.</String>
<String Id="DESC_SectionMurmur">Serveren for Mumble. Inkluderer alt som trengs for å kjøre din egen server.</String>
<String Id="DESC_SectionBonjour">Bonjour annonserer og oppdater Murmur servere på ditt lokale nettverk. Dette vil laste ned og installere Bonjour.</String>

<String Id="MUMBLE_SEC_DesktopShortcut">Desktop shortcut</String>
<String Id="DESC_DesktopShortcut">Creates a shortcut on the desktop</String>

<!-- Uninstall sections -->
<String Id="MUMBLE_UNSEC_BASE">Mumble og Murmur</String>
<String Id="MUMBLE_UNSEC_ALL">Brukerinstillinger og databaser</String>
@@ -33,7 +33,9 @@
<String Id="DESC_SectionMumble11X">Klient Mumble, pozwalający na połączenia do starszych serwerów.</String>
<String Id="DESC_SectionMurmur">Serwer Mumble. Zawiera wszystko czego potrzebujesz by uruchomić swój własny serwer.</String>
<String Id="DESC_SectionBonjour">Bonjour pozwala na automatyczne rozgłaszanie i wykrywanie serwerów Murmur w sieci LAN. Zaznaczając tę opcję instalator Bonjour zostanie pobrany i uruchomiony.</String>

<String Id="MUMBLE_SEC_DesktopShortcut">Desktop shortcut</String>
<String Id="DESC_DesktopShortcut">Creates a shortcut on the desktop</String>

<!-- Uninstall sections -->
<String Id="MUMBLE_UNSEC_BASE">Mumble i Murmur</String>
<String Id="MUMBLE_UNSEC_ALL">Preferencje i bazy danych</String>
@@ -31,7 +31,9 @@
<String Id="DESC_SectionMumble11X">O cliente do Mumble para conectar a servidores antigos.</String>
<String Id="DESC_SectionMurmur">O servidor para o Mumble. Inclui todo o necessário para rodar seu próprio servidor.</String>
<String Id="DESC_SectionBonjour">Bonjour permite anúncio e descobrimento de servidores Murmur na sua LAN. Isso baixará e executará o instalador do Bonjour.</String>

<String Id="MUMBLE_SEC_DesktopShortcut">Desktop shortcut</String>
<String Id="DESC_DesktopShortcut">Creates a shortcut on the desktop</String>

<!-- Uninstall sections -->
<String Id="MUMBLE_UNSEC_BASE">Mumble e Murmur</String>
<String Id="MUMBLE_UNSEC_ALL">Preferências e Base de Dados</String>
@@ -31,7 +31,9 @@
<String Id="DESC_SectionMumble11X">Mumble клиент для подключения к старым серверам.</String>
<String Id="DESC_SectionMurmur">Сервер для Mumble. Включает в себя все необходимое для запуска своего собственного сервера.</String>
<String Id="DESC_SectionBonjour">Bonjour позволяет анонсировать и находить сервера Murmur в Вашей локальной сети. Это позволит загрузить и запустить программу установки Bonjour.</String>

<String Id="MUMBLE_SEC_DesktopShortcut">Desktop shortcut</String>
<String Id="DESC_DesktopShortcut">Creates a shortcut on the desktop</String>

<!-- Uninstall sections -->
<String Id="MUMBLE_UNSEC_BASE">Mumble и Murmur</String>
<String Id="MUMBLE_UNSEC_ALL">Настройки и Базы данных</String>
@@ -31,7 +31,9 @@
<String Id="DESC_SectionMumble11X">该 Mumble 客户端用于连接到一个老的服务器。</String>
<String Id="DESC_SectionMurmur">Mumble 服务器端包含所有您运行个人服务器所必须的文件。</String>
<String Id="DESC_SectionBonjour">Bonjour enables announcement and discovery of Murmur servers on your LAN. This will download and run the Bonjour installer.</String>

<String Id="MUMBLE_SEC_DesktopShortcut">Desktop shortcut</String>
<String Id="DESC_DesktopShortcut">Creates a shortcut on the desktop</String>

<!-- Uninstall sections -->
<String Id="MUMBLE_UNSEC_BASE">Mumble 和 Murmur</String>
<String Id="MUMBLE_UNSEC_ALL">个人偏好和数据库</String>
@@ -31,7 +31,9 @@
<String Id="DESC_SectionMumble11X">El cliente Mumble para conectar a servidores antiguos.</String>
<String Id="DESC_SectionMurmur">El servidor para Mumble. Incluye todo lo necesario para ejecutar su propio servidor.</String>
<String Id="DESC_SectionBonjour">Bonjour posibilita el anuncio y descubrimiento de servidores Murmur en su LAN. Ésto descargará y ejecutará el instalador Bonjour.</String>

<String Id="MUMBLE_SEC_DesktopShortcut">Desktop shortcut</String>
<String Id="DESC_DesktopShortcut">Creates a shortcut on the desktop</String>

<!-- Uninstall sections -->
<String Id="MUMBLE_UNSEC_BASE">Mumble y Murmur</String>
<String Id="MUMBLE_UNSEC_ALL">Preferencias y bases de datos</String>
@@ -31,7 +31,9 @@
<String Id="DESC_SectionMumble11X">Klienten för Mumble att ansluta till äldre servrar.</String>
<String Id="DESC_SectionMurmur">Servern för Mumble. Inkluderar allt du behöver för att köra din egen server.</String>
<String Id="DESC_SectionBonjour">Bonjour tillåter annonsering och upptäckning av Murmur servrar på ditt LAN. Detta kommer att ladda ner och köra installationen för Bonjour.</String>

<String Id="MUMBLE_SEC_DesktopShortcut">Desktop shortcut</String>
<String Id="DESC_DesktopShortcut">Creates a shortcut on the desktop</String>

<!-- Uninstall sections -->
<String Id="MUMBLE_UNSEC_BASE">Mumble och Murmur</String>
<String Id="MUMBLE_UNSEC_ALL">Inställningar och databaser</String>
@@ -31,7 +31,9 @@
<String Id="DESC_SectionMumble11X">該 Mumble 客戶端用于連接到一個老的服務器。</String>
<String Id="DESC_SectionMurmur">Mumble 服務器端包含所有您運行個人服務器所必須的文件。</String>
<String Id="DESC_SectionBonjour">Bonjour enables announcement and discovery of Murmur servers on your LAN. This will download and run the Bonjour installer.</String>

<String Id="MUMBLE_SEC_DesktopShortcut">Desktop shortcut</String>
<String Id="DESC_DesktopShortcut">Creates a shortcut on the desktop</String>

<!-- Uninstall sections -->
<String Id="MUMBLE_UNSEC_BASE">Mumble 和 Murmur</String>
<String Id="MUMBLE_UNSEC_ALL">個人偏好和數據庫</String>
@@ -32,7 +32,9 @@
<String Id="DESC_SectionMumble11X">Eski sunuculara bağlanmak için Mumble istemcisi.</String>
<String Id="DESC_SectionMurmur">Mumble için sunucu. Kendi sunucunuzu işletmeniz için gereken her şeyi içerir.</String>
<String Id="DESC_SectionBonjour">Bonjour yerel ağınızda Murmur sunucularının duyurulmalarına ve keşiflerine imkân sağlar. Bu seçenek Bonjour kurucusunu indirir ve çalıştırır.</String>

<String Id="MUMBLE_SEC_DesktopShortcut">Desktop shortcut</String>
<String Id="DESC_DesktopShortcut">Creates a shortcut on the desktop</String>

<!-- Uninstall sections -->
<String Id="MUMBLE_UNSEC_BASE">Mumble ve Murmur</String>
<String Id="MUMBLE_UNSEC_ALL">Tercihler ve Veritabanları</String>

0 comments on commit 9f5b01b

Please sign in to comment.
You can’t perform that action at this time.