42 Commits

Author SHA1 Message Date
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
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
j.delarago
2f96f7b410 RegularExpressionValidator requires newer version of QtQuick
CURA-8640
2022-04-04 10:45:00 +02:00
c.lamboo
3c9e2a1b08 Update RegExpValidator to RegularExpressionValidator
Due to Qt6 API change

CURA-8640
2022-03-30 15:10:37 +02:00
casper
6159ccbdc7 Fix darkmode issues in the DiscoverUM3Actions dialog
CURA-8688
2022-02-28 12:20:46 +01:00
casper
e03176a1fa Replace UM.MessageDialog with newly added Cura.MessageDialog
This dialog is different from the `UM.MessageDialog` in that it

CURA-8688
2022-02-23 14:09:38 +01:00
casper
5a2e26eff6 Merge branch 'replace_controls_1_for_controls_2' into CURA-8685-replace_text_and_progress_bars
# Conflicts:
#	plugins/PerObjectSettingsTool/PerObjectItem.qml
#	plugins/PerObjectSettingsTool/SettingPickDialog.qml
2022-02-18 09:07:25 +01:00
Jaime van Kessel
58e6cde6e8 Remove incorrect refferents to btnOk 2022-02-17 15:10:18 +01:00
Jaime van Kessel
40f835ed13 Replace labels for UM.Label in DiscoverUM3Action
CURA-8685
2022-02-15 15:51:07 +01:00
casper
aeb433b2a1 Keep showing ip enter dialog after wrongly entered ip address
In component discover um 3 dialog. After a "complete" action the
dialog will immediately close. This was undesired behaviour as we want
to keep the dialog active if an IP address is wrongly added.

Additionally, it is no longer necessary to close/hide the dialog after
a reject/accept as this is done by default.

CURA-8955
2022-02-15 09:29:32 +01:00
casper
3f658a4914 Change UM.Dialog to Controls.Dialog in connect to printer by ip window
As `UM.Dialog` is opened using in a new window, the error-confirmation
that was displayed in a `UM.Dialog` was displayed _behind_ the window
object.

CURA 8687
2022-02-11 14:37:32 +01:00
Ghostkeeper
2606a3b847
Change remaining MessageDialogs to our version
Contributes to issue CURA-8687.
2022-02-04 15:49:06 +01:00
Ghostkeeper
d87551ac9c
Use Controls2 ListView instead of Controls1 ScrollView to scroll
Just a listview with a specialised scroll bar.

Contributes to issue CURA-8686.
2022-01-18 17:01:16 +01:00
Jaime van Kessel
980ac986df Let DiscoverUM3Action use controls 2 2021-11-11 15:59:51 +01:00
Konstantinos Karmas
e18a840c43 Change troubleshooting link
CURA-8441
2021-08-09 13:00:25 +02:00
Jaime van Kessel
57e66a5796 Add campaign links
CURA-8441
2021-08-05 15:42:23 +02:00
Nino van Hooff
214e41f983 Use a more specific link for the network troubleshooting guide
CURA-7434
2020-04-14 16:55:36 +02:00
Lipu Fei
96a9bcccbb Merge remote-tracking branch 'origin/master' into feature_intent 2019-10-01 09:41:05 +02:00
ChrisTerBeke
99832c3a68
Use printer type name instead of id 2019-09-27 21:09:53 +02:00
Remco Burema
7a1850a87b Actually fix QML nullptr warnings for real. 2019-09-27 12:53:32 +02:00
Ghostkeeper
9122d0cca4
Remove misleading text that says you could enter hostnames
We don't resolve the hostnames ever. You can only enter IP addresses.
2019-08-21 09:56:32 +02:00
ChrisTerBeke
e977cdd431
Add legacy 'Connect over Network' button back 2019-08-12 01:19:41 +02:00
ChrisTerBeke
96cf235d8c Get rid of any hardcoded references to machines 2019-07-25 14:56:46 +02:00
Cherubim
cdafdc8d5c
Break up translation in two pieces
As a rule of thumb, translated text should not contain any layout. This particular text has gone wrong in the translations because the translators didn't translate the second part (or their application messed it up). I'm breaking it up into two pieces as to force them to translate both.

Contributes to issue CURA-6547.
2019-05-28 11:23:42 +02:00
Ghostkeeper
4e361a068c
Revert "Merge pull request #5726 from Ultimaker/CL-1331_use_API_for_UM3NetworkPrinting"
This reverts commit bec7b6546d3f7de457418a2e15f08c1e6dfa3148, reversing
changes made to 7094b222b10076af3a13f11b03dd3416eae12156.

The changes there were not accepted. Please see pull request https://github.com/Ultimaker/Cura/pull/5726 for the discussion about this.

Conflicts:
	plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py -> Just in one TODO comment.
2019-05-23 13:40:11 +02:00
Ian Paschal
5774813704 Use class properties
Contributes to CL-1331
2019-05-15 10:09:50 +02:00
Ian Paschal
b3276777b7 Expose machines API to QML
Contributes to CL-1331
2019-05-09 16:19:59 +02:00
Lipu Fei
1d4ab98ddc Fix binding loop
CURA-6483
2019-05-02 08:25:29 +02:00
Lipu Fei
3578482ea5 Fix connect via network dialog
CURA-6483

 - Do not add printers that have already been discovered
 - Add IP address validation check
2019-04-30 15:26:04 +02:00
Remco Burema
113c37f555 Start work on 'AddPrinterByIp' for WelcomePages. [CURA-6057] 2019-03-01 13:17:15 +01:00
Diego Prado Gesto
ef2fb53790 Merge branch '4.0' into unify_font_types 2018-12-19 11:56:22 +01:00
Lipu Fei
aba3b6dd8e Rename setKey() and add docs
CURA-6011
2018-12-14 10:55:36 +01:00
Aleksei S
973970a895 Every print ouput device should define its connection type(usb, network, cluster and etc)
CURA-6011
2018-12-13 16:00:12 +01:00
Diego Prado Gesto
77ede1ae6b Unify the fonts to only have 8 instead of 13.
Contributes to CURA-6025.
2018-12-12 17:50:21 +01:00
Ian Paschal
8a856f13d2 Re-add config changes in monitor tab
Contributes to CL-1152
2018-12-10 11:36:51 +01:00
Diego Prado Gesto
3ca749cdcb Add a bunch of renderTypes to labels in the DiscoverUM3Action. 2018-12-06 14:31:52 +01:00
Diego Prado Gesto
5de367bcc4 Merge branch 'ui_rework_4_0' into cura4.0_header
Conflicts:
plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml
resources/qml/Menus/ViewMenu.qml
resources/themes/cura-dark/theme.json
resources/themes/cura-light/theme.json
2018-10-29 11:10:25 +01:00
Ghostkeeper
1bcd134f85
Fix code style
Most stuff here was recently changed. Some of it was where I found a pattern in something that was likely copy-pasted from somewhere else, so I did a global search and replace on that.

Contributes to issue CURA-5784.
2018-10-18 14:30:33 +02:00
Ian Paschal
2c5095befb Add copyright headers 2018-10-03 09:43:13 +02:00
Ian Paschal
18e0dacda4 Organize files better
First things first... organize!
2018-09-07 14:11:37 +02:00