ldforge: comparison src/gui.cpp

-:81dc5f6b9c73
+:8da2563c645a
 // =============================================================================
 void ForgeWindow::updateTitle() {
 	str title = fmt (APPNAME " %1", fullVersionString());
 	// Append our current file if we have one
-	if (LDOpenFile::current()) {
+	if (LDFile::current()) {
-		if (LDOpenFile::current()->name().length() > 0)
+		if (LDFile::current()->name().length() > 0)
-			title += fmt (": %1", basename (LDOpenFile::current()->name()));
+			title += fmt (": %1", basename (LDFile::current()->name()));
 		else
 			title += fmt (": <anonymous>");
-		if (LDOpenFile::current()->numObjs() > 0 &&
+		if (LDFile::current()->numObjs() > 0 &&
-			LDOpenFile::current()->obj (0)->getType() == LDObject::Comment)
+			LDFile::current()->obj (0)->getType() == LDObject::Comment)
 		{
 			// Append title
-			LDCommentObject* comm = static_cast<LDCommentObject*> (LDOpenFile::current()->obj (0));
+			LDCommentObject* comm = static_cast<LDCommentObject*> (LDFile::current()->obj (0));
 			title += fmt (": %1", comm->text);
 		}
-		if (LDOpenFile::current()->history().pos() != LDOpenFile::current()->savePos())
+		if (LDFile::current()->history().pos() != LDFile::current()->savePos())
 			title += '*';
 	}
 	setWindowTitle (title);
 }
 	List<LDObject*> selCopy = m_sel;
 	int num = 0;
 	// Delete the objects that were being selected
 	for (LDObject* obj : selCopy) {
-		LDOpenFile::current()->forgetObject (obj);
+		LDFile::current()->forgetObject (obj);
 		++num;
 		delete obj;
 	}
 	refresh();
 // =============================================================================
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 // =============================================================================
 void ForgeWindow::buildObjList() {
-	if (!LDOpenFile::current())
+	if (!LDFile::current())
 		return;
 	// Lock the selection while we do this so that refreshing the object list
 	// doesn't trigger selection updating so that the selection doesn't get lost
 	// while this is done.
 	for (int i = 0; i < ui->objectList->count(); ++i)
 		delete ui->objectList->item (i);
 	ui->objectList->clear();
-	for (LDObject* obj : LDOpenFile::current()->objs()) {
+	for (LDObject* obj : LDFile::current()->objs()) {
 		str descr;
 		switch (obj->getType()) {
 		case LDObject::Comment:
 			descr = static_cast<LDCommentObject*> (obj)->text;
 // =============================================================================
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 // =============================================================================
 void ForgeWindow::slot_selectionChanged() {
-	if (g_bSelectionLocked == true || LDOpenFile::current() == null)
+	if (g_bSelectionLocked == true || LDFile::current() == null)
 		return;
 	// Update the shared selection array, though don't do this if this was
 	// called during GL picking, in which case the GL renderer takes care
 	// of the selection.
 	// Get the objects from the object list selection
 	m_sel.clear();
 	const QList<QListWidgetItem*> items = ui->objectList->selectedItems();
-	for (LDObject* obj : LDOpenFile::current()->objs())
+	for (LDObject* obj : LDFile::current()->objs())
 	for (QListWidgetItem* item : items) {
 		if (item == obj->qObjListEntry) {
 			m_sel << obj;
 			break;
 		}
 		// If we have a selection, put the item after it.
 		return (m_sel[m_sel.size() - 1]->getIndex()) + 1;
 	}
 	// Otherwise place the object at the end.
-	return LDOpenFile::current()->numObjs();
+	return LDFile::current()->numObjs();
 }
 // =============================================================================
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 // =============================================================================
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 // =============================================================================
 void ForgeWindow::updateSelection() {
 	g_bSelectionLocked = true;
-	for (LDObject* obj : LDOpenFile::current()->objs())
+	for (LDObject* obj : LDFile::current()->objs())
 		obj->setSelected (false);
 	ui->objectList->clearSelection();
 	for (LDObject* obj : m_sel) {
 		if( obj->qObjListEntry == null )
 }
 // =============================================================================
 void ForgeWindow::deleteObjVector (List<LDObject*> objs) {
 	for (LDObject* obj : objs) {
-		LDOpenFile::current()->forgetObject (obj);
+		LDFile::current()->forgetObject (obj);
 		delete obj;
 	}
 }
 // =============================================================================
 void ForgeWindow::deleteByColor (const short colnum) {
 	List<LDObject*> objs;
-	for (LDObject* obj : LDOpenFile::current()->objs()) {
+	for (LDObject* obj : LDFile::current()->objs()) {
 		if (!obj->isColored() || obj->color() != colnum)
 			continue;
 		objs << obj;
 	}
 	ACTION (ModeDraw)->setChecked (mode == Draw);
 }
 void ForgeWindow::slot_editObject (QListWidgetItem* listitem) {
 	LDObject* obj = null;
-	for (LDObject* it : *LDOpenFile::current()) {
+	for (LDObject* it : *LDFile::current()) {
 		if (it->qObjListEntry == listitem) {
 			obj = it;
 			break;
 		}
 	}
 }
 // =============================================================================
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 // =============================================================================
-void ForgeWindow::save (LDOpenFile* f, bool saveAs) {
+void ForgeWindow::save (LDFile* f, bool saveAs) {
 	str path = f->name();
 	if (path.length() == 0 || saveAs) {
 		path = QFileDialog::getSaveFileName (g_win, tr ("Save As"),
-			LDOpenFile::current()->name(), tr ("LDraw files (*.dat *.ldr)"));
+			LDFile::current()->name(), tr ("LDraw files (*.dat *.ldr)"));
 		if (path.length() == 0) {
 			// User didn't give a file name. This happens if the user cancelled
 			// saving in the save file dialog. Abort.
 			return;
 	}
 	if (f->save (path)) {
 		f->setName (path);
-		if (f == LDOpenFile::current())
+		if (f == LDFile::current())
 			g_win->updateTitle();
 		log ("Saved to %1.", path);
 		// Add it to recent files
 // =============================================================================
 void makeColorSelector (QComboBox* box) {
 	std::map<short, ulong> counts;
-	for (LDObject* obj : LDOpenFile::current()->objs()) {
+	for (LDObject* obj : LDFile::current()->objs()) {
 		if (!obj->isColored())
 			continue;
 		if (counts.find (obj->color()) == counts.end())
 			counts[obj->color()] = 1;
 #include "actions.h"
 void ForgeWindow::updateFileList() {
 	ui->fileList->clear();
-	for (LDOpenFile* f : g_loadedFiles) {
+	for (LDFile* f : g_loadedFiles) {
 		/*
 		if (f->implicit())
 			continue;
 		*/
 		updateFileListItem (f);
 	}
 }
-void ForgeWindow::updateFileListItem (LDOpenFile* f) {
+void ForgeWindow::updateFileListItem (LDFile* f) {
 	if (f->listItem() == null) {
 		// We don't have a list item for this file, so the list
 		// doesn't exist yet. Create it - afterwards this will be
 		// up to date.
 		updateFileList();
 	if (f->name() == "")
 		name = "<anonymous>";
 	else
 		name = basename (f->name());
-	if (f == LDOpenFile::current())
+	if (f == LDFile::current())
 		ui->fileList->setCurrentItem (f->listItem());
 	if (f->implicit())
 		f->listItem()->setForeground (QColor (96, 96, 96));
 }
 void ForgeWindow::beginAction (QAction* act) {
 	// Open the history so we can record the edits done during this action.
 	if (act != ACTION (Undo) && act != ACTION (Redo) && act != ACTION (Open))
-		LDOpenFile::current()->openHistory();
+		LDFile::current()->openHistory();
 }
 void ForgeWindow::endAction() {
 	// Close the history now.
-	LDOpenFile::current()->closeHistory();
+	LDFile::current()->closeHistory();
-	updateFileListItem (LDOpenFile::current());
+	updateFileListItem (LDFile::current());
 }
 void ForgeWindow::changeCurrentFile() {
-	LDOpenFile* f = null;
+	LDFile* f = null;
 	QListWidgetItem* item = ui->fileList->currentItem();
-	for (LDOpenFile* it : g_loadedFiles) {
+	for (LDFile* it : g_loadedFiles) {
 		if (it->listItem() == item) {
 			f = it;
 			break;
 		}
 	}
-	if (!f || f == LDOpenFile::current())
+	if (!f || f == LDFile::current())
 		return;
 	clearSelection();
-	LDOpenFile::setCurrent (f);
+	LDFile::setCurrent (f);
 	log ("Changed file to %1", basename (f->name()));
 	R()->setFile (f);
 	R()->update();
 }
 void ForgeWindow::refreshObjectList() {
 #if 0
 	ui->objectList->clear();
-	LDOpenFile* f = LDOpenFile::current();
+	LDFile* f = LDFile::current();
 	for (LDObject* obj : *f)
 		ui->objectList->addItem (obj->qObjListEntry);
 #endif

Mercurial > ldforge / file comparison

comparison: src/gui.cpp

src/gui.cpp