Commit graph

7343 commits

Author SHA1 Message Date
Diego Prado Gesto
6dc53cc60a Select the next selected material when it is activated or removed.
Contributes to CURA-5682.
2018-09-12 18:39:19 +02:00
Diego Prado Gesto
7e1a833e9c Merge branch '3.5' into CURA-5682_material_manager_leftovers 2018-09-12 17:12:40 +02:00
Diego Prado Gesto
3368428dbb Fix text field alignment.
The color text field was too short in many cases, when the color name is
long.

Contributes to CURA-5682.
2018-09-12 16:57:43 +02:00
Diego Prado Gesto
e3f67f1147 Fix code style.
Contributes to CURA-5682.
2018-09-12 16:37:16 +02:00
Diego Prado Gesto
6183a07d76 Activate the material right after it was created or duplicated.
Contributes to CURA-5682.
2018-09-12 16:35:01 +02:00
Diego Prado Gesto
921b11974c Improve the way the categories are highlighted.
When a material is selected, but the brand or the type is collapsed,
those components are also highlighted to indicate the path to the
material.

Reuse the MaterialBrandSection also for the generic materials, that
allow us to only mantain one component.

Contributes to CURA-5682.
2018-09-12 15:42:02 +02:00
Diego Prado Gesto
56dcc2dded Highlight the material that is currently selected.
Contributes to CURA-5682.
2018-09-12 14:09:29 +02:00
Lipu Fei
e069e0db99 Fix S5 extruder start and end locations
CURA-5672

X coordinate 310 is not at the rightmost position, and this causes the
prime tower to start printing from somewhere in the middle.
2018-09-12 13:18:43 +02:00
Diego Prado Gesto
f298d37134 WIP: Moving current selected material to the material list instead of
the page.

Change all the previous references to the currentItem in the page.
Automatically and correctly select the element that is selected in the
extruder.

Contributes to CURA-5682.
2018-09-11 22:12:54 +02:00
Diego Prado Gesto
9ba4c723f7 Fix the linked materials button.
Contributes to CURA-5682.
2018-09-11 22:07:14 +02:00
Jaime van Kessel
a809575bc8 Add bunch of ID's to qml components so it's easier to test them.
CURA-5618
2018-09-11 16:05:53 +02:00
Jaime van Kessel
c84a2213a7 Merge branch '3.5' of github.com:Ultimaker/Cura 2018-09-11 11:01:55 +02:00
Diego Prado Gesto
19eefc71da Update SDK version for the bundled packages. 2018-09-11 09:38:23 +02:00
Diego Prado Gesto
bacae6c136 Update name of the VersionUpgrade for the version 3.5. 2018-09-11 09:38:23 +02:00
Diego Prado Gesto
fe256b3562 Fix some issues in the material preference page.
Now the generic section collapses and expands correctly. Some qml error
was also fixed.

Contributes to CURA-5682.
2018-09-10 15:57:19 +02:00
Sacha Telgenhof Oude Koehorst
5ca5aacbee
Removed layer_height override as it isn't needed. Only the initial layer height needs to be overridden. 2018-09-10 21:46:26 +09:00
Ian Paschal
1c8b086403 Improve inactive coloring
Contributes to CL-1048
2018-09-10 14:35:05 +02:00
Sacha Telgenhof Oude Koehorst
42a523cb00 Add single extruder definition for Ender-3. 2018-09-10 21:32:36 +09:00
Diego Prado Gesto
51b0497f84 Fix the collapsable panel of the Generic materials.
Contributes to CURA-5682.
2018-09-10 14:28:41 +02:00
Ian Paschal
0ecac9f01e Merge remote-tracking branch 'origin/master' into cura_connect_improvements 2018-09-10 11:46:44 +02:00
Ian Paschal
90426749a2 Change deactiveStates to inactiveStates
Contributes to CL-1047
2018-09-10 11:35:58 +02:00
Ian Paschal
97e8db577a Monitor Tab - Add grey monitor tab text
Contributes to CL-1047
2018-09-07 16:45:30 +02:00
Jaime van Kessel
c7350ff579 Merge branch 'master' of github.com:Ultimaker/Cura 2018-09-07 15:24:09 +02:00
Jaime van Kessel
4cde6c05ae Switch most usages of containerStackId to containerStack for settingPropertyProvider
This mostly makes the code a bit more logic and also decreases the number of searches in the registry
2018-09-07 15:23:09 +02:00
Ian Paschal
49d72f5855
Merge pull request #4301 from Ultimaker/cura_connect_UI_rework
CL-893 CL-894 Cura connect ui rework
2018-09-07 12:45:56 +02:00
Ghostkeeper
c1ef9abf1d
Fix code style
These changed in the same pull request so I'll remove them here.

