From f899a72a85641ade07403e4cfc86bf11bde81e93 Mon Sep 17 00:00:00 2001
From: "Crom (Thibaut CHARLES)" <crom29@hotmail.fr>
Date: Fri, 13 Mar 2015 09:58:17 +0100
Subject: [PATCH] Cleaning & better dialogs

---
 source/window.d | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/source/window.d b/source/window.d
index 8e94ffd..d4c7801 100644
--- a/source/window.d
+++ b/source/window.d
@@ -115,7 +115,6 @@ class Window : MainWindow{
 			save(tree);
 		});
 		buttonSaveAs.addOnClicked((Button){
-			import gtk.Dialog;
 			import gtk.FileChooserDialog;
 
 			auto fc = new FileChooserDialog("Save 2DA as", window, FileChooserAction.SAVE);
@@ -131,18 +130,17 @@ class Window : MainWindow{
 		});
 
 		buttonOpen.addOnClicked((Button){
-			import gtk.Dialog;
 			import gtk.FileChooserDialog;
 
 			auto fc = new FileChooserDialog("Open 2DA", window, FileChooserAction.OPEN);
 			fc.setSelectMultiple(false);
 			fc.setCurrentFolder(openedFile!=""? dirName(openedFile) : getcwd());
 			auto res = fc.run();
-			if(res==GtkResponseType.OK){
-				string filename = fc.getFilename();
-				open(filename, tree);
-			}
+			string filename = fc.getFilename();
 			fc.destroy();
+			if(res==GtkResponseType.OK)
+				open(filename, tree);
+
 		});
 
 		buttonInsert.addOnClicked((Button){
@@ -187,10 +185,10 @@ class Window : MainWindow{
 			int newColIndex = oldstore.getNColumns();
 
 
-				foreach(i ; 0..tree.getNColumns){
-					auto col = tree.getColumn(i);
-					writeln("col",i,"=",col, "(", col is null? "" : col.getTitle, ")");
-				}
+			foreach(i ; 0..tree.getNColumns){
+				auto col = tree.getColumn(i);
+				writeln("col",i,"=",col, "(", col is null? "" : col.getTitle, ")");
+			}
 			
 
 			GType[] types;