Commit Graph

370 Commits (master)

Author SHA1 Message Date
Marius Kintel 2bdf02d352 Cleaned up c++11 config a bit 2014-11-06 12:53:53 +01:00
Marius Kintel 637244d59e Merge remote-tracking branch 'origin/master' into c++11 2014-11-06 12:41:54 +01:00
Torsten Paul 42fab36a05 Add color schemes to "make install". 2014-11-01 22:20:32 +01: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 27594848db Fix translation file build on Windows; Use host gettext tools. 2014-10-19 17:41:22 +02:00
Torsten Paul 989675324b Make setting uic parameters work for both Qt4 and Qt5. 2014-10-19 01:25:23 +02:00
Torsten Paul 54a6f2addb Integrate message catalog creation into build process. 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 ee4b2ffef5 Fix library references and translation scripts on MacOS. 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
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 7343290ffc Removed empty toolbar subtypes 2014-09-30 17:25:01 -04:00
Marius Kintel 6ed2acf791 Merge remote-tracking branch 'origin/master' into Toolbar2 2014-09-29 11:46:45 -04:00
Torsten Paul 4eb53d3355 Add fonts folder to 'make install'. 2014-09-21 21:38:40 +02:00
Torsten Paul e68fc74c87 Merge branch 'master' into Toolbar2
Conflicts:
	openscad.pro
	openscad.qrc
2014-09-15 21:49:47 +02:00
Torsten Paul f8336029f1 Merge branch 'master' into launchingscreen
Conflicts:
	openscad.pro
2014-09-15 19:58:55 +02:00
Keven Villeneuve adbe4c9d86 Modernise help library info 2014-09-14 22:08:18 -04: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 aec33dd75f Separate launching screen from main window and show before main window opens. 2014-09-14 02:08:57 +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 3a3ffc0118 Merge remote-tracking branch 'origin/master' into c++11 2014-09-02 00:16:38 -04:00
Marius Kintel 67c68634b6 Be more verbose when using c++11 2014-09-02 00:16:36 -04:00
Marius Kintel e3960304bd #879 Implemented wheel zoom for scintilla editor 2014-08-23 01:18:51 -04:00
Marius Kintel 79f44ae7fa Fix file drops to legacy editor, misc. cosmetics 2014-08-22 14:17:24 -04:00
Marius Kintel 138d5bc57e Merge remote-tracking branch 'origin/master' into scintillaeditor
Conflicts:
	src/MainWindow.h
	src/Preferences.ui
	src/mainwin.cc
2014-08-22 12:59:10 -04:00
Marius Kintel de6bcb1786 small reorg of cgalutils namespace 2014-08-19 22:02:08 -04:00
Marius Kintel 6405456c8a Renamed CGAL_renderer to CGAL_OGL_Polyhedron for clarity 2014-08-15 13:04:34 -04:00
Marius Kintel e70bc04197 Colormap functionality from pull request #816, mostly by Don Bright, includes new colormaps by shaina 2014-08-14 17:16:24 -04:00
shaina7837 ad11bd8cd2 launching screen 2014-08-01 22:32:55 +05:30
Marius Kintel af8c3ee9d1 Merge remote-tracking branch 'origin/master' into scintillaeditor
Conflicts:
	src/PlatformUtils.cc
2014-07-22 14:48:45 -04:00
Marius Kintel 28864037ee Split info() function into separate file as it depends on too many defines and external libs 2014-07-22 13:32:44 -04:00
Marius Kintel 68962e1c01 Allow building without scintilla 2014-07-17 15:28:23 -04:00
Marius Kintel 6270441341 Merge remote-tracking branch 'origin/master' into scintillaeditor
Conflicts:
	openscad.pro
	src/mainwin.cc
2014-07-17 15:07:42 -04:00
Marius Kintel b394da33c7 Mac: Disallow c++11 if dependencies are linked against libstdc++ 2014-06-21 16:52:35 -04:00
Marius Kintel a0875c845c Merge remote-tracking branch 'origin/master' into c++11 2014-06-21 16:15:56 -04:00
Marius Kintel 458d60faa6 Refactored the camera handling a bit, added --viewall cmd-line parameter 2014-06-19 17:47:38 -04:00
shaina7837 25bf6dd20b new lexer added 2014-06-17 21:45:04 +05:30
shaina7837 5936bc2243 added 2014-06-17 21:27:28 +05:30
shaina7837 9d35c792ed scad lexer added 2014-06-17 21:04:54 +05:30
Marius Kintel 11ca82dbb5 Moved scintilla config to scintilla.pri, enabled scintilla by default 2014-06-13 14:41:40 -04:00
Marius Kintel c4f369fbf8 Merge branch 'master' into c++11
Conflicts:
	openscad.pro
