replace Title in Window class by Caption

diff --git a/Templates/FileDialog.template b/Templates/FileDialog.template
index db145f0fc065649420e3879417f26477cd693308..2545303297b5031061add935d217784b2e83a6cb 100644 (file)
--- a/Templates/FileDialog.template
+++ b/Templates/FileDialog.template
@@ -8,7 +8,7 @@
                                Name="hs" Margin="2" Spacing="0" Height="Fit">
                        <GraphicObject Width="5"/>
                        <Image Margin="1" Width="12" Height="12" Path="{./Icon}"/>
-                       <Label Width="Stretched" Foreground="White" Margin="1" TextAlignment="Center" Text="{./Title}" />
+                       <Label Width="Stretched" Foreground="White" Margin="1" TextAlignment="Center" Text="{./Caption}" />
                        <Border CornerRadius="6" BorderWidth="1" Foreground="Transparent"  Height="12" Width="12"
                                MouseEnter="{Foreground=White}" MouseLeave="{Foreground=Transparent}">
                                <Image Focusable="true" Name="Image" Margin="0" Width="Stretched" Height="Stretched" Path="#Crow.Images.Icons.exit2.svg"

diff --git a/Templates/MessageBox.template b/Templates/MessageBox.template
index 9c361ea691134bc57f5c777a703bfe7a6bdef5b6..8c58d61d5aa00d220d4308253c588990f1c97fc4 100644 (file)
--- a/Templates/MessageBox.template
+++ b/Templates/MessageBox.template
@@ -8,7 +8,7 @@
                        <HorizontalStack Name="hs" Margin="2" Spacing="1" Height="Fit" >
                                <GraphicObject Width="5" Height="5"/>
                                <Image Margin="1" Width="12" Height="12" Path="{./Icon}"/>
-                               <Label Width="Stretched" Foreground="White" Margin="1" TextAlignment="Center" Text="{./Title}" />
+                               <Label Width="Stretched" Foreground="White" Margin="1" TextAlignment="Center" Text="{./Caption}" />
                                <Border CornerRadius="6" BorderWidth="1" Foreground="Transparent"  Height="12" Width="12"
                                        MouseEnter="{Foreground=White}" MouseLeave="{Foreground=Transparent}">
                                        <Image Focusable="true" Name="Image" Path="#Crow.Images.Icons.exit2.svg"

diff --git a/Templates/ToolWindow.template b/Templates/ToolWindow.template
index 7325193c9018d867b14a603c2931c19f4401e840..f021f6ee162de6fa1860adff2173d4694ff542aa 100755 (executable)
--- a/Templates/ToolWindow.template
+++ b/Templates/ToolWindow.template
@@ -10,7 +10,7 @@
                                        Name="hs" Margin="2" Spacing="0" Height="Fit">
                                <GraphicObject Width="5"/>
                                <Image Margin="1" Width="12" Height="12" Path="{./Icon}"/>
-                               <Label Width="Stretched" Foreground="White" Margin="1" TextAlignment="Center" Text="{./Title}" />
+                               <Label Width="Stretched" Foreground="White" Margin="1" TextAlignment="Center" Text="{./Caption}" />
                                <Border CornerRadius="6" BorderWidth="1" Foreground="Transparent"  Height="12" Width="12"
                                        MouseEnter="{Foreground=White}" MouseLeave="{Foreground=Transparent}">
                                        <Image Focusable="true" Name="Image" Margin="0" Width="Stretched" Height="Stretched" Path="#Crow.Images.Icons.exit2.svg"

diff --git a/Templates/Window.template b/Templates/Window.template
index d729021c14665a2496154752b26ecd0e5040288b..20b231478f7cd08d3e6d91fd8c8920dac403b271 100755 (executable)
--- a/Templates/Window.template
+++ b/Templates/Window.template
@@ -10,7 +10,7 @@
                                        Name="hs" Margin="2" Spacing="0" Height="Fit">
                                <GraphicObject Width="5"/>
                                <Image Margin="1" Width="12" Height="12" Path="{./Icon}"/>
