GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-29 15:25:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
31,753 Commits 288 Branches 260 Tags
Commit Graph

394 Commits

Author SHA1 Message Date
jspijker
a8ccb7d2ff Removed translations from WelcomContent 
This is only shown during the on-boarding flow

Contribute to CURA-10208
 2023-03-06 12:07:29 +01:00
jspijker
e64e090814 Remove translations from DataCollectionsContent 
Contribute to CURA-10208
 2023-03-06 11:59:17 +01:00
jspijker
1ddb4d6ca0 Fixed type in source string 
Contributes to CURA-10208
 2023-03-03 14:13:39 +01:00
Casper Lamboo
f4edc3a5d6
Update translation string 
Cura-9808
 2022-11-29 15:28:13 +01:00
jspijker
f76f711790 Update mentions to UltiMaker 
Contributes to CURA-9808
 2022-11-28 14:11:21 +01:00
jspijker
68f6a0d146 Update mentions to UltiMaker 
Contributes to CURA-9808
 2022-11-28 13:31:35 +01:00
jspijker
73ee6d369e Update disclaimer to mention UltiMaker 
Contributes to CURA-9808
 2022-11-28 13:26:52 +01:00
jspijker
61623720ca Update copyright using UltiMaker 
Contributes to CURA-9808
 2022-11-28 10:48:38 +01:00
jspijker
696c0f8547 Update company name to UltiMaker 
Contributes to CURA-9808
 2022-11-28 09:05:21 +01:00
c.lamboo
9774349cb7 Make add printer component more responsive 
For some displays/screen resolutions the cut is expended beyond the borders of the window. By making the component more responsive this should be fixed.

CURA-9894
 2022-11-17 13:03:17 +01:00
c.lamboo
efe86c27b0 Merge remote-tracking branch 'origin/CURA-8689_add_first_cloud_printer_tweaks' into CURA-8689_add_first_cloud_printer_tweaks 2022-11-09 14:02:49 +01:00
c.lamboo
f73d192d65 Use Label for each individual step in add UltiMaker printer 
CURA-8689
 2022-11-09 14:02:43 +01:00
jspijker
f1c8d3d9e0 Show busy indicator 
Contributes to CURA-8689
 2022-11-09 13:47:32 +01:00
c.lamboo
7639b0ba19 Center align UltiMaker onboarding wizzard-text 
CURA-8689
 2022-11-09 13:29:33 +01:00
jspijker
92fb7fd1a6 Show the add printer dialog in the browser 
Contributes to CURA-8689
 2022-11-09 11:14:28 +01:00
jspijker
adf2c16360 Fixed printer buttons conform UX design 
Contributes to CURA-8689
 2022-11-09 11:13:40 +01:00
jspijker
f2147bb259 Enumerate steps 
Contributes to CURA-8689
 2022-11-09 10:09:22 +01:00
jspijker
2ef0c3d163 Don't trigger third-party printer dialog when onCloudPrintersDetected changed 
That signal is received basically every minute when you're already signed in
and it will close the dialog when no new cloud printers are found.

Contributes to CURA-8689
 2022-11-09 07:40:44 +01:00
jspijker
e9a1806570 Allign "learn more" left-side 
Contributes to CURA-8689
 2022-11-09 07:28:46 +01:00
jspijker
a3f259d004 Send user to external DF printer page 
Contributes to CURA-8689
 2022-11-08 18:27:09 +01:00
jspijker
f0966b1c57 Don't stretch in height and adhere border to UX design 
Contributes to CURA-8689
 2022-11-08 18:17:41 +01:00
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