X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fapplicationwindow.cpp;h=41e2f2c8a90176efa535fdcbce96d6fb9f13e030;hb=0e8f4edf80206248f0ad87a966d69d9ec9da3d2f;hp=a4c39b74fe96eace7ee7376055641138c6c49d1e;hpb=e78daf62eb771ee29a59035d16cf63c1e6ebe144;p=architektonas

diff --git a/src/applicationwindow.cpp b/src/applicationwindow.cpp
index a4c39b7..41e2f2c 100644
--- a/src/applicationwindow.cpp
+++ b/src/applicationwindow.cpp
@@ -37,6 +37,7 @@
 #include "layerwidget.h"
 #include "objectwidget.h"
 #include "painter.h"
+#include "penwidget.h"
 #include "settingsdialog.h"
 #include "structs.h"
 #include "utils.h"
@@ -142,7 +143,7 @@ void ApplicationWindow::FileOpen(void)
 		return;
 	}
 
-	Container container;
+	Container container(true);	// Make sure it's a top level container...
 	bool successful = FileIO::LoadAtnsFile(file, &container);
 	fclose(file);
 
@@ -954,6 +955,15 @@ void ApplicationWindow::CreateToolbars(void)
 	connect(spinbox, SIGNAL(valueChanged(int)), this, SLOT(HandleGridSizeInPixels(int)));
 	connect(baseUnitInput, SIGNAL(textChanged(QString)), this, SLOT(HandleGridSizeInBaseUnits(QString)));
 	connect(dimensionSizeInput, SIGNAL(textChanged(QString)), this, SLOT(HandleDimensionSize(QString)));
+
+	PenWidget * pw = new PenWidget();
+	toolbar = addToolBar(tr("Pen"));
+	toolbar->setObjectName(tr("Pen"));
+	toolbar->addWidget(pw);
+	connect(drawing, SIGNAL(ObjectSelected(Object *)), pw, SLOT(SetFields(Object *)));
+	connect(pw, SIGNAL(WidthSelected(float)), drawing, SLOT(HandlePenWidth(float)));
+	connect(pw, SIGNAL(StyleSelected(int)), drawing, SLOT(HandlePenStyle(int)));
+	connect(pw, SIGNAL(ColorSelected(uint32_t)), drawing, SLOT(HandlePenColor(uint32_t)));
 }