2014-06-10 00:16:05 -04:00
Marius Kintel da56dff89d minor c++11 config fixes 2014-06-10 00:15:14 -04:00
Marius Kintel a5a3d8f4cf Some minor cleanup 2014-06-10 00:14:45 -04:00
Marius Kintel 27a2be8411 Applied Oskar's libc++ patches from #828 to master 2014-06-09 23:36:24 -04:00
Marius Kintel 7b4411bbcc We're actually checking for libc++, not c++11 2014-06-09 23:35:33 -04:00
Marius Kintel 35222064c1 Adapt to using CONFIG+=c++11 2014-06-08 00:03:06 -04:00
Marius Kintel 7f782832d7 Merge remote-tracking branch 'origin/mac_libc++_build' into c++11 2014-06-07 23:45:31 -04:00
Oskar Linde c5bc92d97c Mac: Automate build with libc++ when not using OPENSCAD_LIBRARIES
Conflicts:
	openscad.pro
2014-06-08 01:27:44 +02:00
Marius Kintel 2eb96a2a88 Build as c++11. On Mac, build as c++11 if as libc++-linked boost exists 2014-06-07 17:48:42 -04:00
shaina 950ffe9722 layout problem of editor is solved 2014-06-07 17:43:52 +02:00
Marius Kintel 22e884d08f Quick and dirty fixup 2014-06-07 17:43:52 +02:00
shaina 59a71b7e6e added scintilla editor classes 2014-06-07 17:43:52 +02:00
shaina 5a0df4e6d9 legacyeditor 2014-06-07 17:43:46 +02:00
Marius Kintel 2cf6dcacf2 Merge branch 'master' into c++11 2014-06-05 19:18:33 -04:00
Marius Kintel 2cba2a1b55 Merge branch 'master' into text-module
Conflicts:
	scripts/macosx-build-homebrew.sh
	scripts/mingw-x-build-dependencies.sh
	scripts/uni-build-dependencies.sh
	scripts/uni-get-dependencies.sh
	src/GeometryEvaluator.h
	src/MainWindow.ui
	src/clipper-utils.h
	src/mainwin.cc
	tests/CMakeLists.txt
