3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 23:17:32 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
8975 commits 302 branches 270 tags 769 MiB
Commit graph

253 commits

Author SHA1 Message Date
Jaime van Kessel
ca922e9e9d The monitor item is now actually used to display information on monitor page 
The UM3 now provides camera image in this way

CURA-3826
 2017-05-29 13:47:41 +02:00
Arjen Hiemstra
06cc0e9a63 Move the ContextMenu to its own file 
Contributes to CURA-3609
 2017-04-20 17:39:43 +02:00
Jack Ha
07ed1bedc3 Fix boo boo with open multi files including project files. 2017-04-05 16:07:02 +02:00
Jaime van Kessel
ecf905f580 Merge branch 'feature_arrange_cleanup' of github.com:Ultimaker/Cura 2017-04-05 10:45:42 +02:00
Jack Ha
a83b1dd638 Split ShapeArray from Arranger. CURA-3239 2017-04-03 14:48:31 +02:00
Lipu Fei
f57e866119 Move custom functions into FileDialog 
CURA-3495
 2017-04-03 10:58:26 +02:00
Jack Ha
abb5d1e76e Arranger: moved functions, split Arrange into Arrange All and Arrange Selection. CURA-3239 2017-04-03 10:40:04 +02:00
Jaime van Kessel
f82aecb7ca Refactoring; no longer use "Printer" to identify CuraApplication 2017-03-30 20:19:05 +02:00
Lipu Fei
e92c21af28 Remove FIXME 
CURA-3495
 2017-03-29 12:53:19 +02:00
Lipu Fei
42b8f06e99 Ignore gcode when selected multiple files 
CURA-3495
 2017-03-29 12:52:56 +02:00
Lipu Fei
208935960f Add comments for putting open file logic in qml 
CURA-3495
 2017-03-28 15:02:50 +02:00
Lipu Fei
5bec46a29c Drag-and-drop files behave the same as open file menu 
CURA-3495
 2017-03-28 14:27:40 +02:00
Jack Ha
bf08d30e7d Added first arrange function and smart placement after loading. CURA-3239 2017-03-28 14:27:22 +02:00
Lipu Fei
7ad5a64b91 Add msg dialog for ignoring gcode in multiple file selection 
CURA-3495
 2017-03-24 09:53:12 +01:00
Lipu Fei
f3167bb84b Add dialog for opening a project file 
CURA-3495
 2017-03-21 13:56:09 +01:00
Jack Ha
b6d9fdcd13 Merge branch 'master' of github.com:Ultimaker/Cura 2017-03-20 15:10:14 +01:00
Jack Ha
1faa195c35 Renamed 'Save As' to 'Save As...' CURA-3496 2017-03-20 15:10:01 +01:00
Lipu Fei
892225d398 Move some code to OpenFilesIncludingProjectsDialog.qml 
CURA-3495
 2017-03-20 14:59:23 +01:00
Lipu Fei
f259038954 Adjust open project/models dialog size for high DPI 
CURA-3495
 2017-03-20 11:37:04 +01:00
jack
42e7a0defa Merge pull request #1535 from LipuFei/feature_CURA-3495_open_in_one 
CURA-3495 Open project/models menu item
 2017-03-20 10:59:40 +01:00
Lipu Fei
8e77d212f7 Remove "Save All" and add "Save As" MenuItem 
CURA-3496
 2017-03-17 14:31:22 +01:00
Lipu Fei
e00c68344a CURA-3495 open project/models in one dialog 2017-03-16 13:37:06 +01:00
Lipu Fei
ea16f967d7 Fix code styling 2017-03-16 13:37:06 +01:00
Jaime van Kessel
6cc0bd893f Save as now defaults to 3mf 
CURA-3496
 2017-03-15 09:57:50 +01:00
Jaime van Kessel
1d7bf51152 Added confirmation message for starting new project 
CURA-3494
 2017-03-10 14:10:24 +01:00
Jaime van Kessel
66afc2a391 Added new project option 
CURA-3494
 2017-03-10 11:02:27 +01:00
Lipu Fei
a20fb7a479 Fix some coding style 2017-03-07 20:18:31 +01:00
Jack Ha
42d939b34e Solved merge conflict. CURA-3321 2017-03-07 10:34:53 +01:00
Jack Ha
3468bae732 Add result type. 2017-03-07 10:31:11 +01:00
Jack Ha
f9a5dc885c Solved merge conflicts #1479 CURA-3321 2017-03-01 14:47:54 +01:00
Jaime van Kessel
2462699982 Switching profiles now shows a new dialog with all the changes. 
CURA-3221
 2017-02-28 10:25:42 +01:00
Jaime van Kessel
4f74edd421 Project name is now correctly set upon loading project 
CURA-3387
 2017-02-21 14:27:56 +01:00
fieldOfView
878ccc679c Add a legend to Layer View 2017-01-24 23:24:52 +01:00
Victor Larchenko
3605403314 D6: Moved file loading code 2016-12-23 15:53:16 -05:00
Victor Larchenko
c18b3149da D5: Moved loading files code 2016-12-23 15:53:16 -05:00
Victor Larchenko
1631045d7a D5: Refactoring 2016-12-23 15:53:16 -05:00
Victor Larchenko
b4a7173a61 T466: Only one gcode file can be loaded at a time, and deleting previous gcode file when loading non-gcode file 
Merge changes : Only call backgroundItem.hasMesh if/on an imported model (skips if only curaprofiles get loaded)
 2016-12-23 15:53:15 -05:00
Victor Larchenko
84add5be84 T466: Added disabling of view button 2016-12-23 15:53:15 -05:00
Victor Larchenko
8987aa2048 T466: Revert the previous commit since it messed up the file rights. 2016-12-23 15:53:15 -05:00
Victor Larchenko
64d7bb0c2a T466: Added ability to print loaded gcode 2016-12-23 15:53:14 -05:00
Jaime van Kessel
6baff7bbb2 Fixed create profile from settings not working 2016-12-15 17:18:08 +01:00
Jaime van Kessel
36d743384c Initial work for adding a save dialog for project saving 
CURA-1263
 2016-12-08 11:56:42 +01:00
Jaime van Kessel
c50d0172cc Moved open project to below open recent 
CURA-1263
 2016-12-02 13:33:13 +01:00
Jaime van Kessel
4cf454757f Change import & export back to save & open 
CURA-1263
 2016-12-02 10:43:02 +01:00
Jaime van Kessel
d08c1b73bf Fixed export profile derp 
CURA-1263
 2016-11-30 13:13:47 +01:00
Jaime van Kessel
86019c2df0 Renamed load&save workspace to import&export project 
CURA-1263
 2016-11-30 12:59:09 +01:00
Jaime van Kessel
053ea6ad52 Bumped the used API version up by one 
CURA-1263
 2016-11-17 11:44:44 +01:00
Jaime van Kessel
9539774c0b Merge branch 'master' of github.com:Ultimaker/Cura into rework_file_handler 2016-11-17 10:27:28 +01:00
fieldOfView
a70e4c8120 Fixed blurSettings 
UM.MainWindow does not derive from QML Item, so it does not have a forceActiveFocus() method.

CURA-2835
 2016-11-11 10:22:17 +01:00
Jaime van Kessel
f57a17577f Added workspace save option to menu 
CURA-1263
 2016-11-09 14:14:22 +01:00