373 Commits

Author SHA1 Message Date
c.lamboo
4496f3fef3 Merge remote-tracking branch 'origin/feature/_CURA-8689_Make_it_easier_to_add_your_first_printer_via_cloud' into feature/_CURA-8689_Make_it_easier_to_add_your_first_printer_via_cloud 2022-11-04 13:48:39 +01:00
c.lamboo
c5788be6f7 Add ids with interactable components
Makes it easier to perform automatic ui testing

contributes to CURA-8689
2022-11-04 13:48:31 +01:00
Casper Lamboo
81f8939c1f
Update resources/qml/WelcomePages/AddThirdPartyPrinter.qml
Co-authored-by: Joey de l'Arago <joeydelarago@gmail.com>
2022-11-04 13:40:49 +01:00
c.lamboo
c892bac27f Use paragraph for in favor of ordered list
Text indentation became when the text would span multiple lines

contributes to CURA-8689
2022-11-03 10:45:29 +01:00
c.lamboo
d07c2c2c0d Update copy
contributes to CURA-8689
2022-11-03 10:37:02 +01:00
jelle spijker
c8f51a6743 Correctly wrap text body
to prevent weird alignment in welcome pages

CURA-8689
2022-11-03 10:08:00 +01:00
c.lamboo
4381a97c85 Elide button text when text becomes too wide
contributes to CURA-8689
2022-11-02 14:58:25 +01:00
jelle spijker
1dfac6bb71 Apply screenScaleFactor to image size
Contributes to CURA-8689
2022-11-02 14:00:35 +01:00
c.lamboo
056221cda6 Remove "Add cloud printer" button in onboarding-add printer flow
From figma design

contributes to CURA-8689
2022-11-01 17:00:40 +01:00
c.lamboo
846102be4e Update campaign links in onboarding-add printer flow
contributes to CURA-8689
2022-11-01 16:59:25 +01:00
c.lamboo
5cb67ab8c4 Add new pages in add-printer flow
Pages added
- Page to select Ultimaker or third party printer
- Page with information how to add Ultimaker printer(s)

contributes to CURA-8689
2022-11-01 16:11:34 +01:00
Jaime van Kessel
b25e760c53 Remove incorrect enum usage
This only needs to happen in code that uses PyQt, not in qml code
2022-06-17 15:26:30 +02:00
c.lamboo
d5c0fde7f2 Render labels using Text.QtRendering on OSX
Fonts were looking a bit to thick on when using `Text.NativeRendering`, so using `Text.QtRendering` instead. After this the font weight looks identical to figma (as far as I can see).

In this commit I also changed all `Label`'s to `UM.Label`'s and removed default properties where I could.

CURA-9154
2022-05-10 15:40:09 +02:00
c.lamboo
35f5c3f959 Revert "Render labels using Text.QtRendering on OSX"
This reverts commit f0e3c19a34d1fde3b7ec4fd95677fbefa2028b26.
2022-05-10 15:39:02 +02:00
c.lamboo
f0e3c19a34 Render labels using Text.QtRendering on OSX
Fonts were looking a bit to thick on when using `Text.NativeRendering`, so using `Text.QtRendering` instead. After this the font weight looks identical to figma (as far as I can see).

In this commit I also changed all `Label`'s to `UM.Label`'s and removed default properties where I could.

CURA-9154
2022-05-10 15:36:50 +02:00
j.delarago
c4baece3ac Remove reference to nonexistent property source size in UM.ColorImage which was causing add printer page to be empty
CURA-9098
2022-04-11 09:52:33 +02:00
c.lamboo
45bc498c7f Replace RecolorImage with ColorImage
CURA-8640
2022-04-08 15:55:34 +02:00
j.delarago
2ffcfafc77 Some place RegularExpressionValidator can't be found in QtQuick 2.10 but can be in 2.15 so all files using RegularExpressionValidator have been bumped to latest QtQuick
CURA-8640
2022-04-05 16:10:39 +02:00
Jaime van Kessel
9f735a192e Bump up qtQuick version 2022-03-30 17:39:43 +02:00
c.lamboo
3c9e2a1b08 Update RegExpValidator to RegularExpressionValidator
Due to Qt6 API change

