--- a/src/gui.cpp Thu Oct 03 18:07:06 2013 +0300
+++ b/src/gui.cpp Thu Oct 03 20:56:20 2013 +0300
@@ -48,6 +48,7 @@
#include "messagelog.h"
#include "config.h"
#include "ui_ldforge.h"
+#include "moc_gui.cpp"
static bool g_bSelectionLocked = false;
@@ -66,21 +67,21 @@
// =============================================================================
// -----------------------------------------------------------------------------
-ForgeWindow::ForgeWindow() {
- g_win = this;
+ForgeWindow::ForgeWindow()
+{ g_win = this;
m_renderer = new GLRenderer;
-
+
ui = new Ui_LDForgeUI;
ui->setupUi (this);
-
+
// Stuff the renderer into its frame
QVBoxLayout* rendererLayout = new QVBoxLayout (ui->rendererFrame);
rendererLayout->addWidget (R());
-
+
connect (ui->objectList, SIGNAL (itemSelectionChanged()), this, SLOT (slot_selectionChanged()));
connect (ui->objectList, SIGNAL (itemDoubleClicked (QListWidgetItem*)), this, SLOT (slot_editObject (QListWidgetItem*)));
connect (ui->fileList, SIGNAL (currentItemChanged (QListWidgetItem*, QListWidgetItem*)), this, SLOT (changeCurrentFile()));
-
+
// Init message log manager
m_msglog = new MessageManager;
m_msglog->setRenderer (R());
@@ -88,7 +89,7 @@
m_quickColors = quickColorsFromConfig();
slot_selectionChanged();
setStatusBar (new QStatusBar);
-
+
// Init primitive loader task stuff
m_primLoaderBar = new QProgressBar;
m_primLoaderWidget = new QWidget;
@@ -97,7 +98,7 @@
primLoaderLayout->addWidget (m_primLoaderBar);
statusBar()->addPermanentWidget (m_primLoaderWidget);
m_primLoaderWidget->hide();
-
+
// Make certain actions checkable
ui->actionAxes->setChecked (gl_axes);
ui->actionWireframe->setChecked (gl_wireframe);
@@ -107,11 +108,11 @@
updateRecentFilesMenu();
updateToolBars();
updateTitle();
-
+
setMinimumSize (300, 200);
-
+
connect (qApp, SIGNAL (aboutToQuit()), this, SLOT (slot_lastSecondCleanup()));
-
+
// Connect all actions and set shortcuts
#define act(N) \
connect (ui->action##N, SIGNAL (triggered()), this, SLOT (slot_action())); \
@@ -121,41 +122,42 @@
// =============================================================================
// -----------------------------------------------------------------------------
-void ForgeWindow::slot_action() {
- // Find out which action triggered this
+void ForgeWindow::slot_action()
+{ // Find out which action triggered this
#define act(N) if (sender() == ui->action##N) invokeAction (ui->action##N, &actiondef_##N);
#include "actions.h"
}
// =============================================================================
// -----------------------------------------------------------------------------
-void ForgeWindow::invokeAction (QAction* act, void (*func)()) {
- beginAction (act);
- (*func)();
+void ForgeWindow::invokeAction (QAction* act, void (*func) ())
+{ beginAction (act);
+ (*func) ();
endAction();
}
// =============================================================================
// -----------------------------------------------------------------------------
-void ForgeWindow::slot_lastSecondCleanup() {
- delete m_renderer;
+void ForgeWindow::slot_lastSecondCleanup()
+{ delete m_renderer;
delete ui;
}
// =============================================================================
// -----------------------------------------------------------------------------
-void ForgeWindow::updateRecentFilesMenu() {
- // First, clear any items in the recent files menu
- for (QAction* recent : m_recentFiles)
+void ForgeWindow::updateRecentFilesMenu()
+{ // First, clear any items in the recent files menu
+for (QAction * recent : m_recentFiles)
delete recent;
+
m_recentFiles.clear();
-
+
QAction* first = null;
-
- for (const QVariant& it : io_recentfiles) {
- str file = it.toString();
+
+for (const QVariant & it : io_recentfiles)
+ { str file = it.toString();
QAction* recent = new QAction (getIcon ("open-recent"), file, this);
-
+
connect (recent, SIGNAL (triggered()), this, SLOT (slot_recentFile()));
ui->menuOpenRecent->insertAction (first, recent);
m_recentFiles << recent;
@@ -165,53 +167,53 @@
// =============================================================================
// -----------------------------------------------------------------------------
-List<LDQuickColor> quickColorsFromConfig() {
- List<LDQuickColor> colors;
-
- for (str colorname : gui_colortoolbar.value.split (":")) {
- if (colorname == "|")
+List<LDQuickColor> quickColorsFromConfig()
+{ List<LDQuickColor> colors;
+
+for (str colorname : gui_colortoolbar.value.split (":"))
+ { if (colorname == "|")
colors << LDQuickColor::getSeparator();
- else {
- LDColor* col = getColor (colorname.toLong());
-
+ else
+ { LDColor* col = getColor (colorname.toLong());
+
if (col != null)
colors << LDQuickColor (col, null);
}
}
-
+
return colors;
}
// =============================================================================
// -----------------------------------------------------------------------------
-void ForgeWindow::updateToolBars() {
- m_colorButtons.clear();
+void ForgeWindow::updateToolBars()
+{ m_colorButtons.clear();
ui->colorToolbar->clear();
-
- for (LDQuickColor& entry : m_quickColors) {
- if (entry.isSeparator())
+
+for (LDQuickColor & entry : m_quickColors)
+ { if (entry.isSeparator())
ui->colorToolbar->addSeparator();
- else {
- QToolButton* colorButton = new QToolButton;
+ else
+ { QToolButton* colorButton = new QToolButton;
colorButton->setIcon (makeColorIcon (entry.color(), 22));
colorButton->setIconSize (QSize (22, 22));
colorButton->setToolTip (entry.color()->name);
-
+
connect (colorButton, SIGNAL (clicked()), this, SLOT (slot_quickColor()));
ui->colorToolbar->addWidget (colorButton);
m_colorButtons << colorButton;
-
+
entry.setToolButton (colorButton);
}
}
-
+
updateGridToolBar();
}
// =============================================================================
// -----------------------------------------------------------------------------
-void ForgeWindow::updateGridToolBar() {
- // Ensure that the current grid - and only the current grid - is selected.
+void ForgeWindow::updateGridToolBar()
+{ // Ensure that the current grid - and only the current grid - is selected.
ui->actionGridCoarse->setChecked (grid == Grid::Coarse);
ui->actionGridMedium->setChecked (grid == Grid::Medium);
ui->actionGridFine->setChecked (grid == Grid::Fine);
@@ -219,159 +221,160 @@
// =============================================================================
// -----------------------------------------------------------------------------
-void ForgeWindow::updateTitle() {
- str title = fmt (APPNAME " %1", fullVersionString());
-
+void ForgeWindow::updateTitle()
+{ str title = fmt (APPNAME " %1", fullVersionString());
+
// Append our current file if we have one
- if (LDFile::current()) {
- if (LDFile::current()->name().length() > 0)
+ if (LDFile::current())
+ { if (LDFile::current()->name().length() > 0)
title += fmt (": %1", basename (LDFile::current()->name()));
else
title += fmt (": <anonymous>");
-
+
if (LDFile::current()->numObjs() > 0 &&
- LDFile::current()->obj (0)->getType() == LDObject::Comment)
- {
- // Append title
+ LDFile::current()->obj (0)->getType() == LDObject::Comment)
+ { // Append title
LDComment* comm = static_cast<LDComment*> (LDFile::current()->obj (0));
title += fmt (": %1", comm->text);
}
-
+
if (LDFile::current()->history().pos() != LDFile::current()->savePos())
title += '*';
}
-
+
setWindowTitle (title);
}
// =============================================================================
// -----------------------------------------------------------------------------
-int ForgeWindow::deleteSelection() {
- if (m_sel.size() == 0)
+int ForgeWindow::deleteSelection()
+{ if (m_sel.size() == 0)
return 0;
-
+
List<LDObject*> selCopy = m_sel;
int num = 0;
-
+
// Delete the objects that were being selected
- for (LDObject* obj : selCopy) {
- LDFile::current()->forgetObject (obj);
+for (LDObject * obj : selCopy)
+ { LDFile::current()->forgetObject (obj);
++num;
delete obj;
}
-
+
refresh();
return num;
}
// =============================================================================
// -----------------------------------------------------------------------------
-void ForgeWindow::buildObjList() {
- if (!LDFile::current())
+void ForgeWindow::buildObjList()
+{ 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.
g_bSelectionLocked = true;
-
+
for (int i = 0; i < ui->objectList->count(); ++i)
delete ui->objectList->item (i);
-
+
ui->objectList->clear();
-
- for (LDObject* obj : LDFile::current()->objects()) {
- str descr;
-
- switch (obj->getType()) {
- case LDObject::Comment:
- descr = static_cast<LDComment*> (obj)->text;
-
- // Remove leading whitespace
- while (descr[0] == ' ')
- descr.remove (0, 1);
- break;
-
- case LDObject::Empty:
- break; // leave it empty
-
- case LDObject::Line:
- case LDObject::Triangle:
- case LDObject::Quad:
- case LDObject::CndLine:
- for (short i = 0; i < obj->vertices(); ++i) {
- if (i != 0)
- descr += ", ";
-
- descr += obj->getVertex (i).stringRep (true);
- }
- break;
-
- case LDObject::Error:
- descr = fmt ("ERROR: %1", obj->raw());
- break;
-
- case LDObject::Vertex:
- descr = static_cast<LDVertex*> (obj)->pos.stringRep (true);
- break;
-
- case LDObject::Subfile:
- {
- LDSubfile* ref = static_cast<LDSubfile*> (obj);
-
+
+for (LDObject * obj : LDFile::current()->objects())
+ { str descr;
+
+ switch (obj->getType())
+ { case LDObject::Comment:
+ descr = static_cast<LDComment*> (obj)->text;
+
+ // Remove leading whitespace
+ while (descr[0] == ' ')
+ descr.remove (0, 1);
+
+ break;
+
+ case LDObject::Empty:
+ break; // leave it empty
+
+ case LDObject::Line:
+ case LDObject::Triangle:
+ case LDObject::Quad:
+ case LDObject::CndLine:
+
+ for (short i = 0; i < obj->vertices(); ++i)
+ { if (i != 0)
+ descr += ", ";
+
+ descr += obj->getVertex (i).stringRep (true);
+ }
+
+ break;
+
+ case LDObject::Error:
+ descr = fmt ("ERROR: %1", obj->raw());
+ break;
+
+ case LDObject::Vertex:
+ descr = static_cast<LDVertex*> (obj)->pos.stringRep (true);
+ break;
+
+ case LDObject::Subfile:
+ { LDSubfile* ref = static_cast<LDSubfile*> (obj);
+
descr = fmt ("%1 %2, (", ref->fileInfo()->name(),
- ref->position().stringRep (true));
-
+ ref->position().stringRep (true));
+
for (short i = 0; i < 9; ++i)
- descr += fmt ("%1%2", ftoa (ref->transform()[i]),
- (i != 8) ? " " : "");
-
+ descr += fmt ("%1%2", ftoa (ref->transform() [i]),
+ (i != 8) ? " " : "");
+
descr += ')';
}
break;
-
- case LDObject::BFC:
- descr = LDBFC::statements[static_cast<LDBFC*> (obj)->type];
- break;
-
- case LDObject::Overlay:
- {
- LDOverlay* ovl = static_cast<LDOverlay*> (obj);
+
+ case LDObject::BFC:
+ descr = LDBFC::statements[static_cast<LDBFC*> (obj)->type];
+ break;
+
+ case LDObject::Overlay:
+ { LDOverlay* ovl = static_cast<LDOverlay*> (obj);
descr = fmt ("[%1] %2 (%3, %4), %5 x %6", g_CameraNames[ovl->camera()],
- basename (ovl->filename()), ovl->x(), ovl->y(), ovl->width(), ovl->height());
+ basename (ovl->filename()), ovl->x(), ovl->y(), ovl->width(), ovl->height());
}
break;
-
- default:
- descr = obj->typeName();
- break;
+
+ default:
+ descr = obj->typeName();
+ break;
}
-
+
// Put it into brackets if it's hidden
if (obj->hidden())
descr = fmt ("[[ %1 ]]", descr);
-
+
QListWidgetItem* item = new QListWidgetItem (descr);
item->setIcon (getIcon (obj->typeName()));
-
+
// Color gibberish orange on red so it stands out.
- if (obj->getType() == LDObject::Error) {
- item->setBackground (QColor ("#AA0000"));
+ if (obj->getType() == LDObject::Error)
+ { item->setBackground (QColor ("#AA0000"));
item->setForeground (QColor ("#FFAA00"));
} elif (lv_colorize && obj->isColored() &&
- obj->color() != maincolor && obj->color() != edgecolor)
- {
- // If the object isn't in the main or edge color, draw this
+
+ obj->color() != maincolor && obj->color() != edgecolor)
+ { // If the object isn't in the main or edge color, draw this
// list entry in said color.
LDColor* col = getColor (obj->color());
+
if (col)
item->setForeground (col->faceColor);
}
-
+
obj->qObjListEntry = item;
ui->objectList->insertItem (ui->objectList->count(), item);
}
-
+
g_bSelectionLocked = false;
updateSelection();
scrollToSelection();
@@ -379,265 +382,267 @@
// =============================================================================
// -----------------------------------------------------------------------------
-void ForgeWindow::scrollToSelection() {
- if (m_sel.size() == 0)
+void ForgeWindow::scrollToSelection()
+{ if (m_sel.size() == 0)
return;
-
+
LDObject* obj = m_sel[m_sel.size() - 1];
ui->objectList->scrollToItem (obj->qObjListEntry);
}
// =============================================================================
// -----------------------------------------------------------------------------
-void ForgeWindow::slot_selectionChanged() {
- if (g_bSelectionLocked == true || LDFile::current() == null)
+void ForgeWindow::slot_selectionChanged()
+{ 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.
if (m_renderer->picking())
return;
-
+
List<LDObject*> priorSelection = m_sel;
-
+
// Get the objects from the object list selection
m_sel.clear();
const QList<QListWidgetItem*> items = ui->objectList->selectedItems();
-
- for (LDObject* obj : LDFile::current()->objects())
- for (QListWidgetItem* item : items) {
- if (item == obj->qObjListEntry) {
- m_sel << obj;
- break;
+
+for (LDObject * obj : LDFile::current()->objects())
+ for (QListWidgetItem * item : items)
+ { if (item == obj->qObjListEntry)
+ { m_sel << obj;
+ break;
+ }
}
- }
-
+
// Update the GL renderer
- for (LDObject* obj : priorSelection) {
- obj->setSelected (false);
+for (LDObject * obj : priorSelection)
+ { obj->setSelected (false);
m_renderer->compileObject (obj);
}
-
- for (LDObject* obj : m_sel) {
- obj->setSelected (true);
+
+for (LDObject * obj : m_sel)
+ { obj->setSelected (true);
m_renderer->compileObject (obj);
}
-
+
m_renderer->update();
}
// =============================================================================
// -----------------------------------------------------------------------------
-void ForgeWindow::slot_recentFile() {
- QAction* qAct = static_cast<QAction*> (sender());
+void ForgeWindow::slot_recentFile()
+{ QAction* qAct = static_cast<QAction*> (sender());
openMainFile (qAct->text());
}
// =============================================================================
// -----------------------------------------------------------------------------
-void ForgeWindow::slot_quickColor() {
- beginAction (null);
+void ForgeWindow::slot_quickColor()
+{ beginAction (null);
QToolButton* button = static_cast<QToolButton*> (sender());
LDColor* col = null;
-
- for (const LDQuickColor& entry : m_quickColors) {
- if (entry.toolButton() == button) {
- col = entry.color();
+
+for (const LDQuickColor & entry : m_quickColors)
+ { if (entry.toolButton() == button)
+ { col = entry.color();
break;
}
}
-
+
if (col == null)
return;
-
+
short newColor = col->index;
-
- for (LDObject* obj : m_sel) {
- if (obj->isColored() == false)
+
+for (LDObject * obj : m_sel)
+ { if (obj->isColored() == false)
continue; // uncolored object
-
+
obj->setColor (newColor);
R()->compileObject (obj);
}
-
+
refresh();
endAction();
}
// =============================================================================
// -----------------------------------------------------------------------------
-ulong ForgeWindow::getInsertionPoint() {
- if (m_sel.size() > 0) {
- // If we have a selection, put the item after it.
+ulong ForgeWindow::getInsertionPoint()
+{ if (m_sel.size() > 0)
+ { // 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 LDFile::current()->numObjs();
}
// =============================================================================
// -----------------------------------------------------------------------------
-void ForgeWindow::fullRefresh() {
- buildObjList();
+void ForgeWindow::fullRefresh()
+{ buildObjList();
m_renderer->hardRefresh();
}
// =============================================================================
// -----------------------------------------------------------------------------
-void ForgeWindow::refresh() {
- buildObjList();
+void ForgeWindow::refresh()
+{ buildObjList();
m_renderer->update();
}
// =============================================================================
// -----------------------------------------------------------------------------
-void ForgeWindow::updateSelection() {
- g_bSelectionLocked = true;
-
- for (LDObject* obj : LDFile::current()->objects())
+void ForgeWindow::updateSelection()
+{ g_bSelectionLocked = true;
+
+for (LDObject * obj : LDFile::current()->objects())
obj->setSelected (false);
-
+
ui->objectList->clearSelection();
- for (LDObject* obj : m_sel) {
- if (obj->qObjListEntry == null)
+
+for (LDObject * obj : m_sel)
+ { if (obj->qObjListEntry == null)
continue;
-
+
obj->qObjListEntry->setSelected (true);
obj->setSelected (true);
}
-
+
g_bSelectionLocked = false;
slot_selectionChanged();
}
// =============================================================================
// -----------------------------------------------------------------------------
-bool ForgeWindow::isSelected (LDObject* obj) {
- LDObject* needle = obj->topLevelParent();
-
- for (LDObject* hay : m_sel)
+bool ForgeWindow::isSelected (LDObject* obj)
+{ LDObject* needle = obj->topLevelParent();
+
+for (LDObject * hay : m_sel)
if (hay == needle)
return true;
-
+
return false;
}
-short ForgeWindow::getSelectedColor() {
- short result = -1;
-
- for (LDObject* obj : m_sel) {
- if (obj->isColored() == false)
+short ForgeWindow::getSelectedColor()
+{ short result = -1;
+
+for (LDObject * obj : m_sel)
+ { if (obj->isColored() == false)
continue; // doesn't use color
-
+
if (result != -1 && obj->color() != result)
return -1; // No consensus in object color
-
+
if (result == -1)
result = obj->color();
}
-
+
return result;
}
// =============================================================================
// -----------------------------------------------------------------------------
-LDObject::Type ForgeWindow::uniformSelectedType() {
- LDObject::Type result = LDObject::Unidentified;
-
- for (LDObject* obj : m_sel) {
- if (result != LDObject::Unidentified && obj->color() != result)
+LDObject::Type ForgeWindow::uniformSelectedType()
+{ LDObject::Type result = LDObject::Unidentified;
+
+for (LDObject * obj : m_sel)
+ { if (result != LDObject::Unidentified && obj->color() != result)
return LDObject::Unidentified;
-
+
if (result == LDObject::Unidentified)
result = obj->getType();
}
-
+
return result;
}
// =============================================================================
// -----------------------------------------------------------------------------
-void ForgeWindow::closeEvent (QCloseEvent* ev) {
- // Check whether it's safe to close all files.
- if (!safeToCloseAll()) {
- ev->ignore();
+void ForgeWindow::closeEvent (QCloseEvent* ev)
+{ // Check whether it's safe to close all files.
+ if (!safeToCloseAll())
+ { ev->ignore();
return;
}
-
+
// Save the configuration before leaving so that, for instance, grid choice
// is preserved across instances.
Config::save();
-
+
ev->accept();
}
// =============================================================================
// -----------------------------------------------------------------------------
-void ForgeWindow::spawnContextMenu (const QPoint pos) {
- const bool single = (g_win->sel().size() == 1);
- LDObject* singleObj = (single) ? g_win->sel()[0] : null;
-
+void ForgeWindow::spawnContextMenu (const QPoint pos)
+{ const bool single = (g_win->sel().size() == 1);
+ LDObject* singleObj = (single) ? g_win->sel() [0] : null;
+
QMenu* contextMenu = new QMenu;
-
- if (single && singleObj->getType() != LDObject::Empty) {
- contextMenu->addAction (ACTION (Edit));
+
+ if (single && singleObj->getType() != LDObject::Empty)
+ { contextMenu->addAction (ACTION (Edit));
contextMenu->addSeparator();
}
-
+
contextMenu->addAction (ACTION (Cut));
contextMenu->addAction (ACTION (Copy));
contextMenu->addAction (ACTION (Paste));
contextMenu->addAction (ACTION (Delete));
contextMenu->addSeparator();
contextMenu->addAction (ACTION (SetColor));
-
+
if (single)
contextMenu->addAction (ACTION (EditRaw));
-
+
contextMenu->addAction (ACTION (Borders));
contextMenu->addAction (ACTION (SetOverlay));
contextMenu->addAction (ACTION (ClearOverlay));
contextMenu->addAction (ACTION (ModeSelect));
contextMenu->addAction (ACTION (ModeDraw));
contextMenu->addAction (ACTION (ModeCircle));
-
- if (R()->camera() != GL::Free) {
- contextMenu->addSeparator();
+
+ if (R()->camera() != GL::Free)
+ { contextMenu->addSeparator();
contextMenu->addAction (ACTION (SetDrawDepth));
}
-
+
contextMenu->exec (pos);
}
// =============================================================================
// -----------------------------------------------------------------------------
-void ForgeWindow::deleteObjVector (List<LDObject*> objs) {
- for (LDObject* obj : objs) {
- LDFile::current()->forgetObject (obj);
+void ForgeWindow::deleteObjVector (List<LDObject*> objs)
+{ for (LDObject * obj : objs)
+ { LDFile::current()->forgetObject (obj);
delete obj;
}
}
// =============================================================================
// -----------------------------------------------------------------------------
-void ForgeWindow::deleteByColor (const short colnum) {
- List<LDObject*> objs;
- for (LDObject* obj : LDFile::current()->objects()) {
- if (!obj->isColored() || obj->color() != colnum)
+void ForgeWindow::deleteByColor (const short colnum)
+{ List<LDObject*> objs;
+
+for (LDObject * obj : LDFile::current()->objects())
+ { if (!obj->isColored() || obj->color() != colnum)
continue;
-
+
objs << obj;
}
-
+
deleteObjVector (objs);
}
// =============================================================================
// -----------------------------------------------------------------------------
-void ForgeWindow::updateEditModeActions() {
- const EditMode mode = R()->editMode();
+void ForgeWindow::updateEditModeActions()
+{ const EditMode mode = R()->editMode();
ACTION (ModeSelect)->setChecked (mode == Select);
ACTION (ModeDraw)->setChecked (mode == Draw);
ACTION (ModeCircle)->setChecked (mode == CircleMode);
@@ -645,22 +650,23 @@
// =============================================================================
// -----------------------------------------------------------------------------
-void ForgeWindow::slot_editObject (QListWidgetItem* listitem) {
- LDObject* obj = null;
- for (LDObject* it : LDFile::current()->objects()) {
- if (it->qObjListEntry == listitem) {
- obj = it;
+void ForgeWindow::slot_editObject (QListWidgetItem* listitem)
+{ LDObject* obj = null;
+
+for (LDObject * it : LDFile::current()->objects())
+ { if (it->qObjListEntry == listitem)
+ { obj = it;
break;
}
}
-
+
AddObjectDialog::staticDialog (obj->getType(), obj);
}
// =============================================================================
// -----------------------------------------------------------------------------
-void ForgeWindow::primitiveLoaderStart (ulong max) {
- m_primLoaderWidget->show();
+void ForgeWindow::primitiveLoaderStart (ulong max)
+{ m_primLoaderWidget->show();
m_primLoaderBar->setRange (0, max);
m_primLoaderBar->setValue (0);
m_primLoaderBar->setFormat ("%p%");
@@ -668,14 +674,14 @@
// =============================================================================
// -----------------------------------------------------------------------------
-void ForgeWindow::primitiveLoaderUpdate (ulong prog) {
- m_primLoaderBar->setValue (prog);
+void ForgeWindow::primitiveLoaderUpdate (ulong prog)
+{ m_primLoaderBar->setValue (prog);
}
// =============================================================================
// -----------------------------------------------------------------------------
-void ForgeWindow::primitiveLoaderEnd() {
- QTimer* hidetimer = new QTimer;
+void ForgeWindow::primitiveLoaderEnd()
+{ QTimer* hidetimer = new QTimer;
connect (hidetimer, SIGNAL (timeout()), m_primLoaderWidget, SLOT (hide()));
hidetimer->setSingleShot (true);
hidetimer->start (1500);
@@ -685,92 +691,94 @@
// =============================================================================
// -----------------------------------------------------------------------------
-void ForgeWindow::save (LDFile* f, bool saveAs) {
- str path = f->name();
-
- if (path.length() == 0 || saveAs) {
- path = QFileDialog::getSaveFileName (g_win, tr ("Save As"),
- 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
+void ForgeWindow::save (LDFile* f, bool saveAs)
+{ str path = f->name();
+
+ if (path.length() == 0 || saveAs)
+ { path = QFileDialog::getSaveFileName (g_win, tr ("Save As"),
+ 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->save (path))
+ { f->setName (path);
+
if (f == LDFile::current())
g_win->updateTitle();
-
+
log ("Saved to %1.", path);
-
+
// Add it to recent files
addRecentFile (path);
- } else {
- str message = fmt (tr ("Failed to save to %1: %2"), path, strerror (errno));
-
+ }
+ else
+ { str message = fmt (tr ("Failed to save to %1: %2"), path, strerror (errno));
+
// Tell the user the save failed, and give the option for saving as with it.
QMessageBox dlg (QMessageBox::Critical, tr ("Save Failure"), message, QMessageBox::Close, g_win);
-
+
// Add a save-as button
QPushButton* saveAsBtn = new QPushButton (tr ("Save As"));
saveAsBtn->setIcon (getIcon ("file-save-as"));
dlg.addButton (saveAsBtn, QMessageBox::ActionRole);
dlg.setDefaultButton (QMessageBox::Close);
dlg.exec();
-
+
if (dlg.clickedButton() == saveAsBtn)
save (f, true); // yay recursion!
}
}
-void ForgeWindow::addMessage (str msg) {
- m_msglog->addLine (msg);
+void ForgeWindow::addMessage (str msg)
+{ m_msglog->addLine (msg);
}
// ============================================================================
-void ObjectList::contextMenuEvent (QContextMenuEvent* ev) {
- g_win->spawnContextMenu (ev->globalPos());
+void ObjectList::contextMenuEvent (QContextMenuEvent* ev)
+{ g_win->spawnContextMenu (ev->globalPos());
}
// =============================================================================
// -----------------------------------------------------------------------------
-QPixmap getIcon (str iconName) {
- return (QPixmap (fmt (":/icons/%1.png", iconName)));
+QPixmap getIcon (str iconName)
+{ return (QPixmap (fmt (":/icons/%1.png", iconName)));
}
// =============================================================================
-bool confirm (str msg) {
- return confirm (ForgeWindow::tr ("Confirm"), msg);
+bool confirm (str msg)
+{ return confirm (ForgeWindow::tr ("Confirm"), msg);
}
-bool confirm (str title, str msg) {
- return QMessageBox::question (g_win, title, msg,
- (QMessageBox::Yes | QMessageBox::No), QMessageBox::No) == QMessageBox::Yes;
+bool confirm (str title, str msg)
+{ return QMessageBox::question (g_win, title, msg,
+ (QMessageBox::Yes | QMessageBox::No), QMessageBox::No) == QMessageBox::Yes;
}
// =============================================================================
-void critical (str msg) {
- QMessageBox::critical (g_win, ForgeWindow::tr("Error"), msg,
- (QMessageBox::Close), QMessageBox::Close);
+void critical (str msg)
+{ QMessageBox::critical (g_win, ForgeWindow::tr ("Error"), msg,
+ (QMessageBox::Close), QMessageBox::Close);
}
// =============================================================================
-QIcon makeColorIcon (LDColor* colinfo, const ushort size) {
- // Create an image object and link a painter to it.
+QIcon makeColorIcon (LDColor* colinfo, const ushort size)
+{ // Create an image object and link a painter to it.
QImage img (size, size, QImage::Format_ARGB32);
QPainter paint (&img);
-
+
QColor col = colinfo->faceColor;
- if (colinfo->index == maincolor) {
- // Use the user preferences for main color here
+
+ if (colinfo->index == maincolor)
+ { // Use the user preferences for main color here
col = gl_maincolor.value;
col.setAlphaF (gl_maincolor_alpha);
}
-
+
// Paint the icon
paint.fillRect (QRect (0, 0, size, size), colinfo->edgeColor);
paint.drawPixmap (QRect (1, 1, size - 2, size - 2), getIcon ("checkerboard"), QRect (0, 0, 8, 8));
@@ -779,101 +787,102 @@
}
// =============================================================================
-void makeColorSelector (QComboBox* box) {
- std::map<short, ulong> counts;
-
- for (LDObject* obj : LDFile::current()->objects()) {
- if (!obj->isColored())
+void makeColorSelector (QComboBox* box)
+{ std::map<short, ulong> counts;
+
+for (LDObject * obj : LDFile::current()->objects())
+ { if (!obj->isColored())
continue;
-
+
if (counts.find (obj->color()) == counts.end())
counts[obj->color()] = 1;
else
counts[obj->color()]++;
}
-
+
box->clear();
ulong row = 0;
- for (const auto& pair : counts) {
- LDColor* col = getColor (pair.first);
+
+for (const auto & pair : counts)
+ { LDColor* col = getColor (pair.first);
assert (col != null);
-
+
QIcon ico = makeColorIcon (col, 16);
box->addItem (ico, fmt ("[%1] %2 (%3 object%4)",
- pair.first, col->name, pair.second, plural (pair.second)));
+ pair.first, col->name, pair.second, plural (pair.second)));
box->setItemData (row, pair.first);
-
+
++row;
}
}
-void ForgeWindow::setStatusBarText (str text) {
- statusBar()->showMessage (text);
+void ForgeWindow::setStatusBarText (str text)
+{ statusBar()->showMessage (text);
}
-void ForgeWindow::clearSelection() {
- m_sel.clear();
+void ForgeWindow::clearSelection()
+{ m_sel.clear();
}
-Ui_LDForgeUI* ForgeWindow::interface() const {
- return ui;
+Ui_LDForgeUI* ForgeWindow::interface() const
+{ return ui;
}
#define act(N) QAction* ForgeWindow::action##N() { return ui->action##N; }
#include "actions.h"
-void ForgeWindow::updateFileList() {
- ui->fileList->clear();
-
- for (LDFile* f : g_loadedFiles) {
- // Don't list implicit files unless explicitly desired.
+void ForgeWindow::updateFileList()
+{ ui->fileList->clear();
+
+for (LDFile * f : g_loadedFiles)
+ { // Don't list implicit files unless explicitly desired.
if (f->implicit() && !gui_implicitfiles)
continue;
-
+
// Add an item to the list for this file and store a pointer to it in
// the file, so we can find files by the list item.
ui->fileList->addItem ("");
QListWidgetItem* item = ui->fileList->item (ui->fileList->count() - 1);
f->setListItem (item);
-
+
updateFileListItem (f);
}
}
-void ForgeWindow::updateFileListItem (LDFile* f) {
- if (f->listItem() == null) {
- // We don't have a list item for this file, so the list either doesn't
+void ForgeWindow::updateFileListItem (LDFile* f)
+{ if (f->listItem() == null)
+ { // We don't have a list item for this file, so the list either doesn't
// exist yet or is out of date. Build the list now.
updateFileList();
return;
}
-
+
// If this is the current file, it also needs to be the selected item on
// the list.
if (f == LDFile::current())
ui->fileList->setCurrentItem (f->listItem());
-
+
// If we list implicit files, draw them with a shade of gray to make them
// distinct.
if (f->implicit())
f->listItem()->setForeground (QColor (96, 96, 96));
-
+
f->listItem()->setText (f->getShortName());
-
+
// If the file has unsaved changes, draw a little icon next to it to mark that.
f->listItem()->setIcon (f->hasUnsavedChanges() ? getIcon ("file-save") : QIcon());
}
-void ForgeWindow::beginAction (QAction* act) {
- // Open the history so we can record the edits done during this action.
+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))
LDFile::current()->openHistory();
}
-void ForgeWindow::endAction() {
- // Close the history now.
+void ForgeWindow::endAction()
+{ // Close the history now.
LDFile::current()->closeHistory();
-
+
// Update the list item of the current file - we may need to draw an icon
// now that marks it as having unsaved changes.
updateFileListItem (LDFile::current());
@@ -882,40 +891,42 @@
// =============================================================================
// A file is selected from the list of files on the left of the screen. Find out
// which file was picked and change to it.
-void ForgeWindow::changeCurrentFile() {
- LDFile* f = null;
+void ForgeWindow::changeCurrentFile()
+{ LDFile* f = null;
QListWidgetItem* item = ui->fileList->currentItem();
-
+
// Find the file pointer of the item that was selected.
- for (LDFile* it : g_loadedFiles) {
- if (it->listItem() == item) {
- f = it;
+for (LDFile * it : g_loadedFiles)
+ { if (it->listItem() == item)
+ { f = it;
break;
}
}
-
+
// If we picked the same file we're currently on, we don't need to do
// anything.
if (!f || f == LDFile::current())
return;
-
+
LDFile::setCurrent (f);
}
-void ForgeWindow::refreshObjectList() {
+void ForgeWindow::refreshObjectList()
+{
#if 0
ui->objectList->clear();
LDFile* f = LDFile::current();
-
- for (LDObject* obj : *f)
+
+for (LDObject * obj : *f)
ui->objectList->addItem (obj->qObjListEntry);
+
#endif
-
+
buildObjList();
}
-QImage imageFromScreencap (uchar* data, ushort w, ushort h) {
- // GL and Qt formats have R and B swapped. Also, GL flips Y - correct it as well.
+QImage imageFromScreencap (uchar* data, ushort w, ushort h)
+{ // GL and Qt formats have R and B swapped. Also, GL flips Y - correct it as well.
return QImage (data, w, h, QImage::Format_ARGB32).rgbSwapped().mirrored();
}
@@ -925,11 +936,10 @@
m_color (color),
m_toolButton (toolButton) {}
-LDQuickColor LDQuickColor::getSeparator() {
- return LDQuickColor (null, null);
+LDQuickColor LDQuickColor::getSeparator()
+{ return LDQuickColor (null, null);
}
-bool LDQuickColor::isSeparator() const {
- return color() == null;
+bool LDQuickColor::isSeparator() const
+{ return color() == null;
}
-#include "moc_gui.cpp"