vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity
5,545 Commits
29 Branches
9 Tags
31 MiB
Commit Graph

2431 Commits (cc4b633e436ce028b911345b987e48ba5e96fae8)

Author SHA1 Message Date
Torsten Paul 6f9c4f7f09 Integrate with QSettings. 2014-12-29 00:29:09 +01:00
Marius Kintel 03f63c1c40 Minor compile fix 2014-12-28 16:05:54 -05:00
Marius Kintel 3e2ff23c00 Merge pull request #1115 from openscad/quantizevertices 
Quantize vertices
 2014-12-27 00:25:18 -05:00
Tim Deagan b6dcea12d0 Merge remote-tracking branch 'upstream/master' into scalemarkers 
merging the upstream/master branch into my working branch prior to syncing with my fork
12/26/2014 22:07 CST tim deagan
 2014-12-26 22:07:03 -06:00
Tim Deagan 1068f61dc6 Add optional menu driven scaling tics to the large axes 
Tim Deagan 12/26/2014

While add-on rulers can be extremely useful, there are many times that a quick scaling marker would be handy. This feature generates tics every 10 units, driven off the log10 of the l variable defining axes length.  As you zoom in or out, the tics automatically re-scale themselves.  Every tenth tic is slightly larger.  A menu item is added to the view menu to enable or disable the feature.

I experimented with menu driven scaling (.01, .1, 1, 10, etc.), but using small increments when zoomed out brought the app to it's knees.  Adding a visual indicator of the current scaling might be nice, but I'm nto sure where to put it (possibly below the small axes,) since it changes as zooming and would clutter the console.

 Changes to be committed:
	new file:   images/scalemarkers.png
	modified:   openscad.qrc
	modified:   src/GLView.cc
	modified:   src/GLView.h
	modified:   src/MainWindow.h
	modified:   src/MainWindow.ui
	modified:   src/QGLView.h
	modified:   src/mainwin.cc
 2014-12-26 21:44:31 -06:00