-                               <Label Width="Stretched" Foreground="White" Margin="2" TextAlignment="Center" Text="{./Title}" />
+                               <Label Width="Stretched" Foreground="White" Margin="2" TextAlignment="Center" Text="{./Caption}" />
                                <Border Visible="{./ShowMinimize}" BorderWidth="1" Foreground="Transparent"  Height="12" Width="12"
                                        MouseEnter="{Foreground=White}" MouseLeave="{Foreground=Transparent}">
                                        <Image Focusable="true" Path="#Crow.Images.Icons.minimize.svg"

diff --git a/Tests/HelloCube.cs b/Tests/HelloCube.cs
index d9223f5adadf46d1869988512256ce1a1484679c..f16f8203b12e177cc16cf60aeebd613b089e5a36 100644 (file)
--- a/Tests/HelloCube.cs
+++ b/Tests/HelloCube.cs
@@ -66,7 +66,7 @@ namespace Tests
                        AddWidget(
                                new Window ()
                                {
-                                       Title = "Hello World"
+                                       Caption = "Hello World"
                                }
                        );
                        initGL ();

diff --git a/Tests/Interfaces/Divers/0.crow b/Tests/Interfaces/Divers/0.crow
index 3c53ab0119257190c23812aaf5db9e5a856ee5a1..480dde3b3676cbc713b86c6a3a0064aec68de484 100755 (executable)
--- a/Tests/Interfaces/Divers/0.crow
+++ b/Tests/Interfaces/Divers/0.crow
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<Window Title="Showcase" Height="90%" Width="90%">
+<Window Caption="Showcase" Height="90%" Width="90%">
        <HorizontalStack >
                <VerticalStack Width="30%" Margin="5">
                        <GroupBox Caption="Performance" Height="Fit">
@@ -137,7 +137,8 @@
                        </TabView>-->
                        <MessageBox Movable="false"/>
                        <ColorPicker SelectedColor="{²../go.Background}" Name="colorPicker" Background="Onyx" Margin="5" Fit="True" />
-                       <GraphicObject Name="go" Width="100" Height="60" Background="DarkBlue"/>
+                       <GraphicObject Name="go" Width="100" Height="60" Background="{../../colorList.SelectedItem}"/>
+                       <Label Text="{../../colorPicker.SelectedRawColor}"/>
                </VerticalStack>
                <Splitter/>
                <VerticalStack Width="30%" Margin="5">
@@ -148,7 +149,7 @@
                                <DirectoryView Name="dv" CurrentDirectory="/" Margin="1"/>
                        </Border>
                        <Splitter/>
-                       <ListBox Data="{TestList}" Margin="5"
+                       <ListBox Name="colorList" Data="{TestList}" Margin="5"
                                         ItemTemplate="#Tests.Interfaces.colorItem.crow"
                                         Template="#Crow.Templates.ScrollingListBox.goml"
                                         />

diff --git a/Tests/Interfaces/Divers/perfMeasures.crow b/Tests/Interfaces/Divers/perfMeasures.crow
index 3a0cb5754a3ed4162ffe500d1f359bd8c4802181..c0d0d8b9a95f38cfa157f354503d50898c6f2f8a 100755 (executable)
--- a/Tests/Interfaces/Divers/perfMeasures.crow
+++ b/Tests/Interfaces/Divers/perfMeasures.crow
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<Window Focusable="true" Title="Measures" Width="30%" Height="Fit" MinimumSize="100,100">
+<Window Focusable="true" Caption="Measures" Width="30%" Height="Fit" MinimumSize="100,100">
        <ListBox Data="{PerfMeasures}"
                ItemTemplate="#Tests.Interfaces.perfMsr.crow"/>
 </Window>

