3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 07:03:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
17448 commits 307 branches 272 tags 787 MiB
Commit graph

17448 commits

This branch
This branch
All branches
Author SHA1 Message Date
Aleksei S
9146a775a4 After resetting the custom settings the quality slider did not update selected value 
CURA-6028
 2018-12-14 16:17:05 +01:00
Jaime van Kessel
b70a4ae0a2 Merge branch 'CURA-6015_fix_osx_crash' of github.com:Ultimaker/Cura into 4.0 2018-12-14 13:35:37 +01:00
Ghostkeeper
475b008310
Reduce minimum window size slightly 
This way it just fits on the screen of a 13 inch MacBook Air.
 2018-12-14 13:27:36 +01:00
Jaime van Kessel
c4a0f19d56 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2018-12-14 13:23:43 +01:00
Jaime van Kessel
d379f94775 Make the dark theme a bit more readable 2018-12-14 13:23:28 +01:00
Ghostkeeper
a010823a4e
Fix warning when active stage is not yet instantiated 
Edit: Originally this was more or less the same fix as what Diego just did at the same time, which caused a merge conflict, but I think my solution is more elegant than the ternary operator that was originally there so I'm keeping mine.
 2018-12-14 13:22:32 +01:00
Ghostkeeper
8a4a1c9d49
Don't let print info take space if invisible 
This way there is a little bit more space for the text 'No time estimation available', which was previously abbreviated to 'No time estimation availa...'.
 2018-12-14 13:21:00 +01:00
Lipu Fei
a02bccf74d Fix NozzleModel to work with new ListModel data update 
CURA-6015

ListModels should not modify items directly. All ListModels should use
setItems() and the insertions/removals/modifications will be done in
setItems() itself.
 2018-12-14 13:00:06 +01:00
Jaime van Kessel
c3aca8907c Fix extruder number not being visible in dark theme 2018-12-14 12:02:52 +01:00
Jaime van Kessel
6a3ac99551 Ensure that all icons use the same color from theme. 
Also added some fixes for the dark theme
 2018-12-14 11:59:22 +01:00
Lipu Fei
cd3a9e02d6 Merge remote-tracking branch 'origin/4.0' into CURA-6015_fix_osx_crash 2018-12-14 11:45:51 +01:00
Jaime van Kessel
15cd2a9269 Changed textColor of recommended infill slider text to be themed. 
This is required to make the dark theme work correctly
 2018-12-14 11:36:40 +01:00
Aleksei S
8dc2a41fb7 Typo, wrong item type, "item" 
CURA-5941
 2018-12-13 17:27:16 +01:00
Jaime van Kessel
8f278fe938 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2018-12-13 17:21:35 +01:00
Jaime van Kessel
856c1dcb20 Also disconnect the signal for the old parent of printSetupSelector 2018-12-13 17:21:07 +01:00
Diego Prado Gesto
473160a102 Add a check for null to avoid warnings in the logs. 2018-12-13 17:02:13 +01:00
Ghostkeeper
3d4da94b36
Remove obsolete description detail about old Cura versions 
This setting had a detail in the description about how the setting used to behave in old Cura versions. Let's remove it since it is not relevant any more.

Fixes #4536.
 2018-12-13 16:49:45 +01:00
Diego Prado Gesto
d435f21193
Merge pull request #4986 from Ultimaker/CURA-6028_preview_stage_doesnt_switch 
Cura 6028 preview stage doesnt switch
 2018-12-13 16:47:22 +01:00
Diego Prado Gesto
012ee0c02a Use the MouseArea trick to assure that the binding still works for the 
checked property of the button.

Contributes to CURA-6028.
 2018-12-13 16:44:49 +01:00
Jaime van Kessel
bd565bf4cf Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2018-12-13 16:33:46 +01:00
Ghostkeeper
3f3cd5e334
Remove broken load of PrepareSidebar.qml 
This file no longer exists. Loading it gives a warning.
 2018-12-13 16:32:49 +01:00
Jaime van Kessel
d48e89e224 Prevent the parent of printSetupSelector from being set to null 
If it's parent gets set to null it will break the focus, which we need for the binding updates.

CURA-5941
 2018-12-13 16:32:48 +01:00
alekseisasin
70e60e5313
Merge pull request #4981 from Ultimaker/fix_output_device_selector 
Change the behaviour of the output device selector
 2018-12-13 16:21:49 +01:00
