370 Commits

Author SHA1 Message Date
Ian Paschal
e62ce0e4ca Make printer carousel more flexible/robust
Contributes to CL-1157
2018-12-19 13:18:53 +01:00
Diego Prado Gesto
acabd06542 Change the large_nonbold to large in one remaining component
Contributes to CURA-6025.
2018-12-19 12:32:18 +01:00
Diego Prado Gesto
ef2fb53790 Merge branch '4.0' into unify_font_types 2018-12-19 11:56:22 +01:00
Ian Paschal
142ac56d78 Add keyboard navigation for printer carousel 2018-12-19 11:26:38 +01:00
Lipu Fei
71e71e0a4f
Merge pull request #4975 from Ultimaker/CURA-6011_connection_types
[4.0] Every output device should define its connection type
2018-12-18 13:23:02 +01:00
Ian Paschal
627c647fbc Center navigation dots
Contributes to CL-1151
2018-12-18 13:17:25 +01:00
Ian Paschal
aed0bb27f2
Merge pull request #4995 from Ultimaker/CL-1151_add_monitor_carousel
CL-1152 Add monitor carousel
2018-12-17 17:05:50 +01:00
Ian Paschal
5c697ab5be Make hints clickable
Contributes to CL-1151
2018-12-17 16:58:51 +01:00
Diego Prado Gesto
b5d8db6a77 Merge branch '4.0' into CURA-6011_connection_types 2018-12-17 15:44:02 +01:00
Ian Paschal
cb6e4ff2d1 Organize MonitorStage.qml better 2018-12-17 14:05:28 +01:00
Ian Paschal
6178f9ddf6 Improve code style and line lengths 2018-12-17 11:49:09 +01:00
Ian Paschal
ff1a0e30f6 Code style & comments 2018-12-17 10:42:41 +01:00
Ian Paschal
77deabf6d4 Code style 2018-12-17 09:43:24 +01:00
Ian Paschal
331cd730f1 Improve visual hint that side cards are not in focus
Contributes to CL-1151
2018-12-14 16:56:20 +01:00
Ian Paschal
e877b47e22 Disable printer cards which are not in focus
Contributes to CL-1151
2018-12-14 16:55:48 +01:00
Ian Paschal
6747fe3550 Merge remote-tracking branch 'origin/4.0' into CL-1151_add_monitor_carousel 2018-12-14 16:31:47 +01:00
Ian Paschal
30168103b7 Update MonitorStage.qml 2018-12-14 15:47:36 +01:00
Ian Paschal
3bd5d141ab Add easing and make animation less snappy and awesome
Contributes to CL-1151
2018-12-14 15:39:17 +01:00
Ian Paschal
2f6a274c0e Small style improvements
Contributes to CL-1151
2018-12-14 15:27:55 +01:00
Ian Paschal
b2ea597543 Fix button color
Contributes to CL-1151
2018-12-14 15:10:34 +01:00
Ian Paschal
5d0da580b9 Fix border colors 2018-12-14 15:04:22 +01:00
Ghostkeeper
2e835bf48d
Merge branch '4.0' 2018-12-14 15:02:30 +01:00
Ian Paschal
7fc5742b7f Add monitor carousel
Contributes to CL-1151
2018-12-14 15:01:40 +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
Lipu Fei
620790ae3d Reduce the creations of ExtrudersModels
CURA-6015
2018-12-13 14:12:23 +01:00
Lipu Fei
2cf80b4578 Remove unused simpleNames flag
CURA-6015
2018-12-13 14:12:04 +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
1ababf38ad Use full printer name if no tag is known
Contributes to CL-1173
2018-12-11 16:42:44 +01:00
Ian Paschal
daeb86bdb1 Use short printer family tags
Contributes to CL-1173
2018-12-11 15:55:03 +01:00
Ian Paschal
1c373b7205 Improve config override text
Contributes to CL-1152
2018-12-11 11:51:13 +01:00
Ian Paschal
0e19fa731f Codestyle
Contributes to CL-1152
2018-12-10 15:47:45 +01:00
Ian Paschal
04af8fbd50 Update MonitorConfigOverrideDialog.qml
Contributes to CL-1152
2018-12-10 15:33:16 +01:00
Ian Paschal
028d993bab Format .gcode.gz files too
Contributes to CL-1152
2018-12-10 15:27:51 +01:00
Ian Paschal
32f2b7ec1f Fix some warnings
Contributes to CL-1152
2018-12-10 15:05:01 +01:00
Ian Paschal
2db5d2b231 Add support for translation plurals
Contributes to CL-1152
2018-12-10 14:54:45 +01:00
Ian Paschal
df0ae20dde Let's just get stepped up in here and get some personal space
Contributes to CL-1152
2018-12-10 14:39:15 +01:00
Ian Paschal
315bcf50c7 Get some personal space up in this personal space
Contributes to CL-1152
2018-12-10 14:31:49 +01:00
Ian Paschal
df4e5c40df Rename ClusterMonitorItem
Contributes to CL-1152
2018-12-10 12:19:52 +01:00
Ian Paschal
8a856f13d2 Re-add config changes in monitor tab
Contributes to CL-1152
2018-12-10 11:36:51 +01:00
Ian Paschal
ad7dcf6fc0 Delete ClusterControlItem.qml
Contributes to CL-1152
2018-12-10 11:36:12 +01:00
Ian Paschal
021c448627 Remove depreciated monitor tab stuff
Contributes to CL-1152
2018-12-10 11:31:18 +01:00
Diego Prado Gesto
1d33fe081f Clean up the code
Remove all the references to the sidebar and use the term print_setup instead.

Contributes to CURA-5941.
2018-12-07 12:07:41 +01:00
Diego Prado Gesto
3b8b70bddf Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-06 16:35:07 +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
07d58c3aef Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-05 13:56:21 +01:00
Ghostkeeper
024bf409c9
Merge branch 'CURA-5876-Configuration_dropdown' into ui_rework_4_0 2018-12-05 13:29:06 +01:00
Diego Prado Gesto
909b0f3f7e Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-05 13:10:42 +01:00
Diego Prado Gesto
537929893f Merge branch 'master' into ui_rework_4_0 2018-12-05 13:10:14 +01:00
Ian Paschal
e8a933331c Clean-up printer status label
Contributes to CL-1153
2018-12-05 12:14:18 +01:00