Mercurial > silverbladetech
changeset 19:09d18d6e5f40
airport work
line wrap: on
line diff
--- a/Chronosv2/source/Configuration/GenericElementCollection.cs Wed Mar 14 18:06:36 2012 +0700 +++ b/Chronosv2/source/Configuration/GenericElementCollection.cs Thu Mar 15 06:59:15 2012 +0000 @@ -3,7 +3,7 @@ namespace Chronos.Configuration { /// <summary> - /// http://utahdnug.org/blogs/josh/archive/2007/08/21/generic-configurationelementcollection.aspx + /// Generic Configuration Element Collection /// </summary> /// <typeparam name="K"></typeparam> /// <typeparam name="V"></typeparam>
--- a/Chronosv2/source/DragAndDrop/DragDropManager.cs Wed Mar 14 18:06:36 2012 +0700 +++ b/Chronosv2/source/DragAndDrop/DragDropManager.cs Thu Mar 15 06:59:15 2012 +0000 @@ -1,28 +1,4 @@ -/* -The MIT License - -Copyright (c) 2009-2010 Carlos Guzmán Álvarez - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ - -using System.Collections.Generic; +using System.Collections.Generic; using System.Windows; using System.Windows.Controls;
--- a/Chronosv2/source/Extensions/ArrayExtensions.cs Wed Mar 14 18:06:36 2012 +0700 +++ b/Chronosv2/source/Extensions/ArrayExtensions.cs Thu Mar 15 06:59:15 2012 +0000 @@ -1,33 +1,4 @@ -/* - Copyright (c) 2008 - 2009, Carlos Guzmán Álvarez - - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation and/or - other materials provided with the distribution. - * Neither the name of the author nor the names of its contributors may be used to endorse or - promote products derived from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -using System; +using System; using System.Security.Cryptography; using System.Text;
--- a/Chronosv2/source/Extensions/LinqExtensions.cs Wed Mar 14 18:06:36 2012 +0700 +++ b/Chronosv2/source/Extensions/LinqExtensions.cs Thu Mar 15 06:59:15 2012 +0000 @@ -1,28 +1,4 @@ -/* -The MIT License - -Copyright (c) 2009-2010. Carlos Guzmán Álvarez. http://chronoswpf.codeplex.com/ - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ - -using System; +using System; using System.Collections.Generic; using System.Linq.Expressions;
--- a/Chronosv2/source/Extensions/PropertyExtensions.cs Wed Mar 14 18:06:36 2012 +0700 +++ b/Chronosv2/source/Extensions/PropertyExtensions.cs Thu Mar 15 06:59:15 2012 +0000 @@ -1,28 +1,4 @@ -/* -The MIT License - -Copyright (c) 2009-2010. Carlos Guzmán Álvarez. http://chronoswpf.codeplex.com/ - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ - -using System; +using System; using System.ComponentModel; using System.Linq.Expressions;
--- a/Chronosv2/source/Extensions/Windows/ApplicationExtensions.cs Wed Mar 14 18:06:36 2012 +0700 +++ b/Chronosv2/source/Extensions/Windows/ApplicationExtensions.cs Thu Mar 15 06:59:15 2012 +0000 @@ -1,28 +1,4 @@ -/* -The MIT License - -Copyright (c) 2009-2010. Carlos Guzmán Álvarez. http://chronoswpf.codeplex.com/ - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ - -using System.Security.Permissions; +using System.Security.Permissions; using System.Windows; using System.Windows.Threading; using System.Windows.Media;
--- a/Chronosv2/source/Extensions/Windows/DispatcherObjectExtensions.cs Wed Mar 14 18:06:36 2012 +0700 +++ b/Chronosv2/source/Extensions/Windows/DispatcherObjectExtensions.cs Thu Mar 15 06:59:15 2012 +0000 @@ -1,28 +1,4 @@ -/* -The MIT License - -Copyright (c) 2009-2010. Carlos Guzmán Álvarez. http://chronoswpf.codeplex.com/ - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ - -using System; +using System; using System.Windows.Threading; namespace Chronos.Extensions.Windows
--- a/Chronosv2/source/Extensions/Windows/FrameworkElementExtensions.cs Wed Mar 14 18:06:36 2012 +0700 +++ b/Chronosv2/source/Extensions/Windows/FrameworkElementExtensions.cs Thu Mar 15 06:59:15 2012 +0000 @@ -1,28 +1,4 @@ -/* -The MIT License - -Copyright (c) 2009-2010. Carlos Guzmán Álvarez. http://chronoswpf.codeplex.com/ - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ - -using System; +using System; using System.Threading; using System.Windows; using System.Windows.Input;
--- a/Chronosv2/source/Extensions/Windows/PanelExtensions.cs Wed Mar 14 18:06:36 2012 +0700 +++ b/Chronosv2/source/Extensions/Windows/PanelExtensions.cs Thu Mar 15 06:59:15 2012 +0000 @@ -1,28 +1,4 @@ -/* -The MIT License - -Copyright (c) 2009-2010. Carlos Guzmán Álvarez. http://chronoswpf.codeplex.com/ - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ - -using System; +using System; using System.Windows; using System.Windows.Controls;
--- a/Chronosv2/source/Extensions/Windows/UIElementExtensions.cs Wed Mar 14 18:06:36 2012 +0700 +++ b/Chronosv2/source/Extensions/Windows/UIElementExtensions.cs Thu Mar 15 06:59:15 2012 +0000 @@ -1,28 +1,4 @@ -/* -The MIT License - -Copyright (c) 2009-2010. Carlos Guzmán Álvarez. http://chronoswpf.codeplex.com/ - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ - -using System.Windows; +using System.Windows; using System.Windows.Media; using System.Windows.Media.Imaging;
--- a/Chronosv2/source/Interop/Win32Interop.cs Wed Mar 14 18:06:36 2012 +0700 +++ b/Chronosv2/source/Interop/Win32Interop.cs Thu Mar 15 06:59:15 2012 +0000 @@ -1,28 +1,4 @@ -/* -The MIT License - -Copyright (c) 2009-2010. Carlos Guzmán Álvarez. http://chronoswpf.codeplex.com/ - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ - -using System; +using System; using System.Runtime.InteropServices; using System.Windows;
--- a/Chronosv2/source/Modules/Navigation/NavigationRoutes.cs Wed Mar 14 18:06:36 2012 +0700 +++ b/Chronosv2/source/Modules/Navigation/NavigationRoutes.cs Thu Mar 15 06:59:15 2012 +0000 @@ -1,28 +1,4 @@ -/* -The MIT License - -Copyright (c) 2009-2010. Carlos Guzmán Álvarez. http://chronoswpf.codeplex.com/ - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ - -using System; +using System; namespace Chronos.Modules.Navigation { @@ -50,7 +26,7 @@ /// <summary> /// Route for the companies view /// </summary> - public const string Companies = "Configuracion/Empresas"; + public const string Companies = "Configuration/Business"; #endregion }
--- a/Chronosv2/source/Modules/Sample/Models/EmpresaEntity.cs Wed Mar 14 18:06:36 2012 +0700 +++ b/Chronosv2/source/Modules/Sample/Models/EmpresaEntity.cs Thu Mar 15 06:59:15 2012 +0000 @@ -1,28 +1,4 @@ -/* -The MIT License - -Copyright (c) 2009-2010. Carlos Guzmán Álvarez. http://chronoswpf.codeplex.com/ - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ - -using System; +using System; using System.ComponentModel; namespace Chronos.Modules.Sample.Models
--- a/Chronosv2/source/Modules/Sample/ViewModels/EmpresaViewModel.cs Wed Mar 14 18:06:36 2012 +0700 +++ b/Chronosv2/source/Modules/Sample/ViewModels/EmpresaViewModel.cs Thu Mar 15 06:59:15 2012 +0000 @@ -1,35 +1,10 @@ -/* -The MIT License - -Copyright (c) 2009-2010. Carlos Guzmán Álvarez. http://chronoswpf.codeplex.com/ - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ - -using System.ComponentModel; +using System.ComponentModel; using Chronos.Modules.Navigation; using Chronos.Modules.Sample.Models; +using Chronos.Presentation.Core.Navigation; using Chronos.Presentation.Core.Windows; using Chronos.Presentation.ViewModel; -using Chronos.Presentation.Core.Navigation; using nRoute.Components; -using System.Collections.ObjectModel; namespace Chronos.Modules.Sample.ViewModels {
--- a/Chronosv2/source/Presentation/Controls/SplitButton.cs Wed Mar 14 18:06:36 2012 +0700 +++ b/Chronosv2/source/Presentation/Controls/SplitButton.cs Thu Mar 15 06:59:15 2012 +0000 @@ -1,28 +1,4 @@ -/* -The MIT License - -Copyright (c) 2009-2010. Carlos Guzmán Álvarez. http://chronoswpf.codeplex.com/ - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ - -using System.ComponentModel; +using System.ComponentModel; using System.Windows; using System.Windows.Controls; using System.Windows.Controls.Primitives;
--- a/Chronosv2/source/Presentation/Core/Navigation/INavigationService.cs Wed Mar 14 18:06:36 2012 +0700 +++ b/Chronosv2/source/Presentation/Core/Navigation/INavigationService.cs Thu Mar 15 06:59:15 2012 +0000 @@ -1,27 +1,4 @@ -/* -The MIT License - -Copyright (c) 2009-2010. Carlos Guzmán Álvarez. http://chronoswpf.codeplex.com/ - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ - + using nRoute.Navigation; namespace Chronos.Presentation.Core.Navigation
--- a/Chronosv2/source/Presentation/ViewModel/ClosableViewModel.cs Wed Mar 14 18:06:36 2012 +0700 +++ b/Chronosv2/source/Presentation/ViewModel/ClosableViewModel.cs Thu Mar 15 06:59:15 2012 +0000 @@ -1,28 +1,4 @@ -/* -The MIT License - -Copyright (c) 2009-2010. Carlos Guzmán Álvarez. http://chronoswpf.codeplex.com/ - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ - -using System; +using System; using System.Collections.Generic; using System.ComponentModel; using Chronos.Presentation.Core.ViewModel;
--- a/Chronosv2/source/Presentation/ViewModel/NavigationViewModel.cs Wed Mar 14 18:06:36 2012 +0700 +++ b/Chronosv2/source/Presentation/ViewModel/NavigationViewModel.cs Thu Mar 15 06:59:15 2012 +0000 @@ -1,28 +1,4 @@ -/* -The MIT License - -Copyright (c) 2009-2010. Carlos Guzmán Álvarez. http://chronoswpf.codeplex.com/ - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ - -using System; +using System; using Chronos.Presentation.Core.Navigation; using Chronos.Presentation.Core.ViewModel; using Chronos.Presentation.Core.VirtualDesktops; @@ -33,7 +9,7 @@ namespace Chronos.Presentation.ViewModel { /// <summary> - /// base class for navigation based viewmodel iumplementations + /// base class for navigation based viewmodel implementations /// </summary> public abstract class NavigationViewModel : ClosableViewModel, INavigationViewModel @@ -293,4 +269,4 @@ #endregion } -} +} \ No newline at end of file
--- a/Chronosv2/source/Presentation/ViewModel/ViewModelBase.cs Wed Mar 14 18:06:36 2012 +0700 +++ b/Chronosv2/source/Presentation/ViewModel/ViewModelBase.cs Thu Mar 15 06:59:15 2012 +0000 @@ -1,29 +1,4 @@ -/* -The MIT License - -Copyright (c) 2009-2010. Carlos Guzmán Álvarez. http://chronoswpf.codeplex.com/ - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ - -using System.ComponentModel; -using nRoute.Services; +using nRoute.Services; using nRoute.ViewServices; namespace Chronos.Presentation.ViewModel
--- a/Chronosv2/source/Presentation/ViewModel/WindowViewModel.cs Wed Mar 14 18:06:36 2012 +0700 +++ b/Chronosv2/source/Presentation/ViewModel/WindowViewModel.cs Thu Mar 15 06:59:15 2012 +0000 @@ -1,28 +1,4 @@ -/* -The MIT License - -Copyright (c) 2009-2010. Carlos Guzmán Álvarez. http://chronoswpf.codeplex.com/ - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ - -using System; +using System; using System.ComponentModel; using System.Threading; using System.Threading.Tasks;
--- a/Chronosv2/source/Presentation/Widgets/Navigator/NavigatorWidgetView.xaml Wed Mar 14 18:06:36 2012 +0700 +++ b/Chronosv2/source/Presentation/Widgets/Navigator/NavigatorWidgetView.xaml Thu Mar 15 06:59:15 2012 +0000 @@ -8,7 +8,8 @@ <Grid x:Name="LayoutRoot" Margin="3.5"> <Grid.Resources> - <HierarchicalDataTemplate ItemsSource="{Binding ChildNodes}" DataType="{x:Type nRoute:NavigationNode}"> + <HierarchicalDataTemplate ItemsSource="{Binding ChildNodes}" + DataType="{x:Type nRoute:NavigationNode}"> <TextBlock Text="{Binding Title}" FontWeight="SemiBold" /> </HierarchicalDataTemplate>
--- a/Chronosv2/source/Presentation/Windows/ActiveDesktopChangedInfo.cs Wed Mar 14 18:06:36 2012 +0700 +++ b/Chronosv2/source/Presentation/Windows/ActiveDesktopChangedInfo.cs Thu Mar 15 06:59:15 2012 +0000 @@ -1,28 +1,4 @@ -/* -The MIT License - -Copyright (c) 2009-2010. Carlos Guzmán Álvarez. http://chronoswpf.codeplex.com/ - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ - -using Chronos.Presentation.Core.VirtualDesktops; +using Chronos.Presentation.Core.VirtualDesktops; namespace Chronos.Presentation.Windows {
--- a/Chronosv2/source/Presentation/Windows/DesktopSerializer.cs Wed Mar 14 18:06:36 2012 +0700 +++ b/Chronosv2/source/Presentation/Windows/DesktopSerializer.cs Thu Mar 15 06:59:15 2012 +0000 @@ -127,8 +127,8 @@ IShowMessageViewService showMessageService = ViewServiceLocator.GetViewService<IShowMessageViewService>(); showMessageService.ButtonSetup = DialogButton.Ok; - showMessageService.Caption = "Chronos - Error en la carga del escritorio"; - showMessageService.Text = "No ha sido posible realizar la carga del escritorio."; + showMessageService.Caption = "Error loading the desktop"; + showMessageService.Text = "It was not possible to load the desktop."; showMessageService.ShowMessage(); } @@ -147,8 +147,8 @@ IShowMessageViewService showMessageService = ViewServiceLocator.GetViewService<IShowMessageViewService>(); showMessageService.ButtonSetup = DialogButton.Ok; - showMessageService.Caption = "Chronos - Error al guardar el estado del escritorio"; - showMessageService.Text = "No ha sido posible al guardar el estado del escritorio."; + showMessageService.Caption = "Failed to save your desktop state"; + showMessageService.Text = "Unable to save your desktop state."; showMessageService.ShowMessage(); }
--- a/Chronosv2/source/Presentation/Windows/IGroupable.cs Wed Mar 14 18:06:36 2012 +0700 +++ b/Chronosv2/source/Presentation/Windows/IGroupable.cs Thu Mar 15 06:59:15 2012 +0000 @@ -1,28 +1,4 @@ -/* -The MIT License - -Copyright (c) <2009> Carlos guzmán Álvarez - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ - -using System; +using System; namespace Chronos.Presentation.Windows {
--- a/Chronosv2/source/WidgetLibrary/WidgetItemViewModel.cs Wed Mar 14 18:06:36 2012 +0700 +++ b/Chronosv2/source/WidgetLibrary/WidgetItemViewModel.cs Thu Mar 15 06:59:15 2012 +0000 @@ -121,4 +121,4 @@ #endregion } -} +} \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/MetroWpf/MetroWpf.Xaml/Controls/PasswordBoxHelper.cs Thu Mar 15 06:59:15 2012 +0000 @@ -0,0 +1,100 @@ + +using System.Windows; +using System.Windows.Controls; + +namespace MetroWpf.Xaml.Controls +{ + /// <summary> + /// This class adds binding capabilities to the standard WPF PasswordBox. + /// </summary> + /// <remarks> + /// http://www.codeproject.com/Articles/37167/Binding-Passwords.aspx + /// </remarks> + public static class PasswordBoxHelper + { + #region · Static Members · + + private static bool IsUpdating = false; + + #endregion + + #region · Attached Properties · + + /// <summary> + /// BoundPassword Attached Dependency Property + /// </summary> + public static readonly DependencyProperty BoundPasswordProperty = + DependencyProperty.RegisterAttached("BoundPassword", + typeof(string), + typeof(PasswordBoxHelper), + new FrameworkPropertyMetadata(string.Empty, OnBoundPasswordChanged)); + + #endregion + + #region · Attached Property Get/Set Methods · + + /// <summary> + /// Gets the BoundPassword property. + /// </summary> + public static string GetBoundPassword(DependencyObject d) + { + return (string)d.GetValue(BoundPasswordProperty); + } + + /// <summary> + /// Sets the BoundPassword property. + /// </summary> + public static void SetBoundPassword(DependencyObject d, string value) + { + d.SetValue(BoundPasswordProperty, value); + } + + #endregion + + #region · Attached Properties Callbacks · + + /// <summary> + /// Handles changes to the BoundPassword property. + /// </summary> + private static void OnBoundPasswordChanged( + DependencyObject d, + DependencyPropertyChangedEventArgs e) + { + PasswordBox password = d as PasswordBox; + + if (password != null) + { + // Disconnect the handler while we're updating. + password.PasswordChanged -= PasswordChanged; + } + + if (e.NewValue != null) + { + if (!IsUpdating) + { + password.Password = e.NewValue.ToString(); + } + } + else + { + password.Password = string.Empty; + } + + // Now, reconnect the handler. + password.PasswordChanged += new RoutedEventHandler(PasswordChanged); + } + + /// <summary> + /// Handles the password change event. + /// </summary> + static void PasswordChanged(object sender, RoutedEventArgs e) + { + PasswordBox password = sender as PasswordBox; + IsUpdating = true; + SetBoundPassword(password, password.Password); + IsUpdating = false; + } + + #endregion + } +}
--- a/MetroWpf/MetroWpf.Xaml/MetroWpf.Xaml.csproj Wed Mar 14 18:06:36 2012 +0700 +++ b/MetroWpf/MetroWpf.Xaml/MetroWpf.Xaml.csproj Thu Mar 15 06:59:15 2012 +0000 @@ -50,6 +50,7 @@ <ItemGroup> <Compile Include="Adorners\NotesAdorner.cs" /> <Compile Include="Binding\BindingErrorTraceListener.cs" /> + <Compile Include="Controls\PasswordBoxHelper.cs" /> <Compile Include="Controls\WatermarkTextBox.cs" /> <Compile Include="Converters\AddConverter.cs" /> <Compile Include="Converters\AgeToReadableStringConverter.cs" />
--- a/MetroWpf/MetroWpf/Presentation/Login/LoginView.xaml Wed Mar 14 18:06:36 2012 +0700 +++ b/MetroWpf/MetroWpf/Presentation/Login/LoginView.xaml Thu Mar 15 06:59:15 2012 +0000 @@ -5,6 +5,7 @@ xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity" xmlns:PresentationOptions="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options" xmlns:converters="clr-namespace:MetroWpf.Xaml.Converters;assembly=MetroWpf.Xaml" + xmlns:c="clr-namespace:MetroWpf.Xaml.Controls;assembly=MetroWpf.Xaml" xmlns:controls="clr-namespace:Microsoft.Windows.Controls;assembly=MetroWpf.Xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" @@ -32,9 +33,9 @@ x:Name="BrandBar" Grid.Row="1" Fill="{DynamicResource BrandingBrush}" HorizontalAlignment="Left" VerticalAlignment="Bottom" - Width="100" Height="6" IsHitTestVisible="False" /> + Width="125" Height="6" IsHitTestVisible="False" /> - <TextBlock Grid.Row="2" FontSize="24" FontFamily="{DynamicResource HeaderFontFamily}"><Run>WELCOME</Run></TextBlock> + <TextBlock Grid.Row="2" FontSize="24" FontFamily="{DynamicResource HeaderFontFamily}"><Run>WELCOME TO OUR METRO WORLD</Run></TextBlock> <Grid Grid.Row="3"> @@ -65,13 +66,15 @@ HorizontalAlignment="Left" VerticalAlignment="Center" Width="220" MaxLength="50" Margin="3.5" /> - <!--chronos:PasswordBoxHelper.BoundPassword="{Binding Password, Mode=TwoWay, UpdateSourceTrigger=Default, ValidatesOnDataErrors=True}"--> + <PasswordBox Grid.Column="0" Grid.Row="1" + c:PasswordBoxHelper.BoundPassword="{Binding Password, Mode=TwoWay, UpdateSourceTrigger=Default, ValidatesOnDataErrors=True}" HorizontalAlignment="Left" VerticalAlignment="Center" Width="220" MaxLength="50" Margin="3.5" /> - <Button Grid.Column="1" Grid.Row="1" + <Button x:Name="btnLogin" + Grid.Column="1" Grid.Row="1" Margin="3.5" Content="SIGN IN" FontWeight="Bold"
--- a/MetroWpf/MetroWpf/Presentation/Login/LoginViewModel.cs Wed Mar 14 18:06:36 2012 +0700 +++ b/MetroWpf/MetroWpf/Presentation/Login/LoginViewModel.cs Thu Mar 15 06:59:15 2012 +0000 @@ -45,7 +45,7 @@ { this.userId = value; RaisePropertyChanged("UserId"); - //relay requery? + LoginCommand.RaiseCanExecuteChanged(); } } } @@ -63,7 +63,7 @@ { this.password = value; RaisePropertyChanged("Password"); - //relay requery? + LoginCommand.RaiseCanExecuteChanged(); } } }