Torsten Paul 6c25d5ccb6 Add more settings (AutoIndent / TabIndents / IndentationsUseTabs). 2014-12-27 02:59:11 +01:00
Torsten Paul 0cb6b3267a Add editor settings. 2014-12-27 02:17:15 +01:00
Torsten Paul dde4575c88 Add class to handle settings. 2014-12-27 00:12:23 +01:00
Torsten Paul 3a5ee3a4c6 Add GUI controls for editor settings. 2014-12-27 00:12:17 +01:00
Marius Kintel cce016b97b Merge remote-tracking branch 'origin/master' into quantizevertices 2014-12-26 14:08:09 -05:00
Torsten Paul 7ccdb778fc Enable GL_LINE_STIPPLE only for the block where a stipple pattern is used (fixes #1111). 2014-12-26 19:20:11 +01:00
Marius Kintel 3f0b16dd75 Merge branch 'master' of github.com:openscad/openscad 2014-12-25 17:27:40 -05:00
Marius Kintel 641ac4a506 #1107 Correctly display validity for objects which didn't yet touch CGAL 2014-12-25 17:27:13 -05:00
shaina7837 1ba2216108 reset view icon added 2014-12-26 00:56:31 +05:30
shaina7837 295f257bf8 undo redo icons added 2014-12-26 00:35:13 +05:30
shaina7837 2654bf9575 unindent duplicate image removed 2014-12-25 23:44:41 +05:30
shaina7837 040aac5e8f Indent icon added 2014-12-25 23:34:28 +05:30
shaina7837 ed500abd39 indent unindent icons added 2014-12-25 23:12:32 +05:30
Torsten Paul d2af825640 Enable resource lookup for Windows build (needed for dev and MSYS2 package). 2014-12-25 18:22:51 +01:00
Torsten Paul fd4fe0816a Fix style sheet to remove borders from QStatusBar items. 2014-12-25 18:22:51 +01:00
Marius Kintel c2643d82ea #1069 Correctly fall back to CGAL minkowski if our convex decomposition-based minkowski fails. Fixes #1069 for now, but our convex-based minkowski should not fail 2014-12-23 22:50:38 -05:00
Marius Kintel 32c3e0d322 Merge pull request #1106 from openscad/gui-updates 
Gui updates
 2014-12-23 13:20:32 -05:00
Torsten Paul d296d93ddc Quit application when last main window is closed (fixes #1079). 2014-12-23 19:05:53 +01:00
Torsten Paul 0801fc432d Add background to the drag&drop pixmap to make it better readable. 2014-12-23 18:42:16 +01:00
Torsten Paul 481665f8a3 Change layout to allow longer version number text. 2014-12-23 18:28:16 +01:00
Torsten Paul c9a234a079 Add OK button, some Linux window managers do not add a close button to dialogs. 2014-12-23 18:27:39 +01:00
Marius Kintel a68560707f Merge branch 'master' of github.com:openscad/openscad 2014-12-23 01:10:23 -05:00
Marius Kintel 328cd7f362 #1028 Adjusted return values for errors 2014-12-23 01:07:35 -05:00
Marius Kintel b48089e694 Merge branch 'master' of git://github.com/jgelderloos/openscad 2014-12-23 01:02:50 -05:00
Marius Kintel 9b00f69311 #1065 Made font cache progress dialog indeterminate also on Windows 2014-12-23 00:49:37 -05:00
Marius Kintel 22ed0780fa Merge branch 'master' of github.com:openscad/openscad 2014-12-23 00:37:45 -05:00
Marius Kintel c5e4715575 bugfix: highlighted differences didn't render correctly 2014-12-23 00:37:43 -05:00
Torsten Paul 5dc88d0eed Switch between progress widget and status label. 2014-12-23 06:33:35 +01:00
Torsten Paul 3d9b66cf0f Fix crash on startup for the MinGW version. 2014-12-23 06:33:35 +01:00
Marius Kintel 756d3e2a97 Merge pull request #1102 from openscad/text-fixes-part6 
Text fixes (part 6)
 2014-12-23 00:03:34 -05:00
Torsten Paul b37b49f407 Add version number to launching screen and main windows (fixes #1101). 2014-12-23 03:56:17 +01:00
Torsten Paul 5ad36c82b6 Add OpenSCAD version to the status bar. 2014-12-23 03:33:42 +01:00
Torsten Paul c4e895a813 Add drag&drop to the FontListDialog. 2014-12-23 03:07:27 +01:00
Marius Kintel d071ba16cb Merge pull request #1087 from openscad/offset-updates2 
Update offset() parameter handling.
 2014-12-22 19:18:40 -05:00
Torsten Paul b2227c7191 Quote special characters when copying the font selector. 2014-12-23 00:05:42 +01:00
Torsten Paul b5f5ffd142 Update German translation and merge new template. 2014-12-22 23:38:35 +01:00
Marius Kintel f945ce3ad8 Correctly calculate arc_tolerance for Clipper 2014-12-22 16:58:22 -05:00
Marius Kintel 781ec4d7bf Minor doc clarification 2014-12-22 16:58:03 -05:00
Marius Kintel 5fe30c66eb Merge pull request #1094 from openscad/fontconfig-init 
Use QtConcurrentRun to initialize FontConfig in a separate thread.
 2014-12-22 11:23:20 -05:00
Torsten Paul c278963a85 Path and filenames need to use system encoding (fixes #1092). 2014-12-21 17:56:50 +01:00
Torsten Paul 98a9ea7e12 Use QtConcurrentRun to initialize FontConfig in a separate thread. 2014-12-21 03:49:20 +01:00
Torsten Paul 5a0ea7abe2 Color code warning and error messages in the console window (fixes #855). 2014-12-21 02:12:06 +01:00
Torsten Paul 128498a678 Allow reading the keyword lists from the color scheme files. 2014-12-20 17:27:18 +01:00
Torsten Paul 90b7dd82c2 Update lexer keywords. 2014-12-20 04:46:59 +01:00
Torsten Paul b1871c6309 Fix color schemes (brace highlight / selection color / line-end markers). 2014-12-20 02:51:11 +01:00
Torsten Paul ad51cadfbd Update offset() parameter handling. 
- Rounded offset is now using parameter r
- Using delta only or delta with camfer = false creates no chamfer
- Using delta with chamfer =true creates chamfer at delta distance
 2014-12-19 16:48:13 +01:00
Marius Kintel d72c121fa6 Minor Grid3 refactoring 2014-12-19 02:40:17 -05:00
Marius Kintel 0aa215b90c Quantize vertices when building Nef polyhedrons from PolySets 2014-12-19 02:27:56 -05:00
Marius Kintel f0c7ee6d61 #1068 Attempt to fix the Windows line ending issue 2014-12-17 16:19:13 -05:00
Marius Kintel 6492d25265 #1065 The text module is no longer experimental 2014-12-17 12:56:52 -05:00
Marius Kintel 1aef9f2758 #1065 Show progress dialog while building font cache 2014-12-17 12:12:53 -05:00
Marius Kintel 3d0749b619 Improve displayed rendering time by including compilation time 2014-12-16 18:01:25 -05:00
Marius Kintel 0448b0f1db #1076 Fix memory display on 64-bit Windows 2014-12-16 17:40:13 -05:00
Marius Kintel a40b2848e9 killed compiler warning 2014-12-16 17:39:38 -05:00
Marius Kintel 93b6113edc #1065 fix: It's allowed to pass NULL geometry to the preview renderer 2014-12-16 17:22:41 -05:00
Marius Kintel fe3cae8120 #1065 Text preview optimization: Don't tesselate every frame 2014-12-16 17:03:06 -05:00
Torsten Paul 0f2806ab8a Assume internally used strings are stored in UTF-8. 2014-12-16 21:31:00 +01:00
Torsten Paul 4be9a43b40 Add debug output for the Node Id Cache. 2014-12-16 21:21:06 +01:00
Marius Kintel 77c865d1be Improved regex to correctly match quoted characters in strings 2014-12-16 13:03:12 -05:00
jgelderloos 01ce545e1a Merge branch 'master' of https://github.com/jgelderloos/openscad 2014-12-13 16:21:18 -05:00
jgelderloos 6f68330ce0 Changed exit codes to 0 and added help description to help menu #1028 2014-12-13 16:03:25 -05:00
Marius Kintel 14870d69de #1066 Build fix 2014-12-12 14:35:42 -05:00
Marius Kintel f1b1faad44 Preserve whitespace inside strings when creating cache keys. Fixes #1066 2014-12-12 14:06:28 -05:00
Marius Kintel 9fe80a3a66 Mac build fix 2014-12-11 17:23:45 -05:00
Marius Kintel 9da865604c #600 Tag menu action roles to allow translated menu items to move to the correct Mac OS X menu 2014-12-11 16:58:20 -05:00
Marius Kintel 0a10aca8aa #1051 Suppress warning and error output after 5 equal messages 2014-12-11 16:37:27 -05:00
Marius Kintel 9863aa9ab2 #1051 Detect recursion after 1M tail recursion iterations 2014-12-11 16:09:55 -05:00
Marius Kintel df53d05bba Merge pull request #1062 from openscad/sysinfo 
Report system information in the 'Library Info' dialog
 2014-12-10 22:45:15 -05:00
Marius Kintel 39612397fa #1057 Sysinfo for Mac OS X 2014-12-10 22:44:39 -05:00
Marius Kintel 73b6700b69 Empty polysets are convex. Fixes crash in is_approximately_convex() 2014-12-09 17:46:03 -05:00
Marius Kintel 7e728fac6a Improve polyset convexity check by tessellating polygons prior to testing. Fixes #1061 2014-12-09 16:53:11 -05:00
Torsten Paul 845bd5706e Guard against reading huge files. 2014-12-09 22:46:09 +01:00
Marius Kintel f32e03dffb Merge branch 'master' of github.com:openscad/openscad 2014-12-09 16:42:05 -05:00
Marius Kintel 6d9329966a #1061 fixed test build behaving differently from GUI build due to ENABLE_CGAL flag not being passed to all relevant sources. Added testcase 2014-12-09 16:42:02 -05:00
Torsten Paul f7816e02cd Add system info (OS / CPUs/ RAM / Distribution (when on Linux)). 2014-12-09 22:21:04 +01:00
Torsten Paul f4a6da7fb0 Try to detect if compiling with a 32bit or 64bit compiler. 2014-12-09 21:19:57 +01:00
Torsten Paul 3a90fa12fa Merge pull request #1060 from openscad/qglformat-patch 
Disable vertical refresh syncing.
 2014-12-09 21:18:57 +01:00
Marius Kintel 2462799655 Handle a bunch of nullspace corner cases. Fixes #1029 2014-12-08 18:25:48 -05:00
Torsten Paul 342af594ad Disable vertical refresh syncing. 2014-12-08 18:54:39 +01:00
Marius Kintel 94aabb05b5 #1054 Fixed memory leak 2014-12-08 00:57:28 -05:00
Marius Kintel ccea6fdde9 Bugfix: 2D scale or mirror sometimes caused flipped normals which caused larger issues downstream. Fixes #1055 2014-12-07 20:09:45 -05:00
Marius Kintel 6c6882fb2e #1055 Doc: Clarify sanitized polygons 2014-12-07 19:54:31 -05:00
Torsten Paul 2f4171f506 Add optional target suffix for the binary / installation folder. 
This is mainly intended to be used for building snapshot binaries that
are able to install in parallel to a release build. E.g. by using the
parameter "SUFFIX=-nightly" for qmake, the target binary will be called
openscad-nightly and the resource base folder /usr/share/openscad-nightly.
 2014-12-06 19:23:19 +01:00
Torsten Paul 50e79a6817 Fix evaluation of ! expressions. 2014-12-05 20:54:01 +01:00
Torsten Paul 092b9eeddc Build with -DNOGDI by default to prevent name conflicts with windows.h. 2014-12-04 23:30:42 +01:00
Torsten Paul b6167b0b60 Merge branch 'master' into translation2 
Conflicts:
	src/PlatformUtils.h
 2014-12-04 20:51:44 +01:00
Marius Kintel 8bd04b1417 Merge pull request #1030 from openscad/issue409 
Optimize stack usage (#409)
 2014-12-04 14:05:15 -05:00
Torsten Paul 407da2ea8c Move catch for function recursion detection. 
Catching this at ModuleInstantiation::evaluate() should ensure the whole
function call is terminated with the first exception. Otherwise function
calls with multiple recursion points (e.g. function f(x) = f(x) + f(x);)
will still descent into the recursion multiple times.
 2014-12-04 19:40:15 +01:00
Marius Kintel 87f532493e #1047 Some more cleanup for NULLGL 2014-12-03 10:58:44 -05:00
Marius Kintel 88713b01cf Merge branch 'nullglfix' of git://github.com/bmcage/openscad into bmcage-nullglfix 2014-12-03 10:13:12 -05:00
Benny Malengier 3e0ef9dd68 Needed changes to have NULLGL compiling. 
Resulting prog compiles to output stl
 2014-12-02 12:31:59 +01:00
Marius Kintel 0067aafbb0 Forgot to commit Value -> ValuePtr fix to header 2014-12-01 17:34:47 -05:00
Marius Kintel be595efd31 Merge remote-tracking branch 'origin/master' into issue409 
Conflicts:
	src/mainwin.cc
	src/module.cc
 2014-12-01 17:07:01 -05:00
Marius Kintel a59e7d658e Merge branch 'master' of github.com:openscad/openscad 2014-12-01 17:06:30 -05:00
Marius Kintel 582d5dde8c #1030 bugfix: contexts need a parent, or it may crash 2014-12-01 16:52:04 -05:00
Marius Kintel 1e2b28ac2f Merge remote-tracking branch 'origin/master' into translation2 2014-12-01 16:47:36 -05:00
Marius Kintel 57974baa13 Silence verbose debug output 2014-12-01 16:47:00 -05:00
Marius Kintel d6d814586c Merge pull request #1037 from openscad/issue949 
Use FileContext when evaluating $vp{rtd} variables (fixes #949).
 2014-12-01 10:56:32 -05:00
Marius Kintel 80050e94db merge fixes 2014-12-01 02:51:56 -05:00
Marius Kintel 5743064d56 Merge remote-tracking branch 'origin/master' into translation2 2014-12-01 02:34:28 -05:00
Marius Kintel a05fe72c6b Rewrote tessellation used for NefPolyhedron to PolySet conversion. Should fix #1033 2014-12-01 00:54:01 -05:00
Torsten Paul ef9f2f3289 Retain FileContext to lookup $vp{rtd} variables after compilation (fixes #949). 2014-11-30 16:37:17 +01:00
Torsten Paul 6263bfd269 Render crosshair a bit less intrusive. 2014-11-30 03:22:14 +01:00
Torsten Paul fcbd9fc024 Fix crosshair at the center of the display (fixes #1025). 2014-11-30 03:04:15 +01:00
Torsten Paul 3992cc547b Update drawing logic (fixes #1035). 
- Draw negative part of the axis with stippled lines
- Calculate contrast color for axis based on background color
- Disable lighting for axis / crosshair
 2014-11-30 03:04:01 +01:00
Marius Kintel 75b57cd9b5 Added some malformed polyhedron tests and fixed an assertion bug 2014-11-27 21:00:23 -05:00
Marius Kintel fac2340989 More correct handling of empty geometry. Should fix a few crash bugs 2014-11-27 20:40:37 -05:00
Marius Kintel c2775d4541 doc 2014-11-27 20:38:53 -05:00
Marius Kintel 91139402ea toPolygon2d() should never return NULL 2014-11-27 20:38:09 -05:00
Marius Kintel defb486a64 createGeometry() should never return NULL 2014-11-27 20:37:40 -05:00
Marius Kintel 4d6db2caa7 fixes crash when intersecting 3 or more 2d objects which results in an empty polygon 2014-11-27 15:27:09 -05:00
Torsten Paul a820487032 Simple implementation of tail-recursion elimination. 2014-11-26 22:53:10 +01:00
Marius Kintel 819f5d085f Moved Polygon typedef out of PolySet class 2014-11-26 15:22:15 -05:00
Marius Kintel 0b58b7d2b3 Compile fix: Don't include Carbon as it pollutes the global namespace with e.g. 'Polygon' 2014-11-26 15:02:44 -05:00
Marius Kintel ecbaec0849 Updated ClipperLib to 6.2.1 2014-11-25 17:41:08 -05:00
Marius Kintel b621287610 C++11 build fix 2014-11-25 17:40:49 -05:00
Marius Kintel 2e8d93d5be Some Expression refactoring 2014-11-25 17:08:14 -05:00
Marius Kintel b03345ec18 bugfix: dump of list comprehension if expression was buggy 2014-11-25 17:01:10 -05:00
Marius Kintel d99dea1db2 bugfix after merging master - dynamic memory caused contexts not to be destructed 2014-11-25 15:53:44 -05:00
Marius Kintel 32bc6ae516 inlined stack pointer retrieval to silence compiler warning 2014-11-25 15:06:20 -05:00
Marius Kintel 2644b19ce7 Reimplemented serialization of expression to string after last refactoring 2014-11-25 15:05:36 -05:00
Marius Kintel be9b0ee925 indentation 2014-11-25 11:26:14 -05:00
Marius Kintel 4cd712d24d Merge remote-tracking branch 'origin/master' into stack-size-hack 
Conflicts:
	src/context.h
	src/control.cc
	src/evalcontext.h
	src/localscope.cc
	src/module.cc
 2014-11-25 11:25:37 -05:00
Marius Kintel 23c9dee265 bugfix: Correctly handle else scopes, handle overrides inside assign scopes 2014-11-25 00:45:00 -05:00
Marius Kintel 3612db6a2f Fixes crash during the second run of a failing recursive module 2014-11-24 20:44:39 -05:00
Marius Kintel f1b29e1db9 Removed old stack measurement code 2014-11-24 18:54:51 -05:00
Marius Kintel 15835271c2 Implemented stackLimit() for Mac OS X 2014-11-24 18:29:13 -05:00
Marius Kintel d8010a0659 Take a copy of the name of the recursive component, don't use a pointer to a temporary string 2014-11-24 18:25:38 -05:00
Marius Kintel e0fbeb8d95 Use StackCheck to detect module recursion 2014-11-24 18:12:58 -05:00
Torsten Paul aa586136ae Remove duplicate warning message. 2014-11-24 23:52:07 +01:00
Torsten Paul c206fab087 Merge branch 'stack-size-hack' of github.com:openscad/openscad into stack-size-hack 2014-11-24 23:46:57 +01:00
Torsten Paul 241723dd8f Merge branch 'stack-size-hack' of github.com:openscad/openscad into stack-size-hack 
Conflicts:
	src/expr.cc
 2014-11-24 23:46:39 +01:00
Marius Kintel 5debac7de0 Throw and catch RecursionException on module recursion 2014-11-24 17:44:39 -05:00
Marius Kintel edc64bdbe9 forgot exceptions.h 2014-11-24 17:43:13 -05:00
Torsten Paul dc8f559b85 Use class hierarchy for the different types of expressions. 2014-11-24 23:37:42 +01:00
Torsten Paul 756f8079d8 Add class to determine the current stack size. 2014-11-24 23:36:29 +01:00
Torsten Paul ba4c50c631 Add function to retrieve the maximum stack size. 2014-11-24 23:34:57 +01:00
Marius Kintel ab96a82629 Minor cleanup of recursion exception handling 2014-11-24 17:30:05 -05:00
Marius Kintel 54a111472f Initial experiment with using exceptions to handle stack overflows 2014-11-24 12:54:14 -05:00
Torsten Paul 6ed14dafb0 Remove big switch statement from expression evaluation. 
The switch statement causes a huge stack overhead that is very bad for
evaluating recursive functions.
 2014-11-24 00:53:46 +01:00
Torsten Paul 69451af578 Use heap for Context object. 2014-11-24 00:53:46 +01:00
Torsten Paul 609f665406 Extract PRINTB() from recursion stack. 2014-11-24 00:53:46 +01:00
Torsten Paul 1f73807097 Hack to track stack size in function evaluation. 2014-11-24 00:53:41 +01:00
Marius Kintel 406e6e1bac #409 Pass Value objects as shared_ptr instances instead of by Value to battle excess stack usage 2014-11-23 00:59:17 -05:00
Marius Kintel d381ec8bcf #347 Deprecated assign() 2014-11-20 18:31:24 -05:00
Marius Kintel 6a1bc270fd Removed unused member variable 2014-11-20 18:30:58 -05:00
Marius Kintel b2c205ba4c Merge remote-tracking branch 'origin/master' into translation2 
Conflicts:
	tests/csgtexttest.cc
 2014-11-17 21:56:53 -05:00
Marius Kintel 1afb706461 Merge remote-tracking branch 'origin/master' into translation2 2014-11-17 21:55:19 -05:00
Marius Kintel b83bf31ac4 Merge branch 'master' into issue347 2014-11-17 01:00:41 -05:00
Marius Kintel ea1d561c46 Support variable assignment in local blocks. This should fix #347 but more testing is needed 2014-11-17 00:57:36 -05:00
Torsten Paul 8cf85e0987 Fix MDI issues. 2014-11-16 19:35:16 +01:00
Torsten Paul 66b22b24a5 Add path information to info output. 2014-11-15 22:44:46 +01:00
Torsten Paul e1db572688 Fix application path initialization for --info. 2014-11-15 22:44:46 +01:00
Torsten Paul 7761c0887b Postpone color scheme initialization after the application path is set. 2014-11-15 22:44:46 +01:00
Torsten Paul 635bf29308 Throw an error if the application path is accessed before it's initialized. 2014-11-15 22:44:46 +01:00
Torsten Paul ce16eb5ce0 Lookup resource folder only once and add some debug output. 2014-11-15 22:44:46 +01:00
Torsten Paul 650a0d2d21 Add debug output for color scheme enumeration. 2014-11-15 18:39:17 +01:00
mermerico 85a91d62a5 Improved DXF output compatibility 
Changed coordinate order from [X1 X2 Y1 Y2] to [X1 Y1 X2 Y2]. Both orders are standard compliant but [X1 Y1 X2 Y2] is far more common and can be parsed linearly. Some libraries, like the python libraries dxfgrabber and ezdxf, cannot open [X1 X2 Y1 Y2] order.
 2014-11-14 09:49:06 -05:00
Torsten Paul 99c617562c Remove obsolete LOCALE_PREFIX and update documentation. 2014-11-13 00:39:17 +01:00
Torsten Paul ca3672b19c Move translation files to locale folder instead of po. 
While this is not the standard name for the files, this makes the
resource handling easier as the PlatformUtils code already handles
lookup for both installed and dev layouts. At least for Linux the
installed name would be /usr/share/locale, so we use that in source
too for now.
 2014-11-13 00:24:44 +01:00
Torsten Paul 59c4dec623 Merge branch 'master' into translation2 2014-11-12 23:21:42 +01:00
Marius Kintel 40aae17c0e Move software update menu handling to AutoUpdater. This should fix #714 2014-11-10 15:01:34 -05:00
Marius Kintel e518cb9089 bugfix: Correct order of recent files on splash screen 2014-11-08 23:00:56 -05:00
Marius Kintel 31b90d1acb Merge pull request #1008 from openscad/externalize-colorschemes2 
Externalize colorschemes
 2014-11-08 20:49:15 -05:00
Marius Kintel 28d7d54502 Issue warning if trying to export previous F6 state. Fixes #48 2014-11-06 08:14:04 +01:00
Marius Kintel 92389b8589 Merge pull request #1003 from openscad/configure-window-reorder 
Add option to disable window reordering by removing the dock window title bar
 2014-11-05 21:28:13 +04:00
Marius Kintel 90f58ced7d Allow preview of designs with only background or highlight objects. Fixes #1005 2014-11-05 21:24:09 +04:00
Marius Kintel a3a6b66061 Ignore background nodes when checking for mixed 2D and 3D objects. Fixes #1004 2014-11-05 19:35:00 +04:00
Marius Kintel 7086f5fc37 Fixed build issue related to https://svn.boost.org/trac/boost/ticket/6455 2014-11-05 18:58:45 +04:00
Marius Kintel 162b453981 Merge remote-tracking branch 'origin/master' into externalize-colorschemes2 2014-11-05 18:26:10 +04:00
Marius Kintel 26da9ca983 Include debug objects in View All 2014-11-05 18:22:08 +04:00
Marius Kintel 3fd7d9da3c Unify resource path location, correctly find resources for the test suite on Mac 2014-11-05 16:45:14 +04:00
Marius Kintel 9205a378c4 Added ~/Library/Application Support as user config path on Mac 2014-11-05 16:14:14 +04:00
Torsten Paul a9cbabdbc2 Remove some obsolete dependencies to colormap.h. 2014-11-02 23:42:24 +01:00
Torsten Paul 46bffd3f4c Move default color scheme back into code. 2014-11-02 23:36:23 +01:00
Torsten Paul 34981284fc Use local AppData folder for user config on Windows. 2014-11-02 16:39:51 +01:00
Torsten Paul 7c3077b0f2 Read color schemes from additional user config path. 2014-11-01 23:06:36 +01:00
Torsten Paul e59a2f035e Handle color scheme lookup in test cases. 2014-11-01 20:51:36 +01:00
Torsten Paul 2ee58893f5 Move render color schemes to separate files. 2014-11-01 20:51:36 +01:00
Torsten Paul df119fec75 Add solarized render color map to match the editor color scheme. 2014-11-01 20:51:36 +01:00
Torsten Paul 0886944fcd Handle setting of additional color schemes. 2014-11-01 20:51:36 +01:00
Torsten Paul 23275dc927 Get color schemes from editor; Enumerate from resource folder for scintilla. 2014-11-01 20:51:36 +01:00
Torsten Paul 395795949e Move color scheme values into resource files. 2014-11-01 20:51:36 +01:00
Torsten Paul 63201e25fd Add option to disable window reordering by removing the dock window title bar. 2014-11-01 18:55:48 +01:00
Torsten Paul 5078f401e9 Change console minimum size to 10x10. 2014-11-01 17:24:28 +01:00
Marius Kintel a68b39ead7 Fix regression related to intersection with empty shapes. Fixes #996 2014-10-31 15:28:26 +04:00
Marius Kintel a93196eb7e Update settings for show/hide toolbars. Fixes #1001 2014-10-31 11:45:04 +04:00
Torsten Paul 7ad0a86b02 Fix crash in hull() with empty CGAL child geometry (fixes #990). 2014-10-21 20:57:18 +02:00
Torsten Paul ea39c70471 Ensure window is visible after restoring the window state (fixes #976). 2014-10-20 00:22:22 +02:00
Torsten Paul ebb7dde012 Fix status handling for docked windows. 
Especially for the case where the windows are docked as tabs in the
same position, the "visibility-changed" signal does not work as close
indicator. The window is also treated as invisible when just the tab
is invisible, not only in case the window is closed.
 2014-10-20 00:21:06 +02:00
Torsten Paul 6cd441e0f1 Port translation code to use resource path from PlatformUtils. 2014-10-19 01:43:45 +02:00
Torsten Paul e4071472ad Rename for easier translation. 2014-10-19 01:25:23 +02:00
Torsten Paul baf49d107f Add translations. 2014-10-19 01:25:23 +02:00
Torsten Paul 9e52f2fc1b Add N_() to allow adding translation keys without direct gettext() call. 2014-10-19 01:25:23 +02:00
Torsten Paul 05c3c3e76c Add gettext to new dialogs. 2014-10-19 01:25:23 +02:00
Torsten Paul c8a24971b6 Add preferences option to enable/disable localization. 2014-10-19 01:25:23 +02:00
Torsten Paul 929d909947 Set Qt text encoding to UTF-8. 2014-10-19 01:25:23 +02:00
Torsten Paul 8f2491cd0a Support linux packaging structure with shared locale folder. 2014-10-19 01:25:23 +02:00
Torsten Paul cfe14254d4 Handle resource layout on linux and add translation files to openscad.pro. 2014-10-19 01:25:23 +02:00
Torsten Paul afd52b3075 Fix compilation of test cases. 2014-10-19 01:25:23 +02:00
Torsten Paul a512a6442e Handle the MacOS application layout when finding resources. 2014-10-19 01:25:23 +02:00
Torsten Paul d620c8f40b Allow localization to be enabled/disabled by configuration settings. 
This is only the logic to check the settings, no GUI.
Changing the setting requires a restart as disabling localization simply
skips the call to bindtextdomain() at the application start.
 2014-10-19 01:25:23 +02:00
Torsten Paul ae2d19241e Use application resource path to locate the translation files. 2014-10-19 01:25:23 +02:00
Torsten Paul a7e3c8639c Fix compile problem on MinGW and force UTF-8 as encoding. 2014-10-19 01:25:23 +02:00
Torsten Paul 17244af2f9 Add more gettext calls. 2014-10-19 01:25:23 +02:00
don bright c559be20e1 Create basic gettext infrastructure and French language stub. 2014-10-19 01:25:14 +02:00
Torsten Paul 32874b6d92 Retain selection after comment/uncomment (fixes #986). 2014-10-17 23:42:34 +02:00
Marius Kintel f7b15e92a5 #244 Escape spaces in filenames 2014-10-14 16:31:09 -04:00
Marius Kintel a7eab14c29 Proper fix of the save-saveas problem 2014-10-13 15:34:47 -04:00
Marius Kintel 1ab34dc9d0 bugfix: Attempted to assign temporary variable to a const&, broke in debug mode. Fixes #980 2014-10-13 15:13:17 -04:00
Marius Kintel c577c7e501 Calling signals from outside is only possible with Qt5. This is probably the wrong hack anyway 2014-10-12 23:13:15 -04:00
Marius Kintel 1cc4f6be53 update the previous fix: SCN_SAVEPOINTLEFT() is only accessible in QScintilla >= 2.8, always save the file on actionSave() 2014-10-11 18:59:27 -04:00
Marius Kintel d064b9238f bugfix: When saving an unmodified file using Save As, the file wasn't actually saved 2014-10-11 18:38:34 -04:00
Marius Kintel 3dca2873e0 Handle arriving FileOpen events while the launchscreen is active, cleaned up some code, make static MainWindow handling more robust. Fixes #972 2014-10-09 22:13:18 -04:00
Marius Kintel a4b999e0d4 Use same UI inheritance style for launchingscreen as other components, indentation fixes 2014-10-09 17:21:15 -04:00
Marius Kintel 428cf27a03 Merge pull request #957 from openscad/restore_selection_for_find 
Editor: Restore lost 'use selection for find' functionality
 2014-10-02 02:11:43 -04:00
Marius Kintel 0993d5c9c2 Merge branch 'master' into scintilla-updates 
Conflicts:
	src/MainWindow.ui
 2014-10-02 02:10:55 -04:00
Marius Kintel 253b57f747 #964 Implemented a more robust polygon triangulator which will now handle intersecting edges properly. Should output more sane corner-case meshes, although they're not perfectly manifold 2014-10-02 01:38:05 -04:00
Marius Kintel 8eff7ed37b #964 Catch precondition exception for malformed (self-intersecting) polygons to avoid a crash 2014-10-01 00:43:34 -04:00
Marius Kintel 7343290ffc Removed empty toolbar subtypes 2014-09-30 17:25:01 -04:00
Marius Kintel a8e9f63928 Improved some variable naming 2014-09-30 17:18:40 -04:00
Marius Kintel bc86312997 bugfix: Font list was connected to wrong slot 2014-09-30 16:48:36 -04:00
Marius Kintel 7a1737c09f toolBar -> viewerToolBar, indendation fixes 2014-09-30 16:47:14 -04:00
Marius Kintel 6ed2acf791 Merge remote-tracking branch 'origin/master' into Toolbar2 2014-09-29 11:46:45 -04:00
Torsten Paul 1776bcd460 Add menu entry to convert tabs to spaces. 2014-09-19 23:25:49 +02:00
Torsten Paul cdb4120dcb Set indentation defaults. 2014-09-19 23:25:03 +02:00
Oskar Linde ec696b8240 Editor: Don't clear the findbox text if nothing is selected when hitting Ctrl+F 2014-09-19 22:36:08 +02:00
Oskar Linde e533d2a71a Mac: Findbuffer support 2014-09-19 22:35:20 +02:00
Torsten Paul ecc5622e7f Reapply keyboard shortcut fix from #770. 2014-09-19 21:58:39 +02:00
Marius Kintel 42507526b6 minor cosmetics 2014-09-19 14:17:04 -04:00
Oskar Linde 8d3d2fe9f4 Editor: Restore lost 'use selection for find' functionality 2014-09-19 19:52:59 +02:00
Oskar Linde b62079a632 Mark twist-free linear extrusions of convex polygons convex 2014-09-18 23:14:21 +02:00
Oskar Linde 2e1f24b4dc Bugfix. Fixes #953 2014-09-18 23:14:16 +02:00
Torsten Paul d039729878 Add "ViewAll" and remove "Crosshair" icon from toolbar. 2014-09-18 23:14:12 +02:00
Torsten Paul 97424f0447 Add keyboard shortcut to the tooltip of toolbar actions. 2014-09-18 22:55:06 +02:00
Marius Kintel e1fd9c83b8 #948 Allow export of collinear triangles to avoid creating holes in meshes 2014-09-15 20:51:41 -04:00
Torsten Paul e68fc74c87 Merge branch 'master' into Toolbar2 
Conflicts:
	openscad.pro
	openscad.qrc
 2014-09-15 21:49:47 +02:00
Marius Kintel 988333abb8 Merge branch 'master' of github.com:openscad/openscad 2014-09-15 15:43:05 -04:00
Marius Kintel 41348f2166 Merge branch 'launchingscreen' of github.com:openscad/openscad into launchingscreen 2014-09-15 15:35:24 -04:00
Marius Kintel d9ae0dab10 #894 Let enter key open last selected item, allow cursor keys for item selection 2014-09-15 15:35:21 -04:00
Torsten Paul c19df82b72 Use HTML to render the headline text. 2014-09-15 21:29:32 +02:00
Marius Kintel 52797177b2 Auto-fill search field for search&replace 2014-09-15 14:43:31 -04:00
Torsten Paul f8336029f1 Merge branch 'master' into launchingscreen 
Conflicts:
	openscad.pro
 2014-09-15 19:58:55 +02:00
Torsten Paul 131119fd28 Fix stylesheet issue (wrong scrollbar style; unreadable tooltips on MacOS). 2014-09-15 18:12:00 +02:00
Torsten Paul cbddc6313e Fix build. 2014-09-15 17:47:15 +02:00
Keven Villeneuve adbe4c9d86 Modernise help library info 2014-09-14 22:08:18 -04:00
Torsten Paul f9b0a7e9a9 Add more icons. 2014-09-14 21:39:15 +02:00
Torsten Paul c251683c20 Move ToolBar setup to GUI design file. 2014-09-14 21:17:27 +02:00
shaina7837 56ebdd92f1 Added toolbars in Designer, make search panel appear below toolbar 2014-09-14 20:40:29 +02:00
shaina7837 3fd08be98e render icon is shifted to rendering window toolbar 2014-09-14 20:39:59 +02:00
shaina7837 642407c241 improved syntax color scheme and added more icons 2014-09-14 20:39:33 +02:00
shaina7837 8e3b3e1919 added few more icons with tool tips 2014-09-14 20:39:17 +02:00
shaina7837 3f37cf8c50 toolbar splitted into two 2014-09-14 20:39:12 +02:00
shaina7837 efb23fc9bd toolBar-subclass of QToolBar added 2014-09-14 20:39:05 +02:00
shaina7837 7345de27b1 toolbar set 2014-09-14 20:38:20 +02:00
Torsten Paul d67b01c7f2 Default to show welcome screen if no settings value available. 2014-09-14 04:00:17 +02:00
Torsten Paul 78e341cd4c Add bigger logo image. 2014-09-14 03:18:32 +02:00
Torsten Paul aec33dd75f Separate launching screen from main window and show before main window opens. 2014-09-14 02:08:57 +02:00
Torsten Paul 8c892907c2 Make welcome screen resizable and update some minor UI issues. 
- Move images to icons folder
- Move "Show welcome screen" to advanced tab in preferences
- Set button styles via Qt stylesheet to handle hover and disable
- Rename config setting to "launcher/showOnStartup" and add default
 2014-09-13 23:52:21 +02:00
Torsten Paul e7d3025753 Merge branch 'master' into launchingscreen 
Conflicts:
	openscad.pro
	openscad.pro.user
	src/MainWindow.h
	src/Preferences.cc
	src/Preferences.h
	src/Preferences.ui
	src/mainwin.cc
	src/openscad.cc
 2014-09-13 21:19:44 +02:00
Marius Kintel 51c54f2e5b Add --render=cgal option for test purposes (forces conversion to CGAL Nef polyhedron before rendering 2014-09-04 17:35:32 -04:00
Marius Kintel cfb15466e4 #337 Print warning on non-simple export instead of refusing to export 2014-09-04 17:34:53 -04:00
Marius Kintel efc552b0bf Only print one degenerate triangle warning per polyset 2014-09-04 14:40:03 -04:00
Marius Kintel fc26d25011 #915 Make QScintilla editor the default 2014-09-04 14:25:41 -04:00
Marius Kintel 0d304f7e43 #924 Made MDI and undocking options visible again 2014-09-04 12:18:46 -04:00
Marius Kintel 45a649d6ab #879 fix some keyboard binding issues 2014-09-03 15:00:52 -04:00
Marius Kintel 9ef3349e4e #879 fixed some minor layout and shortcut issues 2014-09-03 14:52:41 -04:00
Marius Kintel 845df0cce1 Merge remote-tracking branch 'origin/master' into scintillaeditor 
Conflicts:
	scripts/mingw-x-build-dependencies.sh
 2014-09-03 12:46:54 -04:00
Marius Kintel de2e1090ca Merge branch 'master' of github.com:openscad/openscad 2014-09-03 12:28:16 -04:00
Marius Kintel c7f8d283e2 Merge pull request #928 from openscad/mingw-master 
MXE master / Fix Windows cache folder
 2014-09-03 12:14:42 -04:00
Marius Kintel 546c8dd1d7 constness, codingstyle 2014-09-03 12:14:27 -04:00
Torsten Paul af9843d91b Remove code to add Windows font folder - handled by fonts.conf. 2014-09-03 17:46:27 +02:00
Torsten Paul 3d2290c203 Use FcMatchPattern to make alias replacement work. 2014-09-03 17:43:19 +02:00
Torsten Paul a95b14da42 Add platform abstraction for setenv() which is not supported on MinGW. 2014-09-03 00:36:05 +02:00
Marius Kintel 5dd4823936 Merge remote-tracking branch 'origin/master' into scintillaeditor 2014-08-28 12:04:12 -04:00
Marius Kintel db14aa2bba Tweaked font config handling to hopefully be more correct 2014-08-28 00:39:51 -04:00
Marius Kintel 9ee42012fc Return a canonical resources path 2014-08-28 00:39:20 -04:00
Marius Kintel 0f9450137f Refactored resource path lookup 2014-08-27 16:00:15 -04:00
Marius Kintel edded0f69d Bugfix: Added missing code for properly comparing booleans 2014-08-26 14:52:22 -04:00
Marius Kintel c4d3f22145 C++11 compile fix 2014-08-24 21:27:23 -04:00
Torsten Paul c5c5a02163 Implement indent/unindent and comment/uncomment. 2014-08-24 23:49:13 +02:00
Marius Kintel 99bc04c9ab #879 scintilla editor incorrectly reported a freshly opened file as modified 2014-08-24 17:40:46 -04:00
Marius Kintel 844edc9b78 cosmetics 2014-08-24 17:40:12 -04:00
Marius Kintel 07e620e611 Merge remote-tracking branch 'origin/master' into scintillaeditor 2014-08-24 17:10:35 -04:00
shaina7837 257af85259 brace matching, cursor display and line number scaling is fixed as per the todo list 2014-08-23 20:29:54 +05:30
Marius Kintel 03e5e43269 #879 bugfix: modificationChanged connectinon was made to the wrong component, cosmetics 2014-08-23 01:33:35 -04:00
Marius Kintel f6e02ffb0c cosmetics 2014-08-23 01:28:07 -04:00
Marius Kintel ee89658df3 Use selection as text for find function 2014-08-23 01:25:29 -04:00
Marius Kintel e3960304bd #879 Implemented wheel zoom for scintilla editor 2014-08-23 01:18:51 -04:00
Marius Kintel 6ecf72a976 #879 bugfix: emit contentsChanged instead of textChanged, cosmetics 2014-08-23 01:15:04 -04:00
Marius Kintel 8ab3f843c7 indentation 2014-08-23 00:57:57 -04:00
Marius Kintel c9b0a16843 Use #pragma once 2014-08-23 00:57:22 -04:00
Marius Kintel 3c45262ea8 cosmetics 2014-08-23 00:53:49 -04:00
Marius Kintel 759e926b9a Added Q_OBJECT macro to make slots work, made wrapping look more like existing editor 2014-08-22 18:54:09 -04:00
Marius Kintel 10f4a52985 #879 Handle document modification signals, make editor interface more abstract 2014-08-22 18:39:12 -04:00