3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-10-10 15:27:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 19
3404 commits 330 branches 295 tags 714 MiB
Commit graph

1546 commits

Author SHA1 Message Date
Arjen Hiemstra
0270aecdc3 Replace separate machine/profile menus in menubar with a single "Settings" menu 
Contributes to CURA-342
 2016-06-28 17:43:28 +02:00
Arjen Hiemstra
1a56da464c Introduce a "Manage Materials" action 
Contributes to CURA-342
 2016-06-28 17:42:47 +02:00
Arjen Hiemstra
842015ea10 Move all the menus to individual QML files to make it easier to reuse them 
Contributes to CURA-342
 2016-06-28 17:32:50 +02:00
Arjen Hiemstra
68a8bcb009 Fix width of materials properties tab 2016-06-27 13:33:38 +02:00
Arjen Hiemstra
b2ef607cb6 Fix the material setting list to use a simple placeholder 
Contributes to CURA-342
 2016-06-23 17:34:35 +02:00
Arjen Hiemstra
1cb836aea5 Add a ReadOnlySpinBox control that provides a spinBox with a readOnly property 
Contributes to CURA-342
 2016-06-23 17:33:55 +02:00
Arjen Hiemstra
f71ddc4b9f Start implementing view and edit support in the materials page 
Contributes to CURA-342
 2016-06-23 17:31:50 +02:00
fieldOfView
0faecf9b34 Rearrange MachineActions on Machines page 
CURA-1385
 2016-06-23 14:15:39 +02:00
Arjen Hiemstra
8c8caa2cac Use the right property for the property provider 
Otherwise we get a bunch of errors from the per object settings tool
 2016-06-23 13:33:07 +02:00
Arjen Hiemstra
9f9de493f7 Clean up indentation 2016-06-23 13:32:31 +02:00
Arjen Hiemstra
cc027ddf41 Remove unused code 2016-06-23 13:32:20 +02:00
Arjen Hiemstra
de36122531 Use the expanded categories from Cura to expand the proper categories on startup 2016-06-23 13:31:01 +02:00
Aldo Hoeben
488740c60d Merge pull request #819 from Ultimaker/MachineActions 
Machine actions
 2016-06-23 12:59:03 +02:00
Jaime van Kessel
cd6092581b Removed extraneous space 
CURA-1385
 2016-06-23 11:17:28 +02:00
Jaime van Kessel
3f3a93ae8a Refactoring; Renaming firstRunWizard to machineActionsWizard 
CURA-1385
 2016-06-23 11:12:58 +02:00
Jaime van Kessel
a7deb53acf Added BedLevel as supported action to UMO 2016-06-23 11:12:06 +02:00
fieldOfView
a6bb0c804a Fix minor codereview issues 
CURA-333
 2016-06-22 17:19:14 +02:00
Jaime van Kessel
a35873a31b Removed test files 
CURA-333
 2016-06-22 17:04:31 +02:00
Jaime van Kessel
458749ca4e Removed old wizard pages 
CURA-1385
 2016-06-22 15:35:44 +02:00
Jaime van Kessel
b62118dc1c Added supported actions to all UM machines 
CURA-1385
 2016-06-22 15:29:54 +02:00
Jaime van Kessel
d5b07d29de Actions are now reset before every run 
CURA-1385
 2016-06-22 14:39:41 +02:00
Jaime van Kessel
4ad7731efd Merge branch 'master' of github.com:Ultimaker/Cura into MachineActions 2016-06-22 12:45:29 +02:00
Jaime van Kessel
8cfc0737ac First run actions are now properly handled 
CURA-1385
 2016-06-22 11:49:35 +02:00
fieldOfView
6adc4ef284 Revert "Change spelling of "colour" to "color" for consistency" 
This reverts commit 963a2092ef.

I still say we should use "colour" for consistency, but that change should not be part of this branch.

CURA-333
 2016-06-22 10:19:44 +02:00
fieldOfView
b17d621243 Disable nozzle/material selection on the global tab 
The global tab has no nozzle/material by definition.
CURA-333
 2016-06-22 09:55:25 +02:00
