From 669a05b5a52bd759f0ea08772e0ed17222b015a0 Mon Sep 17 00:00:00 2001 From: Shamus Hammons Date: Mon, 26 Aug 2013 20:57:19 -0500 Subject: [PATCH] Added placeholder icons for File menu, changed Dimension rendering. --- res/architektonas.qrc | 6 ++++++ res/file-close.png | Bin 0 -> 1018 bytes res/file-new.png | Bin 0 -> 873 bytes res/file-open.png | Bin 0 -> 1125 bytes res/file-save-as.png | Bin 0 -> 1233 bytes res/file-save.png | Bin 0 -> 798 bytes res/settings.png | Bin 0 -> 1101 bytes src/applicationwindow.cpp | 19 ++++++++++++------- src/dimension.cpp | 21 +++++++++++++++++++++ 9 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 res/file-close.png create mode 100644 res/file-new.png create mode 100644 res/file-open.png create mode 100644 res/file-save-as.png create mode 100644 res/file-save.png create mode 100644 res/settings.png 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 0000000000000000000000000000000000000000..ba0a72ef73ef59089084dc1279c4a5888c934d81 GIT binary patch literal 1018 zcmViRrbQZ5FChahtuMpIY&F0Fk4zpAr(iZ)wF6&qD}uK zxioFAxtu*rb0lqqz3>ZP?s*RG!{_-O+zDORx!-&t#DN67D`fd;uisy#&CD#tH0_QR zt~{sfVSpmIqobpA=_H>@u{=Ib zaA+utqO_gW^{-?KX=rG0d+O?%bR8r~V9KJczEaoA^Z|%4A_4*)ZdS1uLHTMjt5_U1<~Ro83|%P(ulXa8_n&;<8s+D z@V;CQ28xD~X^Szk#j!E!^9tF?PY8YZFi&*8#>%6QP;=xs6YpJOl{Fj?C^t4B zMMGh!F2XGq3-x_{B+r~-_0AM`pMMf-eu{l{ zkp25IOW)jJ@%l8ZksX0|O28N}*Z~!VHnz4h-qXYW!9kSIr_icl$qg0(a{NcCQzHK< z`js1SdxxoQHXF-_4l!i2-Ml_IIjHM;W>>H% z*qTstOm4TE6YcG+oI1t){5-0vVz=9Q%ID+PYu6?|4hG`@6~Lw~u;c1k0fO7CQ)NBQ~(d}5RR%BVG{9{&bT>fB1r~xue4P&E1NFpp_hw)%A^J-7e;YcL11ZJcPFRvop7(+UprrKG}x8IE_ z{cpeC914Y^lttz~V!#dXMpk9+kA+zGxvrzLv$Ju4ir{cKyu8(4q<>Sg!0D0`BB1}#^JwdP| z$k{z-`I?*M-ti$M*I)LrHPp%DQCo;e;9gq@Nlw9S0>OM2p43Ulq$?`{x#RQ7) zg#Qo9WO2*Q0B-tT=CNZv~B2(Y?SX0&*zn%C?Pb z0fHNY7<&!chBP7@pzRmL2LzH+cQx1w=^|9Skfdsj>nl)g<#9dsd2h5AyznOs+D`Cy zf+7&Hvm1VQf)xO~Jdom*?P@aDTM>)Kh_*$c3N!OCR{}+*2yec@+#=xT6HDB2-sAa& zh3Bg6iuo^UUHNjJp7%W@<`Yl?-w$~mDqFzv0Gr7$&k=E67`nQtAug$!+grBt_V8P7 z?!C#Ou0sU&Z)D599aug-)5-uLc1bCK)A;w|qHNswcDTg#>Bi&noD@Qg(15pQcehro zCU;X8*JX8S)5dl?EX$I!skknMrj3imBI$IRrKKgx<+39;3?m23f}3vphr+%|EH5t$ z`vzf}rl?dZPO8spHzGY*#20P^)O{}RjkxQ}tM2>WF@|8I_c;iAm{(iLSj@=?R_F8PY;KhsaQh$H!bUglU zj3(%;5qqcP^TzC@OP7zYCSCu39;Ag3Db~PW-k42K!5=_z00000NkvXXu0mjfKDd*j literal 0 HcmV?d00001 diff --git a/res/file-open.png b/res/file-open.png new file mode 100644 index 0000000000000000000000000000000000000000..317a3577a0bf8e619319ec078fa0bec6ff535046 GIT binary patch literal 1125 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 literal 0 HcmV?d00001 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); } -- 2.37.2