Jaime van Kessel
0a3803d665
Add CuraView, which does something similar to CuraStage
...
So instead of relying on strange activeViewProxy, it's up to the CuraView to provide a set of components.
These can subsequently be used by the active stage again.
CURA-5829
2018-10-29 16:21:16 +01:00
Diego Prado Gesto
e486bf8b44
Change the primary color to a slightly different kind of blue.
...
Contributes to CURA-5786.
2018-10-29 15:55:16 +01:00
Diego Prado Gesto
bf59097320
Split the action button panel in two different components that are
...
loaded in different moments.
The SliceProcessWidget is loaded once there is something to slice and it
also shows the process of slicing. The OutputProcessWidget will show the
print information and the actions to do to output the results, such as
Print over network, Save to file, ...
Contributes to CURA-5786.
2018-10-29 15:18:34 +01:00
Ghostkeeper
116ca8fdc4
Merge branch '3.6'
2018-10-29 15:13:46 +01:00
Ghostkeeper
f0d7c6fb52
Update version number to 3.6
...
And fill in the report-msgid-bugs-to field where it was missing. There always seems to be something wrong with that metadata.
Contributes to issue CURA-5870.
2018-10-29 15:13:25 +01:00
Ghostkeeper
9c65cc49e4
Update translation templates for all languages for 3.6
...
This adds the new translations to 3.6 to the pre-filled translations from previous translation passes.
Contributes to issue CURA-5870.
2018-10-29 15:08:03 +01:00
Lipu Fei
54afa799c5
Ignore per-meshgroup settings in per object stack
...
CURA-5767
2018-10-29 15:05:49 +01:00
Ghostkeeper
cc8f7f1e0a
Update translation templates for Cura 3.6
...
These are the new and changed strings for version 3.6.
Contributes to issue CURA-5870.
2018-10-29 15:05:08 +01:00
Jaime van Kessel
d8dd9bf363
Set SolidView to invisible.
...
Since we don't have a selector in the prepare stage anymore, solidview must be invisible
CURA-5829
2018-10-29 14:54:42 +01:00
Lipu Fei
248bf0f61e
Merge remote-tracking branch 'origin/3.6' into CURA-5767_disable_per_meshgroup_settings_for_one_at_a_time
2018-10-29 14:32:44 +01:00
Lipu Fei
1623f66c93
Merge pull request #4656 from fieldOfView/fix_network_camera_memory_leak
...
[3.6] Fix memory leak in print monitor
2018-10-29 14:12:31 +01:00
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
