Commit graph

11418 commits

Author SHA1 Message Date
Konstantinos Karmas
26a17e0603
Code-style improvement
CURA-8112

Co-authored-by: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
2021-07-15 10:02:57 +02:00
Konstantinos Karmas
11d86b98ef Merge branch 'master' into CURA-8112_Inform_the_user_about_their_subscription_limits 2021-07-14 15:52:27 +02:00
Ghostkeeper
610582bab7
Merge branch 'CURA-8009_search_digital_library_projects' 2021-07-14 15:40:54 +02:00
Ghostkeeper
c305f8b36a
Merge branch 'master' of https://github.com/v-xup6/Cura into v-xup6-master 2021-07-14 15:09:49 +02:00
Konstantinos Karmas
11f66b2a78 Add brackets
CURA-8112
2021-07-14 12:54:31 +02:00
Jaime van Kessel
b642ebeaf2
Merge branch 'master' of https://github.com/lorenzoromagnoli/Cura 2021-07-14 10:43:24 +02:00
Konstantinos Karmas
f643f19af6 Fix tooltip not shown when the tooltip text is too long
When the tooltip text is too long and the tooltip width ends up being longer than the window it is supposed to be drawn into, the tooltip is not drawn at all. This commit fixed that by allowing the tooltip width of the ActionButton to be changed within QML, limiting it to a certain size that fits the purpose.

CURA-8112
2021-07-13 17:30:30 +02:00
Konstantinos Karmas
9ddb3b7713 Fix icon being ignored in message action buttons
CURA-8112
2021-07-13 16:53:02 +02:00
Victor Lin
52b022c575
Delete atomPlus_extruder_0.def.json
Prototype machine
2021-07-13 22:42:12 +08:00
Victor Lin
8414e8b523
Delete atomPlus.def.json
Prototype machine
2021-07-13 22:42:03 +08:00
Victor Lin
6560766b1f
Update atom2.def.json
Simplify brim width to adjust only the value
2021-07-13 22:40:39 +08:00
Ghostkeeper
3d6601a37e
Fix margins
The margin around the icon didn't work if the icon source was none, because it was provided a QSize rather than a real.
The margin around the background didn't work at all because the background is automatically adjusted to fill the parent element, so it's best left out.

