42 Commits

Author SHA1 Message Date
Diego Prado Gesto
ece2729744 CURA-5445 Remove the action when the Finish button is clicked. The
button will just close the dialog.
2018-06-06 19:02:40 +02:00
Diego Prado Gesto
eea9b7ab46 CURA-5254 Keep track of the latest manual entry key, so it is then
selected in the list.
2018-05-22 12:05:33 +02:00
ChrisTerBeke
e7f70d68c7 Focus on IP address field when adding networked printer 2018-05-18 17:19:14 +02:00
Lipu Fei
37bcf1694d Remove translation wrapper for unnecessary parts
CURA-5221
2018-04-23 12:00:05 +02:00
Lipu Fei
f92985b4ac Add Ultimaker S5 for printer type detection
CURA-5221
2018-04-23 11:57:01 +02:00
Diego Prado Gesto
36c5e0ad15 CURA-4870 Change message of the dialog when the connection with a printer/group already exists 2018-03-16 12:07:05 +01:00
Diego Prado Gesto
99d653cea5 CURA-4870 Don't allow to connect more than one instance to the same
group.
2018-03-15 20:01:47 +01:00
Diego Prado Gesto
260cad36cb CURA-4870 Add name of the group and hidden property to the network
printers. The printer menu shows the printers grouped by group and the
hidden printers are never listed.
2018-03-09 12:42:49 +01:00
Diego Prado Gesto
ae094c8201 CURA-4870 Disable the connect button in the discovery list when the
printer is not a host of printers.
2018-03-08 14:02:22 +01:00
Ghostkeeper
ee9de1f11b
Merge branch '3.2'
Lots of conflicts due to rounding vs. flooring of text element positions for weirdness with the font aliasing.
2018-02-14 10:53:51 +01:00
Mark
b531c0550d Change Math.floor to Math.round as a last try to fix garbled fonts
CURA-4941
2018-02-14 09:28:47 +01:00
Jaime van Kessel
dcf02137ad Fixed connecting for clean machine
CL-541
2018-01-09 14:53:16 +01:00
Jaime van Kessel
041b1830fe Re-added manual printer adding
CL-541
2017-12-20 16:30:40 +01:00
Ghostkeeper
147cbdf592
Clarify translations of 'unknown'
For some languages, the gender matters.

Contributes to issue CURA-4601.
2017-11-24 13:16:14 +01:00
Jaime van Kessel
61753540e4 Callbacks are now handled by url and operation type.
It would have been nicer to use the request, but it's unhashable.

Cl-541
2017-11-20 15:12:29 +01:00
Jaime van Kessel
4197f18fc1 First steps to ensure that the Discover UM3 action works with new architecture
CL-541
2017-11-20 13:35:08 +01:00
Lipu Fei
78456d5bc3 Fix clusterSize property check in QML 2017-11-09 09:06:46 +01:00
Mark
1468c3aae5 move undefined/null check 2017-11-09 07:37:09 +01:00
Mark
fdcce1780e Also check if base.selectedPrinter is null 2017-11-08 19:24:09 +01:00
Mark
334283e893 Found some more margins that wouldnt be fixed numbers and made the code more consistent 2017-10-27 14:12:35 +02:00
Lipu Fei
920c90010f Fix base.selectedPrinter is undefined problem 2017-10-12 14:54:01 +02:00
ChrisTerBeke
e97bdc526b Merge branch '3.0' 2017-10-11 14:13:57 +02:00
Ghostkeeper
3df98ecfc5
Change error/success messages for checking cluster-capability
This breaks the string freeze. The developers of this plug-in are well aware. However, it turns out that for these two strings the string freeze had already broken. We'll change these strings first then translate them out of band. I hate this sort of menial administration that could've been prevented...

Contributes to issue CURA-4341.
2017-10-11 11:10:08 +02:00
ChrisTerBeke
641b3c21f7 fix merge conflicts 2017-10-10 09:21:31 +02:00
Lipu Fei
60726ce179 Increase minimumHeight of the Print Address dialog
CURA-4428
2017-10-10 08:24:47 +02:00
Ghostkeeper
bc419370d0
Merge branch '3.0' 2017-10-06 16:02:13 +02:00
Jaime van Kessel
fddb829273 Added check to see if selectedPrinter is set
CL-500
2017-10-06 14:15:15 +02:00
Ghostkeeper
d458fcde5c
Revert "Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0""
This reverts commit e07e7bc9e714843cf853f0a255ee5a8432696886.

Contributes to issue CURA-4414.
2017-10-05 10:58:49 +02:00
Ghostkeeper
e07e7bc9e7
Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0"
This reverts commit b62c19206f5e494fa27eb0b877197556c559e449, reversing
changes made to 104926c6ed1648ec20b4308fdacad4e99c14c8b3.

Contributes to issue CURA-4414.
2017-10-05 10:28:54 +02:00
Ghostkeeper
1d7792861d
Merge branch '3.0'
Conflict in ClusterControlItem.qml where there was a new element in Master that wasn't present in 3.0. That element wasn't referenced anywhere else so I just removed it.
2017-10-02 17:40:24 +02:00
Jack Ha
5a3e427450 CL-228 when adding a Cura Connect printer, do not ask authentication, it is always authenticated 2017-10-02 14:20:41 +02:00
Ghostkeeper
df14ea2b1a
Proper capitalisation of 'OK'
This is consistent with the rest.

Contributes to issue CURA-4341.
2017-09-27 17:32:24 +02:00
Ghostkeeper
d417bfc7cc
Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0 2017-09-27 14:20:38 +02:00
Simon Edwards
85efd9249c
Add in all of the changes for Cura Connect
CURA-4376
2017-09-27 10:29:48 +02:00
fieldOfView
c5fd0e6c80 Use screenScaleFactor to consistently adapt sizes to display pixel ratio 2017-09-25 22:07:12 +02:00
Jaime van Kessel
021425ee06 Merge branch 'fix_system_text_rendering' of https://github.com/fieldOfView/Cura 2017-07-26 16:49:28 +02:00
Ghostkeeper
dbcf50162f
Fix spelling of combined English words
Contributes to issue CURA-3998.
2017-07-18 13:10:17 +02:00
fieldOfView
b5d7ec5bd2 Round fractional widths and heights in system-themed qml 2017-07-14 12:58:07 +02:00
Ghostkeeper
bd361e500c
Don't keep a copy of currently connected printer
This QML file was holding a copy of the currently connected printer, stored in connectingToPrinter. This copy got out of sync when you load a project file which had a different connected printer. Instead, ask the manager for the currently connected printer key every time you click the button.

Contributes to issue CURA-3839.
2017-05-19 12:30:17 +02:00
Lipu Fei
314fa8b1c8 Fix Enter key trigger for UM3 Add Printer dialog 2017-05-04 15:27:29 +02:00
Lipu Fei
c2dff9fcd9 Accept Enter key on UM3 Add Printer Dialog 2017-05-03 13:58:58 +02:00
Jaime van Kessel
ef4ad8d2ac Renamed um3networkprintingplugin to um3networkprinting
CURA-2862
2016-11-25 11:34:49 +01:00