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

5311 Commits

Author SHA1 Message Date
Ghostkeeper
6ad682b00d
Don't serialise legacy profile via Profile instance 
That profile instance was being explicitly set to version 1 (but then serialised as version 4) and then deserialised with upgrade, so the upgrade was thinking it was upgrading from version 1 to 4, but it was actually upgrading a file which was already at version 4. We shouldn't use the Profile() instance at all but just perform the upgrade on simple string data generated by the configparser.
This also updates the format to the newest version (since that was easiest for me to reimplement) but we don't need to ever update this again because it gets passed through the version upgrade system, which upgrades it from version 4000005 to the latest version in the future.

Contributes to issue CURA-5929.
 2018-11-12 12:02:49 +01:00
Ghostkeeper
9d94b0d63e
Rename input vs. output parsers 
Technically you could re-use the variable name but that is confusing.

Contributes to issue CURA-5929.
 2018-11-12 11:16:33 +01:00
Jaime van Kessel
b60977e435 Convert PrintSetupSelector to an ExpandableComponent 
CURA-5785
 2018-11-12 11:14:39 +01:00
Mark
3d1a9a6f5b Increase lines shown from 3 to 6 2018-11-12 09:28:48 +01:00
Diego Prado Gesto
38a80ecae5 Make some tweaks in the UI for the preview stage. 
Clean up the default theme a bit by removing unused entries.

Contributes to CURA-5829.
 2018-11-11 14:06:52 +01:00
Remco Burema
8e05c2adcb Have translation instead of plain string for Safety Data Sheets and Printing Guidelines. [CURA-5922] 2018-11-09 15:27:02 +01:00
Jaime van Kessel
2c7bdba7d0 Update ConfigurationSelector header to that it looks more like the new design 
CURA-5785
 2018-11-09 15:23:10 +01:00
Remco Burema
9bc85fcda7 Merge branch 'CURA-5922_add_safety_data_sheet_links' of https://github.com/Ultimaker/Cura into master_CURA-5922_add_safety_data_sheet_links 2018-11-09 15:16:22 +01:00
Ghostkeeper
7f54cacd0f
Code style 
Discovered during work on CURA-5840.
 2018-11-09 14:11:38 +01:00
Remco Burema
c8d9ad37ff Add Printing Guidelines links to materials in Marketplace. [CURA-5922] 2018-11-09 13:49:14 +01:00
Remco Burema
21d4cd8f9f Add Safety Data Sheet links to materials in Marketplace. [CURA-5922] 2018-11-09 13:44:42 +01:00
Lipu Fei
c2e6bb8bc6 Merge remote-tracking branch 'origin/3.6' 2018-11-09 09:48:05 +01:00
Lipu Fei
80bf7bb989
Merge pull request #4757 from Ultimaker/CURA-5915_quality_profiles_upgrade 
Add version upgrade for quality profiles
 2018-11-09 09:20:45 +01:00
Diego Prado Gesto
7a12cc53cc Merge branch 'master' into ui_rework_4_0 2018-11-09 08:53:31 +01:00
Jaime van Kessel
d3302938b2 Fix technical data sheet not showing if there is no support_configs 2018-11-08 16:38:38 +01:00
Diego Prado Gesto
94e27fbbdb Add the quality folder to the version upgrade in order to update quality 
profiles.

Contributes to CURA-5915.
 2018-11-08 15:42:39 +01:00
Lipu Fei
369747d106 Merge remote-tracking branch 'origin/3.6' 2018-11-08 15:28:42 +01:00
Lipu Fei
75f2f40534 Make API version configuration for Application 
CURA-5840
 2018-11-08 12:04:43 +01:00
Simon Edwards
69c9ffaf61
Merge pull request #4755 from Ultimaker/CL-1040_show_print_time_in_monitor 
CL-1140 Show print time in monitor tab
 2018-11-08 11:53:47 +01:00
Ian Paschal
aa6ec9e44b Make text black 
Contributes to CL-1040
 2018-11-08 11:48:22 +01:00
Lipu Fei
de6ab02422 Merge pull request #4678 from fieldOfView/fix_networkprinter_post 
Fix type error in NetworkedPrinterOutputDevice.post
 2018-11-08 11:05:47 +01:00
Lipu Fei
59b8bdec54
Merge pull request #4678 from fieldOfView/fix_networkprinter_post 
Fix type error in NetworkedPrinterOutputDevice.post
 2018-11-08 11:02:57 +01:00
Ian Paschal
35ed234991 Show print time in monitor tab 
Contributes to CL-1040
 2018-11-08 10:49:22 +01:00
