Commit Graph

4927 Commits (4cb7b42fb897439d22c308561993dcf4d3631e23)

Author SHA1 Message Date
Torsten Paul 4cb7b42fb8 Add defines for MSYS2 build. 2014-12-25 18:52:20 +01:00
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
Torsten Paul 40602c99bc Minor color scheme tweaks, mainly for brace matching colors. 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 ef83c5c911 Remove duplicate definition. 2014-12-23 19:15:23 +01: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 49ce79a633 Merge branch 'czech' of git://github.com/hroncok/openscad into hroncok-czech
Conflicts:
	locale/cs.po
2014-12-23 11:57:45 -05:00
Miro Hrončok 9445d1297a Minor corrections to Czech translation 2014-12-23 12:27:41 +01:00
Marius Kintel bc98089aca Mac release build fix 2014-12-23 01:18:27 -05:00
Marius Kintel 3812acf146 Merge branch 'jgelderloos-master' 2014-12-23 01:10:37 -05:00
Marius Kintel a68560707f Merge branch 'master' of github.com:openscad/openscad 2014-12-23 01:10:23 -05:00
Marius Kintel cb290bfcaa Merge remote-tracking branch 'origin/master' into jgelderloos-master 2014-12-23 01:09:10 -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 0007684c5b Merge pull request #1077 from openscad/winconsole-fix
Use separate project for winconsole and don't statically link Qt
2014-12-23 00:32:15 -05:00
Marius Kintel 4c11d6b62f Updated test results for offset tests 2014-12-23 00:09:05 -05:00
Marius Kintel a10426acc3 Merge branch 'master' of github.com:openscad/openscad 2014-12-23 00:03:49 -05: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 77a568cda0 Less verbose 2014-12-22 19:31:40 -05:00
Marius Kintel d071ba16cb Merge pull request #1087 from openscad/offset-updates2
Update offset() parameter handling.
2014-12-22 19:18:40 -05:00
Marius Kintel 0eb2c45f12 Merge branch 'master' of github.com:openscad/openscad 2014-12-22 18:58:27 -05:00
Marius Kintel aeba95aa01 Windows build fix (msys2) 2014-12-22 18:58:25 -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
Marius Kintel 0c88f63e00 Merge pull request #1098 from hroncok/czech
Updated the Czech translation
2014-12-22 10:42:06 -05:00
Torsten Paul 594f548b20 Add color schemes "Tomorrow" and "Tomorrow Night".
See https://github.com/chriskempson/tomorrow-theme
2014-12-22 02:25:48 +01:00
Miro Hrončok b79954237c Updated the Czech translation 2014-12-21 23:23:25 +01:00
Marius Kintel dea8dd9bd0 Merge pull request #1096 from openscad/win-updates
Win updates
2014-12-21 14:24:39 -05:00
Torsten Paul b697003b0a Handle different naming conventions for debug versions of QScintilla. 2014-12-21 17:56:51 +01:00
Torsten Paul c278963a85 Path and filenames need to use system encoding (fixes #1092). 2014-12-21 17:56:50 +01:00
Torsten Paul 8214cabe50 Remove qtcreator user configuration. 2014-12-21 17:56:47 +01:00
Marius Kintel fa3cba12cc Merge pull request #1093 from openscad/warning-highlight
Color code warning and error messages in the console window (fixes #855).
2014-12-21 00:02:39 -05:00
Torsten Paul 310ca16c1b Update test reference file for norm(). 2014-12-21 04:40:24 +01:00
Torsten Paul 98a9ea7e12 Use QtConcurrentRun to initialize FontConfig in a separate thread. 2014-12-21 03:49:20 +01:00