aboutWin = new AboutWindow(this);
-// ((TTEdit *)qApp)->charWnd = new CharWindow(this);
-
setWindowIcon(QIcon(":/res/atns-icon.png"));
- setWindowTitle("Architektonas");
+// setWindowTitle("Architektonas");
CreateActions();
CreateMenus();
statusBar()->showMessage(tr("Ready"));
ReadSettings();
+ // Make sure the bottom left corner gets owned by the right side:
+ setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea);
setUnifiedTitleAndToolBarOnMac(true);
Global::font = new QFont("Verdana", 15, QFont::Bold);
if (filename.isEmpty())
return;
+ LoadFile(filename);
+}
+
+void ApplicationWindow::FileOpenRecent(void)
+{
+ QAction * action = qobject_cast<QAction *>(sender());
+
+ if (!action)
+ return;
+
+ LoadFile(action->data().toString());
+}
+
+void ApplicationWindow::LoadFile(QString filename)
+{
FILE * file = fopen(filename.toUtf8().data(), "r");
if (file == 0)
return;
}
-//printf("FileOpen: container size = %li\n", container.objects.size());
// Keep memory leaks from happening by getting rid of the old document
DeleteContents(drawing->document.objects);
emit ReloadLayers();
drawing->dirty = false;
drawing->update();
documentName = filename;
- setWindowTitle(QString("Architektonas - %1").arg(documentName));
+// setWindowTitle(QString("Architektonas - %1").arg(documentName));
+ AdjustMRU(filename);
statusBar()->showMessage(tr("Drawing loaded."));
}
}
drawing->dirty = false;
- setWindowTitle(QString("Architektonas - %1").arg(documentName));
+// setWindowTitle(QString("Architektonas - %1").arg(documentName));
+ AdjustMRU(documentName);
statusBar()->showMessage(tr("Drawing saved."));
}
Global::screenSize = screenSizeSave;
}
+//
+// Right-click menu
+//
void ApplicationWindow::contextMenuEvent(QContextMenuEvent * event)
{
// Proof of concept, still need to code up the real thing
QMenu menu(this);
+
+ VPVector hovered = drawing->GetHovered();
+
+ if ((drawing->select.size() > 0) || (hovered.size() > 0))
+ {
+ QMenu * layerMenu = menu.addMenu("To layer");
+
+ layerAct.clear();
+
+ for(int i=0; i<Global::numLayers; i++)
+ {
+ QAction * act = new QAction(QIcon(), Global::layerName[i].c_str(), this);
+ act->setData(i);
+ layerMenu->addAction(act);
+ layerAct.append(act);
+ connect(act, SIGNAL(triggered()), this, SLOT(MoveToLayer()));
+ }
+ }
+
menu.addAction(mirrorAct);
menu.addAction(rotateAct);
menu.addAction(trimAct);
menu.exec(event->globalPos());
}
+void ApplicationWindow::MoveToLayer(void)
+{
+ QAction * act = qobject_cast<QAction *>(sender());
+
+ drawing->MoveSelectedToLayer(act->data().toInt());
+ drawing->update();
+}
+
void ApplicationWindow::SnapToGridTool(void)
{
Global::snapToGrid = snapToGridAct->isChecked();
{
// For this tool, we check first to see if anything is selected. If so, we
// delete those and *don't* select the delete tool.
-// if (drawing->numSelected > 0)
if (drawing->select.size() > 0)
{
DeleteSelectedObjects(drawing->document.objects);
// Otherwise, toggle the state of the tool
ClearUIToolStatesExcept(deleteAct);
SetInternalToolStates();
+ Global::toolSuppressCrosshair = true;
}
void ApplicationWindow::DimensionTool(void)
{
ClearUIToolStatesExcept(trimAct);
SetInternalToolStates();
+ Global::toolSuppressCrosshair = true;
}
void ApplicationWindow::ParallelTool(void)
else
Global::gridSpacing = 0.015625;
-// drawing->SetGridSize((double)(Global::gridSpacing * Global::zoom));
drawing->update();
zoomIndicator->setText(QString("Zoom: %1% Grid: %2\" BU: Inch").arg(Global::zoom * 100.0).arg(Global::gridSpacing));
void ApplicationWindow::SetInternalToolStates(void)
{
// We can be sure that if we've come here, then either an active tool is
- // being deactivated, or a new tool is being created. In either case, the
- // old tool needs to be deleted.
+ // being deactivated, or a new tool is being activated. In either case,
+ // the tool state needs to be reset. Also, we reset the crosshair
+ // suppression flag.
Global::toolState = TSNone;
+ Global::toolSuppressCrosshair = false;
if (addLineAct->isChecked())
Global::tool = TTLine;
if (!ok || value == 0)
return;
-// drawing->gridSpacing = value;
-// Painter::zoom = drawing->gridPixels / drawing->gridSpacing;
Global::gridSpacing = value;
Global::zoom = drawing->gridPixels / Global::gridSpacing;
-// drawing->UpdateGridBackground();
drawing->update();
}
group->addAction(addLineAct);
group->addAction(addCircleAct);
group->addAction(addArcAct);//*/
+
+ for(int i=0; i<MRU_MAX; i++)
+ {
+ QAction * rfa = new QAction(this);
+ rfa->setVisible(false);
+ connect(rfa, SIGNAL(triggered()), this, SLOT(FileOpenRecent()));
+ mruAct.append(rfa);
+ }
}
//
QMenu * menu = menuBar()->addMenu(tr("&File"));
menu->addAction(fileNewAct);
menu->addAction(fileOpenAct);
+
+ QMenu * recentMenu = menu->addMenu(tr("Open &Recent"));
+
+ for(int i=0; i<MRU_MAX; i++)
+ recentMenu->addAction(mruAct.at(i));
+
+ UpdateMRUActionList();
+
menu->addAction(fileSaveAct);
menu->addAction(fileSaveAsAct);
menu->addAction(fileCloseAct);
toolbar->addAction(fileSaveAct);
toolbar->addAction(fileSaveAsAct);
toolbar->addAction(fileCloseAct);
-// toolbar->addAction(exitAct);
toolbar = addToolBar(tr("View"));
toolbar->setObjectName("View");
QSpinBox * spinbox = new QSpinBox;
toolbar->addWidget(spinbox);
-// QLineEdit * lineedit = new QLineEdit;
toolbar->addWidget(baseUnitInput);
toolbar->addWidget(dimensionSizeInput);
connect(pw, SIGNAL(WidthSelected(float)), drawing, SLOT(HandlePenWidth(float)));
connect(pw, SIGNAL(StyleSelected(int)), drawing, SLOT(HandlePenStyle(int)));
connect(pw, SIGNAL(ColorSelected(uint32_t)), drawing, SLOT(HandlePenColor(uint32_t)));
-// connect(pw, SIGNAL(StampSelected(void)), drawing, SLOT(HandlePenStamp(QAction *)));
connect(pw->tbStamp, SIGNAL(triggered(QAction *)), drawing, SLOT(HandlePenStamp(QAction *)));
connect(pw->tbDropper, SIGNAL(triggered(QAction *)), drawing, SLOT(HandlePenDropper(QAction *)));
}
settings.setValue("useAntialiasing", drawing->useAntialiasing);
settings.setValue("snapToGrid", snapToGridAct->isChecked());
}
+
+void ApplicationWindow::UpdateMRUActionList(void)
+{
+ QStringList mruFilePaths = settings.value("recentFiles").toStringList();
+
+ int mruSize = (mruFilePaths.size() <= MRU_MAX ? mruFilePaths.size() : MRU_MAX);
+
+ for(int i=0; i<mruSize; i++)
+ {
+ QString filename = QFileInfo(mruFilePaths.at(i)).fileName();
+ mruAct.at(i)->setText(filename);
+ mruAct.at(i)->setData(mruFilePaths.at(i));
+ mruAct.at(i)->setVisible(true);
+ }
+
+ for(int i=mruSize; i<MRU_MAX; i++)
+ mruAct.at(i)->setVisible(false);
+}
+
+void ApplicationWindow::AdjustMRU(const QString & filePath)
+{
+ documentName = filePath;
+ setWindowFilePath(documentName);
+
+ QStringList mruFilePaths = settings.value("recentFiles").toStringList();
+ mruFilePaths.removeAll(filePath);
+ mruFilePaths.prepend(filePath);
+
+ while (mruFilePaths.size() > MRU_MAX)
+ mruFilePaths.removeLast();
+
+ settings.setValue("recentFiles", mruFilePaths);
+
+ UpdateMRUActionList();
+}
projects / architektonas / blobdiff