From: Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
Date: Wed, 7 Feb 2018 15:09:04 +0000 (+0100)
Subject: file dialog improvments, window title colors property in window class
X-Git-Tag: v0.9.5-beta~181
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=2937dc695a03c6359494a0f1a9224766b6d1aa04;p=jp%2Fcrow.git

file dialog improvments, window title colors property in window class
---

diff --git a/Crow.csproj b/Crow.csproj
index 13cab16d..c45642b5 100644
--- a/Crow.csproj
+++ b/Crow.csproj
@@ -359,6 +359,7 @@
     <EmbeddedResource Include="Templates\imgItem.template" />
     <EmbeddedResource Include="Templates\ArrowBut.template" />
     <EmbeddedResource Include="Templates\treeList.template" />
+    <EmbeddedResource Include="Templates\CheckBox2.template" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Crow.dll.config">
diff --git a/Default.style b/Default.style
index 07689b50..98c10255 100644
--- a/Default.style
+++ b/Default.style
@@ -136,4 +136,14 @@ HSVSpinner {
 	Minimum = 0;
 	Maximum = 1;
 	SmallIncrement = 0.01;
+}
+TxtInFileDialog {
+	Margine = 1;
+	Font = droid, 12;
+}
+CheckBoxAlt {
+	Template= #Crow.Templates.CheckBox2.template;
+	Background = Transparent;
+	Checked={Background=DarkSlateGray;Foreground=LightGray;};
+	Unchecked = {Background=Transparent;Foreground=DimGray;};
 }
\ No newline at end of file
diff --git a/Templates/CheckBox2.template b/Templates/CheckBox2.template
new file mode 100644
index 00000000..db61dd1a
--- /dev/null
+++ b/Templates/CheckBox2.template
@@ -0,0 +1,7 @@
+<Border Foreground="Transparent" MouseEnter="{Foreground=Gray}" MouseLeave="{Foreground=Transparent}">
+	<Label Font="{./Font}" Text="{./Caption}"
+		Margin="1"
+		Background="{./Background}"
+		Foreground="{./Foreground}"
+		TextAlignment="Center"/>
+</Border>
\ No newline at end of file
diff --git a/Templates/FileDialog.template b/Templates/FileDialog.template
index 7eba6828..62a7dc6d 100644
--- a/Templates/FileDialog.template
+++ b/Templates/FileDialog.template
@@ -4,11 +4,11 @@
 				MouseEnter="./onBorderMouseEnter"
 				MouseLeave="./onBorderMouseLeave">
 	<VerticalStack Spacing="0">
-		<HorizontalStack Background="vgradient|0:0.4,0.6,0.0,0.5|1:0.0,0.8,0.8,0.9"
+		<HorizontalStack Background="{./TitleBarBackground}"
 				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="{./Caption}" />
+			<Label Width="Stretched" Foreground="{./TitleBarForeground}" Margin="1" TextAlignment="Center" Text="{./Caption}" />
 			<Border CornerRadius="0" 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"
@@ -23,30 +23,36 @@
 						<Image Margin="2" Width="14" Height="14"
 							Path="#Crow.Icons.level-up.svg"/>
 					</Button>
-					<TextBox Text="{²./CurrentDirectory}"/>
+					<TextBox Style="TxtInFileDialog" Text="{²./CurrentDirectory}"/>
 				</HorizontalStack>
-				<DirectoryView ShowFiles="true" Name="fv" CurrentDirectory="{./CurrentDirectory}" SelectedItemChanged="./onFVSelectedItemChanged"
+				<DirectoryView ShowHidden="{²../cbShowHidden.IsChecked}" FileMask="{²../txtFileMask.Text}" ShowFiles="{²../cbShowFiles.IsChecked}" Name="fv" CurrentDirectory="{./CurrentDirectory}" SelectedItemChanged="./onFVSelectedItemChanged"
 						Width="100%" Margin="0" MouseDoubleClick="./onFileSelect">
