Commit Graph

4606 Commits (0886944fcd9aca3d5033b1572cbc9bae7cfe79a7)

Author SHA1 Message Date
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 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 cf979b3900 Bumped Ragel to 6.9 and harfbuzz to 0.9.35 2014-10-31 12:34:54 +04:00
Marius Kintel 6c703ab3ef Bugfix: OpenCSG-1.4.0 installed the lib in the wrong location. Fixes #997 2014-10-31 12:34:19 +04:00
Marius Kintel a93196eb7e Update settings for show/hide toolbars. Fixes #1001 2014-10-31 11:45:04 +04:00
Marius Kintel ccfc0c2401 Added testcase for #1000 2014-10-31 10:08:07 +04:00
Marius Kintel 4dfc70f439 Merge pull request #993 from openscad/hull-fix
Hull fix
2014-10-31 09:44:37 +04:00
Marius Kintel fd5c9b8e4f Merge branch 'master' of github.com:openscad/openscad 2014-10-31 09:40:46 +04:00
Torsten Paul f66d274c6e Add cubes to test case to ensure something is rendered. 2014-10-21 20:57:50 +02: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 346fc3622b Merge pull request #991 from hroncok/test990
Test case for #990
2014-10-21 20:10:11 +02:00
Miro Hrončok a23d463020 Test case for #990 2014-10-21 11:52:46 +02:00
Marius Kintel 5d28e86e95 Merge branch 'master' of github.com:openscad/openscad 2014-10-19 20:00:39 -04:00
Marius Kintel 0e88cfdacb Merge pull request #989 from openscad/window-handling-fix
Window handling fixes
2014-10-19 20:00:25 -04: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
Marius Kintel 5669f0d95f Bumped CGAL to 4.5 2014-10-19 17:56:51 -04:00
Marius Kintel b66fb597fa Merge pull request #987 from openscad/comment-fix
Retain selection after comment/uncomment (fixes #986).
2014-10-18 11:38:43 -04:00
Torsten Paul 32874b6d92 Retain selection after comment/uncomment (fixes #986). 2014-10-17 23:42:34 +02:00
Marius Kintel 8d7d854e35 Merge pull request #985 from openscad/build-fix
Handle both Qt4 and Qt5 and add fallback in case of missing qscintilla2.prf
2014-10-17 13:34:28 -04:00
Torsten Paul aefafd2ec5 Handle both Qt4 and Qt5 and add fallback in case of missing qscintilla2.prf. 2014-10-17 19:32:15 +02:00
Marius Kintel f7b15e92a5 #244 Escape spaces in filenames 2014-10-14 16:31:09 -04:00
Marius Kintel d20e1efbbd doc 2014-10-13 23:13:48 -04:00
Marius Kintel 1bd15b45a6 #964 another testcase 2014-10-13 22:33:33 -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 1121c96a11 #964 Added testcases 2014-09-30 19:38:43 -04:00
Marius Kintel 3b307fba93 Merge branch 'master' of github.com:openscad/openscad 2014-09-30 17:26:07 -04:00
Marius Kintel 6d81c37e6c Merge pull request #950 from openscad/Toolbar2
Toolbar2
2014-09-30 17:25:54 -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 e00292b445 Updated OpenCSG build to correctly set the install name 2014-09-30 15:27:24 -04:00
Marius Kintel 6ed2acf791 Merge remote-tracking branch 'origin/master' into Toolbar2 2014-09-29 11:46:45 -04:00
Marius Kintel f98d565714 Use python's difflib instead of calling the diff cmd. Fixes issue where diff isn't always available on Windows. Fixed #960 2014-09-23 12:36:27 -04:00
Torsten Paul 4eb53d3355 Add fonts folder to 'make install'. 2014-09-21 21:38:40 +02:00
Torsten Paul 8d067fe3cb Change categories property to only list a single main category. 2014-09-20 23:46:30 +02:00