ldforge: comparison gui.cpp

-:208adc847377
+:55406ce7446e
 #include "gldraw.h"
 #include "gui.h"
 #include "file.h"
 #include "zz_setContentsDialog.h"
+#include "zz_configDialog.h"
 ForgeWindow::ForgeWindow () {
 	R = new renderer;
 	qObjList = new QTreeWidget;
 	createMenus ();
 	createToolbars ();
 	slot_selectionChanged ();
+	setWindowIcon (QIcon ("icons/ldforge.png"));
 	setTitle ();
 	setMinimumSize (320, 200);
 	resize (800, 600);
 }
 #define MAKE_ACTION(OBJECT, DISPLAYNAME, IMAGENAME, DESCR) \
 	qAct_##OBJECT = new QAction (QIcon ("./icons/" IMAGENAME ".png"), tr (DISPLAYNAME), this); \
 	qAct_##OBJECT->setStatusTip (tr (DESCR)); \
 	connect (qAct_##OBJECT, SIGNAL (triggered ()), this, SLOT (slot_##OBJECT ()));
+// =============================================================================
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// =============================================================================
 void ForgeWindow::createMenuActions () {
 	// Long menu names go here so my cool action definition table doesn't get out of proportions
-	const char* sNewCdLineText = "New Conditional Line",
+	char const* sNewCdLineText = "New Conditional Line",
 		*sNewQuadText = "New Quadrilateral",
 		*sAboutText = "About " APPNAME_DISPLAY;
 	MAKE_ACTION (new,			"&New",			"file-new",		"Create a new part model.")
 	MAKE_ACTION (open,			"&Open",		"file-open",	"Load a part model from a file.")
 	MAKE_ACTION (exit,			"&Exit",		"exit",			"Close " APPNAME_DISPLAY ".")
 	MAKE_ACTION (cut,			"Cut",			"cut",			"Cut the current selection to clipboard.")
 	MAKE_ACTION (copy,			"Copy",			"copy",			"Copy the current selection to clipboard.")
 	MAKE_ACTION (paste,			"Paste",		"paste",		"Paste clipboard contents.")
-	MAKE_ACTION (about,			sAboutText,		"about",		"Shows information about " APPNAME_DISPLAY ".")
-	MAKE_ACTION (aboutQt,		"About Qt",		"aboutQt",		"Shows information about Qt.")
 	MAKE_ACTION (inline,		"Inline",		"inline",		"Inline selected subfiles.")
 	MAKE_ACTION (splitQuads,	"Split Quads",	"quad-split",	"Split quads into triangles.")
 	MAKE_ACTION (setContents,	"Set Contents",	"set-contents",	"Set the raw code of this object.")
 	MAKE_ACTION (newQuad,		sNewQuadText,	"add-quad",		"Creates a new quadrilateral.")
 	MAKE_ACTION (newCondLine,	sNewCdLineText,	"add-condline",	"Creates a new conditional line.");
 	MAKE_ACTION (newComment,	"New Comment",	"add-comment",	"Creates a new comment.");
 	MAKE_ACTION (newVector,		"New Vector",	"add-vector",	"Creates a new vector.")
 	MAKE_ACTION (newVertex,		"New Vertex",	"add-vertex",	"Creates a new vertex.")
+	MAKE_ACTION (settings,		"Settings",		"settings",		"Edit the settings of " APPNAME_DISPLAY ".")
+	MAKE_ACTION (about,			sAboutText,		"ldforge",		"Shows information about " APPNAME_DISPLAY ".")
+	MAKE_ACTION (aboutQt,		"About Qt",		"aboutQt",		"Shows information about Qt.")
 	// Keyboard shortcuts
 	qAct_new->setShortcut (Qt::CTRL | Qt::Key_N);
 	qAct_open->setShortcut (Qt::CTRL | Qt::Key_O);
 	qAct_save->setShortcut (Qt::CTRL | Qt::Key_S);
 	for (ushort i = 0; i < sizeof qaDisabledActions / sizeof *qaDisabledActions; ++i)
 		qaDisabledActions[i]->setEnabled (false);
 }
+// =============================================================================
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// =============================================================================
 void ForgeWindow::createMenus () {
 	// File menu
 	qFileMenu = menuBar ()->addMenu (tr ("&File"));
 	qFileMenu->addAction (qAct_new);			// New
 	qFileMenu->addAction (qAct_open);			// Open
 	qFileMenu->addAction (qAct_save);			// Save
 	qFileMenu->addAction (qAct_saveAs);			// Save As
+	qFileMenu->addSeparator ();					// -------
+	qFileMenu->addAction (qAct_settings);		// Settings
 	qFileMenu->addSeparator ();					// -------
 	qFileMenu->addAction (qAct_exit);			// Exit
 	// Edit menu
 	qInsertMenu = menuBar ()->addMenu (tr ("&Insert"));
 	qHelpMenu = menuBar ()->addMenu (tr ("&Help"));
 	qHelpMenu->addAction (qAct_about);			// About
 	qHelpMenu->addAction (qAct_aboutQt);		// About Qt
 }
+// =============================================================================
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// =============================================================================
 void ForgeWindow::createToolbars () {
 	qFileToolBar = new QToolBar ("File");
 	qFileToolBar->addAction (qAct_new);
 	qFileToolBar->addAction (qAct_open);
 	qFileToolBar->addAction (qAct_save);
 	qEditToolBar->addAction (qAct_splitQuads);
 	qEditToolBar->addAction (qAct_setContents);
 	addToolBar (qEditToolBar);
 }
+// =============================================================================
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// =============================================================================
 void ForgeWindow::setTitle () {
 	str zTitle = APPNAME_DISPLAY " v" VERSION_STRING;
 	// Append our current file if we have one
 	if (g_CurrentFile) {
 	if (~zName && g_CurrentFile->save (zName))
 		g_CurrentFile->zFileName = zName;
 }
+void ForgeWindow::slot_settings () {
+	ConfigDialog::staticDialog (this);
+}
 void ForgeWindow::slot_exit () {
 	exit (0);
 }
 void ForgeWindow::slot_newSubfile () {
 void ForgeWindow::slot_splitQuads () {
 	if (qObjList->selectedItems().size() == 0)
 		return;
-	const QList<QTreeWidgetItem*> qaItems = qObjList->selectedItems();
+	QList<QTreeWidgetItem*> const qaItems = qObjList->selectedItems();
 	for (ulong i = 0; i < g_CurrentFile->objects.size(); ++i) {
 		LDObject* obj = g_CurrentFile->objects[i];
 		// Don't even consider non-quads
 		return;
 	Dialog_SetContents::staticDialog (obj, this);
 }
+// =============================================================================
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// =============================================================================
 static QIcon IconForObjectType (LDObject* obj) {
 	switch (obj->getType ()) {
 	case OBJ_Empty:
 		return QIcon ("icons/empty.png");
 	}
 	return QIcon ();
 }
+// =============================================================================
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// =============================================================================
 void ForgeWindow::buildObjList () {
 	if (!g_CurrentFile)
 		return;
 	QList<QTreeWidgetItem*> qaItems;
 	}
 	qObjList->insertTopLevelItems (0, qaItems);
 }
+// =============================================================================
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// =============================================================================
 void ForgeWindow::slot_selectionChanged () {
 	// If the selection isn't 1 exact, disable setting contents
 	qAct_setContents->setEnabled (qObjList->selectedItems().size() == 1);
 	// If we have no selection, disable splitting quads
 	}
 	// Otherwise place the object at the end.
 	return g_CurrentFile->objects.size();
 }
+void ForgeWindow::refresh () {
+	buildObjList ();
+	R->hardRefresh ();
+}

Mercurial > ldforge / file comparison

comparison: gui.cpp

gui.cpp