Code more readable

yuyuvn · May 26, 2015 · bec5826 · bec5826
1 parent 7c6441d
commit bec5826
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 31 deletions.
diff --git a/Grabacr07.KanColleViewer/ViewModels/MainWindowViewModel.cs b/Grabacr07.KanColleViewer/ViewModels/MainWindowViewModel.cs
@@ -29,7 +29,7 @@ public class MainWindowViewModel : WindowViewModel
 		private ICommand _RefreshNavigator;
 		public ICommand  RefreshNavigator
 		{
-			get { return _RefreshNavigator; }
+			get { return this._RefreshNavigator; }
 		}
 
 		#endregion
@@ -55,7 +55,7 @@ public Mode Mode
 						StatusService.Current.Set(Properties.Resources.StatusBar_Ready);
 						ThemeService.Current.ChangeAccent(Accent.Blue);
 						if (KanColleClient.Current.Homeport != null)
-							KanColleClient.Current.Homeport.Logger.EnableLogging = Settings.EnableLogging;
+							KanColleClient.Current.Homeport.Logger.EnableLogging = this.Settings.EnableLogging;
 						break;
 					case Mode.InSortie:
 						ThemeService.Current.ChangeAccent(Accent.Orange);
@@ -183,12 +183,12 @@ public MainWindowViewModel()
 			this.UpdateCloseConfirm();
 			this.CompositeDisposable.Add(new PropertyChangedEventListener(Setting.Current)
 			{
-				{ "CloseConfirm", (sender, args) => UpdateCloseConfirm() },
-				{ "CloseConfirmOnlyInSortie", (sender, args) => UpdateCloseConfirm() },
+				{ "CloseConfirm", (sender, args) => this.UpdateCloseConfirm() },
+				{ "CloseConfirmOnlyInSortie", (sender, args) => this.UpdateCloseConfirm() },
 			});
 
 
-			_RefreshNavigator = new RelayCommand(Navigator.ReNavigate);
+			this._RefreshNavigator = new RelayCommand(this.Navigator.ReNavigate);
 			this.UpdateMode();
 		}
 
@@ -222,7 +222,7 @@ private void UpdateMode()
 					? Mode.InSortie
 					: Mode.Started
 				: Mode.NotStarted;
-			UpdateCloseConfirm();
+			this.UpdateCloseConfirm();
 		}
 
 		private void UpdateCloseConfirm()
@@ -234,20 +234,15 @@ private void UpdateCloseConfirm()
 			}
 		}
 
-		public void Closing()
+		public void Close()
 		{
-			if (!this.CanClose)
-			{
-				var message = new TransitionMessage(this, "Show/ExitDialog");
-				this.Messenger.Raise(message);
-			}
+			this.Messenger.Raise(new TransitionMessage(this, "Show/ExitDialog"));
 		}
 
-		public void Close()
+		public void ForceClose()
 		{
 			this.CanClose = true;
-			var message = new TransitionMessage(this, "Close");
-			this.Messenger.Raise(message);
+			this.Messenger.Raise(new WindowActionMessage(WindowAction.Close, "Window/Close"));
 		}
 	}
 }
diff --git a/Grabacr07.KanColleViewer/Views/ExitDialog.xaml b/Grabacr07.KanColleViewer/Views/ExitDialog.xaml
@@ -18,11 +18,9 @@
 				   d:DataContext="{d:DesignInstance viewModels:MainWindowViewModel}"
 				   Style="{DynamicResource MetroDialogStyleKey}"
 				   Background="{DynamicResource ThemeBrushKey}"
-				   Foreground="{DynamicResource ActiveForegroundBrushKey}"
 				   Title="{Binding Resources.ExitDialogTitle, Source={x:Static models:ResourceService.Current}, Mode=OneWay}"
 				   WindowStartupLocation="CenterScreen"
-				   SizeToContent="Height"
-				   Name="WindowNameTobeClose">
+				   SizeToContent="Height">
 	<Grid>
 		<Grid.RowDefinitions>
 			<RowDefinition />
@@ -45,7 +43,7 @@
 									 MinWidth="100"
 									 Padding="20,5"
 									 Margin="12,0,0,0" 
-									 MethodName="Close" />
+									 MethodName="ForceClose" />
 			<metro2:CallMethodButton Content="Cancel"
 									 MinWidth="100"
 									 Padding="20,5"

diff --git a/Grabacr07.KanColleViewer/Views/MainWindow.xaml b/Grabacr07.KanColleViewer/Views/MainWindow.xaml
@@ -58,27 +58,22 @@
 										 MessageKey="Window/Activate">
 			<livet:WindowInteractionMessageAction />
 		</livet:InteractionMessageTrigger>
-		<i:EventTrigger EventName="Closing">
-			<livet:LivetCallMethodAction MethodTarget="{Binding}" MethodName="Closing"/>
-		</i:EventTrigger>
+		<livet:InteractionMessageTrigger Messenger="{Binding Messenger, Mode=OneWay}"
+										 MessageKey="Window/Close">
+			<livet:WindowInteractionMessageAction />
+		</livet:InteractionMessageTrigger>
 		<livet:InteractionMessageTrigger Messenger="{Binding Messenger, Mode=OneWay}"
 										 MessageKey="Show/ExitDialog">
 			<livet:TransitionInteractionMessageAction Mode="NewOrActive"
 													  WindowType="views:ExitDialog"
 													  IsOwned="True" />
 		</livet:InteractionMessageTrigger>
-		<livet:InteractionMessageTrigger Messenger="{Binding Messenger, Mode=OneWay}"
-										 MessageKey="Close">
-			<livet:WindowInteractionMessageAction>
-				<livet:DirectInteractionMessage>
-					<livet:WindowActionMessage />
-				</livet:DirectInteractionMessage>
-			</livet:WindowInteractionMessageAction>
-		</livet:InteractionMessageTrigger>
 	</i:Interaction.Triggers>
 
 	<i:Interaction.Behaviors>
-		<livet:WindowCloseCancelBehavior CanClose="{Binding CanClose, Mode=OneWay}" />
+		<livet:WindowCloseCancelBehavior CanClose="{Binding CanClose, Mode=OneWay}" 
+										 CloseCanceledCallbackMethodTarget="{Binding}"
+										 CloseCanceledCallbackMethodName="Close"/>
 	</i:Interaction.Behaviors>
 	<Grid>
 		<Grid.RowDefinitions>