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

314 Commits (22e884d08f7ca8ed4d24b5e43219864fc91df861)

Author SHA1 Message Date
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 65edc63166 kill warning 2014-05-24 12:08:37 -04:00
Torsten Paul c64360d372 Merge branch 'master' into text-module 
Conflicts:
	tests/CMakeLists.txt
 2014-05-20 21:36:51 +02:00
Marius Kintel 619d44800e bugfix: Forgot to add csg as a known filetype 2014-05-15 16:32:25 -04:00
Marius Kintel 7952d24915 Merge branch 'master' into categorized_examples 
Conflicts:
	src/MainWindow.h
 2014-05-13 00:50:25 -04:00
Marius Kintel 5da1861534 Merge pull request #787 from openscad/mdi+dockable-windows 
Make editor and console windows dockable / make MDI mode a runtime option.
 2014-05-13 00:43:46 -04:00
Torsten Paul cb5904d685 Overwrite sizeHint() for the editor to handle missing window state information. 
This triggers only in case the configuration file has no window state
information (or no configuration file at all).
When this happens, the editor would default to a very ugly width due to
the dock widget layout. This overwrites the value reported via sizeHint()
to a width a bit smaller than half the main window size (either the one
loaded from the configuration or the default value of 800).
The height is only a dummy value which will be essentially ignored by
the layouting as the editor is set to expand to fill the available space.
 2014-05-12 22:47:47 +02:00
Torsten Paul 7f84eb0a23 Update window title in undocked mode when loading new files. 2014-05-12 22:47:47 +02:00
Torsten Paul 4fbbc09895 Make editor and console windows dockable and make MDI mode a runtime option. 2014-05-12 22:47:42 +02:00
Marius Kintel 9ac41c6b21 Merge branch 'checkwrite' of git://github.com/tim-caper/openscad into tim-caper-checkwrite 2014-05-12 16:27:55 -04:00
Marius Kintel 71f8e62a15 Merge branch 'close-empty-win-on-open' of git://github.com/OskarLinde/openscad into OskarLinde-close-empty-win-on-open 2014-05-12 16:22:44 -04:00
Marius Kintel eb98e55477 Merge pull request #788 from OskarLinde/autoreload_undo_fix 
auto-reload & compile with internal editor preserve undo status
 2014-05-12 13:40:30 -04:00
Marius Kintel 5707bc6eaf Merge branch 'proxy-icons' of git://github.com/OskarLinde/openscad into OskarLinde-proxy-icons 2014-05-12 13:34:21 -04:00
Oskar Linde 5648573d24 Preserves undo status if using the internal editor together with 'autoreload and compile' 2014-05-10 22:41:46 +02:00
Oskar Linde 9ccde53749 Add Mac standard Cmd-D shortcut for the 'Don't Save' button 2014-05-10 19:27:17 +02:00
shaina7837 2b14befb6f examples showed in separate method 2014-05-03 21:15:05 +02:00
shaina7837 b1976cf3ff categorized_examples 2014-05-03 21:14:57 +02:00
Oskar Linde 75e66a531b Mac: Give document windows proper proxy icons 2014-05-03 19:15:36 +02:00
Oskar Linde 180bd906b7 Avoid leaving the first empty document window when opening a file in MDI mode 2014-05-03 18:20:37 +02:00
Tim V. Shaporev 76389d83cc fixup issue 766 2014-05-03 19:44:22 +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 90b394015b Merge remote-tracking branch 'origin/master' into unstable 
Conflicts:
	src/MainWindow.ui
	src/mainwin.cc
 2014-04-22 01:13:20 -04:00
Sławomir Demeszko ff555d760b Preventing loosing keyboard focus by editor. 
When you write your code in editor sometimes you want to rotate or move object
on 3D view, but due stealing focus by this widget it is quite tedious.
You need additional mouse click to return focus to editor and search line where
you last edited. This behavior is not neccessary as we can interpret keyboard
events globally (in MainWindow) and send commands to 3D view.

Console window need ClickFocus to show context menu.

Zoom In/Out 3D view is assigned to CTRL+[ and CTRL+]. Adding also additional
shortcut to zoom in editor font CTRL+= (with CTRL++ SHIFT is necessary).
 2014-04-11 01:18:08 +02:00
Marius Kintel e30a40f432 minor cleanup of stack handling 2014-04-10 01:23:01 -04:00
Don Bright 0d950338e1 fix issue #694 2014-04-04 23:40:23 -05:00
Marius Kintel ff55dc026e Merge pull request #731 from openscad/amf-export 
Amf export
 2014-04-01 23:37:11 +02:00
Marius Kintel 14aeaba3b7 Merge branch 'tim-caper-consoleprocevents' into unstable 2014-03-30 23:37:54 +02:00
Mark Cooper cdab3e9ab8 Add AMF export. 2014-03-30 22:59:18 +02:00
Marius Kintel 98957526c8 Merge branch 'unstable' into svg-export 2014-03-30 22:53:31 +02:00
Torsten Paul 5667ae14d4 Delete ThrownTogetherRenderer and CSG Root Chain. 2014-03-30 19:16:50 +02:00
Tim V. Shaporev 4f0fd23810 process events in consoleOutput() to allow error message display right away 2014-03-29 13:43:28 +04:00
Marius Kintel 19de4c9d15 Merge branch 'master' into unstable 2014-03-10 10:42:53 -04:00
Marius Kintel 8d77775387 Don't delete MainWindows on close. See #694 2014-03-09 13:17:20 -04:00
Marius Kintel 261109b036 Release preparations 2014-03-06 00:29:08 -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 fbfc9b0879 Print each deprecation message only once per compilation. Fixes #678 2014-03-02 22:09:10 -05:00
Torsten Paul f84c5acada Add SVG export. 2014-03-02 19:26:17 +01:00
Don Bright e2d6afecf5 fix crash bug (mainwindow no longer has a 'highlighter' member) 2014-02-26 22:39:07 -06:00
Marius Kintel bab951b344 Merge branch 'master' into unstable 
Conflicts:
	src/CGALEvaluator.cc
	src/MainWindow.h
	src/MainWindow.ui
	src/import.cc
	src/mainwin.cc
	src/winconsole.c
	tests/CMakeLists.txt
 2014-02-23 15:49:26 -05:00
Marius Kintel bd14e4bab3 Inspired by #386, delete main windows on close 2014-02-21 02:09:30 -05:00
Marius Kintel 0b8929cf1c #665 support multiple open files with the same basename. Always clean up backups on window close 2014-02-21 00:02:09 -05:00
Marius Kintel ed2ea087fb #665 Improve automatic backup: Only save if editor is dirty 2014-02-18 00:00:33 -05:00
Marius Kintel 22ac006f33 Editor hiding broke after adding the search panel. Fixes #664 2014-02-17 23:49:45 -05:00
Don Bright 838e80ae34 refactor + rehighlight only if we are no doing a reload (issue #406) 2014-02-17 13:19:42 -06:00
Marius Kintel 78baae599b Adapted wil1471's pull request #385 to master 2014-02-13 00:15:35 -05:00
Marius Kintel ada0609b9c Bugfix: GUI stayed locked if CGAL compile failed 2014-02-13 00:06:48 -05:00
Marius Kintel 8d8518d128 Fixed issue 1 of #598: Auto-compile on subsequent File->Open 2014-02-10 19:17:39 -05:00
Marius Kintel f8f3ca45e7 fix related to 6a1d91dc76 2014-02-06 01:49:11 -05:00