-						<Template>
-							<ListBox ItemTemplate="#Crow.Templates.FileItems.template" Name="fileView" Data="{./FileSystemEntries}"
-								SelectedItemChanged="./onSelectedItemChanged">
-								<Template>
-									<HorizontalStack>
-										<Scroller ScrollX="{../scrollbar1.Value}"  Name="scroller1"
-											VerticalScrolling="true" HorizontalScrolling="false">
-											<VerticalStack Height="Fit" VerticalAlignment="Top"
-												Name="ItemsContainer" Margin="0" Spacing="1"/>
-										</Scroller>
-										<ScrollBar Name="scrollbar1" Value="{²../scroller1.ScrollY}"
-											Maximum="{../scroller1.MaximumScroll}" Orientation="Vertical"
-											Width="14" />
-									</HorizontalStack>
-								</Template>
-							</ListBox>
-						</Template>
-					</DirectoryView>
-				<TextBox Text="{./SelectedDirectory}"/>
-				<TextBox Text="{²./SelectedFile}"/>
+					<Template>
+						<ListBox ItemTemplate="#Crow.Templates.FileItems.template" Name="fileView" Data="{./FileSystemEntries}"
+							SelectedItemChanged="./onSelectedItemChanged">
+							<Template>
+								<HorizontalStack>
+									<Scroller ScrollX="{../scrollbar1.Value}"  Name="scroller1"
+										VerticalScrolling="true" HorizontalScrolling="false">
+										<VerticalStack Height="Fit" VerticalAlignment="Top"
+											Name="ItemsContainer" Margin="0" Spacing="1"/>
+									</Scroller>
+									<ScrollBar Name="scrollbar1" Value="{²../scroller1.ScrollY}"
+										Maximum="{../scroller1.MaximumScroll}" Orientation="Vertical"
+										Width="14" />
+								</HorizontalStack>
+							</Template>
+						</ListBox>
+					</Template>
+				</DirectoryView>
+				<HorizontalStack Height="Fit">
+					<TextBox Style="TxtInFileDialog" Text="{²./SelectedFile}"/>
+					<TextBox Style="TxtInFileDialog" Width="50" Name="txtFileMask" Text="{²./SearchPattern}"/>
+				</HorizontalStack>
+				<HorizontalStack Margin="5" Fit="true" HorizontalAlignment="Right">
+					<CheckBox Style="CheckBoxAlt" Name="cbShowFiles" Caption="Show Files" IsChecked="{²./ShowFiles}"/>
+					<CheckBox Style="CheckBoxAlt" Name="cbShowHidden" Caption="Show Hidden" IsChecked="{²./ShowHidden}"/>
+				</HorizontalStack>
 				<HorizontalStack Fit="true" HorizontalAlignment="Right">
 					<Button Caption="Ok" MouseClick="./onFileSelect"/>
 					<Button Caption="Cancel" MouseClick="./onCancel"/>
diff --git a/Templates/MessageBox.template b/Templates/MessageBox.template
index b601f43c..129e24ca 100644
--- a/Templates/MessageBox.template
+++ b/Templates/MessageBox.template
@@ -4,11 +4,11 @@
 				MouseLeave="./onBorderMouseLeave">
 	<VerticalStack Background="{./Background}">
 		<Border BorderWidth="0" Foreground="White" Height="Fit" Width="Stretched" MinimumSize="200,0"
-				Background="vgradient|0:0.4,0.6,0.0,0.5|1:0.0,0.8,0.8,0.9">
+				Background="{./TitleBarBackground}">
 			<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="{./Caption}" />
+				<Label Width="Stretched" Foreground="{./TitleBarForeground}" Margin="1" TextAlignment="Center" Text="{./Caption}" />
 				<Border CornerRadius="3" 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 f021f6ee..2fcb7309 100755
--- a/Templates/ToolWindow.template
+++ b/Templates/ToolWindow.template
@@ -6,11 +6,11 @@
 	<VerticalStack Spacing="0">
 <!--		<Border Name="TitleBar" BorderWidth="1" Foreground="White" Width="{./WidthPolicy}" Height="Fit"
 				Background="vgradient|0:0.4,0.6,0.0,0.5|1:0.0,0.8,0.8,0.9">-->
-			<HorizontalStack Background="vgradient|0:0.4,0.6,0.0,0.5|1:0.0,0.8,0.8,0.9"
+			<HorizontalStack Background="{./TitleBarBackground}"
 					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="{./Caption}" />
+				<Label Width="Stretched" Foreground="{./TitleBarForeground}" 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 20b23147..770d5c2c 100755
--- a/Templates/Window.template
+++ b/Templates/Window.template
@@ -6,11 +6,11 @@
 	<VerticalStack Spacing="0">
 <!--		<Border Name="TitleBar" BorderWidth="1" Foreground="White" Width="{./WidthPolicy}" Height="Fit"
 				Background="vgradient|0:0.4,0.6,0.0,0.5|1:0.0,0.8,0.8,0.9">-->
