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

17030 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
20e2f317de Add background to viewModeSelection 
CURA-5785
 2018-11-13 16:02:45 +01:00
Jaime van Kessel
c9389dd9ab Codestyle fixes 2018-11-13 15:58:34 +01:00
Jaime van Kessel
785c2661a2 Make SimulationViewMenuComponent also use the ExpandableComponent 
CURA-5785
 2018-11-13 15:57:00 +01:00
Jaime van Kessel
deb5fd1926 Fix PrintSetupSelector for previewStage 
CURA-5785
 2018-11-13 15:35:05 +01:00
Remco Burema
7a577489ae
Merge pull request #4705 from Ultimaker/CURA-5840-make-plugin-sdk-use-semantic-versioning 
Fixes required for semantic versioning
 2018-11-13 15:34:42 +01:00
Jaime van Kessel
c18b8241f5 Change MachineSelection so that it also uses the ExpandableComponent 
CURA-5785
 2018-11-13 14:00:00 +01:00
Remco Burema
5f4e3948d3 Merge branch 'master' into CURA-5840-make-plugin-sdk-use-semantic-versioning 2018-11-13 13:16:22 +01:00
Ghostkeeper
87cbc3907c
Convert to string before storing in configparser 
Because configparser can only handle strings.

Contributes to issue CURA-5929.
 2018-11-13 12:05:14 +01:00
Ghostkeeper
2486a5b5da
Improve generic profiles for fabtotum and zyyx 
These printers had profiles for zyyx_pro and fabtotum material suites, which were specific to those materials, but caused the generic materials to no longer have any profile. Let's use these machine-specific profiles for the generic materials as well. For the specific materials this changes nothing because the same profiles are still matched. For the generic materials this should improve the quality if the quality profile is tuned in any way to the machine.
 2018-11-13 11:48:02 +01:00
Jaime van Kessel
fe4ed46496 Show material name instead of just color 
CURA-5785
 2018-11-12 16:55:42 +01:00
Ghostkeeper
7bd55f5064
Add test for read() function 
This is complex.
I don't want to get into the actual translations from the DoD here.

Contributes to issue CURA-5929.
 2018-11-12 16:28:29 +01:00
Jaime van Kessel
4c1a45f904 Added sizes to the stage menu 
This isn't themed, but right now it does adhere to the sizes I got from UX

CURA-5785
 2018-11-12 15:53:09 +01:00
Ghostkeeper
bfe5ae6f9c
Merge branch '3.6' 2018-11-12 15:48:22 +01:00
Ghostkeeper
fe66d15b9e
Disable Polish language 
The translation didn't arrive in time for the 3.6 release.

Contributes to issue CURA-5870.
3.6.0 		2018-11-12 15:47:42 +01:00
Jaime van Kessel
783fe9ab73 Updated the look of the extruder buttons 
CURA-5785
 2018-11-12 15:23:58 +01:00
Jaime van Kessel
f14687a749 Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu 2018-11-12 14:32:06 +01:00
Jaime van Kessel
4be33031d7 Added icons to ExpandableComponent 
This also makes the entire header react to mouse events instead of just the icon/button

CURA-5785
 2018-11-12 14:30:55 +01:00
Ghostkeeper
7e87a303cb
Remove config_section parameter 
Just always take 'profile'. We don't need to test with anything else. Just adjust the data to it.

Contributes to issue CURA-5929.
 2018-11-12 13:49:13 +01:00
Ghostkeeper
e18ea4bca4
Expect a NoSectionError if testing with a section that is missing 
We want to get that error in order to debug.

Contributes to issue CURA-5929.
 2018-11-12 13:47:24 +01:00
Ghostkeeper
53c9cdc3fe
Add alternative scenarios for prepareLocals 
Contributes to issue CURA-5929.
 2018-11-12 13:42:14 +01:00
Ghostkeeper
91e8c177fe
Add test for prepareLocal 
Contributes to issue CURA-5929.
 2018-11-12 13:35:18 +01:00
Ghostkeeper
0bf7bf4cbe
Fix handling dictionaries without 'defaults' section 
According to the test, this should return an empty dict then.

Contributes to issue CURA-5929.
 2018-11-12 13:33:44 +01:00
Jaime van Kessel
54685c983a Make PrintSetupSelector use layout instead of fixed width 
This makes the components autoscale a bit when needed.

