Diego Prado Gesto
ca3c639069
Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown
2018-12-04 09:03:13 +01:00
Lipu Fei
c688f0ea88
Merge pull request #4864 from Ultimaker/CURA-5943_ui_usb_printing
...
Cura 5943 ui usb printing
2018-12-03 10:42:58 +01:00
Diego Prado Gesto
7dc3320b06
Remove all the signal propagation for the tooltip and allow only Cura.qml to handle them
...
Contributes to CURA-5941.
2018-12-02 20:32:55 +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
e73a91e746
Merge branch 'master' into ui_rework_4_0
2018-12-02 12:11:12 +01:00
Jaime van Kessel
36a86adc0f
Remove spammy log
2018-11-30 16:08:19 +01:00
Jaime van Kessel
384c359db1
Merge branch 'master' of github.com:Ultimaker/Cura into ui_rework_4_0
2018-11-30 15:34:47 +01:00
Diego Prado Gesto
1a778b3078
Fix qualiy slider alignments
...
Contributes to CURA-5941.
2018-11-30 14:18:07 +01:00
Jaime van Kessel
59a81be65c
Fixed some leftover graphical issues
...
CURA-5943
2018-11-30 14:10:42 +01:00
Jaime van Kessel
48bdb735f2
Added MachineSelector to monitor menu
...
CURA-5943
2018-11-30 13:58:44 +01:00
Jaime van Kessel
6d4a460e58
Move USB sidebar into the main view of the monitorstage
...
CURA-5943
2018-11-30 13:53:53 +01:00
Ghostkeeper
14a7b7b2ce
Merge branch 'update_example_postprocessing_script'
2018-11-29 15:33:03 +01:00
Mark
90aa8c1264
point people to a good example
2018-11-29 15:29:51 +01:00
Lipu Fei
6db52dde46
Fix merge conflicts from ui_rework_40
...
CURA-5943
2018-11-29 15:27:06 +01:00
Lipu Fei
c545d9df77
Add key check before accessing in StartSliceJob
...
CURA-5901
2018-11-29 15:17:43 +01:00
Mark
d88a465737
Increase possible visible description lines in the Marketplace
2018-11-29 14:45:42 +01:00
Lipu Fei
5df7cdde48
Merge remote-tracking branch 'origin/master' into ui_rework_4_0
2018-11-29 08:54:22 +01:00
Lipu Fei
b1b773e464
Merge pull request #4891 from Ultimaker/show_website_as_support_in_marketplace
...
Show website for support
2018-11-29 08:50:32 +01:00
Diego Prado Gesto
85b34d6005
Refactor the PrintSetupSelector
...
The file was splitted in several other files to improve readability.
There is a new folder called PrintSetupSelector where all those files
will be.
Contributes to CURA-5941.
2018-11-28 13:07:39 +01:00
Ian Paschal
14cee32cec
Improve monitor tab temporary scroll bar
2018-11-28 12:20:09 +01:00
Simon Edwards
8262c2dfd6
Merge pull request #4889 from Ultimaker/CL-1150_restyle_monitor_printer_tile
...
CL-1150 restyle monitor printer tile
2018-11-28 11:31:11 +01:00
Ian Paschal
9029d10ed0
Remove debug statement
...
Contributes to CL-1150
2018-11-28 10:47:34 +01:00
Ian Paschal
370fa0fd14
Remove old sidebar
...
Contributes to CL-1150
2018-11-28 10:46:22 +01:00
Ian Paschal
d54a1cb41b
Handle null print job more elegantly
...
Contributes to CL-1150
2018-11-28 10:46:12 +01:00
Ian Paschal
255a7fa1fb
Fix binding loop
...
Contributes to CL-1150
2018-11-28 10:45:46 +01:00
Jaime van Kessel
94c4366194
Merge branch 'master' of github.com:Ultimaker/Cura into ui_rework_4_0
2018-11-27 17:55:13 +01:00
Jaime van Kessel
d8c430abf6
Fix typing
2018-11-27 17:54:53 +01:00
Mark
b98df0f22f
Show one website link where to get the material
2018-11-27 15:46:23 +01:00
Mark
f8f498b90c
Increase the lines that are shown to 12
2018-11-27 15:45:58 +01:00
Mark
c7fd147f59
Show website for support
2018-11-27 14:55:06 +01:00
Diego Prado Gesto
fcde6e3a34
Fix the open file button
...
Now it has the correct size and it doesn't look blurry.
Contributes to CURA-5942.
2018-11-27 13:28:28 +01:00
Diego Prado Gesto
ea75a60dd8
Merge branch 'master' into ui_rework_4_0
2018-11-27 13:17:10 +01:00
Diego Prado Gesto
c56098d82c
Merge pull request #4816 from Ultimaker/tests-for-um3networkplugin
...
Tests for um3networkplugin
2018-11-27 12:59:44 +01:00
Jaime van Kessel
1a6822436d
Add missing HoverEnabled property
...
Some systems, like mine, don't have the hoverEnabled default set to true.
2018-11-27 12:01:43 +01:00
Jaime van Kessel
e04f14b50c
Also add shadow to openFile button
2018-11-27 12:01:05 +01:00
Ian Paschal
fd723e1084
Improve camera icon
...
Contributes to CL-1150
2018-11-27 11:19:45 +01:00
Ian Paschal
a3f0630ee9
Rename printer images
...
Contributes to CL-1150
2018-11-27 11:19:30 +01:00
Diego Prado Gesto
a01ff9419d
Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector
2018-11-27 11:13:34 +01:00
Diego Prado Gesto
729d37cabb
Merge branch 'master' into ui_rework_4_0
2018-11-27 11:12:48 +01:00
Ian Paschal
475a94d10d
Add printer images
...
Commit to CL-1150
2018-11-27 10:55:08 +01:00
Ian Paschal
8965695a59
Update MonitorPrintJobProgressBar.qml
...
Contributes to CL-1150
2018-11-27 10:54:46 +01:00
Ian Paschal
616ec13457
Change context menu button size
...
Contributes to CL-1150
2018-11-27 10:54:26 +01:00
Ian Paschal
7340b6dbc4
Update CameraButton.qml
...
Contributes to CL-1150
2018-11-27 10:53:00 +01:00
Ian Paschal
0cd9c8e087
Add machine images
...
Contributes to CL-1150
2018-11-27 10:52:49 +01:00
Lipu Fei
bd42136712
Fix GcodeStartEndFormatter to use fallback values
...
CURA-5901
Use values from the global stack (if exist) as fallback values.
2018-11-27 09:49:38 +01:00
Diego Prado Gesto
fcc6af68af
Don't show the current checked version of the firmware if the version number we gather is ZERO. That means that there was a problem getting the right value.
...
Contributes to CURA-5980.
2018-11-26 17:55:25 +01:00
Diego Prado Gesto
ad3fa9548a
Add sourceSize to the open file button.
...
Contributes to CURA-5942.
2018-11-26 17:53:38 +01:00
Diego Prado Gesto
6a2bbca7ce
Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector
2018-11-26 17:53:24 +01:00
Jaime van Kessel
5ddb3ff909
Factor out superfluous use of small_tool_button style
...
The style was overly complicated for what it should do
2018-11-26 17:40:34 +01:00
ChrisTerBeke
efd5f3799b
Also catch TypeError now that we have explicit arguments
2018-11-26 16:31:32 +01:00
