X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fapplicationwindow.cpp;h=36c256fb588fb789a7d968f39c84da871c34d8f0;hb=4cb2b99e799d81dc8f589c54fb81fe20ef9ec2ad;hp=23374171066c7ac90c2aa9f4d5e87ca641b777cf;hpb=fc498c685147e3173130e2df8953cc52705553e9;p=architektonas

diff --git a/src/applicationwindow.cpp b/src/applicationwindow.cpp
index 2337417..36c256f 100644
--- a/src/applicationwindow.cpp
+++ b/src/applicationwindow.cpp
@@ -5,7 +5,7 @@
 // (C) 2011 Underground Software
 // See the README and GPLv3 files for licensing and warranty information
 //
-// JLH = James L. Hammons <jlhamm@acm.org>
+// JLH = James Hammons <jlhamm@acm.org>
 //
 // Who  When        What
 // ---  ----------  -------------------------------------------------------------
@@ -88,28 +88,36 @@ void ApplicationWindow::FixLength(void)
 	Object::SetFixedLength(fixLengthAct->isChecked());
 }
 
+// We want certain tools to be exclusive, and this approach isn't working correctly...
 void ApplicationWindow::DeleteTool(void)
 {
-	Object::SetDeleteActive(deleteAct->isChecked());
+	
+	ClearUIToolStatesExcept(deleteAct);
+	SetInternalToolStates();
 }
 
 void ApplicationWindow::DimensionTool(void)
 {
-	Object::SetDimensionActive(addDimensionAct->isChecked());
+	ClearUIToolStatesExcept(addDimensionAct);
+	SetInternalToolStates();
 }
 
 void ApplicationWindow::RotateTool(void)
 {
-	drawing->SetRotateToolActive(rotateAct->isChecked());
+	ClearUIToolStatesExcept(rotateAct);
+	SetInternalToolStates();
 }
 
 void ApplicationWindow::AddLineTool(void)
 {
-	addCircleAct->setChecked(false);
-	addArcAct->setChecked(false);
-	rotateAct->setChecked(false);
-	RotateTool();
-	drawing->SetAddLineToolActive(addLineAct->isChecked());
+	ClearUIToolStatesExcept(addLineAct);
+	SetInternalToolStates();
+}
+
+void ApplicationWindow::AddCircleTool(void)
+{
+	ClearUIToolStatesExcept(addCircleAct);
+	SetInternalToolStates();
 }
 
 void ApplicationWindow::ZoomInTool(void)
@@ -175,6 +183,39 @@ x 2 = (-426, -301)
 	drawing->update();
 }
 
+void ApplicationWindow::ClearUIToolStatesExcept(QAction * exception)
+{
+	if (exception != addArcAct)
+		addArcAct->setChecked(false);
+
+	if (exception != addCircleAct)
+		addCircleAct->setChecked(false);
+
+	if (exception != addDimensionAct)
+		addDimensionAct->setChecked(false);
+
+	if (exception != addLineAct)
+		addLineAct->setChecked(false);
+
+	if (exception != addPolygonAct)
+		addPolygonAct->setChecked(false);
+
+	if (exception != deleteAct)
+		deleteAct->setChecked(false);
+
+	if (exception != rotateAct)
+		rotateAct->setChecked(false);
+}
+
+void ApplicationWindow::SetInternalToolStates(void)
+{
+	Object::SetDeleteActive(deleteAct->isChecked());
+	Object::SetDimensionActive(addDimensionAct->isChecked());
+	drawing->SetRotateToolActive(rotateAct->isChecked());
+	drawing->SetAddLineToolActive(addLineAct->isChecked());
+	drawing->SetAddCircleToolActive(addCircleAct->isChecked());
+}
+
 void ApplicationWindow::HelpAbout(void)
 {
 	aboutWin->show();
@@ -207,23 +248,26 @@ void ApplicationWindow::CreateActions(void)
 		QIcon(":/res/fix-length.png"), QKeySequence(tr("F,L")), true);
 	connect(fixLengthAct, SIGNAL(triggered()), this, SLOT(FixLength()));
 
