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
Lipu Fei
a13fb4a81e
Merge remote-tracking branch 'origin/master' into ui_rework_4_0
2018-12-04 17:12:24 +01:00
Ian Paschal
014a138fda
Remove semi-colon
...
Contributes to CL-1153
2018-12-04 15:12:00 +01:00
Ian Paschal
1494daf671
Simplify preview icon logic
...
Contributes to CL-1153
2018-12-04 15:11:31 +01:00
Ian Paschal
ebb31409b8
Always return a string for preview icon
...
Contributes to CL-1153
2018-12-04 15:10:31 +01:00
Ian Paschal
96b9c7f3ea
Fix multi-argument i18n string
...
Contributes to CL-1153
2018-12-04 11:40:56 +01:00
Ian Paschal
249a90199b
Improve printer status handling
...
Contributes to CL-1153
2018-12-04 11:08:01 +01:00
Ian Paschal
ab245bbff6
Make "finishes at" single translatable string
...
Contributes to CL-1153
2018-12-04 10:23:26 +01:00
Ian Paschal
95400282b9
Simplify logic slightly
...
Contributes to CL-1153
2018-12-03 14:44:15 +01:00
Ian Paschal
cced42a55b
Handle idle, unavailable, and unreachable states
...
Contributes to CL-1153
2018-12-03 14:41:45 +01:00
Ian Paschal
c9ed044205
Improve printer status and progress bar
...
Contributes to CL-1153
2018-12-03 14:41:22 +01:00
Ghostkeeper
7df4c01814
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown
...
Conflicts:
cura/Settings/MachineManager.py -> rowCount vs. count
resources/qml/ExtruderIcon.qml -> Someone changed stuff that I had overwritten.
resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml -> Someone changed stuff that I had removed.
resources/qml/Toolbar.qml -> Git was wrong, not a conflict.
resources/themes/cura-light/theme.json -> Git was wrong, not a conflict.
2018-12-03 11:45:05 +01:00
Diego Prado Gesto
260c0a04ca
Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown
2018-12-02 12:13:28 +01:00
Diego Prado Gesto
1a778b3078
Fix qualiy slider alignments
...
Contributes to CURA-5941.
2018-11-30 14:18:07 +01:00