Contributes to issue CURA-8009.
2021-07-13 16:04:01 +02:00
Ghostkeeper
bec83920e4
Keep showing search icon while typing search query
This adds an option to the TextField element to show an icon on the left side in the text field. The icon remains visible when the user types in something (it's not part of the placeholder string).
Then we use that optional icon for the search bar in the Digital Library.

Contributes to issue CURA-8009.
2021-07-13 15:47:21 +02:00
Ghostkeeper
e659e4fb63
Merge branch 'patch-1' of https://github.com/tispokes/Cura into tispokes-patch-1 2021-07-12 15:27:01 +02:00
Jaime van Kessel
2acf058d79
Merge pull request #10116 from DaveCalaway/master
Update geeetech_a30.def.json
2021-07-12 13:59:53 +02:00
Lars Pöpperl
9ec261f721
corrected z_seam-"Back" from "Zurück" to "Hinten" 2021-07-12 13:08:42 +02:00
Ghostkeeper
3d6b58d5c0
Always show down arrow regardless of expanded state
This is something our UX designer wants to change for all expandable header bar menus. The down arrow indicates that something will pop-up downwards once clicked. It is unnecessary to feedback the state of the expansion in the icon.

Contributes to CURA-8008.
2021-07-12 11:19:04 +02:00
Dave
a1387f7ed7
Update geeetech_a30.def.json
wrong name for the settings
2021-07-10 18:24:00 +02:00
Lorenzo Romagnoli
5cf7cd63f4
replacing with thicker icon
made the circle one pixel thicker so that the colorer ring is more visible for dark and light colors
2021-07-09 11:45:43 +02:00
Lorenzo Romagnoli
ae649d9a9f
replacing with new icon for better visibility 2021-07-09 11:43:37 +02:00
Ghostkeeper
920e220bdb
Merge branch 'master' into CURA-8247_badge_background_colour 2021-07-07 15:12:31 +02:00
Jaime van Kessel
0a487c804a
Merge branch 'CURA-8011_Replace_extruder_icons' of github.com:Ultimaker/Cura 2021-07-07 14:15:05 +02:00
Ghostkeeper
ba6e79c81f
Rework parts of camera button
The new button should be consistent with the looks of the tool buttons. I've given it the same size as the inner part of the tool buttons, reworked the background so that it matches. I'm also giving it the 'secondary button' style which is also used for one other button. But that other detail button should get the same style anyway so that's fine too.

I've also turned this icon into an actual button. That way it can get focus when using keyboard navigation and works better with tools for blind and such.

Contributes to issue CURA-8202.
2021-07-07 11:36:11 +02:00
Ghostkeeper
52018a6048
Adjust size and margin of guide book icon
The icon was rendered at a too small size, such that it would get a different line width or look-and-feel than the rest. However making it bigger doesn't properly centre it either.
To centre it we also reduced the margin.

Contributes to issue CURA-8202.
2021-07-07 11:36:11 +02:00
Ghostkeeper
1975d053b0
Split solid and 100% infill icons into two icons
Both have different margins for their different use cases.

Contributes to issue CURA-8202.
2021-07-07 11:36:10 +02:00
Ghostkeeper
92293e7008
Make checkbox mark colours same as text colours
The new icon set changes the checkmark to something a lot thinner and more subtle. Making it darker compensates for that a bit.
2021-07-07 11:36:09 +02:00
Jaime van Kessel
0347bb9ce2
Merge branch 'CURA-8012_restyle_buttons' of github.com:Ultimaker/Cura 2021-07-06 16:03:38 +02:00
Konstantinos Karmas
d2c0a1f32e Change height of message buttons to be the same with all other action buttons
CURA-8012
2021-07-06 14:13:19 +02:00
Konstantinos Karmas
b850d8c18e Center the extruder icon in the tabRowButton in the custom print settings
CURA-8011 and CURA-8202
2021-07-06 14:10:19 +02:00
Konstantinos Karmas
d4c254dcab Make the Link button in the Messages similar to the Cura Tertiary button
CURA-8012
2021-07-06 13:59:05 +02:00
Konstantinos Karmas
38bec36f6b Revert Tertiary button to its previous style
The styling of the Tertiary button (to not look like a link anymore) and the introduction of the Quatertiary button (as the link button) will happen in a separate ticket in the future.

CURA-8012
2021-07-06 13:45:24 +02:00
Jaime van Kessel
b8afc9c045
Merge branch 'master' of github.com:Ultimaker/Cura 2021-07-06 11:53:59 +02:00
Jaime van Kessel
d0411a95fd
Fixed rigid3d zhop speed 2021-07-06 11:53:41 +02:00
Jaime van Kessel
401f3d0df6
Set default z-hop speed to allowed value 2021-07-06 11:47:47 +02:00
Jaime van Kessel
11b6e680b2
Remove incorrect value from makermade profile
No idea why it worked in the first place, but a max speed of 0 is impossible!
2021-07-06 11:45:51 +02:00
Jaime van Kessel
5acf2ec47d
Set Z speed for dagoma disco 2021-07-06 11:45:04 +02:00
pbr-research
6634fca887
Add PBR 3D Gen-I printer definition (#9307)
* Add new printer PBR_3D.def.json

Adding new Profile definition for PBR 3D.

* Create pbr_3d.extruder_0.def.json

Adding extruder profile for PBR 3D

* Delete pbr_3d.def.json

* Delete pbr_3d.extruder_0.def.json

* Adding PBR 3D Gen-I printer definition.

This is an printer definition for our printer.

* Adding PBR 3D Gen-I Printer Extruder definition

This is an extruder definition for our printer.

* Adding buildplate definition for PBR 3D Gen-I

This is a buildplate definition for our printer.

* Update pbr3d_g1.def.json

* Add files via upload
2021-07-06 11:42:44 +02:00
Jaime van Kessel
b7e60ca413
Set z hop speed to max for Tevo Tarantula
Fixes Ultimaker/Cura#10085
2021-07-06 11:37:30 +02:00
Jaime van Kessel
fe0f460547
Set default z hop speed to max allowed value for maylan m200
Fixes Ultimaker/Cura#10083
2021-07-06 11:33:50 +02:00
Remco Burema
acf3f2d02a
Let Tertiary button have its own hover entry.
Secondary button entries should not be re-used here.

part of CURA-8012
2021-07-06 09:37:48 +02:00
Remco Burema
a42fee4834
Put the dark-theme bg back the way it was.
Not really part of this ticket. Also no buttons are directly on the background anyway.

part of CURA-8012
2021-07-06 09:25:10 +02:00
Remco Burema
e4710dd921
ActionButton is a RoundedRectangle once more.
We want to deprecate the API, not break it (yet).

part of CURA-8012
2021-07-06 09:06:47 +02:00
Ghostkeeper
f92c6594da
Remove stylised caps for Creasee manufacturer
We'd like to keep the list of manufacturers and printers a bit more fair, without some manufacturers/printers getting more attention than others. The printers didn't have stylised caps here either.

Contributes to issue CURA-8364.
2021-07-05 17:55:01 +02:00
Ghostkeeper
02ef22a572
Merge branch 'master' of https://github.com/ivovk9/Cura into ivovk9-master 2021-07-05 17:51:46 +02:00
Ghostkeeper
62916cb7d4
Remove outline of background around connectivity badge
After feedback from our designer, this turns out to no longer be desirable.

Contributes to issue CURA-8247.
2021-07-05 17:34:13 +02:00
Konstantinos Karmas
5ae4ad5429 Center the material label if no variant in the ConfigurationMenu header
CURA-8011
2021-07-05 17:33:03 +02:00
Jaime van Kessel
ff19d1dd63
Rename small_black to small_emphasis
Still not a great name, but it's better than the old one

CURA-8011
CURA-8202
2021-07-05 15:44:50 +02:00
Ghostkeeper
43237c91c6
Merge branch 'CURA-8011_Replace_extruder_icons' into CURA-8247_badge_background_colour 2021-07-05 15:19:38 +02:00
Ghostkeeper
f9fcbf2492
Add new colour for background of the printer connectivity badge
This should be different from the background colour in case of the dark theme. The design asks for a white background for the badge in the dark theme.

Contributes to issue CURA-8247.
2021-07-05 15:19:15 +02:00
Ghostkeeper
fa4c69cb2b
Merge CloudBlueBG and CloudGreyBG into one icon without colour
We don't use the colour of icons. The colour is determined by the theme, and recoloured by UM.RecolorImage.

Contributes to issue CURA-8247.
2021-07-05 15:09:15 +02:00