GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-14 15:28:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
23,719 Commits 290 Branches 260 Tags
Commit Graph

128 Commits

Author SHA1 Message Date
Nino van Hooff
89f0970a88 Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
Nino van Hooff
c2c96faf5f Convert remaining doxygen to rst 2020-05-28 17:13:44 +02:00
Kostas Karmas
d6f150a523 Rearrange the AddPrinterPagesModel and mark "Add Cloud Printer" page as final 
In order to avoid cases where the "Machine actions" page would lead to the "add cloud printer"
page when pressing next, the AddPrinterPagesModel was rearranged and the "add cloud printer"
page was marked as final.

CURA-7022
 2020-04-29 11:38:36 +02:00
Kostas Karmas
b2382593ed Add is_final_page attribute and mark the "Add Cloud Printers" page as final 
CURA-7022
 2020-04-29 11:37:42 +02:00
Kostas Karmas
e4a6fe954d Merge branch 'master' into CURA-7022_Add_cloud_printer_within_add_a_connected_printer 2020-04-28 17:45:55 +02:00
Jaime van Kessel
9e68bcb7a0
Merge branch 'feature_objectlist_improvements' of https://github.com/fieldOfView/Cura 2020-04-28 15:40:08 +02:00
Kostas Karmas
15e7cb44af Merge branch 'master' into CURA-7022_Add_cloud_printer_within_add_a_connected_printer 2020-04-23 15:07:18 +02:00
Kostas Karmas
1d7c327b36 Redirect to "Add cloud printer" page when button clicked 
CURA-7022
 2020-04-22 16:15:24 +02:00
Kostas Karmas
1b1c006998 Skip the Cloud page if the user is logged in 
If the user goes through the welcome wizard, arrives at the login page,
logs in and then closes Cura, he/she will be logged in the next time.
In this case, he/she will go through the welcome page again but will
not see the sign in page at all.

CURA-7019
 2020-04-21 11:23:42 +02:00
Kostas Karmas
7377dd551c Rearrange welcome pages in first run wizard 
Sign in to Ultimaker Cloud page will now appear before the add printer
page.

CURA-7019
 2020-04-20 15:04:53 +02:00
fieldOfView
dbc4c69142 Show correct number of settings for support and anti overhang meshes 2020-04-13 09:51:54 +02:00
fieldOfView
a3dea81d7d Fix typing 2020-04-12 16:11:52 +02:00
fieldOfView
4f0c24fecb Reorder code for readability 2020-04-12 09:24:41 +02:00
fieldOfView
ea805d9a02 Hide extruder swatch for groups 2020-04-11 20:55:35 +02:00
fieldOfView
e13a0bca4a Add extruder swatches to object selector 2020-04-11 20:48:06 +02:00
fieldOfView
bba07d01fb Show mesh type and number of per model settings in ObjectSelector 2020-04-10 19:13:36 +02:00
Jaime van Kessel
2e9dca71ce
Remove a number of unused imports 2020-04-10 13:58:10 +02:00
Jaime van Kessel
a26de5ce79
Gracefully handle the sitation if the changelog was not found 
CURA-4R
 2020-03-18 11:17:23 +01:00
Jaime van Kessel
81b33b8649
Add some missing typing 2020-01-10 14:58:53 +01:00
Jaime van Kessel
5da77472e7
Add some timers to sceneChanged 2020-01-03 10:17:54 +01:00
Jaime van Kessel
41c953112a
Make animation time instead of update dependant 
CURA-6823
 2019-12-24 12:53:19 +01:00
ninovanhooff
a6946fa3d9
Merge branch 'master' into CURA-7011_enterprise_visual_cues 2019-12-13 11:44:34 +01:00
Lipu Fei
0cb27774d6
Merge branch 'master' into pre_sliced_base_filename 2019-12-11 10:46:04 +01:00
Nino van Hooff
cbfa45dd25 Update enterprise splash screen background 
CURA-7011
 2019-12-10 16:27:30 +01:00
