ldforge: comparison src/addObjectDialog.cpp

-:d6b4ed3bf169
+:c5d14d112034
 /*
 *  LDForge: LDraw parts authoring CAD
 *  Copyright (C) 2013 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.h>
+#include <QGridLayout>
-#include <qcheckbox.h>
+#include <QCheckBox>
-#include <qdialogbuttonbox.h>
+#include <QDialogButtonBox>
-#include <qspinbox.h>
+#include <QSpinBox>
-#include <qlabel.h>
+#include <QLabel>
-#include <qlistwidget.h>
+#include <QListWidget>
-#include <qtreewidget.h>
+#include <QTreeWidget>
-#include <qlineedit.h>
+#include <QLineEdit>
-#include <qpushbutton.h>
+#include <QPushButton>
 #include "gui.h"
 #include "addObjectDialog.h"
 #include "file.h"
 #include "colors.h"
 #include "colorSelectDialog.h"
 #include "history.h"
 #include "widgets.h"
 #include "misc.h"
 #include "primitives.h"
+#include "build/moc_addObjectDialog.cpp"
+// =============================================================================
+// -----------------------------------------------------------------------------
 class SubfileListItem : public QTreeWidgetItem {
 	PROPERTY (Primitive*, primInfo, setPrimInfo)
 public:
 	SubfileListItem (QTreeWidgetItem* parent, Primitive* info) :
 	SubfileListItem (QTreeWidget* parent, Primitive* info) :
 		QTreeWidgetItem (parent), m_primInfo (info) {}
 };
 // =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// -----------------------------------------------------------------------------
-// =============================================================================
 AddObjectDialog::AddObjectDialog (const LDObject::Type type, LDObject* obj, QWidget* parent) : QDialog (parent) {
 	setlocale (LC_ALL, "C");
 	short coordCount = 0;
 	str typeName = LDObject::typeName (type);
 		if (obj)
 			rb_bfcType->setValue ((int) static_cast<LDBFCObject*> (obj)->type);
 		break;
 	case LDObject::Subfile:
-		{
+		coordCount = 3;
-			coordCount = 3;
+		// If the primitive lister is busy writing data, we have to wait
-			// If the primitive lister is busy writing data, we have to wait
+		// for that to happen first. This should be quite considerably rare.
-			// for that to happen first. This should be quite considerably rare.
+		while (primitiveLoaderBusy())
-			while (primitiveLoaderBusy())
+			;
-				;
+		tw_subfileList = new QTreeWidget();
-			tw_subfileList = new QTreeWidget();
+		tw_subfileList->setHeaderLabel (tr ("Primitives"));
-			tw_subfileList->setHeaderLabel (tr ("Primitives"));
+		for (PrimitiveCategory& cat : g_PrimitiveCategories) {
-			for (PrimitiveCategory& cat : g_PrimitiveCategories) {
+			SubfileListItem* parentItem = new SubfileListItem (tw_subfileList, null);
-				SubfileListItem* parentItem = new SubfileListItem (tw_subfileList, null);
+			parentItem->setText (0, cat.name());
-				parentItem->setText (0, cat.name());
+			QList<QTreeWidgetItem*> subfileItems;
-				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;
-				for (Primitive& prim : cat.prims) {
+				// If this primitive is the one the current object points to,
-					SubfileListItem* item = new SubfileListItem (parentItem, &prim);
+				// select it by default
-					item->setText (0, fmt ("%1 - %2", prim.name, prim.title));
+				if (obj && static_cast<LDSubfileObject*> (obj)->fileInfo()->name() == prim.name)
-					subfileItems << item;
+					tw_subfileList->setCurrentItem (item);
-					// If this primitive is the one the current object points to,
-					// select it by default
-					if (obj && static_cast<LDSubfileObject*> (obj)->fileInfo()->name() == prim.name)
-						tw_subfileList->setCurrentItem (item);
-				}
-				tw_subfileList->addTopLevelItem (parentItem);
 			}
-			connect (tw_subfileList, SIGNAL (itemSelectionChanged()), this, SLOT (slot_subfileTypeChanged()));
+			tw_subfileList->addTopLevelItem (parentItem);
-			lb_subfileName = new QLabel ("File:");
+		}
-			le_subfileName = new QLineEdit;
-			le_subfileName->setFocus();
+		connect (tw_subfileList, SIGNAL (itemSelectionChanged()), this, SLOT (slot_subfileTypeChanged()));
+		lb_subfileName = new QLabel ("File:");
-			if (obj) {
+		le_subfileName = new QLineEdit;
-				LDSubfileObject* ref = static_cast<LDSubfileObject*> (obj);
+		le_subfileName->setFocus();
-				le_subfileName->setText (ref->fileInfo()->name());
-			}
+		if (obj) {
-			break;
+			LDSubfileObject* ref = static_cast<LDSubfileObject*> (obj);
-		}
+			le_subfileName->setText (ref->fileInfo()->name());
+		}
+		break;
 	default:
 		critical (fmt ("Unhandled LDObject type %1 (%2) in AddObjectDialog", (int) type, typeName));
 		return;
 	}
 	setWindowIcon (icon);
 	delete defaults;
 }
 // =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// -----------------------------------------------------------------------------
-// =============================================================================
 void AddObjectDialog::setButtonBackground (QPushButton* button, short colnum) {
 	LDColor* col = getColor (colnum);
 	button->setIcon (getIcon ("palette"));
 	button->setAutoFillBackground (true);
 	if (col)
 		button->setStyleSheet (fmt ("background-color: %1", col->hexcode));
 }
 // =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// -----------------------------------------------------------------------------
-// =============================================================================
 str AddObjectDialog::currentSubfileName() {
 	SubfileListItem* item = static_cast<SubfileListItem*> (tw_subfileList->currentItem());
 	if (item->primInfo() == null)
 		return ""; // selected a heading
 	return item->primInfo()->name;
 }
 // =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// -----------------------------------------------------------------------------
-// =============================================================================
 void AddObjectDialog::slot_colorButtonClicked() {
 	ColorSelector::getColor (colnum, colnum, this);
 	setButtonBackground (pb_color, colnum);
 }
 // =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// -----------------------------------------------------------------------------
-// =============================================================================
 void AddObjectDialog::slot_subfileTypeChanged() {
 	str name = currentSubfileName();
 	if (name.length() > 0)
 		le_subfileName->setText (name);
 }
 // =============================================================================
-template<class T> T* initObj (LDObject*& obj) {
+// -----------------------------------------------------------------------------
+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::Error)
 		LDFile::current()->insertObj (idx, obj);
 	}
 	g_win->fullRefresh();
 }
-#include "build/moc_addObjectDialog.cpp"

Mercurial > ldforge / file comparison

comparison: src/addObjectDialog.cpp

src/addObjectDialog.cpp