CURA-8640
2022-03-30 15:10:37 +02:00
Jaime van Kessel
f436c97abd Roughly strip out the GraphicalEffects
For some reason qt6 that we built still didn't like it.

Since we wanna know if the rest works, yeeting that stuff out for now
2022-03-28 16:11:28 +02:00
j.spijker@ultimaker.com
ff21c93f9b
Qt6 dropped QtGraphicalEffects
https://doc.qt.io/qt-6/qtgraphicaleffects5-index.html

Contributes to CURA-8640
2022-03-28 15:33:43 +02:00
Jelle Spijker
3f8907d02a
Merge branch 'master' into CURA-8640_PyQt6
# Conflicts:
#	cura/CuraApplication.py
#	resources/qml/Preferences/Materials/MaterialsSyncDialog.qml
#	resources/qml/Preferences/Materials/MaterialsView.qml
2022-03-24 11:53:44 +01:00
Ghostkeeper
c7d7dd11d1
Merge branch 'master' into PyQt6_upgrade
Conflicts:
	cura/PlatformPhysics.py -> Removed shapely on master, while QTimer import got updated to Qt6.
	plugins/Toolbox -> Entire folder is deleted in master, but it was updated to Qt6 here. This can all be removed.
2022-02-21 11:52:28 +01:00
Ghostkeeper
fbb72d6f0a
Remove horizontal scrollbar policies from Cura.ScrollableTextArea
There is no horizontal scrollbar any more so these are giving errors now.

Contributes to issue CURA-8686.
2022-01-28 15:27:47 +01:00
Ghostkeeper
0f61e25a77
Fix anchoring width of network printer view to scrollbar
You can't anchor to something that's not a parent or sibling, and the scrollbar was an... uncle?

Contributes to issue CURA-8686.
2022-01-21 17:07:10 +01:00
Ghostkeeper
f1db69a36a
Remove extra ScrollView and customise ListView instead
Contributes to issue CURA-8686.
2022-01-19 17:14:30 +01:00
Ghostkeeper
9124f213ea
Prevent QML errors when model is not yet initialised
I'm not sure when this happens, but it updates this text twice: Once with 'undefined' name and once with the proper name. For the user it displays the name correctly, but it may be so fast that nothing was visible.

Discovered during work on CURA-8686.
2022-01-19 16:31:36 +01:00
Ghostkeeper
fa2fbb99c7
Fix height and scrolling of add printer menus
This fixes the irritating scrolling behaviour of the local printer menu, as well as the disappearing items (former issue which had a workaround) and makes it use a styled scroll bar.

Contributes to issue CURA-8686.
2022-01-19 16:26:48 +01:00
Ghostkeeper
f94b7ce753
Replace ScrollView+Column+Repeater by ListView with correct scrollbar
Much simpler. And looks more consistent too.

Contributes to issue CURA-8686.
2022-01-19 14:59:48 +01:00
Ghostkeeper
e0a6cb3383
Merge branch 'master' into replace_controls_1_for_controls_2
Conflicts:
	resources/qml/Actions.qml -> Translation fixes on master, while the QML elements were changed here for Controls2.
2022-01-18 17:17:10 +01:00
Ghostkeeper
5eee9958a0
Case-insensitive visibility checking for printers
In Qt's ListModel, the section headers collect items case-insensitively. However, when checking whether a printer should be visible (when the section header is expanded) was still checked case-sensitively. As a result, it was hiding all printers that did not use the same casing in its manufacturer name, e.g. FlashForge vs. Flashforge.

