From: Shamus Hammons Date: Tue, 27 Aug 2013 01:57:19 +0000 (-0500) Subject: Added placeholder icons for File menu, changed Dimension rendering. X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=architektonas;a=commitdiff_plain;h=669a05b5a52bd759f0ea08772e0ed17222b015a0 Added placeholder icons for File menu, changed Dimension rendering. --- diff --git a/res/architektonas.qrc b/res/architektonas.qrc index 16d12d0..cbcba71 100644 --- a/res/architektonas.qrc +++ b/res/architektonas.qrc @@ -24,5 +24,11 @@ lock-closed.png connect-tool.png disconnect-tool.png + file-new.png + file-open.png + file-close.png + file-save.png + file-save-as.png + settings.png diff --git a/res/file-close.png b/res/file-close.png new file mode 100644 index 0000000..ba0a72e Binary files /dev/null and b/res/file-close.png differ diff --git a/res/file-new.png b/res/file-new.png new file mode 100644 index 0000000..fbb4ce0 Binary files /dev/null and b/res/file-new.png differ diff --git a/res/file-open.png b/res/file-open.png new file mode 100644 index 0000000..317a357 Binary files /dev/null and b/res/file-open.png differ diff --git a/res/file-save-as.png b/res/file-save-as.png new file mode 100644 index 0000000..0ecb79e Binary files /dev/null and b/res/file-save-as.png differ diff --git a/res/file-save.png b/res/file-save.png new file mode 100644 index 0000000..a81e70d Binary files /dev/null and b/res/file-save.png differ diff --git a/res/settings.png b/res/settings.png new file mode 100644 index 0000000..45b8fae Binary files /dev/null and b/res/settings.png differ diff --git a/src/applicationwindow.cpp b/src/applicationwindow.cpp index 8600d2d..72948f8 100644 --- a/src/applicationwindow.cpp +++ b/src/applicationwindow.cpp @@ -581,21 +581,21 @@ void ApplicationWindow::CreateActions(void) zoomOutAct = CreateAction(tr("Zoom &Out"), tr("Zoom Out"), tr("Zoom out of the document."), QIcon(":/res/zoom-out.png"), QKeySequence(tr("-"))); connect(zoomOutAct, SIGNAL(triggered()), this, SLOT(ZoomOutTool())); - fileNewAct = CreateAction(tr("&New Drawing"), tr("New Drawing"), tr("Creates a new drawing."), QIcon(":/res/generic-tool.png"), QKeySequence(tr("Ctrl+n"))); + fileNewAct = CreateAction(tr("&New Drawing"), tr("New Drawing"), tr("Creates a new drawing."), QIcon(":/res/file-new.png"), QKeySequence(tr("Ctrl+n"))); connect(fileNewAct, SIGNAL(triggered()), this, SLOT(FileNew())); - fileOpenAct = CreateAction(tr("&Open Drawing"), tr("Open Drawing"), tr("Opens an existing drawing from a file."), QIcon(":/res/generic-tool.png"), QKeySequence(tr("Ctrl+o"))); + fileOpenAct = CreateAction(tr("&Open Drawing"), tr("Open Drawing"), tr("Opens an existing drawing from a file."), QIcon(":/res/file-open.png"), QKeySequence(tr("Ctrl+o"))); connect(fileOpenAct, SIGNAL(triggered()), this, SLOT(FileOpen())); - fileSaveAct = CreateAction(tr("&Save Drawing"), tr("Save Drawing"), tr("Saves the current drawing to a file."), QIcon(":/res/generic-tool.png"), QKeySequence(tr("Ctrl+s"))); + fileSaveAct = CreateAction(tr("&Save Drawing"), tr("Save Drawing"), tr("Saves the current drawing to a file."), QIcon(":/res/file-save.png"), QKeySequence(tr("Ctrl+s"))); connect(fileSaveAct, SIGNAL(triggered()), this, SLOT(FileSave())); - fileSaveAsAct = CreateAction(tr("Save Drawing &As"), tr("Save As"), tr("Saves the current drawing to a file with a different name."), QIcon(":/res/generic-tool.png"), QKeySequence(tr("Ctrl+Shift+s"))); + fileSaveAsAct = CreateAction(tr("Save Drawing &As"), tr("Save As"), tr("Saves the current drawing to a file with a different name."), QIcon(":/res/file-save-as.png"), QKeySequence(tr("Ctrl+Shift+s"))); connect(fileSaveAsAct, SIGNAL(triggered()), this, SLOT(FileSaveAs())); - fileCloseAct = CreateAction(tr("&Close Drawing"), tr("Close Drawing"), tr("Closes the current drawing."), QIcon(":/res/generic-tool.png"), QKeySequence(tr("Ctrl+w"))); + fileCloseAct = CreateAction(tr("&Close Drawing"), tr("Close Drawing"), tr("Closes the current drawing."), QIcon(":/res/file-close.png"), QKeySequence(tr("Ctrl+w"))); - settingsAct = CreateAction(tr("&Settings"), tr("Settings"), tr("Change certain defaults for Architektonas."), QIcon(":/res/generic-tool.png"), QKeySequence()); + settingsAct = CreateAction(tr("&Settings"), tr("Settings"), tr("Change certain defaults for Architektonas."), QIcon(":/res/settings.png"), QKeySequence()); connect(settingsAct, SIGNAL(triggered()), this, SLOT(Settings())); groupAct = CreateAction(tr("&Group"), tr("Group"), tr("Group/ungroup selected objects."), QIcon(":/res/group-tool.png"), QKeySequence("g")); @@ -695,7 +695,12 @@ void ApplicationWindow::CreateToolbars(void) { QToolBar * toolbar = addToolBar(tr("File")); toolbar->setObjectName("File"); // Needed for saveState() - toolbar->addAction(exitAct); + toolbar->addAction(fileNewAct); + toolbar->addAction(fileOpenAct); + toolbar->addAction(fileSaveAct); + toolbar->addAction(fileSaveAsAct); + toolbar->addAction(fileCloseAct); +// toolbar->addAction(exitAct); toolbar = addToolBar(tr("View")); toolbar->setObjectName("View"); diff --git a/src/dimension.cpp b/src/dimension.cpp index 2a989dc..2dc7fce 100644 --- a/src/dimension.cpp +++ b/src/dimension.cpp @@ -108,6 +108,7 @@ I believe they are pixels. } else { + // Draw outside arrowheads Point p7 = p1 - (unit * 9.0 * size); Point p8 = p2 + (unit * 9.0 * size); painter->DrawArrowhead(p1, p7, size); @@ -120,7 +121,27 @@ I believe they are pixels. painter->SetFont(QFont("Arial", 8.0 * Painter::zoom * size)); Vector v1((p1.x - p2.x) / 2.0, (p1.y - p2.y) / 2.0); Point ctr = p2 + v1; + +#if 0 QString dimText = QString("%1\"").arg(Vector(endpoint - position).Magnitude()); +#else + QString dimText; + double length = Vector(endpoint - position).Magnitude(); + + if (length < 12.0) + dimText = QString("%1\"").arg(length); + else + { + double feet = (double)((int)length / 12); + double inches = length - (feet * 12.0); + + if (inches == 0) + dimText = QString("%1'").arg(feet); + else + dimText = QString("%1' %2\"").arg(feet).arg(inches); + } +#endif + painter->DrawAngledText(ctr, angle, dimText, size); }