X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fapplicationwindow.cpp;h=83dbd54bd1b86f20bc82964473e6641f5900f725;hb=4b37ccbdf263a4798e53a62e33d869a728ace283;hp=8220a0eeca1138d6523c884ae70b26c828f92980;hpb=428876081ee41d40e32f5b4f2bfcfdb7a835e6e1;p=architektonas

diff --git a/src/applicationwindow.cpp b/src/applicationwindow.cpp
index 8220a0e..83dbd54 100644
--- a/src/applicationwindow.cpp
+++ b/src/applicationwindow.cpp
@@ -43,6 +43,10 @@
 #include "settingsdialog.h"
 
 
+// Class variables
+DrawingView * ApplicationWindow::drawing;
+
+
 ApplicationWindow::ApplicationWindow():
 	baseUnitInput(new QLineEdit),
 	dimensionSizeInput(new QLineEdit),
@@ -85,6 +89,8 @@ ApplicationWindow::ApplicationWindow():
 	ReadSettings();
 	setUnifiedTitleAndToolBarOnMac(true);
 	Object::SetFont(new QFont("Verdana", 15, QFont::Bold));
+
+	connect(lw, SIGNAL(LayerSelected(int)), drawing, SLOT(SetCurrentLayer(int)));
 }
 
 
@@ -404,6 +410,7 @@ void ApplicationWindow::SetInternalToolStates(void)
 	{
 		delete drawing->toolAction;
 		drawing->toolAction = NULL;
+		Object::ignoreClicks = false;
 	}
 
 #if 0
@@ -419,6 +426,9 @@ void ApplicationWindow::SetInternalToolStates(void)
 	drawing->SetToolActive(mirrorAct->isChecked() ? new MirrorAction() : NULL);
 #endif
 
+	if (drawing->toolAction)
+		Object::ignoreClicks = true;
+
 	update();
 }