2014-04-26 22:08:31 -04:00
Marius Kintel b2b3306205 Merge branch 'master' into c++11 2014-04-25 02:29:40 -04:00
Marius Kintel 9613e992da Suppress unused local typedef warning for gcc. Fixes #757 2014-04-24 00:01:42 -04:00
Don Bright 1ecf715476 add mime-type under linux during make install ( issue #696 ) 2014-04-02 18:16:31 -05:00
Torsten Paul 49dc984bef Add offset() module to inset/outset polygons using Clipper (fixes #483). 2014-03-30 23:41:37 +02:00
Marius Kintel 19de4c9d15 Merge branch 'master' into unstable 2014-03-10 10:42:53 -04:00
Marius Kintel e54d0cca6e Moved MACOSX_DEPLOYMENT_TARGET to the deploy script to allow building against the current system 2014-03-03 21:32:52 -05:00
Marius Kintel d6340b18db Merge branch 'master' into c++11 2014-03-03 21:04:27 -05:00
Marius Kintel ab6192e465 Merge branch 'master' into unstable
Conflicts:
	src/openscad.cc
	src/printutils.h
2014-03-02 22:41:05 -05:00
Marius Kintel 1d211498c6 Added note to encourage people to build with experimental features enabled 2014-03-01 15:11:52 -05:00
Don Bright afcf7239ab fix broken linux gui build!! 2014-02-26 18:29:57 -06:00
Don Bright 36e0d73e69 enable qtaccessibility plugin so that screenreading of QAction menu works
(tested on Jaws screenreader demo on Windows 7, per bug report to mailing list
by Robert Jaquiss 2/25/2014)
2014-02-25 20:20:14 -06:00
Marius Kintel 3ac8895d7a Enable experimental features only for snapshot builds 2014-02-23 15:47:26 -05:00
Jan Huwald 086f231d5a fix typo 2014-02-21 12:21:38 +01:00
Jan Huwald c259e5275c compile with -std=c++0x to support older C++11 compilers 2014-02-21 09:22:39 +01:00
Marius Kintel 34333941d3 Merge branch 'master' into unstable 2014-02-05 01:08:44 -05:00
Marius Kintel b80c6c7bf4 Qt5 qmake needs explicit includpath 2014-02-04 01:21:35 -05:00
Torsten Paul 284a93972a Add dialog to show all registered fonts. 2014-02-02 18:01:08 -05:00
Torsten Paul 8bb32da1c4 Add libraries to qmake config. 2014-02-02 18:00:44 -05:00
Torsten Paul bb45e7e52a Add implementation of text() module. 2014-02-02 18:00:44 -05:00
Marius Kintel 24986eec91 Added Geometry::isEmpty, some cleanups of CGAL_Nef_polyhedron, fixed some 2D-3D-mix issues 2014-01-09 02:06:37 -05:00
Marius Kintel 0c65fec41a Added a separate component for dealing with vertex reindexing 2014-01-09 02:06:37 -05:00
Marius Kintel ace3668736 Cleanup: Removed redundant code 2014-01-09 02:06:35 -05:00
Marius Kintel dc9429acac Use GeometryEvaluator instead of CGALEvaluator. A bunch of refactoring and fixes as a result of that. Renamed GUI menu items to reflect preview vs. render 2014-01-09 02:06:35 -05:00
Marius Kintel 1ef92f55f2 Clipper is bundled 2014-01-09 02:06:34 -05:00
Marius Kintel 1f488f851d Refactoring to facilitate more sharing of code between CGALEvaluator, GeometryEvaluator and CGALUtils 2014-01-09 02:06:34 -05:00
Marius Kintel af59b1983c Implemented non-cut projection using ClipperLib. Upgraded ClipperLib to V6 2014-01-09 02:06:33 -05:00
Marius Kintel b8c15cfb8a Preliminary large refactoring: Created GeometryEvaluator as a replacement for PolySetEvaluator. Use ClipperLib for 2D CSG (first baby steps). This design is far from perfect but sacrifice design for staying in the green. This version is broken, but can render primitives. 2014-01-09 02:06:32 -05:00
Marius Kintel acd08b6f1a Green refactoring, but uncertain if we should keep it 2014-01-09 02:06:32 -05:00
Marius Kintel 62b9746ab1 Mac fixes: Moved sparkle config to sparkle.pri. Link with ApplicationServices 2014-01-04 18:03:33 -05:00
Marius Kintel bee5233a91 Merge branch 'vector-concat' of git://github.com/t-paul/openscad into t-paul-vector-concat
Conflicts:
	src/Preferences.ui
2014-01-03 13:17:58 -05:00
Torsten Paul 72865e17da Add feature registry. 2014-01-02 23:27:52 +01:00
Torsten Paul b49f51dab3 Moved get_fragments_from_r into Calc 2013-12-27 17:48:15 -05:00
Miro Hrončok 90edc3b5f7 `make install` installs manpage and appdata file 2013-12-24 02:11:20 +01:00
Brody Kenrick 0717c67c9f Unicode support for strings
Add suport for using unicode strings in .scad files. Support iterating
across them/accessing them via [] and searching.
--------
Add GLIB (to build for test and normal build -- both with installed and
built locally development files).
Add support for unicode chars to length and search builtin functions and
[] for strings.
Added unicode testing functions.
Ad GLIB to library info page.
2013-12-05 18:28:40 +11:00
Don Bright cf9f19818c prevent crash in CGAL nef3. fix #issue 410 . also deal w qmake bug re .h files 2013-11-26 20:04:57 -06:00
Don Bright 49af42cfd0 a few fixes for netbsd 2013-06-08 23:49:21 -05:00
Don Bright 31c88a434b merge branch to get windows "library path" working. tweak build system,
eliminate several compiler warnings.
2013-05-25 22:37:26 -05:00
Marius Kintel 13e4bcd50e Added meny entry for disclosing the library path. Part of #125 2013-05-21 18:02:16 -04:00
Marius Kintel e2772c70b8 Initial Windows implementation of built-in library path. Part of #125 2013-05-21 17:45:24 -04:00
Marius Kintel b5079a189a wops, duplicate parser files 2013-05-10 00:55:04 +02:00
Marius Kintel 7a8b6f5c51 Put back lex/yacc - we're not using any bison-specific stuff after all 2013-05-09 18:48:27 +02:00
Marius Kintel 14e1ad2363 Forgot to actually add most files in previous commit (#217) 2013-05-09 12:12:58 +02:00