diff -r c595cfb4791c -r 31540c1f22ea src/addObjectDialog.cc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/addObjectDialog.cc	Mon Jan 20 15:04:26 2014 +0200
@@ -0,0 +1,444 @@
+/*
+ *  LDForge: LDraw parts authoring CAD
+ *  Copyright (C) 2013, 2014 Santeri Piippo
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <QGridLayout>
+#include <QCheckBox>
+#include <QDialogButtonBox>
+#include <QSpinBox>
+#include <QLabel>
+#include <QListWidget>
+#include <QTreeWidget>
+#include <QLineEdit>
+#include <QPushButton>
+#include "gui.h"
+#include "addObjectDialog.h"
+#include "document.h"
+#include "colors.h"
+#include "colorSelectDialog.h"
+#include "history.h"
+#include "widgets.h"
+#include "misc.h"
+#include "primitives.h"
+#include "moc_addObjectDialog.cpp"
+
+// =============================================================================
+// -----------------------------------------------------------------------------
+class SubfileListItem : public QTreeWidgetItem
+{
+	PROPERTY (public,	Primitive*,	PrimitiveInfo, NO_OPS,	STOCK_WRITE)
+
+	public:
+		SubfileListItem (QTreeWidgetItem* parent, Primitive* info) :
+			QTreeWidgetItem (parent),
+			m_PrimitiveInfo (info) {}
+
+		SubfileListItem (QTreeWidget* parent, Primitive* info) :
+			QTreeWidgetItem (parent),
+			m_PrimitiveInfo (info) {}
+};
+
+// =============================================================================
+// -----------------------------------------------------------------------------
+AddObjectDialog::AddObjectDialog (const LDObject::Type type, LDObject* obj, QWidget* parent) :
+	QDialog (parent)
+{
+	setlocale (LC_ALL, "C");
+
+	int coordCount = 0;
+	QString typeName = LDObject::typeName (type);
+
+	switch (type)
+	{
+		case LDObject::EComment:
+		{
+			le_comment = new QLineEdit;
+
+			if (obj)
+				le_comment->setText (static_cast<LDComment*> (obj)->text);
+
+			le_comment->setMinimumWidth (384);
+		} break;
+
+		case LDObject::ELine:
+		{
+			coordCount = 6;
+		} break;
+
+		case LDObject::ETriangle:
+		{
+			coordCount = 9;
+		} break;
+
+		case LDObject::EQuad:
+		case LDObject::ECondLine:
+		{
+			coordCount = 12;
+		} break;
+
+		case LDObject::EVertex:
+		{
+			coordCount = 3;
+		} break;
+
+		case LDObject::EBFC:
+		{
+			rb_bfcType = new RadioGroup ("Statement", {}, 0, Qt::Vertical);
+
+			for (int i = 0; i < LDBFC::NumStatements; ++i)
+			{
+				// Separate these in two columns
+				if (i == LDBFC::NumStatements / 2)
+					rb_bfcType->rowBreak();
+
+				rb_bfcType->addButton (LDBFC::statements[i]);
+			}
+
+			if (obj)
+				rb_bfcType->setValue ( (int) static_cast<LDBFC*> (obj)->type);
+		} break;
+
+		case LDObject::ESubfile:
+		{
+			coordCount = 3;
+			tw_subfileList = new QTreeWidget();
+			tw_subfileList->setHeaderLabel (tr ("Primitives"));
+
+			for (PrimitiveCategory* cat : g_PrimitiveCategories)
+			{
+				SubfileListItem* parentItem = new SubfileListItem (tw_subfileList, null);
+				parentItem->setText (0, cat->getName());
+				QList<QTreeWidgetItem*> subfileItems;
+
+				for (Primitive& prim : cat->prims)
+				{
+					SubfileListItem* item = new SubfileListItem (parentItem, &prim);
+					item->setText (0, fmt ("%1 - %2", prim.name, prim.title));
+					subfileItems << item;
+
+					// If this primitive is the one the current object points to,
+					// select it by default
+					if (obj && static_cast<LDSubfile*> (obj)->getFileInfo()->getName() == prim.name)
+						tw_subfileList->setCurrentItem (item);
+				}
+
+				tw_subfileList->addTopLevelItem (parentItem);
+			}
+
+			connect (tw_subfileList, SIGNAL (itemSelectionChanged()), this, SLOT (slot_subfileTypeChanged()));
+			lb_subfileName = new QLabel ("File:");
+			le_subfileName = new QLineEdit;
+			le_subfileName->setFocus();
+
+			if (obj)
+			{
+				LDSubfile* ref = static_cast<LDSubfile*> (obj);
+				le_subfileName->setText (ref->getFileInfo()->getName());
+			}
+		} break;
+
+		default:
+		{
+			critical (fmt ("Unhandled LDObject type %1 (%2) in AddObjectDialog", (int) type, typeName));
+		} return;
+	}
+
+	QPixmap icon = getIcon (fmt ("add-%1", typeName));
+	LDObject* defaults = LDObject::getDefault (type);
+
+	lb_typeIcon = new QLabel;
+	lb_typeIcon->setPixmap (icon);
+
+	// Show a color edit dialog for the types that actually use the color
+	if (defaults->isColored())
+	{
+		if (obj != null)
+			colnum = obj->getColor();
+		else
+			colnum = (type == LDObject::ECondLine || type == LDObject::ELine) ? edgecolor : maincolor;
+
+		pb_color = new QPushButton;
+		setButtonBackground (pb_color, colnum);
+		connect (pb_color, SIGNAL (clicked()), this, SLOT (slot_colorButtonClicked()));
+	}
+
+	for (int i = 0; i < coordCount; ++i)
+	{
+		dsb_coords[i] = new QDoubleSpinBox;
+		dsb_coords[i]->setDecimals (5);
+		dsb_coords[i]->setMinimum (-10000.0);
+		dsb_coords[i]->setMaximum (10000.0);
+	}
+
+	QGridLayout* const layout = new QGridLayout;
+	layout->addWidget (lb_typeIcon, 0, 0);
+
+	switch (type)
+	{
+		case LDObject::ELine:
+		case LDObject::ECondLine:
+		case LDObject::ETriangle:
+		case LDObject::EQuad:
+
+			// Apply coordinates
+			if (obj)
+			{
+				for (int i = 0; i < coordCount / 3; ++i)
+					for (int j = 0; j < 3; ++j)
+						dsb_coords[ (i * 3) + j]->setValue (obj->getVertex (i).getCoordinate (j));
+			}
+
+			break;
+
+		case LDObject::EComment:
+			layout->addWidget (le_comment, 0, 1);
+			break;
+
+		case LDObject::EBFC:
+			layout->addWidget (rb_bfcType, 0, 1);
+			break;
+
+		case LDObject::ESubfile:
+			layout->addWidget (tw_subfileList, 1, 1, 1, 2);
+			layout->addWidget (lb_subfileName, 2, 1);
+			layout->addWidget (le_subfileName, 2, 2);
+			break;
+
+		default:
+			break;
+	}
+
+	if (defaults->hasMatrix())
+	{
+		LDMatrixObject* mo = dynamic_cast<LDMatrixObject*> (obj);
+
+		QLabel* lb_matrix = new QLabel ("Matrix:");
+		le_matrix = new QLineEdit;
+		// le_matrix->setValidator (new QDoubleValidator);
+		Matrix defaultMatrix = g_identity;
+
+		if (mo)
+		{
+			for_axes (ax)
+				dsb_coords[ax]->setValue (mo->getPosition()[ax]);
+
+			defaultMatrix = mo->getTransform();
+		}
+
+		le_matrix->setText (defaultMatrix.toString());
+		layout->addWidget (lb_matrix, 4, 1);
+		layout->addWidget (le_matrix, 4, 2, 1, 3);
+	}
+
+	if (defaults->isColored())
+		layout->addWidget (pb_color, 1, 0);
+
+	if (coordCount > 0)
+	{
+		QGridLayout* const qCoordLayout = new QGridLayout;
+
+		for (int i = 0; i < coordCount; ++i)
+			qCoordLayout->addWidget (dsb_coords[i], (i / 3), (i % 3));
+
+		layout->addLayout (qCoordLayout, 0, 1, (coordCount / 3), 3);
+	}
+
+	QDialogButtonBox* bbx_buttons = new QDialogButtonBox (QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+	QWidget::connect (bbx_buttons, SIGNAL (accepted()), this, SLOT (accept()));
+	QWidget::connect (bbx_buttons, SIGNAL (rejected()), this, SLOT (reject()));
+	layout->addWidget (bbx_buttons, 5, 0, 1, 4);
+	setLayout (layout);
+	setWindowTitle (fmt (tr ("Edit %1"), typeName));
+
+	setWindowIcon (icon);
+	defaults->deleteSelf();
+}
+
+// =============================================================================
+// -----------------------------------------------------------------------------
+void AddObjectDialog::setButtonBackground (QPushButton* button, int colnum)
+{
+	LDColor* col = getColor (colnum);
+
+	button->setIcon (getIcon ("palette"));
+	button->setAutoFillBackground (true);
+
+	if (col)
+		button->setStyleSheet (fmt ("background-color: %1", col->hexcode));
+}
+
+// =============================================================================
+// -----------------------------------------------------------------------------
+QString AddObjectDialog::currentSubfileName()
+{
+	SubfileListItem* item = static_cast<SubfileListItem*> (tw_subfileList->currentItem());
+
+	if (item->getPrimitiveInfo() == null)
+		return ""; // selected a heading
+
+	return item->getPrimitiveInfo()->name;
+}
+
+// =============================================================================
+// -----------------------------------------------------------------------------
+void AddObjectDialog::slot_colorButtonClicked()
+{
+	ColorSelector::selectColor (colnum, colnum, this);
+	setButtonBackground (pb_color, colnum);
+}
+
+// =============================================================================
+// -----------------------------------------------------------------------------
+void AddObjectDialog::slot_subfileTypeChanged()
+{
+	QString name = currentSubfileName();
+
+	if (name.length() > 0)
+		le_subfileName->setText (name);
+}
+
+// =============================================================================
+// -----------------------------------------------------------------------------
+template<class T> static T* initObj (LDObject*& obj)
+{
+	if (obj == null)
+		obj = new T;
+
+	return static_cast<T*> (obj);
+}
+
+// =============================================================================
+// -----------------------------------------------------------------------------
+void AddObjectDialog::staticDialog (const LDObject::Type type, LDObject* obj)
+{
+	setlocale (LC_ALL, "C");
+
+	// FIXME: Redirect to Edit Raw
+	if (obj && obj->getType() == LDObject::EError)
+		return;
+
+	if (type == LDObject::EEmpty)
+		return; // Nothing to edit with empties
+
+	const bool newObject = (obj == null);
+	Matrix transform = g_identity;
+	AddObjectDialog dlg (type, obj);
+
+	assert (!obj || obj->getType() == type);
+
+	if (dlg.exec() == false)
+		return;
+
+	if (type == LDObject::ESubfile)
+	{
+		QStringList matrixstrvals = dlg.le_matrix->text().split (" ", QString::SkipEmptyParts);
+
+		if (matrixstrvals.size() == 9)
+		{
+			double matrixvals[9];
+			int i = 0;
+
+			for (QString val : matrixstrvals)
+				matrixvals[i++] = val.toFloat();
+
+			transform = Matrix (matrixvals);
+		}
+	}
+
+	switch (type)
+	{
+		case LDObject::EComment:
+		{
+			LDComment* comm = initObj<LDComment> (obj);
+			comm->text = dlg.le_comment->text();
+		}
+		break;
+
+		case LDObject::ELine:
+		case LDObject::ETriangle:
+		case LDObject::EQuad:
+		case LDObject::ECondLine:
+		{
+			if (!obj)
+				obj = LDObject::getDefault (type);
+
+			for (int i = 0; i < obj->vertices(); ++i)
+			{
+				Vertex v;
+
+				for_axes (ax)
+					v[ax] = dlg.dsb_coords[ (i * 3) + ax]->value();
+
+				obj->setVertex (i, v);
+			}
+		} break;
+
+		case LDObject::EBFC:
+		{
+			LDBFC* bfc = initObj<LDBFC> (obj);
+			bfc->type = (LDBFC::Type) dlg.rb_bfcType->value();
+		} break;
+
+		case LDObject::EVertex:
+		{
+			LDVertex* vert = initObj<LDVertex> (obj);
+
+			for_axes (ax)
+				vert->pos[ax] = dlg.dsb_coords[ax]->value();
+		}
+		break;
+
+		case LDObject::ESubfile:
+		{
+			QString name = dlg.le_subfileName->text();
+
+			if (name.length() == 0)
+				return; // no subfile filename
+
+			LDDocument* file = getDocument (name);
+
+			if (!file)
+			{
+				critical (fmt ("Couldn't open `%1': %2", name, strerror (errno)));
+				return;
+			}
+
+			LDSubfile* ref = initObj<LDSubfile> (obj);
+			assert (ref);
+
+			for_axes (ax)
+				ref->setCoordinate (ax, dlg.dsb_coords[ax]->value());
+
+			ref->setTransform (transform);
+			ref->setFileInfo (file);
+		} break;
+
+		default:
+			break;
+	}
+
+	if (obj->isColored())
+		obj->setColor (dlg.colnum);
+
+	if (newObject)
+	{
+		int idx = g_win->getInsertionPoint();
+		getCurrentDocument()->insertObj (idx, obj);
+	}
+
+	g_win->refresh();
+}