X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fapplicationwindow.cpp;h=cbb96362521aff7e37a2da3851551026eedde5a7;hb=97cfdecd62ced6cb1237a9ac6c7cbce2092fde99;hp=5093fb6c3b5334e475064af01dd8584a1fbbb7d4;hpb=86ad64f2288cf50ae9832116ef37c433556355c4;p=architektonas diff --git a/src/applicationwindow.cpp b/src/applicationwindow.cpp index 5093fb6..cbb9636 100644 --- a/src/applicationwindow.cpp +++ b/src/applicationwindow.cpp @@ -37,6 +37,7 @@ #include "layerwidget.h" #include "objectwidget.h" #include "painter.h" +#include "penwidget.h" #include "settingsdialog.h" #include "structs.h" #include "utils.h" @@ -97,6 +98,7 @@ ApplicationWindow::ApplicationWindow(): connect(lw, SIGNAL(LayerDeleted(int)), drawing, SLOT(DeleteCurrentLayer(int))); connect(lw, SIGNAL(LayerToggled()), drawing, SLOT(HandleLayerToggle())); connect(lw, SIGNAL(LayersSwapped(int, int)), drawing, SLOT(HandleLayerSwap(int, int))); + connect(this, SIGNAL(ReloadLayers()), lw, SLOT(Reload())); connect(drawing, SIGNAL(ObjectHovered(Object *)), ow, SLOT(ShowInfo(Object *))); } @@ -112,9 +114,38 @@ void ApplicationWindow::closeEvent(QCloseEvent * event) void ApplicationWindow::FileNew(void) { - // Should warn the user if drawing hasn't been saved... !!! FIX !!! + // Warn the user if drawing has changed and hasn't been saved... + if (drawing->dirty) + { + QMessageBox msg; + + msg.setText("The document has been modified."); + msg.setInformativeText("Do you want to save your changes?"); + msg.setStandardButtons(QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel); + msg.setDefaultButton(QMessageBox::Save); + int response = msg.exec(); + + switch (response) + { + case QMessageBox::Save: + // Save was clicked + FileSave(); + break; + case QMessageBox::Discard: + // Don't Save was clicked + break; + case QMessageBox::Cancel: + // Cancel was clicked + return; +// break; + } + } + + FileIO::ResetLayerVectors(); + emit ReloadLayers(); DeleteContents(drawing->document.objects); drawing->document.objects.clear(); + drawing->dirty = false; drawing->update(); documentName.clear(); setWindowTitle("Architektonas - Untitled"); @@ -160,9 +191,12 @@ void ApplicationWindow::FileOpen(void) //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(); // We can do this because the vector is just a bunch of pointers to our - // Objects, and the Containers (non-empty) can be moved way with no problem. + // Objects, and the Containers (non-empty) can be moved this way with no + // problem. drawing->document = container; + drawing->dirty = false; drawing->update(); documentName = filename; setWindowTitle(QString("Architektonas - %1").arg(documentName)); @@ -203,6 +237,7 @@ void ApplicationWindow::FileSave(void) return; } + drawing->dirty = false; setWindowTitle(QString("Architektonas - %1").arg(documentName)); statusBar()->showMessage(tr("Drawing saved.")); } @@ -221,6 +256,16 @@ void ApplicationWindow::FileSaveAs(void) } +void ApplicationWindow::contextMenuEvent(QContextMenuEvent * event) +{ + QMenu menu(this); + menu.addAction(mirrorAct); + menu.addAction(rotateAct); + menu.addAction(trimAct); + menu.exec(event->globalPos()); +} + + void ApplicationWindow::SnapToGridTool(void) { Global::snapToGrid = snapToGridAct->isChecked(); @@ -492,57 +537,6 @@ void ApplicationWindow::Settings(void) // void ApplicationWindow::HandleGrouping(void) { -#if 0 - int itemsSelected = drawing->document.ItemsSelected(); - - // If nothing selected, do nothing - if (itemsSelected == 0) - { - statusBar()->showMessage(tr("No objects selected to make a group from.")); - return; - } - - // If it's a group that's selected, ungroup it and leave the objects in a - // selected state - if (itemsSelected == 1) - { - Object * object = drawing->document.SelectedItem(0); - -#if 0 -if (object == NULL) - printf("SelectedItem = NULL!\n"); -else - printf("SelectedItem = %08X, type = %i\n", object, object->type); -#endif - - if (object == NULL || object->type != OTContainer) - { - statusBar()->showMessage(tr("A group requires two or more selected objects.")); - return; - } - - // Need the parent of the group, we're assuming here that the parent is - // the drawing's document. Does it matter? Maybe... - // Could just stipulate that grouping like this only takes place where - // the parent of the group is the drawing's document. Makes life much - // simpler. - ((Container *)object)->SelectAll(); - ((Container *)object)->MoveContentsTo(&(drawing->document)); - drawing->document.Delete(object); - statusBar()->showMessage(tr("Objects ungrouped.")); - } - // Otherwise, if it's a group of 2 or more objects (which can be groups too) - // group them and select the group - else if (itemsSelected > 1) - { - Container * container = new Container(Vector(), &(drawing->document)); - drawing->document.MoveSelectedContentsTo(container); - drawing->document.Add(container); - container->DeselectAll(); - container->state = OSSelected; - statusBar()->showMessage(QString(tr("Grouped %1 objects.")).arg(itemsSelected)); - } -#else int numSelected = drawing->select.size(); // If nothing selected, do nothing @@ -569,13 +563,8 @@ else // Could just stipulate that grouping like this only takes place where // the parent of the group is the drawing's document. Makes life much // simpler. -// ((Container *)object)->SelectAll(); -// ((Container *)object)->MoveContentsTo(&(drawing->document)); -// drawing->document.Delete(object); Container * c = (Container *)obj; -//printf("Ungroup: container size = %li\n", c->objects.size()); SelectAll(c->objects); -//printf("Ungroup: document size = %li (pre-AddObjectsTo)\n", drawing->document.objects.size()); RemoveSelectedObjects(drawing->document.objects); AddObjectsTo(drawing->document.objects, c->objects); drawing->select.clear(); @@ -588,26 +577,22 @@ else // group them and select the group else if (numSelected > 1) { -// Container * container = new Container(Vector(), &(drawing->document)); -// drawing->document.MoveSelectedContentsTo(container); -// drawing->document.Add(container); -// container->DeselectAll(); -// container->state = OSSelected; - Container * c = new Container(); -// AddObjectsTo(c->objects, drawing->select); -// RemoveSelectedObjects(drawing->document.objects); MoveSelectedObjectsTo(c->objects, drawing->document.objects); drawing->document.objects.push_back(c); ClearSelected(c->objects); c->selected = true; - c->layer = Global::currentLayer; + c->layer = Global::activeLayer; + + Rect r = drawing->GetObjectExtents((Object *)c); + c->p[0] = r.TopLeft(); + c->p[1] = r.BottomRight(); + drawing->select.clear(); drawing->select.push_back(c); statusBar()->showMessage(QString(tr("Grouped %1 objects.")).arg(numSelected)); //printf("Group: document size = %li\n", drawing->document.objects.size()); } -#endif drawing->update(); } @@ -716,6 +701,9 @@ void ApplicationWindow::HandleGridSizeInBaseUnits(QString text) void ApplicationWindow::HandleDimensionSize(QString text) { +/* +This is the third input on the view toolbar; not sure what it was supposed to do... +*/ // Parse the text... bool ok; double value = text.toDouble(&ok); @@ -728,6 +716,39 @@ void ApplicationWindow::HandleDimensionSize(QString text) drawing->update(); } +void ApplicationWindow::EditCopy(void) +{ + if (drawing->select.size() > 0) + { + DeleteContents(clipboard); + CopySelectedObjectsTo(clipboard, drawing->document.objects); + } +} + + +void ApplicationWindow::EditCut(void) +{ + if (drawing->select.size() > 0) + { + DeleteContents(clipboard); + MoveSelectedObjectsTo(clipboard, drawing->document.objects); + drawing->update(); + } +} + + +void ApplicationWindow::EditPaste(void) +{ + if (clipboard.size() > 0) + { + // We want to maybe make it so that the pasted objects are being moved in a "mouse drag" state... + // This only moves the cut/copied from the clipboard to the drawing. +// AddObjectsTo(drawing->document.objects, clipboard); + CopyObjects(clipboard, drawing->document.objects); + drawing->update(); + } +} + void ApplicationWindow::CreateActions(void) { @@ -814,6 +835,14 @@ void ApplicationWindow::CreateActions(void) triangulateAct = CreateAction(tr("&Triangulate"), tr("Triangulate"), tr("Make triangles from selected lines, preserving their lengths."), QIcon(":/res/triangulate-tool.png"), QKeySequence("t,g"), true); connect(triangulateAct, SIGNAL(triggered()), this, SLOT(TriangulateTool())); + editCutAct = CreateAction(tr("&Cut Objects"), tr("Cut Objects"), tr("Cut objects from the drawing to the clipboard."), QIcon(":/res/editcut2.png"), QKeySequence(tr("Ctrl+x"))); + connect(editCutAct, SIGNAL(triggered()), this, SLOT(EditCut())); + + editCopyAct = CreateAction(tr("&Copy Objects"), tr("Copy Objects"), tr("Copy objects from the drawing to the clipboard."), QIcon(":/res/editcopy2.png"), QKeySequence(tr("Ctrl+c"))); + connect(editCopyAct, SIGNAL(triggered()), this, SLOT(EditCopy())); + + editPasteAct = CreateAction(tr("&Paste Objects"), tr("Paste Objects"), tr("Paste objects from the clipboard to the drawing."), QIcon(":/res/editpaste2.png"), QKeySequence(tr("Ctrl+v"))); + connect(editPasteAct, SIGNAL(triggered()), this, SLOT(EditPaste())); //Hm. I think we'll have to have separate logic to do the "Radio Group Toolbar" thing... // Yup, in order to turn them off, we'd have to have an "OFF" toolbar button. Ick. @@ -829,8 +858,8 @@ void ApplicationWindow::CreateActions(void) // // Consolidates action creation from a multi-step process to a single-step one. // -QAction * ApplicationWindow::CreateAction(QString name, QString tooltip, QString statustip, - QIcon icon, QKeySequence key, bool checkable/*= false*/) +QAction * ApplicationWindow::CreateAction(QString name, QString tooltip, + QString statustip, QIcon icon, QKeySequence key, bool checkable/*= false*/) { QAction * action = new QAction(icon, name, this); action->setToolTip(tooltip); @@ -846,8 +875,9 @@ QAction * ApplicationWindow::CreateAction(QString name, QString tooltip, QString // This is essentially the same as the previous function, but this allows more // than one key sequence to be added as key shortcuts. // -QAction * ApplicationWindow::CreateAction(QString name, QString tooltip, QString statustip, - QIcon icon, QKeySequence key1, QKeySequence key2, bool checkable/*= false*/) +QAction * ApplicationWindow::CreateAction(QString name, QString tooltip, + QString statustip, QIcon icon, QKeySequence key1, QKeySequence key2, + bool checkable/*= false*/) { QAction * action = new QAction(icon, name, this); action->setToolTip(tooltip); @@ -889,6 +919,9 @@ void ApplicationWindow::CreateMenus(void) menu->addAction(connectAct); menu->addAction(disconnectAct); menu->addSeparator(); + menu->addAction(editCutAct); + menu->addAction(editCopyAct); + menu->addAction(editPasteAct); menu->addAction(deleteAct); menu->addSeparator(); menu->addAction(addLineAct); @@ -937,6 +970,9 @@ void ApplicationWindow::CreateToolbars(void) toolbar->addAction(mirrorAct); toolbar->addAction(trimAct); toolbar->addAction(triangulateAct); + toolbar->addAction(editCutAct); + toolbar->addAction(editCopyAct); + toolbar->addAction(editPasteAct); toolbar->addAction(deleteAct); toolbar->addAction(connectAct); toolbar->addAction(disconnectAct); @@ -954,6 +990,15 @@ void ApplicationWindow::CreateToolbars(void) connect(spinbox, SIGNAL(valueChanged(int)), this, SLOT(HandleGridSizeInPixels(int))); connect(baseUnitInput, SIGNAL(textChanged(QString)), this, SLOT(HandleGridSizeInBaseUnits(QString))); connect(dimensionSizeInput, SIGNAL(textChanged(QString)), this, SLOT(HandleDimensionSize(QString))); + + PenWidget * pw = new PenWidget(); + toolbar = addToolBar(tr("Pen")); + toolbar->setObjectName(tr("Pen")); + toolbar->addWidget(pw); + connect(drawing, SIGNAL(ObjectSelected(Object *)), pw, SLOT(SetFields(Object *))); + 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))); }