changeset 153:87fda1e6d4d3

* Merge accidental new head
author IBBoard <dev@ibboard.co.uk>
date Tue, 08 May 2012 21:01:57 +0100
parents b612d7137f4d 83b19b57cba1
children c549fd4ff4bf
files
diffstat 1 files changed, 8 insertions(+), 4 deletions(-) [+]
line diff
     1.1 --- a/FrmMainWindow.cs	Tue May 08 21:00:24 2012 +0100
     1.2 +++ b/FrmMainWindow.cs	Tue May 08 21:01:57 2012 +0100
     1.3 @@ -1,7 +1,6 @@
     1.4  // This file (FrmMainWindow.cs) is a part of the IBBoard.WarFoundry.GTK project and is copyright 2008, 2009 IBBoard.
     1.5  //
     1.6  // The file and the library/program it is in are licensed and distributed, without warranty, under the GNU Affero GPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license.
     1.7 -
     1.8  using System;
     1.9  using System.Collections;
    1.10  using System.Collections.Generic;
    1.11 @@ -509,6 +508,11 @@
    1.12  			if (system != null)
    1.13  			{
    1.14  				AddCategoryButtons(system.Categories);
    1.15 +				logger.DebugFormat("Game system set to {0} with ID {1}", system.Name, system.ID);
    1.16 +			}
    1.17 +			else
    1.18 +			{
    1.19 +				logger.Debug("Game system set to null");
    1.20  			}
    1.21  		}
    1.22  
    1.23 @@ -572,12 +576,12 @@
    1.24  			SetStatusBarText();
    1.25  		}
    1.26  
    1.27 -		private void OnArmyNameChanged (WarFoundryObject obj, string oldValue, string newValue)
    1.28 +		private void OnArmyNameChanged(WarFoundryObject obj, string oldValue, string newValue)
    1.29  		{
    1.30  			SetAppTitle();
    1.31  		}
    1.32  
    1.33 -		private void OnMaxPointsValueChanged (WarFoundryObject obj, int oldValue, int newValue)
    1.34 +		private void OnMaxPointsValueChanged(WarFoundryObject obj, int oldValue, int newValue)
    1.35  		{
    1.36  			SetStatusBarText();
    1.37  		}
    1.38 @@ -983,7 +987,7 @@
    1.39  				}
    1.40  				else
    1.41  				{
    1.42 -					MessageDialog dialog = new MessageDialog(this, DialogFlags.Modal, MessageType.Error, ButtonsType.Ok,  Translation.GetTranslation("SaveFailed", "File save failed. Please check log file"));
    1.43 +					MessageDialog dialog = new MessageDialog(this, DialogFlags.Modal, MessageType.Error, ButtonsType.Ok, Translation.GetTranslation("SaveFailed", "File save failed. Please check log file"));
    1.44  					dialog.Title = Translation.GetTranslation("SaveFailedTitle", "File save failed");
    1.45  					dialog.Run();
    1.46  					dialog.Hide();