diff --git a/Tests/Interfaces/TemplatedContainer/testMsgBox.crow b/Tests/Interfaces/TemplatedContainer/testMsgBox.crow
index 953663775cbb4e998513d240d64689455c84ac80..d60c281e4456917dc9ed89260eddc273336ba82d 100755 (executable)
--- a/Tests/Interfaces/TemplatedContainer/testMsgBox.crow
+++ b/Tests/Interfaces/TemplatedContainer/testMsgBox.crow
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
-<MessageBox Title="message" Message="this is a message box"/>
+<MessageBox Caption="message" Message="this is a message box"/>
 <!--   Ok="onMsgBoxOk"
        Cancel="onMsgBoxCancel"/>-->
\ No newline at end of file

diff --git a/Tests/Interfaces/TemplatedGroup/0.crow b/Tests/Interfaces/TemplatedGroup/0.crow
index c502e63a513a0b54b5d9fb515c2f577dd0c70385..92cd224bba0716faead8bdab99f1c724058752af 100755 (executable)
--- a/Tests/Interfaces/TemplatedGroup/0.crow
+++ b/Tests/Interfaces/TemplatedGroup/0.crow
@@ -1,27 +1,27 @@
 <?xml version="1.0"?>
 <Menu>
-       <MenuItem Caption="File">
-               <MenuItem Caption="New" Execute="onNew"/>
+       <MenuItem Caption="File" Width="Fit">
+               <MenuItem Caption="New" />
                <MenuItem Caption="Open"/>
                <MenuItem Caption="Save"/>
                <MenuItem Caption="Quit"/>
        </MenuItem>
-       <MenuItem Caption="Edit" Name="edit">
+       <MenuItem Caption="Edit" Name="edit" Width="Fit">
                <MenuItem Caption="Cut"/>
                <MenuItem Caption="Copy"/>
                <MenuItem Caption="Paste"/>
-               <MenuItem Caption="Special" Name="special">
+               <MenuItem Caption="Special" Name="special" Width="Fit">
                        <MenuItem Caption="Cut"/>
                        <MenuItem Caption="Copy"/>
                        <MenuItem Caption="Paste"/>
                </MenuItem>
-               <MenuItem Caption="Special2" Name="special">
+               <MenuItem Caption="Special2" Name="special" Width="Fit">
                        <MenuItem Caption="Cut"/>
                        <MenuItem Caption="Copy"/>
                        <MenuItem Caption="Paste"/>
                </MenuItem>
        </MenuItem>
-       <MenuItem Caption="Help">
+       <MenuItem Caption="Help" Width="Fit">
                <MenuItem Caption="About"/>
                <MenuItem Caption="Help"/>
        </MenuItem>

diff --git a/Tests/Interfaces/Unsorted/testFileDialog.crow b/Tests/Interfaces/Unsorted/testFileDialog.crow
index fd54b551e58b8004e986bcae539c35a62bb7b8d3..d24b1c99d16b6a9f12e02b27eecdd7938a6f28e6 100644 (file)
--- a/Tests/Interfaces/Unsorted/testFileDialog.crow
+++ b/Tests/Interfaces/Unsorted/testFileDialog.crow
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
-<FileDialog Title="Open File" CurrentDirectory="/"/>
+<FileDialog Caption="Open File" CurrentDirectory="/"/>
 

diff --git a/Tests/Interfaces/Wrapper/1.crow b/Tests/Interfaces/Wrapper/1.crow
index feddc6ef3fac7bdf8a20b184360005a3823bd69a..e8ffd6b24f22eeec877a8e5873965854448c8986 100755 (executable)
--- a/Tests/Interfaces/Wrapper/1.crow
+++ b/Tests/Interfaces/Wrapper/1.crow
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<Window Width="50%" Height="50%">
+<Window Caption="Vertical Wrapper" Width="50%" Height="50%">
        <Wrapper Orientation="Vertical" Height="Fit" Width="Fit" Margin="5" Background="Teal" Spacing="1" >
                <GraphicObject Width="50" Height="50" Background="Mantis"/>
                <GraphicObject Width="50" Height="50" Background="Mantis"/>

