crowIDE wip

diff --git a/CrowIDE/CrowIDE.csproj b/CrowIDE/CrowIDE.csproj
index 69e8bf425aa20213e317d11fede51e055d7dad1f..44a02a06d03eeb421058d3a5db796b2e82a69e8b 100644 (file)
--- a/CrowIDE/CrowIDE.csproj
+++ b/CrowIDE/CrowIDE.csproj
@@ -124,9 +124,6 @@
     <EmbeddedResource Include="ui\GTreeExplorer.crow" />
     <EmbeddedResource Include="ui\GTreeExpITemp.crow" />
     <EmbeddedResource Include="ui\MemberView.crow" />
-    <EmbeddedResource Include="ui\MenuItem.template">
-      <LogicalName>Crow.MenuItem.template</LogicalName>
-    </EmbeddedResource>
     <EmbeddedResource Include="ui\CSProjExplorer.crow" />
     <EmbeddedResource Include="ui\ProjectProperties.crow" />
     <EmbeddedResource Include="ui\TreeExpandable.template">
@@ -173,5 +170,8 @@
     <None Include="ui\icons\zoom-in.svg" />
     <None Include="ui\icons\zoom-out.svg" />
     <None Include="ui\icons\basic_floppydisk.svg" />
+    <None Include="ui\MenuItem.template">
+      <LogicalName>Crow.MenuItem.template</LogicalName>
+    </None>
   </ItemGroup>
 </Project>

diff --git a/CrowIDE/ui/EditPaneItems.template b/CrowIDE/ui/EditPaneItems.template
index 08875ce22e339dce411c02ccd7b5092794d8e7f2..5879e2a7e9b43bc786b7ab8341362ffb9c8c9513 100644 (file)
--- a/CrowIDE/ui/EditPaneItems.template
+++ b/CrowIDE/ui/EditPaneItems.template
@@ -45,7 +45,7 @@
                                Name="crowContainer" Background="Onyx"/>
                        <Splitter/>
                        <HorizontalStack Height="Stretched" >
-                               <SourceEditor Focusable="true" Name="editor" Font="monospace, 12" VerticalAlignment="Top" Margin="10"
+                               <SourceEditor Focusable="true" Name="editor" Font="monospace, 11" VerticalAlignment="Top" Margin="10"
                                                Foreground="Jet" Background="White" Width="Stretched" Height="Stretched"
                                                 FilePath="{AbsolutePath}"  KeyDown="textView_KeyDown"/>
                                <ScrollBar Name="scrollbarY" Value="{²../editor.ScrollY}"

diff --git a/CrowIDE/ui/MembersItem.template b/CrowIDE/ui/MembersItem.template
index abf8c24c567058e747187f4c495f322a25d985ec..a3cf670e0e458e7806688b26f997d9f515037e82 100644 (file)
--- a/CrowIDE/ui/MembersItem.template
+++ b/CrowIDE/ui/MembersItem.template
@@ -25,16 +25,20 @@
                        <Template>
                                <Popper Name="popper" PopDirection="Bottom">
                                        <Template>
-                                               <Border CornerRadius="0" Foreground="LightGray" Background="White">
-                                                       <HorizontalStack Margin="0" Spacing="1">
-                                                               <Label Width="Stretched" MinimumSize="80,10" Margin="1" Foreground="Black" Background="White"
-                                                                       Text="{../../../../SelectedItem}"/>
-                                                               <Button Width="12" Height="12" Focusable="false"
-                                                                       Template="#Crow.Templates.ArrowBut.template">
-                                                                       <Image Margin="1"  Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
-                                                               </Button>
-                                                       </HorizontalStack>
-                                               </Border>
+                                               <CheckBox Caption="{./Caption}" IsChecked="{²./IsPopped}" Foreground="{./Foreground}" Background="{./Background}">
+                                                       <Template>
+                                                               <Border CornerRadius="0" Foreground="LightGray" Background="White">
+                                                                       <HorizontalStack Margin="0" Spacing="1">
+                                                                               <Label Width="Stretched" MinimumSize="80,10" Margin="1" Foreground="Black" Background="White"
+                                                                                       Text="{../../../../../SelectedItem}"/>
+                                                                               <Button Width="12" Height="12" Focusable="false"
+                                                                                       Template="#Crow.Templates.ArrowBut.template">
+                                                                                       <Image Margin="1"  Path="#Crow.Images.Icons.updown.svg" SvgSub="down"/>
+                                                                               </Button>
+                                                                       </HorizontalStack>
+                                                               </Border>
+                                                       </Template>
+                                               </CheckBox>
                                        </Template>
                                        <Border Background="White" BorderWidth="1" Margin="1" Foreground="Black"
                                                MinimumSize="{../../MinimumPopupSize}" Fit="true">
@@ -69,12 +73,16 @@
                <Label Margin="1" Text="{Name}" Height="Fit" Width="50%"/>
                <Popper Background="White" Margin="0" Height="Stretched" Caption="{Value}">
                        <Template>
-                               <HorizontalStack Spacing="3" Height="Fit" Background="{./Background}">
-                                       <Border Foreground="Black" Width="16" Height="10" CornerRadius="3"
-                                               Background="{Value}">
-                                       </Border>
-                                       <Label Text="{./Caption}" Foreground="Black"/>
-                               </HorizontalStack>
+                               <CheckBox Caption="{./Caption}" IsChecked="{²./IsPopped}" Foreground="{./Foreground}" Background="{./Background}">
+                                       <Template>
+                                               <HorizontalStack Spacing="3" Height="Fit" Background="{./Background}">
+                                                       <Border Foreground="Black" Width="16" Height="10" CornerRadius="3"
+                                                               Background="{Value}">
+                                                       </Border>
+                                                       <Label Text="{./Caption}" Foreground="Black"/>
+                                               </HorizontalStack>
+                                       </Template>
+                               </CheckBox>
                        </Template>
                        <ColorPicker SelectedColor="{²Value}" Background="Onyx" Margin="5" Fit="True" />
                </Popper>