diff options
Diffstat (limited to 'CrowIDE')
| -rw-r--r-- | CrowIDE/src/ImlVisualEditor.cs | 13 | ||||
| -rw-r--r-- | CrowIDE/src/MembersView.cs | 10 | ||||
| -rw-r--r-- | CrowIDE/ui/CSProjExplorer.crow | 2 | ||||
| -rw-r--r-- | CrowIDE/ui/GTreeExpITemp.crow | 2 | ||||
| -rw-r--r-- | CrowIDE/ui/MembersItem.template | 2 | ||||
| -rwxr-xr-x | CrowIDE/ui/MembersView.template | 2 | ||||
| -rw-r--r-- | CrowIDE/ui/imlEditor.crow | 4 |
7 files changed, 13 insertions, 22 deletions
diff --git a/CrowIDE/src/ImlVisualEditor.cs b/CrowIDE/src/ImlVisualEditor.cs index 9c51338f..e238a706 100644 --- a/CrowIDE/src/ImlVisualEditor.cs +++ b/CrowIDE/src/ImlVisualEditor.cs @@ -129,19 +129,6 @@ namespace CrowIDE get { return imlVE.GraphicTree; } } - - public CrowMSBuild.Project CSProj { - get { - CrowMSBuild.Project proj = null; - XmlSerializer serializer = new XmlSerializer(typeof(CrowMSBuild.Project)); - string path=@"/mnt/data2/devel/crow/Tests/Tests.csproj"; - using (StreamReader reader = new StreamReader (path)) { - proj = (CrowMSBuild.Project)serializer.Deserialize (reader); - } - return proj; - } - } - void reloadFromSource(){ if (string.IsNullOrEmpty (imlSource)) { reload_iTor (null); diff --git a/CrowIDE/src/MembersView.cs b/CrowIDE/src/MembersView.cs index 18f1a709..67c712bd 100644 --- a/CrowIDE/src/MembersView.cs +++ b/CrowIDE/src/MembersView.cs @@ -24,6 +24,7 @@ using System.Xml.Serialization; using System.ComponentModel; using System.Reflection; using System.Collections.Generic; +using System.Linq; namespace CrowIDE { @@ -47,7 +48,10 @@ namespace CrowIDE try { if (!pi.PropertyType.IsAssignableFrom(value.GetType()) && pi.PropertyType != typeof(string)){ if (pi.PropertyType.IsEnum) { - pi.SetValue (instance, value); + if (value is string) { + pi.SetValue (instance, Enum.Parse (pi.PropertyType, (string)value)); + }else + pi.SetValue (instance, value); } else { MethodInfo me = pi.PropertyType.GetMethod ("Parse", BindingFlags.Static | BindingFlags.Public, @@ -65,9 +69,9 @@ namespace CrowIDE public string Type { get { return pi.PropertyType.IsEnum ? "System.Enum" : pi.PropertyType.FullName; }} - public string[] Choices { + public object[] Choices { get { - return Enum.GetNames (pi.PropertyType); + return Enum.GetValues (pi.PropertyType).Cast<object>().ToArray(); } } diff --git a/CrowIDE/ui/CSProjExplorer.crow b/CrowIDE/ui/CSProjExplorer.crow index f8155a23..5f9f9949 100644 --- a/CrowIDE/ui/CSProjExplorer.crow +++ b/CrowIDE/ui/CSProjExplorer.crow @@ -51,7 +51,7 @@ <HorizontalStack Height="Fit"> <GraphicObject Width="12" Height="10"/> <TreeView Name="List" Height="Fit" - Template="#Crow.Templates.treeList.crow" /> + Template="#Crow.Templates.treeList.template" /> </HorizontalStack> </Expandable> </ItemTemplate> diff --git a/CrowIDE/ui/GTreeExpITemp.crow b/CrowIDE/ui/GTreeExpITemp.crow index 32eeb43b..4be4f094 100644 --- a/CrowIDE/ui/GTreeExpITemp.crow +++ b/CrowIDE/ui/GTreeExpITemp.crow @@ -23,6 +23,6 @@ <HorizontalStack Height="Fit"> <GraphicObject Width="12" Height="10"/> <TreeView Name="List" Height="Fit" - Template="#Crow.Templates.treeList.crow" /> + Template="#Crow.Templates.treeList.template" /> </HorizontalStack> </Expandable> diff --git a/CrowIDE/ui/MembersItem.template b/CrowIDE/ui/MembersItem.template index 4b1c97c7..abf8c24c 100644 --- a/CrowIDE/ui/MembersItem.template +++ b/CrowIDE/ui/MembersItem.template @@ -21,7 +21,7 @@ MouseLeave="{Background=Transparent}" > <Label Margin="1" Text="{Name}" Height="Fit" Width="50%"/> <ComboBox Margin="0" Height="Stretched" Width="50%" Data="{Choices}" - SelectedIndex="{²Value}"> + SelectedItem="{²Value}"> <Template> <Popper Name="popper" PopDirection="Bottom"> <Template> diff --git a/CrowIDE/ui/MembersView.template b/CrowIDE/ui/MembersView.template index 48475116..92f132f3 100755 --- a/CrowIDE/ui/MembersView.template +++ b/CrowIDE/ui/MembersView.template @@ -2,7 +2,7 @@ <Window Template="#Crow.ToolWindow.template" Caption="Properties" MinimumSize="10,10" Width="Stretched" Height="Stretched"> <VerticalStack> <Border Height="Fit"> - <Label TextAlignment="Left" Text="{./Instance}" Width="Stretched"/> + <Label TextAlignment="Left" Text="{../../../../Instance}" Width="Stretched"/> </Border> <Scroller Name="scroller1" Margin="1" VerticalScrolling="true" ValueChanged="./_scroller_ValueChanged"> diff --git a/CrowIDE/ui/imlEditor.crow b/CrowIDE/ui/imlEditor.crow index 4df6b40d..2b2fc8ec 100644 --- a/CrowIDE/ui/imlEditor.crow +++ b/CrowIDE/ui/imlEditor.crow @@ -29,9 +29,9 @@ <!-- <HorizontalStack Height="Fit" Margin="2"> <Image Style="icon" Path="#CrowIDE.images.save.svg" MouseClick="onCommandSave"/> </HorizontalStack>--> - <Border Margin="1" Background="Onyx" Height="Fit"> +<!-- <Border Margin="1" Background="Onyx" Height="Fit"> <Label Width="Stretched" Margin="1" Text="{../../dv.SelectedItem}"/> - </Border> + </Border>--> <HorizontalStack> <TreeView Name="treeview" Width="20%" Height="100%" IsRoot="true" DataSource="{CurrentSolution}" Data="{Projects}" |