Ghostkeeper
d8a1d458cf
Merge branch '3.6' 2018-11-08 09:49:15 +01:00
Diego Prado Gesto
9f663cfd18 Change the gradient for the LinearGradient that works in the new versions of Qt. 
I also changed it because we had a TODO here and I thought it was the right moment to do it.

Contributes to CURA-5829.
 2018-11-07 17:25:43 +01:00
Jaime van Kessel
f15d03d48c Fix foldout of the layerview panel being too short or too long 
CURA-5829
 2018-11-07 16:30:52 +01:00
fieldOfView
f12efb7aa1 Fix LegacyUM3OutputDevice post() call 2018-11-07 16:07:45 +01:00
Jaime van Kessel
36a9642c90 Merge branch 'CURA-5887_fix_material_shown_in_print_job' of github.com:Ultimaker/Cura 2018-11-07 12:39:41 +01:00
Jaime van Kessel
68512a2184 Merge branch '3.6' of github.com:Ultimaker/Cura into 3.6 2018-11-07 12:35:25 +01:00
Jaime van Kessel
9a93f6866a Fix crash of toolbox when metadata got corrupted 2018-11-07 12:03:32 +01:00
Diego Prado Gesto
44ab6dee77
Merge pull request #4748 from Ultimaker/CURA-5900_rename_cc_red_06_to_cc_06 
[3.6] [CURA-5900] Rename "CC Red 0.6" to "CC 0.6"
 2018-11-07 11:21:09 +01:00
Diego Prado Gesto
2c28e931ea Rename CC Red 0.6 to CC 0.6 in the Changelog. 
Contributes to CURA-5900.
 2018-11-07 11:06:40 +01:00
Simon Edwards
7ecffdef3d Merge branch 'CL-1126_monitor_tab_context_menu_improvements' into 3.6 2018-11-06 17:06:04 +01:00
Diego Prado Gesto
2c59419dbb Merge branch 'cura4.0_header' into CURA-5829-Add-preview-stage 2018-11-06 17:01:18 +01:00
Diego Prado Gesto
2d59ca02ca Merge branch 'ui_rework_4_0' into cura4.0_header 2018-11-06 16:59:07 +01:00
Ian Paschal
4c831de06c Remove console logs 
Contributes to CL-1126
 2018-11-06 16:41:59 +01:00
Ian Paschal
dc4b69c386 Show context menu at the right times 
Contributes to CL-1126
 2018-11-06 16:37:47 +01:00
Diego Prado Gesto
ce7d2c36d0 Fix the width of the slider label when the number of layers was exactly 
10, 100, 1000 and so on.

The calculation was using the maximumValue that is 9 in case we have 10
layers, since we start counting from 0 but showing from 1. Now it uses
maximumValue + 1.
 2018-11-06 16:15:32 +01:00
Lipu Fei
8e33a19ca7 Fix quality changes lookup in project loading 
CURA-5899

Should always use custom quality profile names to look up.
 2018-11-06 13:31:04 +01:00
Ian Paschal
c84aa9cf21 Use default font for configuration override 
Contributes to CL-1124
 2018-11-05 17:19:22 +01:00
Jaime van Kessel
319d52a2f9 Make collapsible simulation view collapse to right height 
CURA-5829
 2018-11-05 16:59:06 +01:00
Jaime van Kessel
8106df1ae2 Bit of QML cleanup 2018-11-05 16:45:12 +01:00
Ian Paschal
1abd0b3499 Show "Pausing...", "Aborting...", and "Resuming..." texts 
Contributes to CL-1126
 2018-11-05 15:45:17 +01:00
Lipu Fei
88f3325972 Add typing for _createMaterialOutputModel() 
CURA-5887
 2018-11-05 13:11:58 +01:00
Ian Paschal
4f10b7809a Configuration override improvements 
Contributes to CL-1124
 2018-11-05 12:15:17 +01:00
Jaime van Kessel
406dd68aa4 Made path slider widht themable. 
CURA-5829
 2018-11-05 11:54:55 +01:00
Lipu Fei
fa693aef2b Fix material shown in print jobs 
CURA-5887

 - Use MaterialManager to get materials
 - For a GUID with mulitple matches, show the read-only materials first
   if any. Otherwise, show non-read-only materials.
 2018-11-05 11:48:19 +01:00
Jaime van Kessel
9f13de9f0d No longer create two instances of the setting view. 
This caused a bunch of issues with the getPluginId, as one of the instances
didn't got added to the registry (and as such, never got an ID)

CURA-5829
 2018-11-05 11:48:19 +01:00
Jaime van Kessel
f0e205423f Pause simulation view when preferences have been changed. 
I accidentally removed this feature when working on CURA-5829, but
it was spotted in the review.
 2018-11-05 11:47:22 +01:00
Jaime van Kessel
4659b0d387 Fix codestyle 2018-11-05 11:36:58 +01:00