Contributes to issue CURA-5682.
2018-09-06 17:23:16 +02:00
Lipu Fei
5a36bc963c Fix shortcut conflict in French 2018-09-06 16:06:45 +02:00
Aleksei S
27c112d4db Fix duplicated shortcut keys in all languages
CURA-5642
2018-09-06 16:06:45 +02:00
Aleksei S
0f655553bb Removed shortcut keys from general cura.pot
CURA-5642
2018-09-06 16:06:45 +02:00
Aleksei S
e853cdc04d Removed shortcut from Reset All Model &Transformations
CURA-5642
2018-09-06 16:06:45 +02:00
Aleksei S
3a8d023371 Addded test for checking shortcut keys
CURA-5642
2018-09-06 16:06:45 +02:00
Jaime van Kessel
53d083e232 Merge branch 'master' of github.com:Ultimaker/Cura into cura_connect_UI_rework 2018-09-06 10:50:51 +02:00
Lipu Fei
9aea0e5109 Fix quality lookup logic for extruders
CURA-5694

 - Add convenience functions into GlobalStack
 - Use "has_variants" and "has_materials" instead of
 "has_variant_materials"
 - Remove "has_variant_materials"
 - For extruder qualities, skip global qualities if the machine has
   variants or materials
2018-09-06 08:12:55 +02:00
Remco Burema
d3356cdba6
Merge pull request #4142 from smartavionics/mb-improve-overhanging-walls
Improve processing of overhanging walls
2018-09-05 17:38:32 +02:00
Ian Paschal
9e56d6d29f Improved expansion behavior
Contributes to CURA-5682

- Active material is now expanded by default when opening the manager

- Expanded and collapsed sections are saved to preferences

- Sections are now highlighted when collapsed and having a selected material inside

- Bug with losing focus between fields is not yet fixed
2018-09-05 17:16:06 +02:00
Mark
f18d9fed97
Merge pull request #4316 from stelgenhof/master
Add Creality Ender-3 machine definition
2018-09-05 14:46:37 +02:00
Ghostkeeper
b02769912f
Don't print slower than 1mm/s
If you set the wall printing speed to 10, it would through inheritance result in an outer wall printing speed of 0. No longer.
2018-09-05 09:42:20 +02:00
Aleksei S
149a47e5a7 Remove double keys from right click menu, remove backspaceSelectionAction because not used
CURA-5642
2018-09-03 11:15:25 +02:00
KangDroid
9edf2b5b0b
Re-Enable fullscreen shortcut and add menu on ViewMenu 2018-09-03 12:04:54 +09:00
Sacha Telgenhof Oude Koehorst
6ddafa00a4
Add Creality Ender-3 machine definition. 2018-09-01 19:37:53 +09:00
Mark
9bcc8ffff6
Merge pull request #4288 from thopiekar/patch-2
bq Hephestos2: Getting a rid of custom g-code
2018-09-01 09:25:17 +02:00
Lipu Fei
6cceebb117 Revert "Remove double shortcut buttons"
CURA-5642

This breaks translations and doesn't fix the shortcut key problem.
2018-08-31 15:14:12 +02:00
alekseisasin
aa2cb7d415
Merge pull request #4212 from fieldOfView/feature_support_infill_angle
Add setting for Support Infill Line Direction
2018-08-31 11:18:03 +02:00
fieldOfView
65f3605d92 Allow the full range of orientations 2018-08-30 14:43:00 +02:00
fieldOfView
ac2125c3a5 Hide setting when support pattern is set to concentric...
because it has no influence on the concentric pattern
2018-08-30 14:36:54 +02:00
alekseisasin
0488494537
Merge pull request #4300 from Ultimaker/remove_double_extensions_cura_5650
change .curaproject.3mf to just use .3mf
2018-08-30 13:19:47 +02:00
Jaime van Kessel
49aeb60e7d Merge branch 'master' of github.com:Ultimaker/Cura into cura_connect_UI_rework 2018-08-30 10:35:20 +02:00
Ghostkeeper
1fbf9c9731
Add default value to extruders_enabled_count
Otherwise CuraEngine can't parse this setting from the JSON file in command line slicing.

Contributes to issue CURA-4410.
2018-08-29 17:21:47 +02:00
Gabriele Rossetti
f681b2abc7
Merge branch 'master' into master 2018-08-29 15:34:38 +02:00
Mark
baef0350cd Cleaned up MIME types 2018-08-29 14:41:38 +02:00