[mapguide-commits] r8046 - in trunk/Installer: Installers/MapGuide Libraries/MapGuide Server/Lang
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Apr 15 18:06:20 PDT 2014
Author: jng
Date: 2014-04-15 18:06:20 -0700 (Tue, 15 Apr 2014)
New Revision: 8046
Modified:
trunk/Installer/Installers/MapGuide/MapGuide.wxs
trunk/Installer/Libraries/MapGuide Server/Lang/MapGuideServer_en-US.wxl
trunk/Installer/Libraries/MapGuide Server/Lang/MapGuideServer_es-ES.wxl
Log:
#2428: So we already had a MapGuide Server IP configuration dialog in the installer. Oops. Back out.
Modified: trunk/Installer/Installers/MapGuide/MapGuide.wxs
===================================================================
--- trunk/Installer/Installers/MapGuide/MapGuide.wxs 2014-04-15 09:21:15 UTC (rev 8045)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wxs 2014-04-16 01:06:20 UTC (rev 8046)
@@ -347,7 +347,6 @@
Web Server Port Number: _______________________
Virtual Directory Name: _______________________
- MapGuide Server IP: _______________________
Development Environment:
( ) PHP
@@ -357,10 +356,8 @@
<Control Id="TxtServerPort" Type="Edit" Property="APACHE_PORT" X="150" Y="60" Width="120" Height="15" />
<Control Id="LblVdirName" Type="Text" Text="{\WixUI_Font_Title}!(loc.ApacheConfigDlg_VDirName)" X="20" Y="80" Width="120" Height="15" />
<Control Id="TxtVdirName" Type="Edit" Property="VIRTUALDIR" X="150" Y="80" Width="120" Height="15" />
- <Control Id="LblMgServerIp" Type="Text" Text="{\WixUI_Font_Title}!(loc.Common_MgServerIp)" X="20" Y="100" Width="120" Height="15" />
- <Control Id="TxtMgServerIp" Type="Edit" Property="MGSERVER_IP" X="150" Y="100" Width="120" Height="15" />
- <Control Id="LblDevEnv" Type="Text" Text="{\WixUI_Font_Title}!(loc.ApacheConfigDlg_DevEnv)" X="20" Y="130" Width="120" Height="15" />
- <Control Id="RdApacheApiType" Property="APACHE_API_TYPE" Type="RadioButtonGroup" X="20" Y="150" Height="100" Width="290">
+ <Control Id="LblDevEnv" Type="Text" Text="{\WixUI_Font_Title}!(loc.ApacheConfigDlg_DevEnv)" X="20" Y="110" Width="120" Height="15" />
+ <Control Id="RdApacheApiType" Property="APACHE_API_TYPE" Type="RadioButtonGroup" X="20" Y="130" Height="100" Width="290">
<RadioButtonGroup Property="APACHE_API_TYPE">
<RadioButton Text="PHP" Value="PHP" X="25" Y="10" Width="200" Height="45" />
<RadioButton Text="Java" Value="JAVA" X="25" Y="40" Width="200" Height="45" />
@@ -380,7 +377,6 @@
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
<!--
Virtual Directory Name: __________________________________
- MapGuide Server IP: __________________________________
Development environment:
( ) PHP
@@ -388,9 +384,7 @@
-->
<Control Id="LblVDirName" Type="Text" Text="{\WixUI_Font_Title}!(loc.IISLangConfigDlg_VDirName)" X="20" Y="60" Width="120" Height="15" />
<Control Id="TxtVDirName" Type="Edit" Property="VIRTUALDIR" X="150" Y="60" Width="120" Height="15" />
- <Control Id="LblMgServerIp" Type="Text" Text="{\WixUI_Font_Title}!(loc.Common_MgServerIp)" X="20" Y="80" Width="120" Height="15" />
- <Control Id="TxtMgServerIp" Type="Edit" Property="MGSERVER_IP" X="150" Y="80" Width="120" Height="15" />
- <Control Id="LblDevEnv" Type="Text" Text="{\WixUI_Font_Title}!(loc.IISLangConfigDlg_DevEnv)" X="20" Y="100" Width="120" Height="15" />
+ <Control Id="LblDevEnv" Type="Text" Text="{\WixUI_Font_Title}!(loc.IISLangConfigDlg_DevEnv)" X="20" Y="80" Width="120" Height="15" />
<Control Id="RdIIsApiType" Property="IIS_API_TYPE" Type="RadioButtonGroup" Text="{\WixUI_Font_Title}!(loc.IISLangConfigDlg_DevEnv)" X="30" Y="90" Height="100" Width="290">
<RadioButtonGroup Property="IIS_API_TYPE">
<RadioButton Text="PHP" Value="PHP" X="25" Y="10" Width="200" Height="45" />
Modified: trunk/Installer/Libraries/MapGuide Server/Lang/MapGuideServer_en-US.wxl
===================================================================
--- trunk/Installer/Libraries/MapGuide Server/Lang/MapGuideServer_en-US.wxl 2014-04-15 09:21:15 UTC (rev 8045)
+++ trunk/Installer/Libraries/MapGuide Server/Lang/MapGuideServer_en-US.wxl 2014-04-16 01:06:20 UTC (rev 8046)
@@ -18,7 +18,6 @@
<String Id="ServerRepositoriesTileCacheFeature_Description">You may choose a location for the Tile Cache repository.</String>
<String Id="ServerTempFeature">Temp Directory</String>
<String Id="ServerTempFeature_Description">You may choose a location where MapGuide will store temporary files.</String>
- <String Id="Common_MgServerIp">MapGuide Server IP</String>
<!-- FDO -->
<String Id="FdoDescription">FDO (Feature Data Objects) allows abstract access to many different data sources.</String>
<String Id="ArcSdeProvider">ArcSDE Provider</String>
Modified: trunk/Installer/Libraries/MapGuide Server/Lang/MapGuideServer_es-ES.wxl
===================================================================
--- trunk/Installer/Libraries/MapGuide Server/Lang/MapGuideServer_es-ES.wxl 2014-04-15 09:21:15 UTC (rev 8045)
+++ trunk/Installer/Libraries/MapGuide Server/Lang/MapGuideServer_es-ES.wxl 2014-04-16 01:06:20 UTC (rev 8046)
@@ -18,7 +18,6 @@
<String Id="ServerRepositoriesTileCacheFeature_Description">You may choose a location for the Tile Cache repository.</String>
<String Id="ServerTempFeature">Archivos temporales</String>
<String Id="ServerTempFeature_Description">Usted puede elegir un lugar donde MapGuide almacenará los archivos temporales</String>
- <String Id="Common_MgServerIp">MapGuide Servidor IP</String>
<!-- FDO -->
<String Id="FdoDescription">FDO (objetos de datos de características) permite el acceso al resumen diferentes fuentes de datos.</String>
<String Id="ArcSdeProvider">ArcSDE Proveedor</String>
More information about the mapguide-commits
mailing list