X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fapplicationwindow.cpp;h=03f8cb5b167ef94c60c0c18d0b786032beb3e898;hb=2af76acd67a2703859c11446be3be4d3ff8ff4b4;hp=77767f0610ae2a32b9d2df941a48f1db2e97f5b1;hpb=f3110724be7ad4d4e8c6b97d350ff8af7fbf3799;p=architektonas diff --git a/src/applicationwindow.cpp b/src/applicationwindow.cpp index 77767f0..03f8cb5 100644 --- a/src/applicationwindow.cpp +++ b/src/applicationwindow.cpp @@ -29,9 +29,11 @@ #include "applicationwindow.h" #include "about.h" +#include "blockwidget.h" #include "drawingview.h" #include "fileio.h" #include "generaltab.h" +#include "layerwidget.h" #include "painter.h" #include "settingsdialog.h" @@ -53,20 +55,26 @@ ApplicationWindow::ApplicationWindow(): settings("Underground Software", "Archit CreateMenus(); CreateToolbars(); + // Create Dock widgets + QDockWidget * dock1 = new QDockWidget(tr("Layers"), this); + LayerWidget * lw = new LayerWidget; + dock1->setWidget(lw); + addDockWidget(Qt::RightDockWidgetArea, dock1); + QDockWidget * dock2 = new QDockWidget(tr("Blocks"), this); + BlockWidget * bw = new BlockWidget; + dock2->setWidget(bw); + addDockWidget(Qt::RightDockWidgetArea, dock2); + // Needed for saveState() + dock1->setObjectName("Layers"); + dock2->setObjectName("Blocks"); + // Create status bar zoomIndicator = new QLabel("Grid: 12.0\" Zoom: 12.5%"); statusBar()->addPermanentWidget(zoomIndicator); statusBar()->showMessage(tr("Ready")); ReadSettings(); - -// connect(textEdit->document(), SIGNAL(contentsChanged()), -// this, SLOT(documentWasModified())); - -// setCurrentFile(""); setUnifiedTitleAndToolBarOnMac(true); - -// ((TTEdit *)qApp)->charWnd->show();//eh? Object::SetFont(new QFont("Verdana", 15, QFont::Bold)); } @@ -282,9 +290,11 @@ when zooming in, new origin will be (xCenter - origin.x) / 2, (yCenter - origin. //printf("Zoom in... level going from %02f to ", Painter::zoom); // This just zooms leaving origin intact... should zoom in at the current center! [DONE] + // This should actually be calculated by drawing->gridPixels / grid size. Painter::zoom *= zoomFactor; drawing->gridSpacing = 12.0 / Painter::zoom; - zoomIndicator->setText(QString("Grid: %2\" Zoom: %1%").arg(Painter::zoom * 100.0 * SCREEN_ZOOM).arg(drawing->gridSpacing)); +// zoomIndicator->setText(QString("Grid: %2\" Zoom: %1%").arg(Painter::zoom * 100.0 * SCREEN_ZOOM).arg(drawing->gridSpacing)); + zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(drawing->gridSpacing)); drawing->UpdateGridBackground(); drawing->update(); } @@ -320,7 +330,8 @@ x 2 = (-426, -301) // This just zooms leaving origin intact... should zoom out at the current center! [DONE] Painter::zoom /= zoomFactor; drawing->gridSpacing = 12.0 / Painter::zoom; - zoomIndicator->setText(QString("Grid: %2\" Zoom: %1%").arg(Painter::zoom * 100.0 * SCREEN_ZOOM).arg(drawing->gridSpacing)); +// zoomIndicator->setText(QString("Grid: %2\" Zoom: %1%").arg(Painter::zoom * 100.0 * SCREEN_ZOOM).arg(drawing->gridSpacing)); + zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(drawing->gridSpacing)); drawing->UpdateGridBackground(); drawing->update(); } @@ -398,8 +409,10 @@ void ApplicationWindow::Settings(void) // void ApplicationWindow::HandleGrouping(void) { + int itemsSelected = drawing->document.ItemsSelected(); + // If nothing selected, do nothing - if (drawing->document.ItemsSelected() == 0) + if (itemsSelected == 0) { statusBar()->showMessage(tr("No objects selected to make a group from.")); return; @@ -407,7 +420,7 @@ void ApplicationWindow::HandleGrouping(void) // If it's a group that's selected, ungroup it and leave the objects in a // selected state - if (drawing->document.ItemsSelected() == 1) + if (itemsSelected == 1) { Object * object = drawing->document.SelectedItem(0); @@ -431,29 +444,38 @@ else ((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 (drawing->document.ItemsSelected() > 1) + 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)); } drawing->update(); } +void ApplicationWindow::HandleGridSizeInPixels(int size) +{ + drawing->SetGridSize(size); + drawing->update(); +} + + void ApplicationWindow::CreateActions(void) { exitAct = CreateAction(tr("&Quit"), tr("Quit"), tr("Exits the application."), QIcon(":/res/quit.png"), QKeySequence(tr("Ctrl+q"))); connect(exitAct, SIGNAL(triggered()), this, SLOT(close())); - snapToGridAct = CreateAction(tr("Snap To &Grid"), tr("Snap To Grid"), tr("Snaps mouse cursor to the visible grid when moving/creating objects."), QIcon(":/res/generic-tool.png"), QKeySequence(tr("S")), true); + snapToGridAct = CreateAction(tr("Snap To &Grid"), tr("Snap To Grid"), tr("Snaps mouse cursor to the visible grid when moving/creating objects."), QIcon(":/res/snap-to-grid-tool.png"), QKeySequence(tr("S")), true); connect(snapToGridAct, SIGNAL(triggered()), this, SLOT(SnapToGridTool())); fixAngleAct = CreateAction(tr("Fix &Angle"), tr("Fix Angle"), tr("Fixes the angle of an object."), @@ -511,7 +533,7 @@ void ApplicationWindow::CreateActions(void) settingsAct = CreateAction(tr("&Settings"), tr("Settings"), tr("Change certain defaults for Architektonas."), QIcon(":/res/generic-tool.png"), QKeySequence()); connect(settingsAct, SIGNAL(triggered()), this, SLOT(Settings())); - groupAct = CreateAction(tr("&Group"), tr("Group"), tr("Group/ungroup selected objects."), QIcon(":/res/generic-tool.png"), QKeySequence("g")); + groupAct = CreateAction(tr("&Group"), tr("Group"), tr("Group/ungroup selected objects."), QIcon(":/res/group-tool.png"), QKeySequence("g")); connect(groupAct, SIGNAL(triggered()), this, SLOT(HandleGrouping())); //Hm. I think we'll have to have separate logic to do the "Radio Group Toolbar" thing... @@ -601,13 +623,18 @@ void ApplicationWindow::CreateMenus(void) void ApplicationWindow::CreateToolbars(void) { QToolBar * toolbar = addToolBar(tr("File")); + toolbar->setObjectName("File"); // Needed for saveState() toolbar->addAction(exitAct); toolbar = addToolBar(tr("View")); + toolbar->setObjectName("View"); toolbar->addAction(zoomInAct); toolbar->addAction(zoomOutAct); + QSpinBox * spinbox = new QSpinBox; + toolbar->addWidget(spinbox); toolbar = addToolBar(tr("Edit")); + toolbar->setObjectName("Edit"); toolbar->addAction(snapToGridAct); toolbar->addAction(groupAct); toolbar->addAction(fixAngleAct); @@ -620,6 +647,10 @@ void ApplicationWindow::CreateToolbars(void) toolbar->addAction(addArcAct); toolbar->addAction(addPolygonAct); toolbar->addAction(addDimensionAct); + + spinbox->setRange(4, 256); + spinbox->setValue(12); + connect(spinbox, SIGNAL(valueChanged(int)), this, SLOT(HandleGridSizeInPixels(int))); } @@ -631,10 +662,7 @@ void ApplicationWindow::ReadSettings(void) snapToGridAct->setChecked(settings.value("snapToGrid", true).toBool()); resize(size); move(pos); -// pos = settings.value("charWndPos", QPoint(0, 0)).toPoint(); -// size = settings.value("charWndSize", QSize(200, 200)).toSize(); -// ((TTEdit *)qApp)->charWnd->resize(size); -// ((TTEdit *)qApp)->charWnd->move(pos); + restoreState(settings.value("windowState").toByteArray()); } @@ -642,9 +670,8 @@ void ApplicationWindow::WriteSettings(void) { settings.setValue("pos", pos()); settings.setValue("size", size()); + settings.setValue("windowState", saveState()); settings.setValue("useAntialiasing", drawing->useAntialiasing); settings.setValue("snapToGrid", snapToGridAct->isChecked()); -// settings.setValue("charWndPos", ((TTEdit *)qApp)->charWnd->pos()); -// settings.setValue("charWndSize", ((TTEdit *)qApp)->charWnd->size()); }