GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-04 03:04:23 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,021 Commits 295 Branches 268 Tags
Commit Graph

17021 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marijn Deé
59510487fa Merge branch 'tests-for-um3networkplugin' of github.com:Ultimaker/Cura into tests-for-um3networkplugin 2018-11-26 09:50:40 +01:00
Ghostkeeper
5469613c17
Don't fail the samefile check if second file didn't exist 
If the backup file didn't exist but the original did, then apparently they are not the same file so the copy should be allowed.
 2018-11-26 09:40:14 +01:00
Jaime van Kessel
09af7a9435 Slice button will now be disabled on error 
CURA-5959
 2018-11-26 09:34:27 +01:00
Ghostkeeper
c9eb57cead
Don't copy preference file to the same location 
This crashes Cura on start-up for some people.
 2018-11-26 09:32:59 +01:00
Ghostkeeper
8f9d6bee62
Document dependency on fdm_materials 
Without it, Cura simply won't start if you had a printer loaded with material profiles.

Fixes #4460.
 2018-11-26 08:30:24 +01:00
Diego Prado Gesto
c5d0ed2651 Define the look and feel of the view selector button. Adjust the sizes. 2018-11-25 20:13:56 +01:00
Diego Prado Gesto
68c96a2577 Modify the header item of the view selector. 2018-11-25 19:42:00 +01:00
Diego Prado Gesto
f3bf20ca1b Separate the view selector into a different file. 2018-11-25 18:24:21 +01:00
Diego Prado Gesto
9e92542eee Fix the height of the IconLabel to avoid getting binding loops. 
Contributes to CURA-5942.
 2018-11-25 18:14:01 +01:00
Jaime van Kessel
b82ea58bc8 Changed all the action buttons to either use primary or secondary button 
CURA-5959
 2018-11-23 18:07:50 +01:00
Jaime van Kessel
af1ee53578 Fix the hover effect of action button 
CURA-5959
 2018-11-23 17:41:58 +01:00
Aleksei S
2e262dd9d2 Added Icons to SidebarSimple 2018-11-23 17:35:55 +01:00
Jaime van Kessel
e1f3e07f04 Changed Marketplace button to no longer use the action button 
The actionButton is weirdly named and overly used. That being said, the marketplace button is unique, so
there is little sense in re-using it
 2018-11-23 17:11:20 +01:00
Diego Prado Gesto
a3bcdaf3b6 Make the popup in the printer selector resizable depending on the 
contents. Also there is a maximum height that will fit 9 printers.

Contributes to CURA-5942.
 2018-11-23 16:58:57 +01:00
Aleksei S
c4d0207cc1 Added close button in right top corner 
CURA-5941
 2018-11-23 13:10:48 +01:00
Jaime van Kessel
1a8df9e10e Removed blue border if slicing is not possible 
CURA-5959
 2018-11-23 11:46:38 +01:00
Aleksei S
666ed595e5 Added space 2018-11-23 11:36:31 +01:00
Aleksei S
6d34218012 Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-11-23 11:34:46 +01:00
ChrisTerBeke
e3894c291c Merge branch 'tests-for-um3networkplugin' of https://github.com/Ultimaker/Cura into tests-for-um3networkplugin 2018-11-23 11:27:41 +01:00
Jaime van Kessel
3ba4b9fd81 Add shadows to various used actionbuttons 
CURA-5959
 2018-11-23 11:20:53 +01:00
Jaime van Kessel
a71e75508c Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into CURA-5959-action-panel-ui-fixes 2018-11-23 11:00:11 +01:00
Ghostkeeper
48c24b1034
Remove log entry for bonjour services added 
For most networks that would not be a problematic log entry. But for our own debugging on Ultimaker's network this is a very spammy log entry and doesn't add much value anyway.
 2018-11-23 10:50:16 +01:00
Diego Prado Gesto
67dc415b58 Add the connected icon to the printer selector that shows a blue icon 
when the printer is connected. If not connected then there is no icon.

Contributes to CURA-5942.
 2018-11-23 10:46:55 +01:00
alekseisasin
45076d9ca6
Merge pull request #4859 from Ultimaker/CURA-5878_gcode_file_association 
CURA-5878 Update desktop and mimeinfo to add gcode mime type
 2018-11-23 10:37:10 +01:00