diff --git a/Tests/Interfaces/Wrapper/2.crow b/Tests/Interfaces/Wrapper/2.crow
index 4fa1cd9a5115cfbd47581b4b0e13ad56298255af..14b005e879d79408d088b41280b6bb295542c1d8 100755 (executable)
--- a/Tests/Interfaces/Wrapper/2.crow
+++ b/Tests/Interfaces/Wrapper/2.crow
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<Window Width="50%" Height="50%">      
+<Window Caption="Horizontal Wrapper" Width="50%" Height="50%">
        <Wrapper Orientation="Horizontal" Height="Fit" Width="Fit" Margin="5" Background="Teal" Spacing="1" >
                <GraphicObject Width="50" Height="50" Background="Mantis"/>
                <GraphicObject Width="50" Height="50" Background="Mantis"/>

diff --git a/Tests/UIEditor.cs b/Tests/UIEditor.cs
index 2c03bdbb318230cf9f3e4ec8cee2d77289fb1848..6a7815f47d85b185c26a3e11143d59b08490dddc 100644 (file)
--- a/Tests/UIEditor.cs
+++ b/Tests/UIEditor.cs
@@ -47,7 +47,7 @@ namespace Tests
                        AddWidget(
                                new Window ()
                                {
-                                       Title = "Hello World"
+                                       Caption = "Hello World"
                                }
                        );
                }

diff --git a/Tests/ui/test.crow b/Tests/ui/test.crow
index da77637106e9bba675b97b268c41d2f207118b88..9a0e22c085f82c0a88b88d46d1bc1b718193473d 100755 (executable)
--- a/Tests/ui/test.crow
+++ b/Tests/ui/test.crow
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<Window Font="droid bold, 10" Title="Open GL" HorizontalAlignment="Left" Width="30%" Height="90%">
+<Window Font="droid bold, 10" Caption="Open GL" HorizontalAlignment="Left" Width="30%" Height="90%">
        <VerticalStack>
                <HorizontalStack Background="Jet" Height="Fit" Width="Stretched"  Margin="2">
                        <Popper Caption="File" Template="#Tests.ui.Popper.template" Width="Fit">

diff --git a/Tests/ui/tmpWindow.crow b/Tests/ui/tmpWindow.crow
index 64c97d55e63cab523334f419feb42d27883f71e0..8af356bff0133bbb7d7ac1d13002941543dc65e4 100755 (executable)
--- a/Tests/ui/tmpWindow.crow
+++ b/Tests/ui/tmpWindow.crow
@@ -5,7 +5,7 @@
        Background="vgradient|0:0.6,0.6,0.6,0.9|1:0.4,0.4,0.4,0.6">
        <VerticalStack>
                <HorizontalStack Height="Fit">
-                       <Label Margin="2" Font="{../../../../Font}" Text="{../../../../Title}" Width="Stretched"/>
+                       <Label Margin="2" Font="{../../../../Font}" Text="{../../../../Caption}" Width="Stretched"/>
                        <Border HorizontalAlignment="Right" Margin="0" VerticalAlignment="Top"
                                CornerRadius="6" BorderWidth="1" Foreground="Transparent"
                                Height="12" Width="12"

diff --git a/src/GraphicObjects/Window.cs b/src/GraphicObjects/Window.cs
index 9c1a0124f495bbbb918e3909d156721822d74311..ab7796094a8436601b39e9945be86791ae6dbfe7 100644 (file)
--- a/src/GraphicObjects/Window.cs
+++ b/src/GraphicObjects/Window.cs
@@ -41,7 +41,6 @@ namespace Crow
                        SE,
                }
 
-               string _title;
                string _icon;
                bool _resizable;
                bool _movable;
@@ -84,16 +83,6 @@ namespace Crow
                #endregion
 
                #region public properties
-               [XmlAttributeAttribute][DefaultValue("Window")]
-               public string Title {
-                       get { return _title; } 
-                       set {
-                               if (_title == value)
-                                       return;
-                               _title = value;
-                               NotifyValueChanged ("Title", _title);
-                       }
-               }
                [XmlAttributeAttribute][DefaultValue("#Crow.Images.Icons.crow.png")]
                public string Icon {
                        get { return _icon; }