GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-30 01:55:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,734 Commits 294 Branches 267 Tags
Commit Graph

5333 Commits

Author SHA1 Message Date
Ian Paschal
0622c5cb8b Rename MonitorPrinterContextMenu to MonitorContextMenu 2019-01-10 09:22:27 +01:00
Ian Paschal
669f6d8f0c Fix available space bug 
Contributes to CL-1165
 2019-01-09 17:04:51 +01:00
Ian Paschal
548882e398 Use new context menu 
Contributes to CL-1165
 2019-01-09 17:04:33 +01:00
Ian Paschal
cdc24081a5 Create MonitorPrinterContextMenu.qml 
Contributes to CL-1165
 2019-01-09 17:03:56 +01:00
Ian Paschal
5a15ffc090 Create MonitorContextMenuButton.qml 
Contributes to CL-1165
 2019-01-09 17:03:41 +01:00
Ian Paschal
5a78eb0541 Temporarily disable context menu and camera button 
Contributes to CL-1165
 2019-01-09 16:32:26 +01:00
Ian Paschal
4248deeb76 Line-length fixes 2019-01-09 16:31:49 +01:00
Ian Paschal
f6c754c57f Remove PropertyAnimation test 2019-01-09 16:31:26 +01:00
Ian Paschal
4ce244362c Make camera button grey if disabled 
Contributes to CL-1165
 2019-01-09 16:30:39 +01:00
Ian Paschal
920b7b6706 Create MonitorInfoBlurb.qml 
Contributes to CL-1165
 2019-01-09 16:30:11 +01:00
Ian Paschal
e7b60a5290 Create GenericPopUp.qml 
Contributes to CL-1165
 2019-01-09 16:29:57 +01:00
Jaime van Kessel
366d2c8114 Prevent crash for firmware updater if the activePrinter is not set 2019-01-09 12:56:49 +01:00
Jaime van Kessel
e718bed151 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-01-09 12:51:53 +01:00
Jaime van Kessel
862c76a2ea Check if the optimised layer data is stored before attempting to delete it 2019-01-09 12:51:20 +01:00
Simon Edwards
0de84dad13
Merge pull request #5138 from Ultimaker/CL-1157_skeleton_loading_monitor_tab 
CL-1157 Add skeleton loading to the monitor tab
 2019-01-08 16:23:16 +01:00
Ian Paschal
97e17d9fb8 Remove debug behavior 
Contributes to CL-1157
 2019-01-08 15:17:42 +01:00
Ian Paschal
8f37b65ffe Add skeleton loading to print job queue 
Contributes to CL-1157
 2019-01-08 15:15:21 +01:00
Ian Paschal
e81742d296 Add skeleton loading to printer cards 
Contributes to CL-1157
 2019-01-08 14:27:54 +01:00
Lipu Fei
8e898148f6 Make checkboxes and texts more aligned 
CURA-6085
 2019-01-08 09:42:52 +01:00
Ian Paschal
4dbab88792 Add dummy printer for loading 2019-01-07 13:56:04 +01:00
Ian Paschal
18545e18ce Merge remote-tracking branch 'origin/4.0' into CL-1157_skeleton_loading_monitor_tab 2019-01-07 13:38:23 +01:00
Jaime van Kessel
4c1f68a447 Ensure that the connectiontype of a connected printer is set correctly 
CURA-6011
 2019-01-04 15:24:01 +01:00
Ghostkeeper
e15e06f29f
Make Z relative 
This way if we ever want to change the parent's Z for some other ordering requirements, the children will stay in order.
 2019-01-03 16:04:28 +01:00
Ghostkeeper
798c1f198c
Hide action panel when displaying a stage with a background 
This is not the worst hack ever, but it's quite a hack.

Contributes to issue CURA-6054.
 2019-01-03 16:04:27 +01:00
Jaime van Kessel
1973397b92 Remove confusing printer preference text 
CURA-6003
 2019-01-03 15:34:41 +01:00
