GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-03 01:04:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,338 Commits 289 Branches 260 Tags
Commit Graph

911 Commits

Author SHA1 Message Date
Jack Ha
2f9618f2ad Merge branch 'master' into layer_view3_cleanup 2017-01-30 11:25:55 +01:00
Ghostkeeper
d3029c6c4f
Add Brazillian Portuguese language 
The translation is almost complete at the moment. In the beta of the next release we'll decide if we want to keep this language.
 2017-01-26 17:06:06 +01:00
Jack Ha
3a2438937d Removed crappy legend 2017-01-25 12:46:07 +01:00
Jack Ha
e21a6ed62a Cleanup 2017-01-24 16:52:47 +01:00
Ghostkeeper
a8efde9450 Merge pull request #1243 from fieldOfView/feature_material_cost 
Implement material cost
 2017-01-24 15:54:57 +01:00
Jack Ha
abe7a8e9a3 Merge branch 'master' into layer_view3_cleanup 2017-01-17 15:16:50 +01:00
fieldOfView
c48f02a7eb Fix horizontal scrolling/flicking of materialview 
(probably windows-only)
 2017-01-09 14:19:22 +01:00
fieldOfView
4ba8b4e7c8 Update spool length and cost per meter when editing values in materials dialog 2017-01-09 14:08:50 +01:00
Ruslan Popov
0c4b2c404b Add Russian language into select control on General Page. 2017-01-06 23:51:28 +03:00
fieldOfView
ebbe37a6cd Remove "Edit" button from materials page 
The "Edit" button is an unnecessary barrier. Read-only materials are still uneditable.
 2017-01-03 11:23:31 +01:00
fieldOfView
6479f2f938 Remove redundant "(Approx.)" 
It is made redundant by the ~, and Approx. is an ugly abbreviation anyway
 2017-01-03 11:11:57 +01:00
fieldOfView
27cf300ba6 Remove lingering debug statement 2017-01-03 11:05:32 +01:00
fieldOfView
ac34fe89ee Make currency preference settable 2017-01-03 11:05:32 +01:00
fieldOfView
4429825d15 Show the calculated values are an approximation 2017-01-03 11:05:31 +01:00
fieldOfView
a06f66305f Calculate spool length and cost per meter 2017-01-03 11:05:31 +01:00
fieldOfView
7516fb6056 Store cost & weight as preference values independent of material definition 
Users need to be able to set these values independent of the xml definition, as it is not a material property but something that depends on the reseller etc. It must also be settable for read-only materials.
 2017-01-03 11:05:31 +01:00
Jack Ha
93137fcc91 Added compatibility mode - old layer view is now also available 2017-01-02 12:56:18 +01:00
Ghostkeeper
0ca157518e
Update current item when importing new material 
Since we select the newly imported material, we need to update the current item so that the window on the right also gets updated.

Contributes to issue CURA-3138.
 2016-12-16 11:12:33 +01:00
jack
8fdc0a40ce Merge pull request #1235 from Ultimaker/project_save_dialog 
Project save dialog
 2016-12-12 10:41:49 +01:00
Simon Edwards
882f4c1aef Make the other parts of the Cura UI which have a filter, also search on i18n labels. 
CURA-2653 Searching in English while other language set
 2016-12-08 16:55:22 +01:00
Jaime van Kessel
72112159d6 It's no longer possible to set materials for machines that dont support them 
CURA-3042
 2016-12-08 14:43:28 +01:00
Jaime van Kessel
36d743384c Initial work for adding a save dialog for project saving 
CURA-1263
 2016-12-08 11:56:42 +01:00
Jack Ha
c3320bb1a4 Change settings to settings/overrides in selected messages. CURA-2898 2016-11-23 13:33:12 +01:00
Jaime van Kessel
42b8df86d3 Information text is now translated 
CURA-2808
 2016-11-07 16:54:28 +01:00
Tim Kuipers
e51f9ba678 fix: exclude command line settings from being viewed in the frontend (CURA-566) 2016-11-07 11:54:47 +01:00
Jaime van Kessel
2eb1c61033 Merge branch 'feature_drag_curaprofile' of github.com:Ultimaker/Cura 2016-11-04 14:31:58 +01:00
Jaime van Kessel
ab06d692d7 Added showAncestor option to settingvisibility page 
CURA-2859
 2016-11-03 14:59:57 +01:00