CURA-5785
 2018-11-12 13:29:21 +01:00
alekseisasin
5094e45331
Merge pull request #4780 from Ultimaker/toolbar_4_0 
Toolbar 4.0
 2018-11-12 13:20:27 +01:00
Jaime van Kessel
ca63733827 Updated header of the settingbar 
CURA-5785
 2018-11-12 13:06:12 +01:00
Ghostkeeper
bbbb08c793
Add test for prepareDefaults 
Contributes to issue CURA-5929.
 2018-11-12 13:02:28 +01:00
Ghostkeeper
6d1b64465a
Fix URL in error message 
Contributes to issue CURA-5929.
 2018-11-12 12:50:18 +01:00
Ghostkeeper
27aff4e5da
Fix typing issues 
Because this function now has typing, it's raising a load of issues with it.

Contributes to issue CURA-5929.
 2018-11-12 12:48:49 +01:00
Ghostkeeper
6022ed0f23
Update target version in DoD 
There are no changes to these settings, luckily.
This target version is now only here for documentation (like source_version was). It is no longer actually used by the code.

Contributes to issue CURA-5929.
 2018-11-12 12:06:00 +01:00
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
Jaime van Kessel
987ff1737f Remove unused background from PrintSetupSelector 
CURA-5785
 2018-11-12 11:27:54 +01:00
Jaime van Kessel
88b57518d9 Fix codestyle 
CURA-5785
 2018-11-12 11:24:11 +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
Ghostkeeper
9c555bf67f
Add typing and always add error message if loading failed 
There were some places where it would return None. Then in the QML it would give a QML error that the null object has no dictionary items.

Contributes to issue CURA-5929.
 2018-11-12 11:02:43 +01:00
alekseisasin
32c16041e8
Merge pull request #4773 from Ultimaker/change_ultimaker_author_id 
Change the Ultimaker author_id to UltimakerPackages
 2018-11-12 10:43:15 +01:00
Jaime van Kessel
e641584021 Made strings in ConfigurationSelector translatable. 
CURA-5785
 2018-11-12 09:45:55 +01:00
Diego Prado Gesto
f534885e34 Modify the color behavior of the toolbar buttons. 2018-11-12 09:35:32 +01:00
Mark
3d1a9a6f5b Increase lines shown from 3 to 6 2018-11-12 09:28:48 +01:00
Diego Prado Gesto
9bf18031ce Apply restyle of the toolbar according to the new designs. 2018-11-11 19:15:02 +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
Diego Prado Gesto
8a63a79896 Add soft animation to the entire popup and not only in the background. 
This prevents the content to show before the background.

Contributes to CURA-5786.
 2018-11-11 13:17:59 +01:00
Diego Prado Gesto
f65b1f8fbc Add soft animation to the entire popup and not only in the background. 
This prevents the content to show before the background.

Contributes to CURA-5784.
 2018-11-11 13:16:38 +01:00
Diego Prado Gesto
3669a3791d Hide the Preview shortcut in the action panel when the active stage is the PreviewStage. 
Also adjust the size of the output button when the Preview button is not visible.

Contributes to CURA-5786.
 2018-11-11 12:56:30 +01:00
Diego Prado Gesto
69daa0d91a Rename Toolbox menu to Marketplace. It was remove by mistake in a merge conflict. 
Contributes to CURA-5784.
 2018-11-11 12:44:56 +01:00
Vlad Gribinchuk
d8d92eb4b0 Merge remote-tracking branch 'upstream/master' into feature_minimum_support_area 2018-11-09 20:45:37 +02:00
Diego Prado Gesto
a9523fd894 Change the Ultimaker author_id to UltimakerPackages. Apparently this is 
the new author_id.

Contributes to CURA-5926.
 2018-11-09 17:18:01 +01:00
Diego Prado Gesto
15a30a7a98 Increase the version of the bundled TPLA to match with the version that 
is currently in the server.
 2018-11-09 17:06:45 +01:00
Ghostkeeper
4551b73d5c
Merge branch 'master_CURA-5922_add_safety_data_sheet_links' 2018-11-09 17:04:11 +01:00
Ghostkeeper
a8017fe179
Merge branch '3.6' 2018-11-09 17:00:44 +01:00