Marijn Deé
76542a82d5 Removed the asserts on internals 2018-11-23 10:33:57 +01:00
Marijn Deé
294527f7fe Review changes 2018-11-23 09:21:09 +01:00
Marijn Deé
bb5c0326de Used duoble quotes iso single quotes 2018-11-23 09:20:19 +01:00
Diego Prado Gesto
1d84bd7356 Improve the machine selector header to show an icon in case it is a 
network printer.

Contributes to CURA-5942.
 2018-11-22 17:37:10 +01:00
Jaime van Kessel
7ecad41625
Merge pull request #4843 from Ultimaker/fix-oauth2-client 
Switch Ultimaker Account OAuth2 client
 2018-11-22 16:38:10 +01:00
Diego Prado Gesto
2b08857331 Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector 2018-11-22 16:11:34 +01:00
Diego Prado Gesto
81c776213a Merge branch 'master' into ui_rework_4_0 2018-11-22 16:11:06 +01:00
Lipu Fei
06cb628699 Update desktop and mimeinfo to add gcode mime type 
CURA-5878
 2018-11-22 15:47:12 +01:00
Diego Prado Gesto
692868a0b4 Create a function that given a printer type name, it will return and 
abbreviated name.

Contributes to CURA-5942.
 2018-11-22 15:45:38 +01:00
Jaime van Kessel
3f4d379908 Added shadow to slice button 
CURA-5959
 2018-11-22 15:35:40 +01:00
Simon Edwards
ee7355c2bb
Merge pull request #4841 from Ultimaker/CL-1148_restyling_monitor_queue_tiles 
CL-1148 Re-styling monitor queue tiles
 2018-11-22 15:08:42 +01:00
Diego Prado Gesto
5c30df2a68 Create a reusable component for the printer type label. Other parts of 
the UI can just reuse it.

Contributes to CURA-5942.
 2018-11-22 15:00:35 +01:00
Diego Prado Gesto
0211122b12 Add a proper component with a label and a rectangle in the background 
that shows the type of printer.

Contributes to CURA-5942.
 2018-11-22 14:46:13 +01:00
Ian Paschal
963b8aa974 Fix QML warnings 
Contributes to CL-1148
 2018-11-22 13:56:01 +01:00
Ian Paschal
55554c62a9 Use array for extruder configurations 
Contributes to CL-1148
 2018-11-22 13:55:43 +01:00
Ian Paschal
da834d6a1f Silence binding loop 
Contributes to CL-1148
 2018-11-22 13:55:22 +01:00
Diego Prado Gesto
9720512f50 Add a new printer selector button that is connected to the output 
devices and shows labels containing the type of printers that are in the
same group.

Contributes to CURA-5942.
 2018-11-22 13:54:10 +01:00
Jaime van Kessel
a1613c7f81 Set the variable types of the Action button to the right kind. 
Because of boyscouting; these must be colors (and not generic vars)
 2018-11-22 13:53:27 +01:00
Ian Paschal
1de21c1d94 Remove unnecessary "else" 
Contributes to CL-1148
 2018-11-22 13:13:06 +01:00
Ian Paschal
3c3343a407 Use bool for expanded or collapsed state 
Contributes to CL-1148
 2018-11-22 13:11:59 +01:00
alekseisasin
b091e3a52c
Merge pull request #4854 from Ultimaker/fix_version_upgrade_returning_none 
Fix version upgrade returning none
 2018-11-22 11:44:36 +01:00
Aleksei S
088b2f6f28 Added an extra import module, did not pass coding style test 
CURA-5936
 2018-11-22 11:36:32 +01:00
Aleksei S
c765615f1a Merge branch 'master' into fix_version_upgrade_returning_none 2018-11-22 11:17:44 +01:00
Ian Paschal
ba7863c9d9 Fix type error for hovering manage queue link 
Contributes to CL-1148
 2018-11-22 11:09:35 +01:00
Jaime van Kessel
bf8a04fa40 Fix some minor display issues for simulation view 
CURA-5785
 2018-11-22 11:08:46 +01:00
Jaime van Kessel
d4e4e50741 Fix typo 2018-11-22 10:55:53 +01:00