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
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
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
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
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
a5a3d8f4cf
Some minor cleanup
2014-06-10 00:14:45 -04:00