Jaime van Kessel
cfa962311b
Fixed typing
...
CURA-5829
2018-10-29 13:54:20 +01:00
Aldo Hoeben
699fc6d482
Merge pull request #3 from LipuFei/fix_url_pyqt
...
Change camera URL to non-optional QUrl
2018-10-29 13:42:14 +01:00
Jaime van Kessel
fc6ad4f623
Put back the view menu, since it did more than just show the views
...
CURA-5829
2018-10-29 13:41:46 +01:00
Jaime van Kessel
ebe533bdc8
Move active view panel to previewStage
...
CURA-5829
2018-10-29 13:39:00 +01:00
Jaime van Kessel
9cc7a7ca23
Moved view selection to previewStage
...
CURA-5829
2018-10-29 13:27:47 +01:00
Lipu Fei
02681a5700
Change camera URL to non-optional QUrl
...
Otherwise pyqt property will complain when it tries to convert a None to
a QUrl.
2018-10-29 13:25:23 +01:00
Ghostkeeper
6df0d1a85d
Merge branch '3.6'
2018-10-29 13:19:16 +01:00
Ghostkeeper
718df14d07
Merge branch 'add_bundled_materials' into 3.6
2018-10-29 13:18:19 +01:00
Jaime van Kessel
3248a05819
Add PreviewStagePlugin stubs
...
Since we are going to move all the views into a seperate stage, we need to add another stage to do that.
CURA-5829
2018-10-29 11:28:08 +01:00
fieldOfView
0c1b3931db
Revert "WIP: Add custom CameraView for UM camera feed"
...
This reverts commit b00ea4719a268ec4b000375343bbc4082783b435.
2018-10-29 11:18:55 +01:00
fieldOfView
e0d6bac37d
Fix remaining references to NetworkCamera and OutputDevice.activeCamera
2018-10-29 11:18:54 +01:00
fieldOfView
736bf040a8
Fix typing and typos
2018-10-29 11:18:54 +01:00
fieldOfView
484b1e5ec6
Remove CameraImageProvider and NetworkCamera
2018-10-29 11:18:53 +01:00
fieldOfView
c187b6a25c
Replace NetworkCamera with NetworkMJPGImage
2018-10-29 11:18:39 +01:00
fieldOfView
890ddc015e
Add Cura.NetworkMJPGImage widget
2018-10-29 11:17:41 +01:00
Diego Prado Gesto
5de367bcc4
Merge branch 'ui_rework_4_0' into cura4.0_header
...
Conflicts:
plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml
resources/qml/Menus/ViewMenu.qml
resources/themes/cura-dark/theme.json
resources/themes/cura-light/theme.json
2018-10-29 11:10:25 +01:00
Lipu Fei
924951815c
Merge remote-tracking branch 'origin/3.6'
2018-10-29 10:45:03 +01:00
Lipu Fei
2223ff14f7
Fix extruder index for material diameter box in MachineSettings dialog
...
CURA-5857
2018-10-29 10:40:25 +01:00
Lipu Fei
261a3976d7
Merge remote-tracking branch 'origin/3.6'
2018-10-29 08:13:23 +01:00
fieldOfView
7899b249fc
Use preferred material instead of generic PLA when creating a new material
2018-10-28 12:12:14 +01:00
fieldOfView
517428a308
Fix typing error in NetworkedPrinterOutputDevice.post
...
Strictly speaking the QNetworkManager.post() method takes a QByteArray instead of Python bytes, but according to the PyQt documentation, PyQt handles that conversion transparently:
http://pyqt.sourceforge.net/Docs/PyQt5/gotchas.html#python-strings-qt-strings-and-unicode
2018-10-28 11:27:08 +01:00
pinchies
cdb5ab1930
Update cocoon_create_modelmaker.def.json
2018-10-27 03:51:05 +11:00
pinchies
46c6ef71ab
Update jgaurora_z_603s.def.json
2018-10-27 03:50:15 +11:00
pinchies
0487288edf
Update alfawise_u20.def.json
2018-10-27 03:49:34 +11:00
pinchies
6fa382a527
Update jgaurora_a1.def.json
2018-10-27 03:48:24 +11:00
pinchies
5a759fa9f4
fix start routing
2018-10-27 03:47:29 +11:00
Diego Prado Gesto
90e8a05aab
Remove all the entries in the theme that make reference to the sidebar,
...
because there is no sidebar anymore.
Several different margins and linings were created depending on the
side, not depending on where it belongs.
Contributes to CURA-5784.
2018-10-26 17:51:28 +02:00
Remco Burema
5133b6300a
Merge pull request #4650 from Ultimaker/CURA-5857_fix_machine_settings_set_diameter
...
[3.6] [CURA-5857] Fix setting extruder material diameter in Machine Settings dialog
2018-10-26 17:35:50 +02:00
Diego Prado Gesto
c8bdf7321c
Move the visible check within the component.
...
Contributes to CURA-5772.
2018-10-26 16:31:03 +02:00
Diego Prado Gesto
5a5adb71cd
Make the height of the Print setup selector themable.
...
Contributes to CURA-5772.
2018-10-26 16:16:33 +02:00
Diego Prado Gesto
3eb71021e2
Change the way the string for the tooltip is formatted.
...
Contributes to CURA-5772.
2018-10-26 15:53:20 +02:00
Remco Burema
de680f4aac
Merge pull request #4669 from Ultimaker/CURA-5821_fix_camera_memory_leak
...
Cura 5821 fix camera memory leak
2018-10-26 15:00:03 +02:00
pinchies
49ac423383
Add files via upload
2018-10-26 23:54:29 +11:00
pinchies
135ad6d705
Add files via upload
2018-10-26 23:53:59 +11:00
pinchies
03532969c6
Add files via upload
2018-10-26 23:46:39 +11:00
pinchies
79ef3635a5
Add files via upload
2018-10-26 23:45:32 +11:00
pinchies
adee0fa260
Add files via upload
2018-10-26 23:42:49 +11:00
pinchies
c8269ee4c0
Add files via upload
2018-10-26 23:42:27 +11:00
pinchies
494bedbe0d
Add files via upload
2018-10-26 23:40:27 +11:00
pinchies
f0277f5ef3
Add files via upload
2018-10-26 23:38:30 +11:00
pinchies
1f97aa3df6
Add files via upload
2018-10-26 23:37:31 +11:00
pinchies
5d4aa569a9
Revert "Add JGAurora A1"
...
This reverts commit bc5f92b69b096234512fa8e9ad0f3a0d63c7dd71.
2018-10-26 22:34:15 +11:00
pinchies
bc5f92b69b
Add JGAurora A1
...
Add a preset for the JGAurora A1 to model list
2018-10-26 22:24:04 +11:00
pinchies
2cbaece3e1
Add JGAurora Z-603S
...
Add a preset for the JGAurora Z-603S to model list
2018-10-26 22:21:01 +11:00
Diego Prado Gesto
87086907da
Add some Ultimaker materials to the list of bundled materials, so they
...
will show as installed in the Toolbox.
2018-10-26 12:14:27 +02:00
Diego Prado Gesto
a277bd9f3b
Don't use the hand cursor in the action buttons by default.
...
Contributes to CURA-5784.
2018-10-26 11:29:05 +02:00
Diego Prado Gesto
54518bdc82
Change the minimum window size to be 1280x800.
...
Contributes to CURA-5784.
2018-10-26 11:14:39 +02:00
Remco Burema
24f9804f03
Disable per-meshgroup settings in the per-mesh settings when in one-at-a-time mode.
...
[CURA-5767]
The backend can't handle per mesh-group settings (as opposed to per mesh settings)
when sequence was in one-at-a-time mode. The problem is that the extruder train is
in between the per-meshgroup-settings (child-of) and per-mesh-settings (parent-of).
For any per-mesh-group settings, the possibility exists that they'll be overridden
by settings we always set (and that need to be set) per extruder. Changing this
would require the engine-architecture to change, and _all_ settings would need to
be thouroughly retested. As this was a too extensive change, it was decied just to
disable the per-meshgroup settings when printing one-at-a-time (too).
The issue was originally reported as:
'"Printing Temperature Initial layer" setting per mode does not work'
2018-10-26 11:01:46 +02:00
Diego Prado Gesto
a8531a335d
Fix the alignments for the sliders in the simulation view.
...
Contributes to CURA-5772.
2018-10-26 09:52:02 +02:00
Diego Prado Gesto
e64698209c
Adjust the minimum size to be something around 1280x1024.
...
Also adjust some colors color for the dark theme.
Contributes to CURA-5772.
2018-10-25 17:41:35 +02:00