-			<HorizontalStack Background="vgradient|0:0.4,0.6,0.0,0.5|1:0.0,0.8,0.8,0.9"
+			<HorizontalStack Background="{./TitleBarBackground}"
 					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="{./Caption}" />
+				<Label Width="Stretched" Foreground="{./TitleBarForeground}" 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/Interfaces/Divers/0.crow b/Tests/Interfaces/Divers/0.crow
index 330e3bd8..d5cf83c6 100755
--- a/Tests/Interfaces/Divers/0.crow
+++ b/Tests/Interfaces/Divers/0.crow
@@ -151,7 +151,7 @@
 			<Splitter/>-->
 			<ListBox Name="colorList" Data="{TestList}" Margin="5"
 					 ItemTemplate="#Tests.Interfaces.colorItem.crow"
-					 Template="#Crow.Templates.ScrollingListBox.templat"
+					 Template="#Crow.Templates.ScrollingListBox.template"
 					 />
 		</VerticalStack>
 	</HorizontalStack>
diff --git a/Tests/Interfaces/Unsorted/testFileDialog.crow b/Tests/Interfaces/Unsorted/testFileDialog.crow
index d24b1c99..868baf63 100644
--- a/Tests/Interfaces/Unsorted/testFileDialog.crow
+++ b/Tests/Interfaces/Unsorted/testFileDialog.crow
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
-<FileDialog Caption="Open File" CurrentDirectory="/"/>
+<FileDialog Caption="Open File" CurrentDirectory="/" SearchPattern="*.*"/>
 
diff --git a/src/GraphicObjects/DirectoryView.cs b/src/GraphicObjects/DirectoryView.cs
index 0aa44267..d530f0cb 100644
--- a/src/GraphicObjects/DirectoryView.cs
+++ b/src/GraphicObjects/DirectoryView.cs
@@ -28,6 +28,8 @@ using System;
 using System.Xml.Serialization;
 using System.ComponentModel;
 using System.IO;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace Crow
 {
@@ -46,7 +48,8 @@ namespace Crow
 		#endregion
 
 		string currentDirectory = "/";
-		bool showFiles;
+		bool showFiles, showHidden;
+		string fileMask = "*.*";
 
 		object _selectedItem;
 		[XmlIgnore]public object SelectedItem {
@@ -71,6 +74,28 @@ namespace Crow
 				NotifyValueChanged ("FileSystemEntries", FileSystemEntries);
 			}
 		}
+		[XmlAttributeAttribute()][DefaultValue(false)]
+		public virtual bool ShowHidden {
+			get { return showHidden; }
+			set {
+				if (showHidden == value)
+					return;
+				showHidden = value;
+				NotifyValueChanged ("ShowHidden", showHidden);
+				NotifyValueChanged ("FileSystemEntries", FileSystemEntries);
+			}
+		}
+		[XmlAttributeAttribute][DefaultValue("*.*")]
+		public virtual string FileMask {
+			get { return fileMask; }
+			set {
+				if (fileMask == value)
+					return;
+				fileMask = value;
+				NotifyValueChanged ("FileMask", fileMask);
+				NotifyValueChanged ("FileSystemEntries", FileSystemEntries);
+			}
+		}
 		[XmlAttributeAttribute][DefaultValue("/")]
 		public virtual string CurrentDirectory {
 			get { return currentDirectory; }
@@ -83,11 +108,21 @@ namespace Crow
 			}
 		}
 		[XmlIgnore]public FileSystemInfo[] FileSystemEntries {
-			get { 
-				return string.IsNullOrEmpty(CurrentDirectory) ? null :
-					showFiles ?					
-					new DirectoryInfo (CurrentDirectory).GetFileSystemInfos () :
-					new DirectoryInfo(CurrentDirectory).GetDirectories(); 
+			get {
+				try {
+					if (string.IsNullOrEmpty(CurrentDirectory))
+						return null;
+					DirectoryInfo di = new DirectoryInfo(CurrentDirectory);
+					List<FileSystemInfo> fi = new List<FileSystemInfo> (di.GetDirectories());
+					if (showFiles && !string.IsNullOrEmpty(fileMask))
+						fi.AddRange(di.GetFiles(fileMask));
+					return showHidden ?
+						fi.ToArray() :
+						fi.Where(f=>!f.Attributes.HasFlag (FileAttributes.Hidden)).ToArray();
+				} catch (Exception ex) {
+					Console.WriteLine (ex.ToString ());
+					return null;
+				}
 			}
 		}
 		public void onSelectedItemChanged (object sender, SelectionChangeEventArgs e){
diff --git a/src/GraphicObjects/FileDialog.cs b/src/GraphicObjects/FileDialog.cs
index f2fb3b89..a5ba7b20 100644
--- a/src/GraphicObjects/FileDialog.cs
+++ b/src/GraphicObjects/FileDialog.cs
@@ -46,6 +46,7 @@ namespace Crow
 		#endregion
 
 		string searchPattern, curDir, _selectedFile, _selectedDir;
+		bool showHidden, showFiles;
 
 		#region events
 		public event EventHandler OkClicked;
@@ -74,6 +75,26 @@ namespace Crow
 
 			}
 		}
