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

349 Commits (a41c8716ec28a8be2d6f02adbd536b81b4338781)

Author SHA1 Message Date
Marius Kintel a41c8716ec Merge remote-tracking branch 'origin/master' into c++11 
Conflicts:
	openscad.pro
 2015-01-06 01:10:04 -05:00
Marius Kintel 4eaf8797c2 Small refactoring: Split out Polyhedron-related functions to from cgalutils.cc to cgalutils-polyhedron.cc 2014-12-31 02:52:56 -05:00
Torsten Paul dde4575c88 Add class to handle settings. 2014-12-27 00:12:23 +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
Torsten Paul c4e895a813 Add drag&drop to the FontListDialog. 2014-12-23 03:07:27 +01:00
Torsten Paul 98a9ea7e12 Use QtConcurrentRun to initialize FontConfig in a separate thread. 2014-12-21 03:49:20 +01:00
Torsten Paul abdf80c494 Revert usage of the -Wa,-mbig-obj flag as that does not work on MXE. 2014-12-20 23:28:51 +01:00
Torsten Paul 7d863d2bf2 Updates to build on MSYS2. 2014-12-20 23:09:03 +01:00
Torsten Paul 4a75c57209 Move -DNOGDI to main project file. 
This is not related to the cross build but a workaround when including
windows.h that also defines Polygon. So it's now enabled for all Windows
builds including MSYS2.
 2014-12-20 21:46:30 +01:00
Torsten Paul 1126a0ef17 Use separate project for winconsole and don't statically link Qt (fixes #870). 2014-12-16 23:35:42 +01:00
Torsten Paul ba8446e8bf Remove qtaccessiblewidgets as QTPLUGIN. 
MXE now ships Qt-5.4.0-rc which has accessibility built-in. All other
platforms did not have it enabled so far.
 2014-12-09 22:21:07 +01:00
Torsten Paul 399895bbfe Fix translation file install target when running qmake on clean source. 2014-12-07 05:46:07 +01:00
Torsten Paul 771526b5ae Fix install target for translation files. 2014-12-07 03:39:01 +01:00
Torsten Paul 04c194f6d6 Update .desktop file to include the install SUFFIX. 2014-12-07 03:38:02 +01:00
Torsten Paul dcd0f23277 Fix make install with INSTALL_ROOT set, e.g. used by Debian package build. 2014-12-06 21:31:37 +01: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 80f1a31143 Update translation file generator scripts. 2014-12-04 23:20:25 +01:00
Torsten Paul a466638433 Remove automatic translation update as that always generates modified *.po files. 2014-12-04 20:52:07 +01:00
Torsten Paul b6167b0b60 Merge branch 'master' into translation2 
Conflicts:
	src/PlatformUtils.h
 2014-12-04 20:51:44 +01: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 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
Marius Kintel 437aa69292 Merge remote-tracking branch 'origin/master' into c++11 2014-11-25 17:13:01 -05: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
Torsten Paul 756f8079d8 Add class to determine the current stack size. 2014-11-24 23:36:29 +01:00
Marius Kintel ab96a82629 Minor cleanup of recursion exception handling 2014-11-24 17:30:05 -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 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