Commit graph

871 commits

Author SHA1 Message Date
daid303
9d46c12da1 Improvement on the bed leveling wizard 2012-12-19 09:21:24 +01:00
daid303
26e85f4ee6 Merge branch 'master' of github.com:daid/Cura 2012-12-17 14:15:50 +01:00
daid303
073fb3109f Add bed leveling wizard. 2012-12-17 14:15:40 +01:00
daid303
93f9fb4284 Do not show the rotate ring in GCode preview. 2012-12-13 17:47:50 +01:00
daid
b0cbce6b02 Merge pull request #288 from GreatFruitOmsk/master
Fix package.sh and improve file association
2012-12-13 05:55:30 -08:00
Ilya Kulakov
4a6a1f34fc Fix resulted archive was wrong in Mac OS X. 2012-12-13 20:38:11 +07:00
Ilya Kulakov
8ee80a5e34 Make app an owner of file formats.
Since Cura works with file formats designed for exporting
it makes sense to be an Owner of such files, since Cura
prints them.
2012-12-13 20:37:46 +07:00
daid
03689c4e06 Merge pull request #287 from GreatFruitOmsk/master
Small Optimization for Drawin
2012-12-13 05:23:02 -08:00
daid303
3495de027c Fixed #234 2012-12-13 10:56:26 +01:00
daid303
5b44f01b85 Check for modified files and ask the user to reload if the file is changed. 2012-12-13 09:52:25 +01:00
Ilya Kulakov
009364ad6a Do not import splashScreen when platform is darwin. 2012-12-13 15:51:45 +07:00
daid303
cedfec86b5 Fix the windows shortcut to run Cura as a module, which is the proper way to start python software. 2012-12-10 18:10:03 +01:00
daid303
30db719d80 Retract 15mm by default when switching extruders in a dual extrusion setup, as 5mm is nowhere near enough. 2012-12-10 16:52:43 +01:00
daid303
91a592d922 Fix the simplemode. 2012-12-10 14:35:47 +01:00
daid303
9bba87387e Fixed the layout problems with the quickprint/normal switch. Still need to test on Mac. 2012-12-10 13:57:09 +01:00
daid303
b6d7981529 Small extra comment to make it clear why the import is at an odd spot 2012-12-10 13:24:08 +01:00
daid
a4f4b7ae0e Merge pull request #284 from jcosmo/timelapse_spelling
timelaps -> timelapse
2012-12-10 03:28:21 -08:00
daid303
00c2b1ed66 Make a single entry point for the GUI interface, as Cura.gui.app 2012-12-10 11:38:30 +01:00
daid303
98ef38eb46 Fix encoding bug when using locals with none-ascii chars in it. 2012-12-10 10:09:55 +01:00
James Walker
0a6074be9f timelaps -> timelapse 2012-12-10 20:07:46 +11:00
daid303
7376c44b85 Turn all classes into new style classes, this speeds up skeinforge a tiny bit. 2012-12-07 18:58:26 +01:00
daid303
d2f7aa4199 Some minor fixes. 2012-12-07 16:08:47 +01:00
daid303
1a1a35e483 Fix all the imports in skeinforge. 2012-12-07 12:20:42 +01:00
daid303
0c5e218b09 Merge branch 'master' of github.com:daid/Cura 2012-12-07 12:07:21 +01:00
daid303
c537207a62 Update on normal/quickprint mode. Now they share a lot of code and use the same main window. Switching still has some minor issues. 2012-12-07 11:37:05 +01:00
daid
3bd84550a8 Merge pull request #281 from GreatFruitOmsk/master
Mac OS X related and general fixes
2012-12-07 02:06:58 -08:00
Ilya Kulakov
449c54d44d Fix darwin setup.py according to new resources structure. 2012-12-07 15:45:06 +07:00
Ilya Kulakov
17173e7688 Make gui.util a package. 2012-12-07 15:30:30 +07:00
Ilya Kulakov
40e86b2883 Fix power import. 2012-12-07 15:29:41 +07:00
Ilya Kulakov
59ccbb256c Fix typo in requirements. 2012-12-07 15:00:07 +07:00
Ilya Kulakov
df08ba3ee6 Use Power as pip dependency, not git submodule. 2012-12-07 14:57:35 +07:00
Ilya Kulakov
948bbb8d13 Upload formula. 2012-12-07 14:53:23 +07:00
Ilya Kulakov
f42ee83bc7 Merge remote-tracking branch 'upstream/master' 2012-12-07 14:48:25 +07:00
daid303
c7e497c1c8 Move some gui utility files into a seperate location so the code gets a bit more seperated. 2012-12-06 18:28:37 +01:00
daid303
c12c427569 Move resources in to their own subdirectory and update the code that uses the resources. 2012-12-06 18:17:14 +01:00
Ilya Kulakov
fbe29005c7 Fix STLQuickLook is not copied into Mac OS X bundle. 2012-12-06 23:32:30 +07:00
Ilya Kulakov
b25ef2dd39 Ignore build files for Mac OS X. 2012-12-06 23:31:57 +07:00
daid303
df2bd314b5 Quick and ugly change which fixes slicing with pypy. Cleanup will follow. 2012-12-06 14:57:00 +01:00
daid303
3b2a96f33c Fixed the imports. 2012-12-06 14:51:55 +01:00
Daid
6c4c4ba2f9 Updated all lineends for py files to unix style. 2012-12-06 14:12:13 +01:00
daid
c4b3c26be1 Merge pull request #280 from GreatFruitOmsk/macosx
Better support for Mac OS X
2012-12-06 04:51:36 -08:00
Ilya Kulakov
252244cb65 package.sh is able to package Cura using new build system. 2012-12-06 19:39:37 +07:00
Ilya Kulakov
a9dcc800f2 Fix typo in README. 2012-12-06 15:59:59 +07:00
Ilya Kulakov
4dcb07e4be Finish updating README for Mac OS X. 2012-12-06 14:57:18 +07:00
Ilya Kulakov
9f3d727817 Merge remote-tracking branch 'upstream/master' into macosx
Conflicts:
	Cura/gui/configWizard.py
	Cura/gui/mainWindow.py
	Cura/gui/opengl.py
	Cura/gui/printWindow.py
	scripts/osx64/Cura.app/Contents/MacOS/Cura
2012-12-06 00:33:55 +07:00
Ilya Kulakov
1d42ce8afc Initial subclass of wx.App and removing splash on Mac OS X. 2012-12-05 23:54:11 +07:00
Ilya Kulakov
0a1b1c419a Start updating README for Mac OS X. 2012-12-05 20:16:50 +07:00
Ilya Kulakov
0e6b9fd67e New py2app based distribution of Cura for Mac OS X. 2012-12-05 19:16:41 +07:00
Ilya Kulakov
377ea03c15 Fix resources, imports and indentations. 2012-12-05 19:14:06 +07:00
daid303
2081a9cc9a Add Ultimaker upgrade page in first run wizard, which helps in setting better defaults. 2012-12-05 12:45:20 +01:00