jack
85a29e967f
Merge pull request #1757 from fieldOfView/fix_material_uniqueness
...
Fix material uniqueness
2017-05-16 09:44:10 +02:00
Ghostkeeper
4b28e9bf43
Re-enable Japanese from language selection menu
...
Contributes to issue CURA-3817.
2017-05-16 09:38:39 +02:00
fieldOfView
a727e4ffd0
Make sure all materials are shown
...
Without this workaround, some materials that are listed above the generic materials do not show up untill the user scrolls the scrollview.
2017-05-11 18:17:11 +02:00
fieldOfView
6fa83a9110
Fix selecting a material when an edit field has the focus
2017-05-11 13:22:14 +02:00
fieldOfView
e45f04f391
Merge branch 'master' into fix_material_uniqueness
2017-05-11 12:23:01 +02:00
Mark
04611b06af
Fix two spelling errors
...
TRI-1450
2017-05-10 20:14:03 +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
b4f56d10d7
Set currentIndex to a more logical successor when deleting a material
2017-05-08 11:17:10 +02:00
fieldOfView
00f3cf409b
Select newly created material
2017-05-08 10:38:25 +02:00
Mark
0e1748b705
Small layout fix so the comboboxes are aligned
2017-05-02 12:55:37 +02:00
Mark
be21cd7f7d
Fix preference category double name
2017-05-01 13:25:13 +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
23cd6b1c2c
Fix rendering of readonly description/adhesion info
2017-04-29 16:43:26 +02:00
Lipu Fei
37ec14c239
Merge pull request #1710 from alephobjects/theme-picker
...
Theme picker
2017-04-27 15:32:14 +02:00
Victor Larchenko
58a857403c
Added resetting of theme
2017-04-27 16:37:01 +06:00
fieldOfView
02b978272f
Add "Create" button to create a new, unique material.
...
The new custom material is still based on generic_pla, but it gets a new GUID and uses itself as base_file so it is not conjoined to another material.
2017-04-27 11:19:46 +02:00
fieldOfView
c1fa927118
Make the general settings page options draggable only in the vertical direction
...
... to match other scrollviews. Fixes #1723
2017-04-22 23:07:13 +02:00
Victor Larchenko
e5eb0c9a14
Merge remote-tracking branch 'um/master' into theme-picker
2017-04-21 14:29:01 +06:00
Mark
2d14052f4e
Change Label to Text to fix ugly fonts
...
CURA-3389
2017-04-18 13:35:39 +02:00
Lipu Fei
865ab7135a
Merge pull request #1686 from fieldOfView/fix_material_nan
...
Fix NaN values on material print settings tab
2017-04-18 09:52:38 +02:00
Jaime van Kessel
397b08ce6d
Merge branch 'feature_filter_materials_by_diameter' of git://github.com/fieldOfView/Cura
2017-04-14 11:22:35 +02:00
Ghostkeeper
f35124400b
Merge branch '2.5'
2017-04-13 09:50:27 +02:00
Ghostkeeper
cf25eeea5f
Remove Japanese and Korean translations
...
They are not complete (by far).
Contributes to issue CURA-3487.
2017-04-13 09:39:10 +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
e92aaca7b6
Filter materials by the (approximate) material diameter of the printer
...
If a machine defines material diameter of 2.85mm, there is no use to show the 1.75mm materials and vice-versa
2017-04-12 23:03:58 +02:00
Ghostkeeper
db4854702b
Add Japanese and Hangul to the language drop-down
...
These are partial translations at the moment, and normally we don't allow them in the drop-down then. But this is an exception, orders from higher up.
Contributes to issue CURA-3487.
2017-04-04 09:05:12 +02:00
Ghostkeeper
a127d463bc
Add Japanese and Hangul to the language drop-down
...
These are partial translations at the moment, and normally we don't allow them in the drop-down then. But this is an exception, orders from higher up.
Contributes to issue CURA-3487.
2017-04-04 09:04:45 +02:00
Jaime van Kessel
f82aecb7ca
Refactoring; no longer use "Printer" to identify CuraApplication
2017-03-30 20:19:05 +02:00
Jack Ha
02bb575ced
Fixed extruder per gcode layer. Created show_caution preference for gcode reader. CURA-3390
2017-03-29 10:56:36 +02:00
Tim Kuipers
7a67ab4e66
Merge branch '2.5'
2017-03-28 12:55:18 +02:00
Jaime van Kessel
6367755875
Disabled center_on_select for windows, as pyqt has a bug with it
2017-03-28 10:21:52 +02:00
Lipu Fei
50266f760b
Revert "Prevent MachineSettings dialog go beyond the top of screen"
...
This reverts commit a0f841e8eb2e3fc41a5d053232ea29cf538e30be.
2017-03-27 16:00:08 +02:00
Lipu Fei
6644a4d386
Revert "Prevent MachineSettings dialog go beyond the top of screen"
...
This reverts commit a0f841e8eb2e3fc41a5d053232ea29cf538e30be.
2017-03-27 11:09:40 +02:00
fieldOfView
33f20710d9
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 11:23:40 +01: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
Jaime van Kessel
8023341090
Merge branch '2.5' of github.com:Ultimaker/Cura
2017-03-23 15:15:08 +01:00
Lipu Fei
a0f841e8eb
Prevent MachineSettings dialog go beyond the top of screen
2017-03-23 13:46:01 +01:00
Jack Ha
f2eebc165f
Merge branch '2.5'
2017-03-21 14:37:42 +01:00
Lipu Fei
f3167bb84b
Add dialog for opening a project file
...
CURA-3495
2017-03-21 13:56:09 +01:00
Jaime van Kessel
70dbeaf256
Merge branch '2.5' of github.com:Ultimaker/Cura
2017-03-21 13:24:06 +01:00
Lipu Fei
8dbb1d47e1
Shrink the widht of profile override combobox
2017-03-21 11:14:55 +01:00
Lipu Fei
8f3e7c6fa5
More spacing for override profile combobox
2017-03-21 11:05:37 +01:00
Lipu Fei
555cd58f5e
Save with code names for profile override preference
...
CURA-3561
2017-03-21 09:09:17 +01:00
Jaime van Kessel
d52515d57d
Added invert zoom preference option
2017-03-16 19:06:57 +01:00
Jaime van Kessel
a7b5879263
Merge branch '2.5' of github.com:Ultimaker/Cura
2017-03-16 13:18:41 +01:00
Jaime van Kessel
efce0696bd
Recently activated material can no longer be removed
...
CURA-3147
2017-03-16 13:11:51 +01:00