fieldOfView
6fa1fb9d2f Select "Global" tab when switching to a machine that has multiple extruders. 
CURA-333
 2016-06-22 09:55:24 +02:00
fieldOfView
963a2092ef Change spelling of "colour" to "color" for consistency 
I know "colour" is the more correct spelling, but Qt uses the spelling "color" and we have already adopted that spelling in a number of places.

CURA-333
 2016-06-22 09:55:23 +02:00
fieldOfView
92905ada34 Show true extrudernames in Simple Mode support extruder selection combobox 
CURA-333
 2016-06-22 09:55:21 +02:00
fieldOfView
eba2451cf2 Add tooltip to extruder-tabs 
CURA-333
 2016-06-22 09:55:21 +02:00
fieldOfView
d0626f8c8a Add hypothetical multiextrusion printer to test 2016-06-22 09:55:19 +02:00
Jaime van Kessel
65751d7400 Added completed signal to machine action, so model can notify display that it is completed 
CURA-1385
 2016-06-21 16:19:44 +02:00
Jaime van Kessel
181d16aad8 Running machine actions outside of first run is now possible 
CURA-1385
 2016-06-21 14:34:53 +02:00
Jaime van Kessel
924af37dff Fleshing out of bedleveling action 
CURA-1385
 2016-06-21 13:30:36 +02:00
Ghostkeeper
63edd6f74d
Improve default raft settings 
Results from materials testing.
 2016-06-21 12:57:33 +02:00
Jaime van Kessel
3342f2a76a Merge branch 'master' of github.com:Ultimaker/Cura into MachineActions 2016-06-20 13:52:11 +02:00
Jaime van Kessel
8237047907 Actions are now added as buttons to machinePages 
CURA-1385
 2016-06-20 13:46:05 +02:00
Ghostkeeper
f139e91f88
Remove minimum and maximum of _extruder_nr settings 
This way the validation won't get an error any more. There is no validation. It's an enum anyway.

Contributes to issue CURA-1716.
 2016-06-20 12:00:56 +02:00
Tim Kuipers
db3d568c76 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-17 16:31:22 +02:00
Tim Kuipers
2e9ee9f668 JSON lil fix: default didn't coicide with default inherited state 2016-06-17 11:36:50 +02:00
Ghostkeeper
60d6cc07fb
Add Mendel90 by Bo Herrmannsen 
Provided via https://github.com/Ultimaker/Cura/issues/808
 2016-06-16 13:17:41 +02:00
Jaime van Kessel
8b5800c1ee Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-15 14:14:19 +02:00
Jaime van Kessel
12faf23af8 Added a way to check if a printer is connected 
CURA-1036
 2016-06-15 14:13:54 +02:00
Ghostkeeper
8617f10a46 Merge branch 'materials_test' 2016-06-15 13:58:18 +02:00
Ghostkeeper
85422ae6a5
Make extruder_nr a string value 
It's an enum after all, and the front-end doesn't work well with enums that are ints. The code for the back-end should remain the same.

Contributes to issue CURA-1716.
 2016-06-15 13:52:57 +02:00
fieldOfView
0864b53081 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-15 09:46:08 +02:00
fieldOfView
61db0a7660 Fix extruder tabs for >2 extruders or long extruder names 
CURA-340
 2016-06-15 09:45:55 +02:00
Jaime van Kessel
1bab4032fd Fixed broken perobject setting panel 
CURA-1725
 2016-06-15 09:41:32 +02:00
Arjen Hiemstra
e473d7a4e9 Ensure the control has active focus when clicking a SettingItem 
This way we ensure that things update properly when for example changing
infill pattern.

Fixes CURA-1494
 2016-06-14 17:29:05 +02:00
Simon Edwards
175b5429b4 Refactor the profile and Cura specific import/export code, put the cura stuff in Cura itself. 
Contributes to CURA-1667 Profile import/export
 2016-06-14 11:44:38 +02:00
fieldOfView
2498e7110d Allow setting the diffuse_color with a uniform binding 
CURA-345
 2016-06-14 11:05:50 +02:00