X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fapplicationwindow.cpp;h=77767f0610ae2a32b9d2df941a48f1db2e97f5b1;hb=f3110724be7ad4d4e8c6b97d350ff8af7fbf3799;hp=a9c7fb6b25c64e1451beb26ed35f41775a58a511;hpb=baf67656b97e3d61e9223e66ebe4f554e364cd4a;p=architektonas

diff --git a/src/applicationwindow.cpp b/src/applicationwindow.cpp
index a9c7fb6..77767f0 100644
--- a/src/applicationwindow.cpp
+++ b/src/applicationwindow.cpp
@@ -118,6 +118,7 @@ void ApplicationWindow::FileOpen(void)
 		return;
 	}
 
+printf("FileOpen: container size = %li\n", container.objects.size());
 	drawing->document = container;
 	drawing->update();
 	documentName = filename;
@@ -196,7 +197,17 @@ void ApplicationWindow::FixLength(void)
 // We want certain tools to be exclusive, and this approach isn't working correctly...
 void ApplicationWindow::DeleteTool(void)
 {
-	
+	// For this tool, we check first to see if anything is selected. If so, we
+	// delete those and *don't* select the delete tool.
+	if (drawing->document.ItemsSelected() > 0)
+	{
+		drawing->document.DeleteSelectedItems();
+		drawing->update();
+		deleteAct->setChecked(false);
+		return;
+	}
+
+	// Otherwise, toggle the state of the tool
 	ClearUIToolStatesExcept(deleteAct);
 	SetInternalToolStates();
 }
@@ -345,8 +356,19 @@ 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
+	// old tool needs to be deleted.
+	if (drawing->toolAction)
+	{
+		delete drawing->toolAction;
+		drawing->toolAction = NULL;
+	}
+
 	drawing->SetAddLineToolActive(addLineAct->isChecked());
 	drawing->SetAddCircleToolActive(addCircleAct->isChecked());
+	drawing->SetAddDimensionToolActive(addDimensionAct->isChecked());
 }
 
 
@@ -370,9 +392,58 @@ void ApplicationWindow::Settings(void)
 }
 
 
+//
+// Group a bunch of selected objects (which can include other groups) together
+// or ungroup a selected group.
+//
 void ApplicationWindow::HandleGrouping(void)
 {
-	// Group a bunch of selected objects together or ungroup a selected group.
+	// If nothing selected, do nothing
+	if (drawing->document.ItemsSelected() == 0)
+	{
+		statusBar()->showMessage(tr("No objects selected to make a group from."));
+		return;
+	}
+
+	// If it's a group that's selected, ungroup it and leave the objects in a
+	// selected state
+	if (drawing->document.ItemsSelected() == 1)
+	{
+		Object * object = drawing->document.SelectedItem(0);
+
+#if 0
+if (object == NULL)
+	printf("SelectedItem = NULL!\n");
+else
+	printf("SelectedItem = %08X, type = %i\n", object, object->type);
+#endif
+
+		if (object == NULL || object->type != OTContainer)
+		{
+			statusBar()->showMessage(tr("A group requires two or more selected objects."));
+			return;
+		}
+
+		// Need the parent of the group, we're assuming here that the parent is
+		// the drawing's document. Does it matter? Maybe...
+		// Could just stipulate that grouping like this only takes place where the
+		// parent of the group is the drawing's document. Makes life much simpler.
+		((Container *)object)->SelectAll();
+		((Container *)object)->MoveContentsTo(&(drawing->document));
+		drawing->document.Delete(object);
+	}
+	// Otherwise, if it's a group of 2 or more objects (which can be groups too)
+	// group them and select the group
+	else if (drawing->document.ItemsSelected() > 1)
+	{
+		Container * container = new Container(Vector(), &(drawing->document));
+		drawing->document.MoveSelectedContentsTo(container);
+		drawing->document.Add(container);
+		container->DeselectAll();
+		container->state = OSSelected;
+	}
+
+	drawing->update();
 }
 
 
@@ -393,7 +464,7 @@ 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/delete-tool.png"), QKeySequence(), true);
+	deleteAct = CreateAction(tr("&Delete"), tr("Delete Object"), tr("Deletes selected objects."), QIcon(":/res/delete-tool.png"), QKeySequence(tr("Delete")), 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);