Nino van Hooff
d09f3492db Add enterprise splash screen. 
Added it as a png, which might be a bit overkill but it could also
could be hard getting strokes / shadows exactly right otherwise. Also
Allows for more visual distinction of the background later

CURA-7011
 2019-12-10 15:59:57 +01:00
Jaime van Kessel
366dd4bd00
Swap the splashscreen image 
RIP Ultibot :(

CURA-6656
 2019-11-05 09:33:50 +01:00
Tim Kuipers
96f8dab853 dont prepend 'Pre-sliced file' 2019-10-31 11:43:26 +01:00
Lipu Fei
94e89ad4ac Fix merge conflicts with master 2019-09-24 14:26:43 +02:00
Ghostkeeper
cc9115b3d3
Don't use material manager to reset material 
Use the container tree.

Contributes to issue CURA-6776.
 2019-09-20 09:57:35 +02:00
Jaime van Kessel
0ff9d72c4c
Remove use of deprecated extruders property 2019-09-13 17:27:16 +02:00
Jaime van Kessel
c3166703b4 Also connect the objectsModel to the selectionChanged signal 2019-07-22 10:27:19 +02:00
Jaime van Kessel
66d8e41064 Also add tests for the update of the objects mode 
CURA-6283
 2019-05-24 15:27:08 +02:00
Jaime van Kessel
834e6344df Cut up large update function to make testing easier 
CURA-6283
 2019-05-24 13:26:11 +02:00
Jaime van Kessel
bd39a9c591 Simplify & cleanup objects mode 
CURA-6283
 2019-05-24 09:30:50 +02:00
Jaime van Kessel
502eea4d26 Simplify the objects model further 
CUA-6283
 2019-05-23 16:09:22 +02:00
Jaime van Kessel
71d156b175 Remove unneeded check 
CURA-6283
 2019-05-23 16:04:39 +02:00
Jaime van Kessel
4a6495a0e6 Remove unneeded itemsChanged emit 
CURA-6283
 2019-05-23 16:01:53 +02:00
Jaime van Kessel
48dd9d247c Renamed some local variables so they describe better what they do 
CURA-6283
 2019-05-23 16:01:19 +02:00
Jaime van Kessel
c784a39ec6 Fixed typing 
CURA-6283
 2019-05-23 15:59:14 +02:00
Lipu Fei
5d58d60a16 Fix typing 
CURA-6283
 2019-05-21 13:39:14 +00:00
Lipu Fei
83b9e5e53b Change import 
CURA-6182
 2019-05-21 15:17:04 +02:00
Lipu Fei
c9642273eb Fix typing 
CURA-6283
 2019-05-21 15:15:18 +02:00
Lipu Fei
c282897c1e Fix numbering in object renaming 
CURA-6283

For both individual nodes and grouped nodes.
 2019-05-21 14:49:45 +02:00
Lipu Fei
80827bdf70 Fix adhesion checkbox in recommended mode 
CURA-6182

Move complex logic to Python.
 2019-05-21 08:10:49 +02:00
Diego Prado Gesto
9e5e57e6c5 Merge branch 'master' into feature_model_list 2019-05-07 11:57:31 +02:00
Diego Prado Gesto
11e86512cb Include the prime tower to the time calculations 
Contributes to CURA-6509.
 2019-05-06 14:33:24 +02:00
Lipu Fei
defcba6927 Fix that you can only cancel in WizardDialog 
CURA-6483
 2019-04-29 15:53:08 +02:00
Jaime van Kessel
ef92aad6bb Merge branch 'master' of github.com:Ultimaker/Cura into CURA-6435_new_style_add_machine 2019-04-17 11:06:30 +02:00
Ghostkeeper
325e60d821
Correct renamed welcome check function 
Contributes to issue CURA-6435.
 2019-04-16 15:28:32 +02:00
Lipu Fei
9494173f43 Remove hack in WelcomePagesModel and add WhatsNewPagesModel 
CURA-6447
 2019-04-12 12:11:09 +02:00