diff options
author | Benoit Foucher <benoit@zeroc.com> | 2012-04-25 11:19:13 +0200 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2012-04-25 11:19:13 +0200 |
commit | 7e874613ff22bedf988273b51a15ab937f01169f (patch) | |
tree | 115a92a902f80fcc6252c5fac6a957ecc548b82c /vsaddin/src/IceCsharpConfigurationDialog.cs | |
parent | Fixed copyrights (diff) | |
download | ice-7e874613ff22bedf988273b51a15ab937f01169f.tar.bz2 ice-7e874613ff22bedf988273b51a15ab937f01169f.tar.xz ice-7e874613ff22bedf988273b51a15ab937f01169f.zip |
Merged Silverlight support
Diffstat (limited to 'vsaddin/src/IceCsharpConfigurationDialog.cs')
-rwxr-xr-x | vsaddin/src/IceCsharpConfigurationDialog.cs | 85 |
1 files changed, 55 insertions, 30 deletions
diff --git a/vsaddin/src/IceCsharpConfigurationDialog.cs b/vsaddin/src/IceCsharpConfigurationDialog.cs index 96ef6e6a378..56a2542d031 100755 --- a/vsaddin/src/IceCsharpConfigurationDialog.cs +++ b/vsaddin/src/IceCsharpConfigurationDialog.cs @@ -43,7 +43,8 @@ namespace Ice.VisualStudio { this.Text = "Ice Configuration - Project: " + _project.Name; bool enabled = Util.isSliceBuilderEnabled(project); - _compactFramework = Util.isCSharpSmartDeviceProject(_project); + _compactFramework = Util.isCSharpSmartDeviceProject(_project);
+ _silverlightFramework = Util.isSilverlightProject(_project); setEnabled(enabled); chkEnableBuilder.Checked = enabled; load(); @@ -84,10 +85,16 @@ namespace Ice.VisualStudio { dotNetNames = Util.getDotNetCompactNames(); checkComponent("IceSSL", false); - } - else - { - dotNetNames = Util.getDotNetNames(); + }
+ else if(_silverlightFramework)
+ {
+ dotNetNames = Util.getSilverlightNames();
+ checkComponent("IceSSL", false);
+ checkComponent("IceBox", false);
+ }
+ else
+ {
+ dotNetNames = Util.getDotNetNames();
} foreach(String s in dotNetNames) { @@ -251,15 +258,23 @@ namespace Ice.VisualStudio chkIceGrid.Enabled = enabled; chkIcePatch2.Enabled = enabled; // - // Ice .NET Compact Framework doesn't support SSL + // Ice .NET Compact Framework doesn't support IceSSL // if(_compactFramework) { chkIceSSL.Enabled = false; - } - else - { - chkIceSSL.Enabled = enabled; + }
+ //
+ // Ice Silverlight doesn't support IceSSL and IceBox
+ //
+ else if(_silverlightFramework)
+ {
+ chkIceSSL.Enabled = false;
+ chkIceBox.Enabled = false;
+ }
+ else
+ {
+ chkIceSSL.Enabled = enabled;
} chkIceStorm.Enabled = enabled; @@ -389,10 +404,13 @@ namespace Ice.VisualStudio if(chkGlacier2.Checked) { components.Add("Glacier2"); - } - if(chkIceBox.Checked) - { - components.Add("IceBox"); + }
+ if(!_silverlightFramework)
+ {
+ if (chkIceBox.Checked)
+ {
+ components.Add("IceBox");
+ }
} if(chkIceGrid.Checked) { @@ -402,7 +420,7 @@ namespace Ice.VisualStudio { components.Add("IcePatch2"); } - if(!_compactFramework) + if(!_compactFramework && !_silverlightFramework) { if(chkIceSSL.Checked) { @@ -513,14 +531,17 @@ namespace Ice.VisualStudio { components.Add("Glacier2"); } - } - if(chkIceBox.Checked != Util.hasDotNetReference(_project, "IceBox")) - { - componentChanged("IceBox", chkIceBox.Checked, development); - if(!chkIceBox.Checked) - { - components.Add("IceBox"); - } + }
+ if(!_silverlightFramework)
+ {
+ if (chkIceBox.Checked != Util.hasDotNetReference(_project, "IceBox"))
+ {
+ componentChanged("IceBox", chkIceBox.Checked, development);
+ if (!chkIceBox.Checked)
+ {
+ components.Add("IceBox");
+ }
+ }
} if(chkIceGrid.Checked != Util.hasDotNetReference(_project, "IceGrid")) { @@ -538,7 +559,7 @@ namespace Ice.VisualStudio components.Add("IcePatch2"); } } - if(!_compactFramework) + if(!_compactFramework && !_silverlightFramework) { if(chkIceSSL.Checked != Util.hasDotNetReference(_project, "IceSSL")) { @@ -638,10 +659,13 @@ namespace Ice.VisualStudio if(chkGlacier2.Checked != Util.hasDotNetReference(_project, "Glacier2")) { return true; - } - if(chkIceBox.Checked != Util.hasDotNetReference(_project, "IceBox")) - { - return true; + }
+ if(!_silverlightFramework)
+ {
+ if(chkIceBox.Checked != Util.hasDotNetReference(_project, "IceBox"))
+ {
+ return true;
+ }
} if(chkIceGrid.Checked != Util.hasDotNetReference(_project, "IceGrid")) { @@ -651,7 +675,7 @@ namespace Ice.VisualStudio { return true; } - if(!_compactFramework) + if(!_compactFramework && !_silverlightFramework) { if(chkIceSSL.Checked != Util.hasDotNetReference(_project, "IceSSL")) { @@ -668,6 +692,7 @@ namespace Ice.VisualStudio private bool _initialized; private Project _project; private bool _changed = false; - private bool _compactFramework = false; + private bool _compactFramework = false;
+ private bool _silverlightFramework = false; } } |