Jaime van Kessel
1b3cb32334 Fix the simulation view not being selected as default 
CURA-6028
 2018-12-13 15:59:15 +01:00
Diego Prado Gesto
b48eedfb80 Modify color for the progress bar in the messages. 2018-12-13 15:15:22 +01:00
Diego Prado Gesto
aa2fa371c4 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2018-12-13 14:32:28 +01:00
Diego Prado Gesto
17f0c12858 Make the middle component to have zero width if there is no component to 
fill the gap.

Contributes to CURA-6020.
 2018-12-13 14:31:34 +01:00
Jaime van Kessel
c4700b2752 Also update the model if the data changed 
CURA-6028
 2018-12-13 14:30:00 +01:00
Jaime van Kessel
a1a9b058f5 Let header listen to activeStageId instead of the model 
CURA-6028
 2018-12-13 14:28:32 +01:00
Lipu Fei
8021c8e449 Fix errors in SettingOptionalExtruder.qml 
CURA-6015
 2018-12-13 14:12:51 +01:00
Lipu Fei
d879cab91a Add all fields for optional extruder in ExtruderModel 
CURA-6015
 2018-12-13 14:12:44 +01:00
Lipu Fei
df0b1c6c77 Fix ExtruderManager creation in MachineManager 
CURA-6015
 2018-12-13 14:12:38 +01:00
Lipu Fei
935f7a2512 Remove unused imports 
CURA-6015
 2018-12-13 14:12:31 +01:00
Lipu Fei
620790ae3d Reduce the creations of ExtrudersModels 
CURA-6015
 2018-12-13 14:12:23 +01:00
Lipu Fei
2cf80b4578 Remove unused simpleNames flag 
CURA-6015
 2018-12-13 14:12:04 +01:00
Jaime van Kessel
b7ea075fa9 Merge branch 'fix_toolbutton_style' of github.com:Ultimaker/Cura into 4.0 2018-12-13 13:26:35 +01:00
Jaime van Kessel
b64882bb1e Merge branch 'quit_cura_button' of github.com:Ultimaker/Cura into 4.0 2018-12-13 13:23:47 +01:00
Jaime van Kessel
0a6c1a7c14 Fix CLIENT_ID (again) 
It got messed up in a merge again. Ugh.
 2018-12-13 13:12:57 +01:00
Diego Prado Gesto
121af7ad60 Reuse the primary button in the toolbox for the "Quit Cura" button 2018-12-13 09:41:07 +01:00
Diego Prado Gesto
635115a879
Merge pull request #4982 from Ultimaker/fix_preview_stage_menu 
Fix preview stage menu
 2018-12-13 09:32:01 +01:00
Diego Prado Gesto
e7fe7571aa Change the behaviour of the output device selector 
Now the behavior is the following:
- The active output device is the one that shows up in the button (same as before)
- The list of the output devices don't show the active device
- When clicking in one item of the list, it becomes the active output and automatically it performs the action.

Contributes to CURA-6026.
 2018-12-13 09:02:14 +01:00
Diego Prado Gesto
a1d7fa893d Change the style for the toolbuttons that appear in the popup panel of some tools 
Contributes to CURA-6024
 2018-12-12 17:26:13 +01:00
alekseisasin
a505adbf40
Merge pull request #4945 from Ultimaker/CURA-6006-login-required 
[4.0] CURA-6006 login required
 2018-12-12 11:31:38 +01:00
Remco Burema
1b2ef91c13 Merge branch 'CURA-6016_Improve_UI_Speed' into 4.0 2018-12-12 10:54:36 +01:00
Lipu Fei
f302a76d3a Fix typing issue in Toolbox 
CURA-6006
 2018-12-12 10:47:18 +01:00
Diego Prado Gesto
31331e36d2 Revert "Use the capitalized version of the buildplate name" 
This reverts commit 11d8831d7a.

Contributes to CURA-6021.
 2018-12-12 10:41:01 +01:00
Remco Burema
b413b4cdb6 Correct a typo in typing. [CURA-6016] 2018-12-11 17:21:14 +01:00
Diego Prado Gesto
c804610fa6 Make the stage menu in the preview using 85 percent of the total width in order to prevent the print setup panel to be in the middle 2018-12-11 15:19:40 +01:00
Diego Prado Gesto
742fc34e75 Change labels in the layer view legend 2018-12-11 14:31:12 +01:00
Diego Prado Gesto
db56aa028c Change the swatch from a circle to the extruder icon 2018-12-11 13:59:36 +01:00