diff options
| author | Damian Minkov <damencho@jitsi.org> | 2014-04-04 15:16:03 +0300 |
|---|---|---|
| committer | Damian Minkov <damencho@jitsi.org> | 2014-04-04 15:16:03 +0300 |
| commit | 0c339e0c270d750596dde25a356b1a06d8a29ef2 (patch) | |
| tree | f11c5ac055da2490b49c07de5379334b849a43b0 /resources/install/windows | |
| parent | b5c4487c0de1a9b74690f4afb03d564c813c89d9 (diff) | |
| download | jitsi-0c339e0c270d750596dde25a356b1a06d8a29ef2.zip jitsi-0c339e0c270d750596dde25a356b1a06d8a29ef2.tar.gz jitsi-0c339e0c270d750596dde25a356b1a06d8a29ef2.tar.bz2 | |
Adds space for default im application checkbox in installer. Adds one more parametrised string to the executable.
Diffstat (limited to 'resources/install/windows')
| -rw-r--r-- | resources/install/windows/installer-windows.wxs | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/resources/install/windows/installer-windows.wxs b/resources/install/windows/installer-windows.wxs index d7578fc..1e31d2e 100644 --- a/resources/install/windows/installer-windows.wxs +++ b/resources/install/windows/installer-windows.wxs @@ -187,28 +187,29 @@ </Dialog>
<Dialog Id="ShortcutsAndRegistryDlg" Width="370" Height="270" Title="!(loc.ShortcutsAndRegistryDlg_Title)">
- <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)" />
- <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
- <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
- <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
- </Control>
- <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.ShortcutsAndRegistryDlgDescription)" />
- <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.ShortcutsAndRegistryDlgTitle)" />
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.ShortcutsAndRegistryDlgBannerBitmap)" />
+ <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.ShortcutsAndRegistryDlgTitle)" />
+ <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.ShortcutsAndRegistryDlgDescription)" />
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
- <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
- <Control Id="ShortcutGroup" Type="GroupBox" X="20" Y="60" Width="330" Height="80" Text="!(loc.ShortcutsAndRegistryDlg_CreateShortcuts)" />
+ <Control Id="ShortcutGroup" Type="GroupBox" X="20" Y="60" Width="330" Height="90" Text="!(loc.ShortcutsAndRegistryDlg_CreateShortcuts)" />
<Control Id="StartMenuShortcutCheckBox" Type="CheckBox" X="25" Y="75" Width="320" Height="15" Property="CREATE_START_MENU_SHORTCUT" CheckBoxValue="1" Text="!(loc.ShortcutsAndRegistryDlg_CreateStartMenu)" />
<Control Id="DesktopShortcutCheckBox" Type="CheckBox" X="25" Y="90" Width="320" Height="15" Property="CREATE_DESKTOP_SHORTCUT" CheckBoxValue="1" Text="!(loc.ShortcutsAndRegistryDlg_CreateDesktop)" />
<Control Id="StartupShortcutCheckBox" Type="CheckBox" X="25" Y="105" Width="320" Height="15" Property="HAS_STARTUP_REGISTRY" CheckBoxValue="1" Text="!(loc.ShortcutsAndRegistryDlg_CreateAutoStart)" />
- <Control Id="DefaultIMApplicationCheckBox" Type="CheckBox" X="25" Y="120" Width="320" Height="15" Property="SET_DEFAULT_IM_APP" CheckBoxValue="1" Text="!(loc.ShortcutsAndRegistryDlg_DefaultIMApp)" />
+ <Control Id="DefaultIMApplicationCheckBox" Type="CheckBox" X="25" Y="120" Width="320" Height="25" Property="SET_DEFAULT_IM_APP" CheckBoxValue="1" Text="!(loc.ShortcutsAndRegistryDlg_DefaultIMApp)" />
+
+ <Control Id="RegistryGroup" Type="GroupBox" X="20" Y="155" Width="330" Height="50" Text="!(loc.ShortcutsAndRegistryDlg_AssociateProtocols)" />
+ <Control Id="SipRegistryEntriesCheckBox" Type="CheckBox" X="25" Y="170" Width="320" Height="15" Property="CREATE_SIP_REGISTRY_ENTRIES" CheckBoxValue="1" Text="&SIP" />
+ <Control Id="XmppRegistryEntriesCheckBox" Type="CheckBox" X="25" Y="185" Width="320" Height="15" Property="CREATE_XMPP_REGISTRY_ENTRIES" CheckBoxValue="1" Text="&XMPP" />
- <Control Id="RegistryGroup" Type="GroupBox" X="20" Y="145" Width="330" Height="50" Text="!(loc.ShortcutsAndRegistryDlg_AssociateProtocols)" />
- <Control Id="SipRegistryEntriesCheckBox" Type="CheckBox" X="25" Y="160" Width="320" Height="15" Property="CREATE_SIP_REGISTRY_ENTRIES" CheckBoxValue="1" Text="&SIP" />
- <Control Id="XmppRegistryEntriesCheckBox" Type="CheckBox" X="25" Y="175" Width="320" Height="15" Property="CREATE_XMPP_REGISTRY_ENTRIES" CheckBoxValue="1" Text="&XMPP" />
-
+ <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+
+ <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)" />
+ <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
+ <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
+ <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+ </Control>
</Dialog>
<Dialog Id="CleanSweepDlg" Width="370" Height="270" Title="!(loc.CleanSweepDlg_Title)">
|