11058 Commits

Author SHA1 Message Date
Diego Prado Gesto
1ff2541947 Add nozzle color to the default themes 2017-11-09 10:34:35 +01:00
Diego Prado Gesto
b7172ad9e3 Add return values to some functions that cause some crashes 2017-11-07 17:43:27 +01:00
Diego Prado Gesto
97fd926654 CURA-4526 Add to SimulationView the same behavior than LayerView 2017-11-03 17:46:12 +01:00
Diego Prado Gesto
74a7f02166 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-11-02 13:21:25 +01:00
Diego Prado Gesto
a4441e2bdb CURA-4481 Setting description improved 2017-11-02 13:20:25 +01:00
Lipu Fei
25c41062e1 Fix material upgrade and version checking
CURA-4519

Less duplicated code, but it's still one of the worst parts...
2017-11-02 13:01:49 +01:00
Diego Prado Gesto
a623c2ae75 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-11-02 09:53:36 +01:00
Diego Prado Gesto
d503283089 CURA-4509 Minor fix that avoids crashes when there is no specified
material (such as in UM2)
2017-11-02 09:51:57 +01:00
ChrisTerBeke
142ff4e9dc
Merge pull request #2669 from fieldOfView/feature_jogging
Jogging
2017-11-01 16:15:40 +01:00
Aleksei S
87a7bf72a8 Monitor view, "connect" button position
CURA-4509
2017-11-01 15:57:30 +01:00
ChrisTerBeke
4326884f97 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-11-01 15:54:43 +01:00
alekseisasin
db51054984
Merge pull request #2700 from fieldOfView/feature_cleanup_save_monitor_area
Cleanup save/monitor button area
2017-11-01 15:53:20 +01:00
ChrisTerBeke
e2c62a4609 Revert "Remove unnecessary properties which after update triggered view rendering"
This reverts commit ee228155af1677f3f375fb0b28b53ecef744d4d2.
2017-11-01 15:50:23 +01:00
Diego Prado Gesto
7f76749e2c Merge branch 'CURA-4062_layerview_laggy' 2017-11-01 13:37:44 +01:00
Diego Prado Gesto
c85e10f4c5 CURA-4062 Minor changes 2017-11-01 13:31:17 +01:00
Mark
cb0f94eed0 Resolve merge conflict 2017-11-01 10:57:16 +01:00
Aleksei S
1de61600a7 Checkbox position and warning in log file
CURA-4503
2017-11-01 10:45:09 +01:00
Mark
512541be08 Change the font of the checkbox
CURA-4503
2017-11-01 10:44:46 +01:00
alekseisasin
fb87b73bbe
Merge pull request #2591 from BagelOrb/trihex_infill
trihex infill
2017-10-31 17:25:31 +01:00
Lipu Fei
324b39fc39 Fix layout for open project dialog
CURA-4503
2017-10-31 16:20:01 +01:00
alekseisasin
759c494aaa
Merge pull request #2703 from fieldOfView/fix_setting_text_on_focus
Stop SettingTextField from setting values when getting/losing the focus
2017-10-31 12:47:25 +01:00
Diego Prado Gesto
d7b75cab2e CURA-4502 Minor changes 2017-10-31 11:42:46 +01:00
Lipu Fei
22e36ff3af Fix not supported quality profile list
CURA-4451
2017-10-31 11:21:34 +01:00
Aleksei S
4e40da54b3 Merge branch 'master' of github.com:Ultimaker/cura 2017-10-31 11:08:55 +01:00
Aleksei S
f1db8ed001 Show message (hover slieder) if user selected custom quality profile in recomended mode
CURA-4466
2017-10-31 11:07:45 +01:00
Andreea Scorojitu
e36cefedf6
Update ChangeLog.txt 2017-10-31 10:47:57 +01:00
Aleksei S
f7ce4cc78a Merge branch 'master' of github.com:Ultimaker/cura 2017-10-31 10:27:35 +01:00
Aleksei S
e0c1afe01f Added Request package information to AboutDialog.qml
CURA-4415
2017-10-31 10:26:42 +01:00
alekseisasin
055b6ebaab
Merge pull request #2691 from Ultimaker/cleaner_open_project_dialog
Cleaner open project dialog & redering on partial pixels fixes
2017-10-31 09:58:52 +01:00
Ghostkeeper
92cf76b30b
Merge branch '3.0' 2017-10-31 09:57:42 +01:00
Andreea Scorojitu
d7b0583640 Update changelog to the current 3.0.4 version 2017-10-31 09:52:30 +01:00
Lipu Fei
67c11b8cdf
Fix code style
CURA-4503
2017-10-31 09:24:32 +01:00
Ruben D
93e746b1b3
Warm up to layer_0 temperatures in start g-code
Thanks to nounours2099 for the correction.

Fixes #2631.
2017-10-31 00:23:05 +01:00
Aleksei S
7f02ddd6e9 Simplified version for validation need to show user agreement
CURA-4501
2017-10-30 15:43:40 +01:00
Lipu Fei
aab601927c Show Add Machine dialog after User Agreement dialog is closed
CURA-4501
2017-10-30 15:43:40 +01:00
Lipu Fei
b5904cd239 Fix code style
CURA-4501
2017-10-30 15:43:40 +01:00
Mark
ca8127c047 Fixed code comments
CURA-4501
2017-10-30 15:43:39 +01:00
Mark
9aebb395ab Refactor and cleanup
CURA-4501
2017-10-30 15:43:39 +01:00
Mark
b45e44b388 Add useragreement screen on first run of Cura
CURA-4501
2017-10-30 15:43:39 +01:00
fieldOfView
8dfba9a318 Stop SettingTextField from setting values when getting/losing the focus
Fixes #2694
2017-10-30 15:31:14 +01:00
Lipu Fei
e6e61e9a3c
Merge pull request #2697 from Ultimaker/feature_add_user_agreement
Feature add user agreement
2017-10-30 14:50:52 +01:00
fieldOfView
7a9dda4022 Disable jogging for UM3
NetworkPrinterOutputDevice does not have the API to control jogging
2017-10-30 14:46:31 +01:00
Aleksei S
22aaf64b63 Simplified version for validation need to show user agreement
CURA-4501
2017-10-30 14:42:46 +01:00
Lipu Fei
69cd00d1c7 Do not take into account the active materials when importing a quality profile
CURA-4451

When importing a quality profile, it should not fail/succeed based on
which materials are activated at the moment. The imported quality
profile will be available when the user switches to a compatible
settings.
2017-10-30 13:13:54 +01:00
Lipu Fei
0096fe0de3 Fix project loading to handle "Not Supported" quality profiles
CURA-4451
2017-10-30 12:54:21 +01:00
Lipu Fei
b6dd87081c Add upgrade script for 3.0 to 3.1
CURA-4451

- Add upgrade script for 3.0. to 3.1
- Upgrade old stack files so they will use "empty_quality" as the
  "Not Supported" quality profile.
- Increase SettingVersion to 4
2017-10-30 12:45:25 +01:00
fieldOfView
2d109090bc Show material name instead of extruder number 2017-10-30 12:40:41 +01:00
fieldOfView
fc7d1210cf Fix qml binding loop 2017-10-30 12:31:46 +01:00
fieldOfView
6fa4dd0a97 Fix qml binding loops 2017-10-30 12:26:02 +01:00
fieldOfView
84002a70d0 Remove binding loop by cleaning up tooltipText creation 2017-10-30 11:50:57 +01:00