Jaime van Kessel
450eb5443f Updated text to be more clear 
CURA-2726
 2016-11-03 14:21:13 +01:00
Simon Edwards
cadf2115ac Merge pull request #1058 from Ultimaker/cura-2730 
Changed MachineManager.isActiveStackValid to areStacksValid. CURA-2730
 2016-11-01 16:17:04 +01:00
Ghostkeeper
0fa93f2214 Merge branch '2.3' 2016-10-31 17:26:51 +01:00
Ghostkeeper
48b57de6df
Filter materials on compatibility for non-machine-specific materials 
This only listens to whether the 'base' XML profile is marked as compatible in its metadata, but since the machine doesn't have its own materials, the base is the only one that exists. This needs to be changed when we change the filtering on fdmprinter, hence the comment in the code.

Contributes to issue CURA-2837.
 2016-10-31 17:26:36 +01:00
Ghostkeeper
6999a14821
Merge branch '2.3' 2016-10-31 10:55:54 +01:00
Ghostkeeper
9f43a740a6
Also validate machine name in rename dialogue 
Otherwise you could still circumvent the length limitation.

Contributes to issue CURA-2692.
 2016-10-28 13:33:37 +02:00
Jack Ha
d308cd45bc Moved function out of MachineManager, changed "Valid" to "HaveErrors". 
CURA-2730
 2016-10-20 16:16:33 +02:00
Jack Ha
a23a922eec Drag profile into Cura; added importProfile(s), exportProfile to ContainerManager. CURA-787 2016-10-20 13:55:39 +02:00
Jack Ha
98688bf013 Changed MachineManager.isActiveStackValid to MachineManager.areStacksValid. CURA-2730 2016-10-19 15:46:22 +02:00
fieldOfView
d3e3c0c659 Fix translation of machines page and some other references to Uranium 
CURA-570
 2016-10-18 15:34:52 +02:00
Jack Ha
9195961806 Fixed translation of 4 words in profilespage. remains of CURA-570 2016-10-18 15:05:18 +02:00
fieldOfView
e2d32ef963 Change references from Uranium to Cura 2016-10-17 14:17:28 +02:00
fieldOfView
98a2ebc157 Fix translation of machines page and some other references to Uranium 
CURA-570
 2016-10-17 14:10:02 +02:00
Jack Ha
1cd5052666 Fixed translation of 4 words in profiles page. CURA-570 2016-10-17 13:57:24 +02:00
Jaime van Kessel
3afd813e5e Profiles page is now correctly updated when single extrusion machine is used 2016-10-15 19:23:07 +02:00
Jaime van Kessel
ff24def63c Use globalProfileId to check if we need to show changed settings 
CURA-2690
 2016-10-15 17:05:55 +02:00
Simon Edwards
c3cf762451 Show the warning color for unsupported materials/qualities by using the new 'supported' metadata flag. 
CURA-2271
 2016-10-12 15:57:50 +02:00
fieldOfView
95fabbaf6d Don't allow creating profiles based on empty_profile 
...because empty_profile has no quality_type
CURA-2271
 2016-10-11 15:22:17 +02:00
Ghostkeeper
608248bec8
Fix display of inherited materials 
Materials are sometimes inherited, such as for UM2E+. The activeQualityDefinitionId is the definition from which it should get its profiles, including material profiles. Likewise for activeQualityVariantId.

Contributes to issue CURA-2576.
 2016-10-08 17:14:24 +02:00
fieldOfView
90c3a09bc0 Add tooltip for formulas on profile overview tabs 2016-10-08 15:15:12 +02:00
fieldOfView
6bea0ad7b4 Select the currently active extruder on the profiles tab 2016-10-08 15:14:11 +02:00
fieldOfView
5d3d13e9ef Make whole row for user & quality_changes values italic 
The italic pattern is now shared between the sidebar and the profile overview. Current settings (user) and the values set in the custom profile (quality_changes) are now made italic in both places.
 2016-10-08 14:52:39 +02:00
Jaime van Kessel
6e369bec57 Disabled exporting for read-only profiles 
CURA-2496
 2016-10-05 10:36:33 +02:00