GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-29 23:34:32 +08:00
Code Issues Packages Projects Releases Wiki Activity
10,797 Commits 289 Branches 260 Tags
Commit Graph

44 Commits

Author SHA1 Message Date
Mark
eaa7b75f0e Changed parseInt to Math.floor 2017-10-11 16:47:40 +02:00
Mark
d4a8dbdee7 Change Text to Label and cast all sizes to int 
CURA-4437
 2017-10-11 12:48:42 +02:00
Lipu Fei
7b6faf0030 Adjust column width for Materials "Print Settings" page 
CURA-4428
 2017-10-10 08:03:08 +02:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
fieldOfView
b5d7ec5bd2 Round fractional widths and heights in system-themed qml 2017-07-14 12:58:07 +02:00
Ghostkeeper
b8b23055ba
Fix getting new material diameter 
Same problem, it's not been updated yet at this point.

Contributes to issue CURA-2822.
 2017-06-29 16:50:15 +02:00
Ghostkeeper
27bcb11dc9
Store old approximate diameter in variable 
Shorter line, easier to read.

Contributes to issue CURA-2822.
 2017-06-29 16:41:24 +02:00
Ghostkeeper
b3e49f0c12
Fix getting the old approximate diameter 
The properties.approximate_diameter gets updated later via signals, so at this point it's not correct yet.

Contributes to issue CURA-2822.
 2017-06-29 16:28:01 +02:00
Ghostkeeper
0e23930bfe
Fix checking whether the old material diameter was the same 
Getting the old material diameter wasn't working properly.

Contributes to issue CURA-2822.
 2017-06-22 18:17:16 +02:00
Ghostkeeper
1d048f39db
Fix getting old material diameter 
This diameter works. I still don't know why the properties/diameter one didn't work, but this is good too since they are now equal.

Contributes to issue CURA-2822.
 2017-06-22 18:17:15 +02:00
Ghostkeeper
b37fa6f718
Implement warning message when you change material diameter 
The undo functionality currently gives an error though. Investigating...

Contributes to issue CURA-2822.
 2017-06-22 18:17:15 +02:00
fieldOfView
49f2fb2cea
Fix filtering maerials after editing materials 
NB: previously the "approximate_diameter" metadata was stored as a number. This caused some issues passing arguments from QML to Python. Now "approximate_diameter" is stored as a string.
 2017-06-14 10:42:04 +02:00
fieldOfView
ed6f4d851c
Update documentation 2017-06-14 10:41:39 +02:00
fieldOfView
1f49a87acb
Update material_diameter when editing the material in MaterialView.qml 2017-06-14 10:41:02 +02:00
fieldOfView
8f792b2504 Tweak Print Settings layout to match the rest of the UI. 2017-05-09 13:03:49 +02:00
fieldOfView
836cf27266 Keep material selected when editing its name, brand or type 
Editing a material name, brand or type may change its position in the materials list. We now reselect the material after editing one of these values.
 2017-05-08 11:37:19 +02:00
fieldOfView
577a8d0a3e Fix MaterialView layout issues 
Make scrollview look more in line with the scrollview on the profiles page
 2017-04-30 10:28:03 +02:00
fieldOfView
a1d9b1a37f Force update after unlinking material. 2017-04-29 21:19:54 +02:00
fieldOfView
67b8302d40 Add a notice to linked materials and allow "unlinking" a material. 2017-04-29 21:08:48 +02:00
fieldOfView
5e50a8fe0b Show value from definition if it is not defined in the material profile 
This way you get sane defaults if no value is provided in the material xml file, instead of 0s
 2017-04-13 00:53:47 +02:00
fieldOfView
c97f8679c2 Fix NaN values on material print settings tab 2017-04-13 00:25:38 +02:00
fieldOfView
6474f3eb25 Ups the limit of the maximum cost of a spool of filament 
This is necessary for currencies such as Japanese Yen or South Korean Won, where prices can easily exceed 1000. This PR sets the limit to 100,000,000. If the price of a spool exceeds this amount, perhaps the user should consider moving to a more stable country.

Fixes https://github.com/Ultimaker/Cura/issues/1567
 2017-03-24 09:12:48 +01:00
Lipu Fei
c9d223acd4 CURA-3452 Save spool cost and weight upon change 2017-03-10 12:41:28 +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
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
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
Jaime van Kessel
42b8df86d3 Information text is now translated 
CURA-2808
 2016-11-07 16:54:28 +01:00
fieldOfView
bb92c0d7fa Fix units for density and diameter 2016-09-08 11:56:11 +02:00
Jack Ha
77b58d8231 MaterialsPage material label is now also updated after rename. CURA-1969 2016-08-25 10:37:11 +02:00
Jack Ha
2ae998737f Added materialspage Display Name field and made it work. CURA-1969 2016-08-25 09:54:22 +02:00
Arjen Hiemstra
d6ba70c552 Do not try to set a material's metadata when we know it has not changed 
Contributes to CURA-342
 2016-07-11 14:57:28 +02:00
Arjen Hiemstra
6b9689c2c7 Use clearer styling of disabled entry fields on the materials page 
Contributes to CURA-342
 2016-07-07 17:32:49 +02:00
Arjen Hiemstra
7df5008d3c Disable spool weight etc. fields since they are not yet functional 
Contributes to CURA-342
 2016-07-07 17:32:11 +02:00
Arjen Hiemstra
975106b90e Also update description and adhesion info when they change 
Contributes to CURA-342
 2016-07-07 17:31:12 +02:00
Arjen Hiemstra
eb48a4e768 Set the new metadata when editing a material 
Contributes to CURA-342
 2016-06-30 17:32:43 +02:00
Arjen Hiemstra
419326132f Use ContainerPropertyProvider to provide properties for the materials page 
Contributes to CURA-342
 2016-06-30 01:54:58 +02:00
Arjen Hiemstra
f7e4b91569 Update styling of Material management page 
Contributes to CURA-342
 2016-06-28 17:44:19 +02:00
Arjen Hiemstra
68a8bcb009 Fix width of materials properties tab 2016-06-27 13:33:38 +02:00
Arjen Hiemstra
b2ef607cb6 Fix the material setting list to use a simple placeholder 
Contributes to CURA-342
 2016-06-23 17:34:35 +02:00
Arjen Hiemstra
f71ddc4b9f Start implementing view and edit support in the materials page 
Contributes to CURA-342
 2016-06-23 17:31:50 +02:00