Jaime van Kessel
e769b324e1 Merge branch 'CURA-6035_send_materials_fix' of github.com:Ultimaker/Cura into 4.0 2019-01-03 11:41:05 +01:00
Lipu Fei
d97b812ccd
Merge branch '4.0' into unify_font_types 2019-01-03 10:46:49 +01:00
Jaime van Kessel
195d39f698 Update the style of the postprocessing button 
CURA-6043
 2019-01-03 09:47:48 +01:00
Lipu Fei
ee72284616 Use appropriate log level 
CURA-6035
 2019-01-03 08:32:42 +01:00
Ghostkeeper
4177faa6ea
Fix font usage in installed plug-ins 
Several different font sizes should be used here.

Contributes to issue CURA-6025.
 2018-12-31 15:37:31 +01:00
Ghostkeeper
7ef8287e52
Fix theming of back button in Marketplace 
Give it a bit more space for if the translated text is wider, and if it is wider also align it properly with the arrow.

Contributes to issue CURA-6025.
 2018-12-31 15:33:37 +01:00
Ghostkeeper
30ab1a957f
Make headers of Marketplace large 
As per the design.

Contributes to issue CURA-6025.
 2018-12-31 15:18:50 +01:00
Ghostkeeper
df0351acd4
Fix fonts of plug-in tiles 
Contributes to issue CURA-6025.
 2018-12-31 15:14:23 +01:00
Ghostkeeper
c6fb0d70af
Use medium font size for everything in stage menu 
Except the material manufacturer, which should remain default.

Contributes to issue CURA-6025.
 2018-12-31 13:22:53 +01:00
Jaime van Kessel
a16e406507 Properly display the full type + brand of unknown material 
CURA-6033
 2018-12-31 11:01:30 +01:00
Jaime van Kessel
c08339e191 Merge branch 'CURA-6033_unknown_material' of github.com:Ultimaker/Cura into 4.0 2018-12-31 10:33:01 +01:00
Ghostkeeper
b54312fb9b
Merge branch '4.0' into unify_font_types 2018-12-28 15:51:54 +01:00
Jaime van Kessel
7269065cca Only clear the stored optimized layer data if the slice started 2018-12-21 11:54:11 +01:00
Ghostkeeper
75fbdf2c94
Expand error message for cases when extruders are disabled 
It is also unable to slice models that are on extruders that are disabled.
 2018-12-21 10:40:37 +01:00
Aleksei S
81a6531f47 Fix range slider label position in LayerSlider.qml. 2018-12-20 20:37:48 +01:00
Lipu Fei
346d8d884e Remove unnecessary patches in TestSendMaterialJob 
CURA-6035
 2018-12-20 14:23:39 +01:00
Lipu Fei
e79f312fa0 Fix unit tests for SendMaterialJob 
CURA-6035
 2018-12-20 14:20:34 +01:00
Jaime van Kessel
9ffc039254 Fix logo aliasing 
CURA-6044
 2018-12-20 14:01:12 +01:00
Lipu Fei
68372aff60 Use MaterialManager in SendMaterialJob 
CURA-6035
 2018-12-20 10:45:40 +01:00
Jaime van Kessel
8bff0d17e8 Prevent the backend attempting to reslice everytime a preference changed 2018-12-20 09:43:01 +01:00
Remco Burema
9dbc642967 SendMaterials: Make sure the base-material is compared to and make case insensitive. [CURA-6035] 2018-12-19 17:34:31 +01:00
Jaime van Kessel
f2719ef582 Fix identation for postProcessing plugin settings 
CURA-6043
 2018-12-19 14:09:07 +01:00
Jaime van Kessel
9e867f8077 Fix the codestyle and cleanup the QML a bit 
CURA-6043
 2018-12-19 13:53:34 +01:00
Jaime van Kessel
08c736f770 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2018-12-19 13:31:06 +01:00
Jaime van Kessel
9acaf9abd7 Disable dropping of files into cura when monitor stage is active. 
CURA-6038
 2018-12-19 13:30:25 +01:00