Fixes #11125.
2022-01-11 16:29:40 +01:00
Remco Burema
c8ed3634ed
Qt5->Qt6: Even more renaming stuff.
part of CURA-8591
2021-12-29 12:43:56 +01:00
Jaime van Kessel
83be495414 Replace usage of controls label with our custom label
This prevents copy pasting a bunch of parameters that we set by default
2021-11-10 16:37:26 +01:00
Jelle Spijker
b49004a742
Reorient layout of skip, sign-in and create
* Skip button
  - Moved to the left, such that a user won't click on it mindlessly
  - Made it a Tertiary button, so it will have predictable margins
* Sign-in button
  - Moved to the right bottom, making it the logical next option
* Create an account
  - Moved to be inline with skip and sign-in
  - Made it a secondary button as requested by UX

Contributes to CURA-8602
2021-10-04 16:48:51 +02:00
Konstantinos Karmas
5266cbb950 Initiate an account sync immediately after pressing "Add cloud printer"
It was a bit weird that the sync didn't happen immediately and you had to wait for 30seconds until the printer appeared.
2021-09-23 12:53:57 +02:00
luz paz
d68f375e38 Fix various typos
Found via `codespell -q 3 -S *.po,*.pot -L childs,initialy,lod,ned,te,slicable,sur,tutoriels,wont`
2021-09-07 11:33:54 -04:00
Ghostkeeper
f4508c709e
Fix links to account sign up page
This was a miscommunication.

Contributes to issue CURA-8440.
2021-09-02 14:32:06 +02:00
Ghostkeeper
c779135112
Rename Group icon to People, and add high detail variant
The icon is called People in the UX team's icon system, and we need to stay aligned to that.
The high detail variant has an extra person in it.

Contributes to issue CURA-8530.
2021-09-01 18:01:10 +02:00
Ghostkeeper
b7b0d25615
Add high detail versions of some icons
The group icon seems to be broken though. We'll look into it.

Contributes to issue CURA-8530.
2021-09-01 15:39:04 +02:00
Ghostkeeper
34531656d6
Merge branch 'CURA-8520_Fix_missing_icons_in_deprecated_icons_list' into 4.11 2021-08-31 13:35:33 +02:00
Ghostkeeper
9ea025885a
Update links to network troubleshooting page
The new links also have campaign identifiers. Because apparently the website doesn't read the HTTP metadata information saying that it redirected from Cura, and it adds information which button it came from.
The old links will remain working via redirects, for older Cura versions.

Contributes to issue CURA-8528.
2021-08-31 12:07:11 +02:00
Konstantinos Karmas
cf93f66135 Add missing Group.svg icon
CURA-8520
2021-08-30 11:42:57 +02:00
Konstantinos Karmas
01b0d78f7b Use custom style for the links in the what's new textArea
A style had to be prepended in the text to make sure that it adheres to the style we want instead of using the OS-based link style.

Note: For some reason QML ignores all other link-style tags (such as `a:hover`, `a:focus` etc) apart from `a:link`, so we can only change the style for the normal link and NOT for when it is clicked or hovered.

CURA-8380
2021-08-24 13:31:39 +02:00
Konstantinos Karmas
e0e4a3f2c0 Add shadow behind the what's new pages
As discussed during the eCCB.
2021-08-16 17:00:30 +02:00
Jaime van Kessel
79ccccb1a1 Fix qml warning spam 2021-08-12 15:27:39 +02:00
Konstantinos Karmas
332475562b Change account signup link
CURA-8441
2021-08-09 13:00:03 +02:00
Konstantinos Karmas
b37716de58 Add missing campaign tags
CURA-8441
2021-08-09 12:59:29 +02:00
Jaime van Kessel
57e66a5796 Add campaign links
CURA-8441
2021-08-05 15:42:23 +02:00
Konstantinos Karmas
74a611d577 Change maximum network printers item count
So that it does not make the Local printers button overlap with the add/cancel buttons when the network printers list is full.
2021-07-21 11:49:34 +02:00