# HG changeset patch
# User stevenh7776 stevenhollidge@hotmail.com
# Date 1329825570 -25200
# Node ID 741981715d945b09c2bc88bab2ff9202272ba91c
# Parent 87905693f506974876ae89b6adc2dc97e9051e8a
Initial review and translations
diff -r 87905693f506 -r 741981715d94 Chronosv2/source/App.xaml.cs
--- a/Chronosv2/source/App.xaml.cs Tue Feb 21 17:49:06 2012 +0700
+++ b/Chronosv2/source/App.xaml.cs Tue Feb 21 18:59:30 2012 +0700
@@ -141,7 +141,7 @@
private void OnDispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
{
- Logger.ErrorException("Excepción no manejada", e.Exception);
+ Logger.ErrorException("Unhandled Exception", e.Exception);
e.Handled = true;
}
diff -r 87905693f506 -r 741981715d94 Chronosv2/source/ApplicationStateObserver.cs
--- a/Chronosv2/source/ApplicationStateObserver.cs Tue Feb 21 17:49:06 2012 +0700
+++ b/Chronosv2/source/ApplicationStateObserver.cs Tue Feb 21 18:59:30 2012 +0700
@@ -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 System;
using System.Windows;
using System.Windows.Shell;
diff -r 87905693f506 -r 741981715d94 Chronosv2/source/Authentication/AuthenticationAction.cs
--- a/Chronosv2/source/Authentication/AuthenticationAction.cs Tue Feb 21 17:49:06 2012 +0700
+++ b/Chronosv2/source/Authentication/AuthenticationAction.cs Tue Feb 21 18:59:30 2012 +0700
@@ -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.
-*/
-
-
-namespace Chronos.Authentication
+namespace Chronos.Authentication
{
///
/// Authentication actions
diff -r 87905693f506 -r 741981715d94 Chronosv2/source/Authentication/AuthenticationInfo.cs
--- a/Chronosv2/source/Authentication/AuthenticationInfo.cs Tue Feb 21 17:49:06 2012 +0700
+++ b/Chronosv2/source/Authentication/AuthenticationInfo.cs Tue Feb 21 18:59:30 2012 +0700
@@ -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.
-*/
-
-namespace Chronos.Authentication
+namespace Chronos.Authentication
{
///
/// Provides information about an information action
diff -r 87905693f506 -r 741981715d94 Chronosv2/source/Authentication/AuthenticationObserver.cs
--- a/Chronosv2/source/Authentication/AuthenticationObserver.cs Tue Feb 21 17:49:06 2012 +0700
+++ b/Chronosv2/source/Authentication/AuthenticationObserver.cs Tue Feb 21 18:59:30 2012 +0700
@@ -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.Tasks;
using Chronos.Authentication;
using Chronos.Modules.Navigation;
@@ -76,19 +52,19 @@
switch (value.Action)
{
case AuthenticationAction.LogOn:
- Logger.Debug("Autenticación del usuario");
+ Logger.Debug("User Authentication");
ServiceLocator.GetService()
.Navigate(NavigateMode.Modal, NavigationRoutes.Login);
break;
case AuthenticationAction.LoggedIn:
- Logger.Debug("Usuario autenticado correctamente");
+ Logger.Debug("Properly authenticated user");
ServiceLocator.GetService()
.ActivateDefaultDesktop();
break;
case AuthenticationAction.LogOut:
- Logger.Debug("Cerrando sesión");
+ Logger.Debug("Logging out");
Task t = Task.Factory.StartNew
(
() =>
diff -r 87905693f506 -r 741981715d94 Chronosv2/source/Main.cs
--- a/Chronosv2/source/Main.cs Tue Feb 21 17:49:06 2012 +0700
+++ b/Chronosv2/source/Main.cs Tue Feb 21 18:59:30 2012 +0700
@@ -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 NLog;
namespace Chronos
diff -r 87905693f506 -r 741981715d94 Chronosv2/source/NLog.config
--- a/Chronosv2/source/NLog.config Tue Feb 21 17:49:06 2012 +0700
+++ b/Chronosv2/source/NLog.config Tue Feb 21 18:59:30 2012 +0700
@@ -9,7 +9,7 @@
-
+
\ No newline at end of file
diff -r 87905693f506 -r 741981715d94 Chronosv2/source/Services/WidgetConfigurationService.cs
--- a/Chronosv2/source/Services/WidgetConfigurationService.cs Tue Feb 21 17:49:06 2012 +0700
+++ b/Chronosv2/source/Services/WidgetConfigurationService.cs Tue Feb 21 18:59:30 2012 +0700
@@ -1,12 +1,12 @@
using System;
using System.Collections.Generic;
+using System.Configuration;
using Chronos.Configuration;
using Chronos.Presentation.Core.Configuration;
using Chronos.Presentation.Core.Widgets;
using NLog;
using nRoute.Components.Composition;
using nRoute.Services;
-using System.Configuration;
namespace Chronos.Services
{
diff -r 87905693f506 -r 741981715d94 Chronosv2/source/Shell.xaml.cs
--- a/Chronosv2/source/Shell.xaml.cs Tue Feb 21 17:49:06 2012 +0700
+++ b/Chronosv2/source/Shell.xaml.cs Tue Feb 21 18:59:30 2012 +0700
@@ -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.Input;
using Chronos.Interop;
diff -r 87905693f506 -r 741981715d94 Chronosv2/source/SingleInstance.cs
--- a/Chronosv2/source/SingleInstance.cs Tue Feb 21 17:49:06 2012 +0700
+++ b/Chronosv2/source/SingleInstance.cs Tue Feb 21 18:59:30 2012 +0700
@@ -1,18 +1,15 @@
-namespace Chronos
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.Remoting;
+using System.Runtime.Remoting.Channels;
+using System.Runtime.Remoting.Channels.Ipc;
+using System.Runtime.Serialization.Formatters;
+using System.Threading;
+using System.Windows;
+
+namespace Chronos
{
- using System;
- using System.Collections.Generic;
- using System.Diagnostics.CodeAnalysis;
- using System.Runtime.Remoting;
- using System.Runtime.Remoting.Channels;
- using System.Runtime.Remoting.Channels.Ipc;
- using System.Runtime.Serialization.Formatters;
- using System.Threading;
- using System.Windows;
-
- ///
- /// http://www.fishbowlclient.com/
- ///
public static class SingleInstance
{
#region · Consts ·
diff -r 87905693f506 -r 741981715d94 Chronosv2/source/SingleInstanceEventArgs.cs
--- a/Chronosv2/source/SingleInstanceEventArgs.cs Tue Feb 21 17:49:06 2012 +0700
+++ b/Chronosv2/source/SingleInstanceEventArgs.cs Tue Feb 21 18:59:30 2012 +0700
@@ -3,9 +3,6 @@
namespace Chronos
{
- ///
- /// http://www.fishbowlclient.com/
- ///
public sealed class SingleInstanceEventArgs
: EventArgs
{
diff -r 87905693f506 -r 741981715d94 Chronosv2/source/ViewModel/AboutViewModel.cs
--- a/Chronosv2/source/ViewModel/AboutViewModel.cs Tue Feb 21 17:49:06 2012 +0700
+++ b/Chronosv2/source/ViewModel/AboutViewModel.cs Tue Feb 21 18:59:30 2012 +0700
@@ -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.Deployment.Application;
using System.Reflection;
using Chronos.Presentation.Core.VirtualDesktops;
diff -r 87905693f506 -r 741981715d94 Chronosv2/source/ViewModel/ShellViewModel.cs
--- a/Chronosv2/source/ViewModel/ShellViewModel.cs Tue Feb 21 17:49:06 2012 +0700
+++ b/Chronosv2/source/ViewModel/ShellViewModel.cs Tue Feb 21 18:59:30 2012 +0700
@@ -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.IO;
using System.Linq;
@@ -38,7 +14,6 @@
using Chronos.Presentation.Core.VirtualDesktops;
using Chronos.Presentation.ViewModel;
using Chronos.Presentation.Windows;
-using Chronos.Presentation.Windows.Navigation;
using Chronos.WidgetLibrary;
using NLog;
using nRoute.Components;
@@ -300,7 +275,7 @@
///
public string UserName
{
- get { return (!String.IsNullOrEmpty(this.userName) ? this.userName : "Sesión no iniciada"); }
+ get { return (!String.IsNullOrEmpty(this.userName) ? this.userName : "Not logged in"); }
private set
{
this.userName = value;
@@ -370,7 +345,7 @@
///
private void OnShutdown()
{
- Logger.Debug("Finalizando la sesión");
+ Logger.Debug("Ending the session");
Application.Current.Shutdown();
}
@@ -397,7 +372,7 @@
this.WindowState = WindowState.Maximized;
}
- Logger.Debug("Cambiado el estado de la ventana principal de la aplicación ({0})", this.WindowState);
+ Logger.Debug("Changed the status of the main application window ({0})", this.WindowState);
}
///
@@ -420,7 +395,7 @@
private void InitializeObservers()
{
- Logger.Debug("Inicializando observers de nroute");
+ Logger.Debug("Starting observers of nRoute");
// Authentication Observer
this.authenticationObserver = new ChannelObserver(
@@ -468,14 +443,14 @@
private void OnActiveDesktopChanged(ActiveDesktopChangedInfo info)
{
- Logger.Debug("Cambiando el escritorio activo");
+ Logger.Debug("Changing the Active Desktop");
this.NotifyPropertyChanged(() => ActiveWindows);
}
private void OnNavigated(NavigatedInfo info)
{
- Logger.Debug("Navegación finalizada correctamente ({0})", info.Request.RequestUrl);
+ Logger.Debug("Navigation completed successfully ({0})", info.Request.RequestUrl);
this.CreateRecentNavigationEntry(info);
}
diff -r 87905693f506 -r 741981715d94 Chronosv2/source/WidgetLibrary/WidgetLibraryViewModel.cs
--- a/Chronosv2/source/WidgetLibrary/WidgetLibraryViewModel.cs Tue Feb 21 17:49:06 2012 +0700
+++ b/Chronosv2/source/WidgetLibrary/WidgetLibraryViewModel.cs Tue Feb 21 18:59:30 2012 +0700
@@ -3,13 +3,11 @@
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Linq;
-using System.Windows.Input;
using Chronos.Presentation.Core.Configuration;
using Chronos.Presentation.Core.VirtualDesktops;
using Chronos.Presentation.Core.Widgets;
using Chronos.Presentation.Core.Windows;
using Chronos.Presentation.ViewModel;
-using NLog;
using nRoute.Components;
namespace Chronos.WidgetLibrary