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

4674 Commits (241723dd8f4a14aafedff4b0ddee1364f051cbd6)

Author SHA1 Message Date
shaina7837 642407c241 improved syntax color scheme and added more icons 2014-09-14 20:39:33 +02:00
shaina7837 8e3b3e1919 added few more icons with tool tips 2014-09-14 20:39:17 +02: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 d67b01c7f2 Default to show welcome screen if no settings value available. 2014-09-14 04:00:17 +02:00
Torsten Paul 78e341cd4c Add bigger logo image. 2014-09-14 03:18:32 +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 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 5252bae1f9 Merge pull request #941 from openscad/qscintilla-fedora20-fix 
Use fallback if CONFIG+=qscintilla2 does not add a lib reference
 2014-09-05 14:42:06 -04:00
Torsten Paul d08e7bbe82 Use fallback if CONFIG+=qscintilla2 does not add a lib reference (fixes #938). 2014-09-05 20:31:54 +02:00
Torsten Paul 155c275180 Add qscintilla2 to dependency list. 2014-09-05 19:58:31 +02:00
Torsten Paul af69e95bbe Check also lib64 path for glib-2.0; fixes detection on fedora20/64bit. 2014-09-05 18:43:37 +02:00
Marius Kintel 771f764533 Use --render=cgal in export-import tests, added testcase for #936 2014-09-04 17:36:52 -04:00
Marius Kintel 51c54f2e5b Add --render=cgal option for test purposes (forces conversion to CGAL Nef polyhedron before rendering 2014-09-04 17:35:32 -04:00
Marius Kintel cfb15466e4 #337 Print warning on non-simple export instead of refusing to export 2014-09-04 17:34:53 -04:00
Marius Kintel f15a177132 Added expected files for #904 2014-09-04 14:43:34 -04:00
Marius Kintel efc552b0bf Only print one degenerate triangle warning per polyset 2014-09-04 14:40:03 -04:00
Marius Kintel 2c11e397d1 #904 testcase 2014-09-04 14:36:23 -04:00
Marius Kintel fc26d25011 #915 Make QScintilla editor the default 2014-09-04 14:25:41 -04:00
Marius Kintel 15d596099c Disabled some tests for Travis which fails due to Gallium 0.4 driver issues on Ubuntu 12.04 2014-09-04 13:49:12 -04:00
Marius Kintel 0d304f7e43 #924 Made MDI and undocking options visible again 2014-09-04 12:18:46 -04:00
Marius Kintel c4485cfdeb Merge pull request #879 from openscad/scintillaeditor 
Scintilla Editor
 2014-09-03 16:44:35 -04:00
Torsten Paul dab35ffa40 Use strong bindings for the liberation font aliases. 2014-09-03 21:55:18 +02:00
Marius Kintel 45a649d6ab #879 fix some keyboard binding issues 2014-09-03 15:00:52 -04:00
Marius Kintel 9ef3349e4e #879 fixed some minor layout and shortcut issues 2014-09-03 14:52:41 -04:00
Marius Kintel 845df0cce1 Merge remote-tracking branch 'origin/master' into scintillaeditor 
Conflicts:
	scripts/mingw-x-build-dependencies.sh
 2014-09-03 12:46:54 -04:00
Marius Kintel de2e1090ca Merge branch 'master' of github.com:openscad/openscad 2014-09-03 12:28:16 -04:00
Marius Kintel c7f8d283e2 Merge pull request #928 from openscad/mingw-master 
MXE master / Fix Windows cache folder
 2014-09-03 12:14:42 -04:00
Marius Kintel 546c8dd1d7 constness, codingstyle 2014-09-03 12:14:27 -04:00
Marius Kintel 98fb23f6b3 Merge pull request #929 from openscad/fix-fontconfig 
Fix fontconfig logic
 2014-09-03 12:12:00 -04:00
Torsten Paul af9843d91b Remove code to add Windows font folder - handled by fonts.conf. 2014-09-03 17:46:27 +02:00
Torsten Paul 3d2290c203 Use FcMatchPattern to make alias replacement work. 2014-09-03 17:43:19 +02:00
Torsten Paul 64e66bb397 Move additional conf files for fontconfig back to previous location. 2014-09-03 15:37:57 +02:00
Torsten Paul 2959cd0f30 Install fontconfig configuration folder. 2014-09-03 00:36:05 +02:00
Torsten Paul fde1b89cd9 Switch to MXE master branch using mingw-w64/static targets. 2014-09-03 00:36:05 +02:00
Torsten Paul a95b14da42 Add platform abstraction for setenv() which is not supported on MinGW. 2014-09-03 00:36:05 +02:00
Torsten Paul 89201c91c8 Suppress find error output. 2014-08-30 22:22:33 +02:00
Torsten Paul 2170e0ad2d Detect qmake-qt5 first, use qmake as fallback (needed for fedora). 2014-08-30 21:32:21 +02:00
Torsten Paul fdd5464835 Use OPENSCAD_LIBRARY include path only if it actually exists. 2014-08-30 21:23:03 +02:00
Torsten Paul e00287c8a4 Update dependency script for fedora. 2014-08-30 21:07:22 +02:00
Marius Kintel 5dd4823936 Merge remote-tracking branch 'origin/master' into scintillaeditor 2014-08-28 12:04:12 -04:00
Marius Kintel f1f4e4c778 Copy resourcess 2014-08-28 00:46:21 -04:00
Marius Kintel fb1270ea66 Added OS X font config for binary distribution 2014-08-28 00:43:58 -04:00
Marius Kintel 2edfed69b3 Copy font config for Mac binary build. The same should be done for Windows 2014-08-28 00:42:53 -04:00
Marius Kintel 44fa788a34 Add system, MacPorts and Homebrew fonts for OS X 2014-08-28 00:42:07 -04:00
Marius Kintel 97b47c8ee3 To auto-load configs, we need to prefix the config files with a number 2014-08-28 00:41:13 -04:00
Marius Kintel db14aa2bba Tweaked font config handling to hopefully be more correct 2014-08-28 00:39:51 -04:00
Marius Kintel 9ee42012fc Return a canonical resources path 2014-08-28 00:39:20 -04:00