X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fapplicationwindow.cpp;h=71e8a087d5618225543d37438e1e5b8c23986d53;hb=921bf050ffe5fc81a9ab377e634180e659ee5d5d;hp=72948f8a3907e6643201ecee05c6bb089f0c99b4;hpb=669a05b5a52bd759f0ea08772e0ed17222b015a0;p=architektonas

diff --git a/src/applicationwindow.cpp b/src/applicationwindow.cpp
index 72948f8..71e8a08 100644
--- a/src/applicationwindow.cpp
+++ b/src/applicationwindow.cpp
@@ -38,10 +38,16 @@
 #include "fileio.h"
 #include "generaltab.h"
 #include "layerwidget.h"
+#include "mirroraction.h"
 #include "painter.h"
+#include "rotateaction.h"
 #include "settingsdialog.h"
 
 
+// Class variables
+DrawingView * ApplicationWindow::drawing;
+
+
 ApplicationWindow::ApplicationWindow():
 	baseUnitInput(new QLineEdit),
 	dimensionSizeInput(new QLineEdit),
@@ -84,6 +90,8 @@ ApplicationWindow::ApplicationWindow():
 	ReadSettings();
 	setUnifiedTitleAndToolBarOnMac(true);
 	Object::SetFont(new QFont("Verdana", 15, QFont::Bold));
+
+	connect(lw, SIGNAL(LayerSelected(int)), drawing, SLOT(SetCurrentLayer(int)));
 }
 
 
@@ -243,6 +251,13 @@ void ApplicationWindow::RotateTool(void)
 }
 
 
+void ApplicationWindow::MirrorTool(void)
+{
+	ClearUIToolStatesExcept(mirrorAct);
+	SetInternalToolStates();
+}
+
+
 void ApplicationWindow::AddLineTool(void)
 {
 	ClearUIToolStatesExcept(addLineAct);
@@ -377,6 +392,9 @@ void ApplicationWindow::ClearUIToolStatesExcept(QAction * exception)
 
 	if (exception != rotateAct)
 		rotateAct->setChecked(false);
+
+	if (exception != mirrorAct)
+		mirrorAct->setChecked(false);
 }
 
 
@@ -384,7 +402,6 @@ void ApplicationWindow::SetInternalToolStates(void)
 {
 	Object::SetDeleteActive(deleteAct->isChecked());
 	Object::SetDimensionActive(addDimensionAct->isChecked());
-	drawing->SetRotateToolActive(rotateAct->isChecked());
 
 	// We can be sure that if we've come here, then either an active tool is
 	// being deactivated, or a new tool is being created. In either case, the
@@ -393,21 +410,20 @@ void ApplicationWindow::SetInternalToolStates(void)
 	{
 		delete drawing->toolAction;
 		drawing->toolAction = NULL;
+		Object::ignoreClicks = false;
 	}
 
-#if 0
-	drawing->SetAddLineToolActive(addLineAct->isChecked());
-	drawing->SetAddCircleToolActive(addCircleAct->isChecked());
-	drawing->SetAddArcToolActive(addArcAct->isChecked());
-	drawing->SetAddDimensionToolActive(addDimensionAct->isChecked());
-#else
 	drawing->SetToolActive(addLineAct->isChecked() ? new DrawLineAction() : NULL);
 	drawing->SetToolActive(addCircleAct->isChecked() ? new DrawCircleAction() : NULL);
 	drawing->SetToolActive(addArcAct->isChecked() ? new DrawArcAction() : NULL);
 	drawing->SetToolActive(addDimensionAct->isChecked() ? new DrawDimensionAction() : NULL);
-#endif
+	drawing->SetToolActive(mirrorAct->isChecked() ? new MirrorAction() : NULL);
+	drawing->SetToolActive(rotateAct->isChecked() ? new RotateAction() : NULL);
+
+	if (drawing->toolAction)
+		Object::ignoreClicks = true;
 
-	update();
+	drawing->update();
 }
 
 
@@ -605,6 +621,10 @@ void ApplicationWindow::CreateActions(void)
 
 	disconnectAct = CreateAction(tr("&Disconnect"), tr("Disconnect"), tr("Disconnect objects joined at point."), QIcon(":/res/disconnect-tool.png"), QKeySequence("d,d"));
 
+	mirrorAct = CreateAction(tr("&Mirror"), tr("Mirror"), tr("Mirror selected objects around a line."), QIcon(":/res/mirror-tool.png"), QKeySequence("m,i"), true);
+	connect(mirrorAct, SIGNAL(triggered()), this, SLOT(MirrorTool()));
+
+
 //Hm. I think we'll have to have separate logic to do the "Radio Group Toolbar" thing...
 // Yup, in order to turn them off, we'd have to have an "OFF" toolbar button. Ick.
 /*	QActionGroup * group = new QActionGroup(this);
@@ -673,6 +693,7 @@ void ApplicationWindow::CreateMenus(void)
 	menu->addAction(fixAngleAct);
 	menu->addAction(fixLengthAct);
 	menu->addAction(rotateAct);
+	menu->addAction(mirrorAct);
 	menu->addAction(connectAct);
 	menu->addAction(disconnectAct);
 	menu->addSeparator();
@@ -720,6 +741,7 @@ void ApplicationWindow::CreateToolbars(void)
 	toolbar->addAction(fixAngleAct);
 	toolbar->addAction(fixLengthAct);
 	toolbar->addAction(rotateAct);
+	toolbar->addAction(mirrorAct);
 	toolbar->addAction(deleteAct);
 	toolbar->addAction(connectAct);
 	toolbar->addAction(disconnectAct);