changeset 16:d211d01efa44

Re #242: Create Qt# UI for WarFoundry * Fix MonoDevelop's annoying auto-formatting * Remove debugging "true" from IF condition
author IBBoard <dev@ibboard.co.uk>
date Sat, 13 Feb 2010 19:45:08 +0000
parents 03ed32fdc706
children 8f9f757f2099
files MainWindow.cs
diffstat 1 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/MainWindow.cs	Sat Feb 13 12:02:14 2010 +0000
+++ b/MainWindow.cs	Sat Feb 13 19:45:08 2010 +0000
@@ -62,18 +62,18 @@
 			layout.actionAbout.icon = new QIcon("icons/ui/help-about.png");
 		}
 		
-		private void ConnectMenuActions ()
+		private void ConnectMenuActions()
 		{
-			ConnectMenuAction (layout.actionCreateArmy, CreateNewArmy);
-			ConnectMenuAction (layout.actionUndo, UndoAction);
-			ConnectMenuAction (layout.actionRedo,RedoAction);
-			ConnectMenuAction (layout.actionSaveArmyAs, DoSaveCurrentArmyAs);
-			ConnectMenuAction (layout.actionSaveArmy, DoSaveCurrentArmy);
-			ConnectMenuAction (layout.actionCloseArmy, DoCloseArmy);
-			ConnectMenuAction (layout.actionOpenArmy, DoOpenArmy);
+			ConnectMenuAction(layout.actionCreateArmy, CreateNewArmy);
+			ConnectMenuAction(layout.actionUndo, UndoAction);
+			ConnectMenuAction(layout.actionRedo,RedoAction);
+			ConnectMenuAction(layout.actionSaveArmyAs, DoSaveCurrentArmyAs);
+			ConnectMenuAction(layout.actionSaveArmy, DoSaveCurrentArmy);
+			ConnectMenuAction(layout.actionCloseArmy, DoCloseArmy);
+			ConnectMenuAction(layout.actionOpenArmy, DoOpenArmy);
 		}
 		
-		private void ConnectMenuAction (QAction menuAction, SlotFunc method)
+		private void ConnectMenuAction(QAction menuAction, SlotFunc method)
 		{
 			QObject.Connect(menuAction, SIGNAL("triggered()"), method);
 		}
@@ -484,7 +484,7 @@
 				log.Debug("Closing "+CurrentArmy.Name);
 				bool canClose = false;
 
-				if (CommandStack.IsDirty() || true)
+				if (CommandStack.IsDirty())
 				{
 					log.Debug("Unsaved changes");
 					string saveChanges = Translation.GetTranslation("SaveChangesQuestion", "the army \"{0}\" has been modified\r\nsave changes before closing army?", CurrentArmy.Name);