-	deleteAct = CreateAction(tr("&Delete"), tr("Delete Object"), tr("Deletes selected objects."), QIcon(":/res/generic-tool.png"), QKeySequence(), true);
+	deleteAct = CreateAction(tr("&Delete"), tr("Delete Object"), tr("Deletes selected objects."), QIcon(":/res/delete-tool.png"), QKeySequence(), true);
 	connect(deleteAct, SIGNAL(triggered()), this, SLOT(DeleteTool()));
 
 	addDimensionAct = CreateAction(tr("Add &Dimension"), tr("Add Dimension"), tr("Adds a dimension to the drawing."), QIcon(":/res/dimension-tool.png"), QKeySequence("D,I"), true);
 	connect(addDimensionAct, SIGNAL(triggered()), this, SLOT(DimensionTool()));
 
-	addLineAct = CreateAction(tr("Add &Line"), tr("Add Line"), tr("Adds lines to the drawing."), QIcon(":/res/generic-tool.png"), QKeySequence("A,L"), true);
+	addLineAct = CreateAction(tr("Add &Line"), tr("Add Line"), tr("Adds lines to the drawing."), QIcon(":/res/add-line-tool.png"), QKeySequence("A,L"), true);
 	connect(addLineAct, SIGNAL(triggered()), this, SLOT(AddLineTool()));
 
-	addCircleAct = CreateAction(tr("Add &Circle"), tr("Add Circle"), tr("Adds circles to the drawing."), QIcon(":/res/generic-tool.png"), QKeySequence("A,C"), true);
+	addCircleAct = CreateAction(tr("Add &Circle"), tr("Add Circle"), tr("Adds circles to the drawing."), QIcon(":/res/add-circle-tool.png"), QKeySequence("A,C"), true);
+	connect(addCircleAct, SIGNAL(triggered()), this, SLOT(AddCircleTool()));
+
+	addArcAct = CreateAction(tr("Add &Arc"), tr("Add Arc"), tr("Adds arcs to the drawing."), QIcon(":/res/add-arc-tool.png"), QKeySequence("A,A"), true);
 
-	addArcAct = CreateAction(tr("Add &Arc"), tr("Add Arc"), tr("Adds arcs to the drawing."), QIcon(":/res/generic-tool.png"), QKeySequence("A,A"), true);
+	addPolygonAct = CreateAction(tr("Add &Polygon"), tr("Add Polygon"), tr("Add polygons to the drawing."), QIcon(":/res/add-polygon-tool.png"), QKeySequence("A,P"), true);
 
 	aboutAct = CreateAction(tr("About &Architektonas"), tr("About Architektonas"), tr("Gives information about this program."), QIcon(":/res/generic-tool.png"), QKeySequence());
 	connect(aboutAct, SIGNAL(triggered()), this, SLOT(HelpAbout()));
 
-	rotateAct = CreateAction(tr("&Rotate Objects"), tr("Rotate"), tr("Rotate object(s) around an arbitrary center."), QIcon(":/res/generic-tool.png"), QKeySequence(tr("R,O")), true);
+	rotateAct = CreateAction(tr("&Rotate Objects"), tr("Rotate"), tr("Rotate object(s) around an arbitrary center."), QIcon(":/res/rotate-tool.png"), QKeySequence(tr("R,O")), true);
 	connect(rotateAct, SIGNAL(triggered()), this, SLOT(RotateTool()));
 
 	zoomInAct = CreateAction(tr("Zoom &In"), tr("Zoom In"), tr("Zoom in on the document."), QIcon(":/res/zoom-in.png"), QKeySequence(tr("+")), QKeySequence(tr("=")));
@@ -313,6 +357,7 @@ void ApplicationWindow::CreateMenus(void)
 	menu->addAction(addLineAct);
 	menu->addAction(addCircleAct);
 	menu->addAction(addArcAct);
+	menu->addAction(addPolygonAct);
 	menu->addAction(addDimensionAct);
 	menu->addSeparator();
 	menu->addAction(settingsAct);
@@ -338,6 +383,7 @@ void ApplicationWindow::CreateToolbars(void)
 	toolbar->addAction(addLineAct);
 	toolbar->addAction(addCircleAct);
 	toolbar->addAction(addArcAct);
+	toolbar->addAction(addPolygonAct);
 	toolbar->addAction(addDimensionAct);
 }