+		[XmlAttributeAttribute()][DefaultValue(false)]
+		public virtual bool ShowHidden {
+			get { return showHidden; }
+			set {
+				if (showHidden == value)
+					return;
+				showHidden = value;
+				NotifyValueChanged ("ShowHidden", showHidden);
+			}
+		}
+		[XmlAttributeAttribute()][DefaultValue(true)]
+		public virtual bool ShowFiles {
+			get { return showFiles; }
+			set {
+				if (showFiles == value)
+					return;
+				showFiles = value;
+				NotifyValueChanged ("ShowFiles", showFiles);
+			}
+		}
 		[XmlAttributeAttribute]public string SelectedFile {
 			get { return _selectedFile; }
 			set {
@@ -119,14 +140,11 @@ namespace Crow
 				CurrentDirectory = SelectedDirectory;
 			else {
 				OkClicked.Raise (this, null);
-				unloadDialog ((sender as GraphicObject).CurrentInterface);
+				CurrentInterface.DeleteWidget (this);
 			}
 		}
 		void onCancel(object sender, MouseButtonEventArgs e){
-			unloadDialog ((sender as GraphicObject).CurrentInterface);
-		}
-		void unloadDialog(Interface host){
-			host.DeleteWidget (this);
+			CurrentInterface.DeleteWidget (this);
 		}
 	}
 }
diff --git a/src/GraphicObjects/Window.cs b/src/GraphicObjects/Window.cs
index 5025b3fb..cb9498ff 100644
--- a/src/GraphicObjects/Window.cs
+++ b/src/GraphicObjects/Window.cs
@@ -51,6 +51,8 @@ namespace Crow
 		bool _movable;
 		protected bool hoverBorder = false;
 		bool alwaysOnTop = false;
+		Fill titleBarBackground = Color.UnitedNationsBlue;
+		Fill titleBarForeground = Color.White;
 
 		Rectangle savedBounds;
 		bool _minimized = false;
@@ -91,6 +93,34 @@ namespace Crow
 				NotifyValueChanged ("Icon", _icon);
 			}
 		} 
+		/// <summary>
+		/// Background of the title bar if any.
+		/// </summary>
+		[XmlAttributeAttribute][DefaultValue("vgradient|0:Onyx|1:UnitedNationsBlue")]
+		public virtual Fill TitleBarBackground {
+			get { return titleBarBackground; }
+			set {
+				if (titleBarBackground == value)
+					return;
+				titleBarBackground = value;
+				NotifyValueChanged ("TitleBarBackground", titleBarBackground);
+				RegisterForRedraw ();
+			}
+		}
+		/// <summary>
+		/// Foreground of the title bar, usualy used for the window caption color.
+		/// </summary>
+		[XmlAttributeAttribute][DefaultValue("White")]
+		public virtual Fill TitleBarForeground {
+			get { return titleBarForeground; }
+			set {
+				if (titleBarForeground == value)
+					return;
+				titleBarForeground = value;
+				NotifyValueChanged ("TitleBarForeground", titleBarForeground);
+				RegisterForRedraw ();
+			}
+		}
 		[XmlAttributeAttribute][DefaultValue(true)]
 		public bool Resizable {
 			get {
diff --git a/src/StyleReader.cs b/src/StyleReader.cs
index db12053d..8a79cd4a 100644
--- a/src/StyleReader.cs
+++ b/src/StyleReader.cs
@@ -31,6 +31,10 @@ using System.Reflection;
 
 namespace Crow
 {
+	/// <summary>
+	/// Parser for style files.
+	/// </summary>
+	//TODO: style key shared by different class may use only first encouneter class setter, which can cause bug.
 	public class StyleReader : StreamReader
 	{
 		enum readerState { classNames, propertyName, expression }