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

67 Commits (a41c8716ec28a8be2d6f02adbd536b81b4338781)

Author SHA1 Message Date
Torsten Paul 8d4d83f168 Fix build with Qt4. 2014-12-30 13:03:51 +01:00
Marius Kintel e69513fa2e #1119 Added missing slot to change tab key function 2014-12-30 02:49:47 -05:00
Torsten Paul 9bcb38df48 Change settings handling to use Value objects. 2014-12-30 02:37:16 +01:00
Torsten Paul 2c89f562a3 Update GUI to make options a bit clearer for the user. 2014-12-29 03:49:45 +01:00
Torsten Paul 6f9c4f7f09 Integrate with QSettings. 2014-12-29 00:29:09 +01:00
Torsten Paul 6c25d5ccb6 Add more settings (AutoIndent / TabIndents / IndentationsUseTabs). 2014-12-27 02:59:11 +01:00
Torsten Paul 0cb6b3267a Add editor settings. 2014-12-27 02:17:15 +01:00
Marius Kintel b2c205ba4c Merge remote-tracking branch 'origin/master' into translation2 
Conflicts:
	tests/csgtexttest.cc
 2014-11-17 21:56:53 -05:00
Marius Kintel 1afb706461 Merge remote-tracking branch 'origin/master' into translation2 2014-11-17 21:55:19 -05:00
Torsten Paul 8cf85e0987 Fix MDI issues. 2014-11-16 19:35:16 +01:00
Torsten Paul 59c4dec623 Merge branch 'master' into translation2 2014-11-12 23:21:42 +01:00
Marius Kintel 40aae17c0e Move software update menu handling to AutoUpdater. This should fix #714 2014-11-10 15:01:34 -05:00
Marius Kintel 31b90d1acb Merge pull request #1008 from openscad/externalize-colorschemes2 
Externalize colorschemes
 2014-11-08 20:49:15 -05:00
Torsten Paul 2ee58893f5 Move render color schemes to separate files. 2014-11-01 20:51:36 +01:00
Torsten Paul 23275dc927 Get color schemes from editor; Enumerate from resource folder for scintilla. 2014-11-01 20:51:36 +01:00
Torsten Paul 63201e25fd Add option to disable window reordering by removing the dock window title bar. 2014-11-01 18:55:48 +01:00
Torsten Paul c8a24971b6 Add preferences option to enable/disable localization. 2014-10-19 01:25:23 +02:00
Torsten Paul d620c8f40b Allow localization to be enabled/disabled by configuration settings. 
This is only the logic to check the settings, no GUI.
Changing the setting requires a restart as disabling localization simply
skips the call to bindtextdomain() at the application start.
 2014-10-19 01:25:23 +02:00
Torsten Paul 8c892907c2 Make welcome screen resizable and update some minor UI issues. 
- Move images to icons folder
- Move "Show welcome screen" to advanced tab in preferences
- Set button styles via Qt stylesheet to handle hover and disable
- Rename config setting to "launcher/showOnStartup" and add default
 2014-09-13 23:52:21 +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 fc26d25011 #915 Make QScintilla editor the default 2014-09-04 14:25:41 -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 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 755c23391e added option in preferences to show launcher again 2014-08-02 11:46:07 +05:30
shaina7837 8ab18596ad runtime switching from simple editor to scintilla editor 2014-07-11 19:41:16 +05:30
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 0e9d06669e Merge pull request #708 from openscad/zoompeace 
Zoompeace
 2014-03-30 19:09:27 +02:00
Don Bright 0d8c9359b5 fix build errors 2014-03-18 18:59:47 -05:00
Don Bright 3022a83148 disable ctrl-mouse-wheel zoom on Mac by default. add preference to toggle 2014-03-18 18:52:15 -05:00
Marius Kintel 19de4c9d15 Merge branch 'master' into unstable 2014-03-10 10:42:53 -04:00
Marius Kintel c1ed1146cf Disable Update tab for platforms where this is not implemented. Fixes #416 2014-03-04 00:52: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 3ac8895d7a Enable experimental features only for snapshot builds 2014-02-23 15:47:26 -05:00
Marius Kintel 34333941d3 Merge branch 'master' into unstable 2014-02-05 01:08:44 -05:00
Marius Kintel 0f3de6ca8a Qt5: Ported Q_WS usage to Q_OS 2014-02-05 00:27:05 -05:00
Marius Kintel acd08b6f1a Green refactoring, but uncertain if we should keep it 2014-01-09 02:06:32 -05:00
Marius Kintel c4a1d855f1 Merge branch 'vector-concat' of git://github.com/t-paul/openscad into t-paul-vector-concat 2014-01-03 13:27:22 -05:00
Torsten Paul c350f428b7 Update comment to reflect changed behavior. 2014-01-03 19:25:37 +01: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
Marius Kintel 3d5b844679 Keep cmd-line and GUI separate in terms of preferences, handle experimental tests separately, minor cleanups 2014-01-03 02:31:57 -05:00
Torsten Paul bef4ea3053 Handle synchronization between Qt settings / GUI and Feature objects. 2014-01-02 23:32:09 +01:00
Torsten Paul b7b2681c74 Add GUI Settings page to enable/disable features. 2014-01-02 23:32:03 +01:00
Don Bright f0e0772694 enable disabling of syntax highlighter, add highlighter for dark backgrounds 2013-12-29 15:25:35 -06:00
don bright 0f6b76cf21 move csg chain prep code to CsgInfo.h, move defaults to rendersettings.h 2013-03-03 09:22:36 -06:00
don bright 09edcdf822 fix build errors, display 'not implemented' message on win32/linux 2013-02-17 04:48:30 +01:00
Marius Kintel fa00547507 First version of automatic updates for Mac 2013-02-05 00:36:25 -05:00
Marius Kintel 6f205814bc Make it possible to build without CGAL. Fixes #264 2013-01-30 11:58:19 -05:00
don bright b33a02b372 remove debugging statements 2012-07-22 20:45:12 -05:00
don bright 3c7a85af57 debugging and rearranging to find issue 2012-07-22 20:16:37 -05:00
Marius Kintel 4cbdbf9827 Ported remaining color handling away from Qt 2012-01-25 21:13:03 +01:00