zcy
/
solvespace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add two more icons to the toolbar, for text in a TrueType font and 

for the tangent arc thing.

And update the version number to 1.7, in preparation for the next
release.

[git-p4: depot-paths = "//depot/solvespace/": change = 2147]
solver
Jonathan Westhues 2010-05-16 09:04:56 -08:00
parent fe2ea5d5e1
commit 00231a6799
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
icons/tangent-arc.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

BIN
icons/text.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

2
solvespace.cpp
View File

@ -828,7 +828,7 @@ void SolveSpace::MenuHelp(int id) {
break; break;
case GraphicsWindow::MNU_ABOUT: case GraphicsWindow::MNU_ABOUT:
Message("This is SolveSpace version 1.6.\n\n" Message("This is SolveSpace version 1.7.\n\n"
"For more information, see http://solvespace.com/\n\n" "For more information, see http://solvespace.com/\n\n"
"Built " __TIME__ " " __DATE__ ".\n\n" "Built " __TIME__ " " __DATE__ ".\n\n"
"Copyright 2008-2010 Useful Subset, LLC.\n" "Copyright 2008-2010 Useful Subset, LLC.\n"

4
toolbar.cpp
View File

@ -11,6 +11,8 @@ static const struct {
{ Icon_rectangle, GraphicsWindow::MNU_RECTANGLE, "Sketch rectangle" }, { Icon_rectangle, GraphicsWindow::MNU_RECTANGLE, "Sketch rectangle" },
{ Icon_circle, GraphicsWindow::MNU_CIRCLE, "Sketch circle" }, { Icon_circle, GraphicsWindow::MNU_CIRCLE, "Sketch circle" },
{ Icon_arc, GraphicsWindow::MNU_ARC, "Sketch arc, or tangent arc at selected point" }, { Icon_arc, GraphicsWindow::MNU_ARC, "Sketch arc, or tangent arc at selected point" },
{ Icon_text, GraphicsWindow::MNU_TTF_TEXT, "Sketch curves from text in a TrueType font" },
{ Icon_tangent_arc, GraphicsWindow::MNU_TANGENT_ARC, "Create tangent arc at selected point" },
{ Icon_bezier, GraphicsWindow::MNU_CUBIC, "Sketch cubic Bezier spline" }, { Icon_bezier, GraphicsWindow::MNU_CUBIC, "Sketch cubic Bezier spline" },
{ Icon_point, GraphicsWindow::MNU_DATUM_POINT, "Sketch datum point" }, { Icon_point, GraphicsWindow::MNU_DATUM_POINT, "Sketch datum point" },
{ Icon_construction, GraphicsWindow::MNU_CONSTRUCTION, "Toggle construction" }, { Icon_construction, GraphicsWindow::MNU_CONSTRUCTION, "Toggle construction" },
@ -100,7 +102,7 @@ bool GraphicsWindow::ToolbarDrawOrHitTest(int mx, int my,
int x = 17, y = (int)(height - 52); int x = 17, y = (int)(height - 52);
int fudge = 8; int fudge = 8;
int h = 32*14 + 3*16 + fudge; int h = 32*15 + 3*16 + fudge;
int aleft = 0, aright = 66, atop = y+16+fudge/2, abot = y+16-h; int aleft = 0, aright = 66, atop = y+16+fudge/2, abot = y+16-h;
bool withinToolbar = bool withinToolbar =