Jaime van Kessel
|
7ecad41625
|
Merge pull request #4843 from Ultimaker/fix-oauth2-client
Switch Ultimaker Account OAuth2 client
|
2018-11-22 16:38:10 +01:00 |
|
Diego Prado Gesto
|
2b08857331
|
Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector
|
2018-11-22 16:11:34 +01:00 |
|
Diego Prado Gesto
|
81c776213a
|
Merge branch 'master' into ui_rework_4_0
|
2018-11-22 16:11:06 +01:00 |
|
Lipu Fei
|
06cb628699
|
Update desktop and mimeinfo to add gcode mime type
CURA-5878
|
2018-11-22 15:47:12 +01:00 |
|
Diego Prado Gesto
|
692868a0b4
|
Create a function that given a printer type name, it will return and
abbreviated name.
Contributes to CURA-5942.
|
2018-11-22 15:45:38 +01:00 |
|
Jaime van Kessel
|
3f4d379908
|
Added shadow to slice button
CURA-5959
|
2018-11-22 15:35:40 +01:00 |
|
Simon Edwards
|
ee7355c2bb
|
Merge pull request #4841 from Ultimaker/CL-1148_restyling_monitor_queue_tiles
CL-1148 Re-styling monitor queue tiles
|
2018-11-22 15:08:42 +01:00 |
|
Lipu Fei
|
2d2f24251d
|
Fix MonitorMainView for USB printing
CURA-5943
|
2018-11-22 15:07:49 +01:00 |
|
Diego Prado Gesto
|
5c30df2a68
|
Create a reusable component for the printer type label. Other parts of
the UI can just reuse it.
Contributes to CURA-5942.
|
2018-11-22 15:00:35 +01:00 |
|
Diego Prado Gesto
|
0211122b12
|
Add a proper component with a label and a rectangle in the background
that shows the type of printer.
Contributes to CURA-5942.
|
2018-11-22 14:46:13 +01:00 |
|
Lipu Fei
|
d8c3078d78
|
Add connectedPrinter to HeatedBedBox
CURA-5943
|
2018-11-22 14:10:41 +01:00 |
|
Lipu Fei
|
8eb0f66df3
|
Add connectedPrinter to ExtruderBox
CURA-5943
|
2018-11-22 14:08:50 +01:00 |
|
Lipu Fei
|
75661d9bba
|
Fix MonitorSidebar due to widget renaming
CURA-5943
|
2018-11-22 14:08:50 +01:00 |
|
Lipu Fei
|
e65f2d66a6
|
Add connectedPrinter to MonitorItem
CURA-5943
|
2018-11-22 14:06:43 +01:00 |
|
Lipu Fei
|
5a16918391
|
Update ManualPrinterControl
CURA-5943
|
2018-11-22 14:03:03 +01:00 |
|
Lipu Fei
|
cf0994037c
|
Move MonitorButtonSytle to a separate QML file
CURA-5943
|
2018-11-22 14:03:03 +01:00 |
|
Lipu Fei
|
45d4f2ad3d
|
Update MonitorSection
CURA-5943
|
2018-11-22 14:03:03 +01:00 |
|
Lipu Fei
|
698409803d
|
Fix null warning in QML
CURA-5943
|
2018-11-22 14:03:03 +01:00 |
|
Ian Paschal
|
963b8aa974
|
Fix QML warnings
Contributes to CL-1148
|
2018-11-22 13:56:01 +01:00 |
|
Ian Paschal
|
55554c62a9
|
Use array for extruder configurations
Contributes to CL-1148
|
2018-11-22 13:55:43 +01:00 |
|
Ian Paschal
|
da834d6a1f
|
Silence binding loop
Contributes to CL-1148
|
2018-11-22 13:55:22 +01:00 |
|
Diego Prado Gesto
|
9720512f50
|
Add a new printer selector button that is connected to the output
devices and shows labels containing the type of printers that are in the
same group.
Contributes to CURA-5942.
|
2018-11-22 13:54:10 +01:00 |
|
Jaime van Kessel
|
a1613c7f81
|
Set the variable types of the Action button to the right kind.
Because of boyscouting; these must be colors (and not generic vars)
|
2018-11-22 13:53:27 +01:00 |
|
Ian Paschal
|
1de21c1d94
|
Remove unnecessary "else"
Contributes to CL-1148
|
2018-11-22 13:13:06 +01:00 |
|
Ian Paschal
|
3c3343a407
|
Use bool for expanded or collapsed state
Contributes to CL-1148
|
2018-11-22 13:11:59 +01:00 |
|
alekseisasin
|
b091e3a52c
|
Merge pull request #4854 from Ultimaker/fix_version_upgrade_returning_none
Fix version upgrade returning none
|
2018-11-22 11:44:36 +01:00 |
|
Aleksei S
|
088b2f6f28
|
Added an extra import module, did not pass coding style test
CURA-5936
|
2018-11-22 11:36:32 +01:00 |
|
Aleksei S
|
c765615f1a
|
Merge branch 'master' into fix_version_upgrade_returning_none
|
2018-11-22 11:17:44 +01:00 |
|
Ian Paschal
|
ba7863c9d9
|
Fix type error for hovering manage queue link
Contributes to CL-1148
|
2018-11-22 11:09:35 +01:00 |
|
Jaime van Kessel
|
bf8a04fa40
|
Fix some minor display issues for simulation view
CURA-5785
|
2018-11-22 11:08:46 +01:00 |
|
Jaime van Kessel
|
d4e4e50741
|
Fix typo
|
2018-11-22 10:55:53 +01:00 |
|
Diego Prado Gesto
|
b890e40e81
|
Close the popup panel when the user clicks in some of the buttons in the
printer selector.
Contributes to CURA-5942.
|
2018-11-22 10:54:25 +01:00 |
|
Marijn Deé
|
352427e460
|
Moved exception handling closer to the cause of error
|
2018-11-22 10:01:15 +01:00 |
|
Jaime van Kessel
|
7a8522ce72
|
Merge branch 'CURA-5785-Restyle_stage_menu' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu
|
2018-11-22 09:38:06 +01:00 |
|
Marijn Deé
|
7e3f86f091
|
Moved some of the mocks to class level because they are used in every test method
|
2018-11-22 09:37:47 +01:00 |
|
Jaime van Kessel
|
a9f0402f63
|
Made size of viewselector themable
CURA-5785
|
2018-11-22 09:37:36 +01:00 |
|
Diego Prado Gesto
|
3434b30ee0
|
Merge branch 'CURA-5785-Restyle_stage_menu' into CURA-5942_printer_selector
|
2018-11-21 17:08:15 +01:00 |
|
Diego Prado Gesto
|
cbee18597e
|
Merge branch 'ui_rework_4_0' into CURA-5785-Restyle_stage_menu
|
2018-11-21 16:59:03 +01:00 |
|
Diego Prado Gesto
|
f866390c7b
|
Fix an issue in the action panel.
When the panel is created while the user is in the preview stage, the
row has no width.
Contributes to CURA-5786.
|
2018-11-21 16:56:25 +01:00 |
|
Diego Prado Gesto
|
fe7d1825d4
|
Add styling to the buttons in the printer list.
Contributes to CURA-5942.
|
2018-11-21 16:54:57 +01:00 |
|
Diego Prado Gesto
|
a1f3ebc25b
|
Fix typo.
Contributes to CURA-5785.
|
2018-11-21 13:58:21 +01:00 |
|
Jaime van Kessel
|
a9672458fd
|
Update extruderIcon to be more in line with the design
CURA-5785
|
2018-11-21 13:46:50 +01:00 |
|
Diego Prado Gesto
|
406fac9e60
|
Remove duplicate entries of renderType.
Contributes to CURA-5942.
|
2018-11-21 13:38:08 +01:00 |
|
Jaime van Kessel
|
c7dbaa3a00
|
Add rendertype for labels in quickConfigurationSelector
CURA-5785
|
2018-11-21 13:22:03 +01:00 |
|
Diego Prado Gesto
|
7c9cd75cf9
|
Merge branch 'CURA-5785-Restyle_stage_menu' into CURA-5942_printer_selector
|
2018-11-21 13:19:23 +01:00 |
|
Jaime van Kessel
|
bd636e61a0
|
Minor changes suggested in review
CURA-5785
|
2018-11-21 13:17:36 +01:00 |
|
Diego Prado Gesto
|
4772972145
|
Merge branch 'CURA-5785-Restyle_stage_menu' into CURA-5942_printer_selector
|
2018-11-21 12:18:51 +01:00 |
|
Jaime van Kessel
|
eef6ad662d
|
Added enum for the roundedCorner property
This makes it a whole lot easier to read what is being set.
CURA-5785
|
2018-11-21 11:50:39 +01:00 |
|
Diego Prado Gesto
|
64bbab9d40
|
Use the group name to show in the printer list if it's a network
connected printer.
Contributes to CURA-5942.
|
2018-11-21 11:50:00 +01:00 |
|
Diego Prado Gesto
|
de650300e2
|
Add the buttons to add printer and manage printers in the bottom of the
print selector panel.
Contributes to CURA-5942.
|
2018-11-21 11:43:20 +01:00 |
|