3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 22:35:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
270 commits 313 branches 275 tags 719 MiB
Commit graph

270 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime van Kessel
66b22134ba Always hide progress message if connection is lost 2016-09-19 11:31:20 +02:00
Jaime van Kessel
27d017b29e Merge branch 'master' of github.com:Ultimaker/JediWifiPrintingPlugin 2016-09-19 11:30:30 +02:00
Jaime van Kessel
e388b8126b No longer re-create zeroConf object, as this crashes 
CURA-2393
 2016-09-19 11:29:57 +02:00
fieldOfView
d980f6b792 Code style 
CURA-2277/CURA-2276
 2016-09-19 10:26:25 +02:00
Jaime van Kessel
c4d197ea8a Merge branch 'master' of github.com:Ultimaker/JediWifiPrintingPlugin 2016-09-16 16:20:14 +02:00
Jaime van Kessel
7840f6a82e Increased time to 5 sec 
CURA-2393
 2016-09-16 16:19:20 +02:00
fieldOfView
c50cae6d28 Fix showing additional components for UM3Ex 
CURA-2276 and CURA-2277
 2016-09-15 17:43:25 +02:00
fieldOfView
5024581e2e Fix events for added components 
Not sharing the _context variable with the machine action fixes signals and events being sent to the additional components.

CURA-2277 and CURA-2276
 2016-09-15 17:42:36 +02:00
fieldOfView
2725abd4f4 Don't show Request Access button when no printer is connected 
CURA-2276
 2016-09-15 14:49:15 +02:00
fieldOfView
cf2c3e79cf Do not show the "Request Access" button when no printer is connected 
CURA-2277
 2016-09-15 14:17:04 +02:00
fieldOfView
00c328bfe9 Fix qml warnings when no printer is connected 2016-09-15 13:44:12 +02:00
Jaime van Kessel
96e36c0555 Refreshing zeroconf multiple times no longer causes cura crash 
CURA-2393
 2016-09-15 13:32:13 +02:00
fieldOfView
34aeb50b6a self._code_style 2016-09-15 10:21:32 +02:00
fieldOfView
20f76b62fe Hide "Request Access" buttons when access request is active 
CURA-2277 & CURA-2276
 2016-09-14 16:40:20 +02:00
fieldOfView
f11308e74e Allow syncing materials & printcores from the Printers preference pane 
CURA-2276
 2016-09-14 16:21:00 +02:00
fieldOfView
98f0fd2a08 Merge branch 'master' of https://github.com/Ultimaker/JediWifiPrintingPlugin 2016-09-14 15:01:10 +02:00
fieldOfView
15d933ed73 Show Extruders, PrintCores, Materials on Printer preference pane 
CURA-2276
 2016-09-14 15:00:41 +02:00
Jaime van Kessel
cc38705a68 Use right extruder for material 2016-09-14 12:55:11 +02:00
Jaime van Kessel
a754952f5e Close connection now also ensures that cached machine & material ids are reset 
CURA-2354
 2016-09-13 17:43:57 +02:00
Jaime van Kessel
400401929d User message now also states what the mismatch between cura and printer is 
CURA-2285
 2016-09-13 14:36:36 +02:00
Jack Ha
d8d1bd92d3 Merge branch 'master' of github.com:Ultimaker/JediWifiPrintingPlugin 2016-09-13 11:47:07 +02:00
Jack Ha
1cf92d432d Typo. CURA-2277 2016-09-13 11:46:55 +02:00
Jaime van Kessel
2c29085a20 Merge branch 'master' of github.com:Ultimaker/JediWifiPrintingPlugin 2016-09-13 11:17:44 +02:00
Jaime van Kessel
cb05bbadd0 Explicitly set it to bool to prevent warnings 2016-09-13 11:05:09 +02:00
fieldOfView
2347624bde Merge branch 'master' of https://github.com/Ultimaker/JediWifiPrintingPlugin 2016-09-13 11:04:10 +02:00
fieldOfView
5c4f79eab3 Add stub button to sync configuration from printer to Cura 
inb4 string-freeze
CURA-2276
 2016-09-13 11:03:51 +02:00
Jaime van Kessel
a266a4026c Added explicit enabled property so connect button actually reacts to clicks 
CURA-2277
 2016-09-13 11:02:45 +02:00
Jaime van Kessel
1ce6c3a4f1 Added defaults to requestAcces 
Cura-2277
 2016-09-13 10:53:41 +02:00
Jack Ha
665ea9b222 Merge branch 'master' of github.com:Ultimaker/JediWifiPrintingPlugin 2016-09-13 09:50:16 +02:00
Jack Ha
6069182175 Added UM3InfoComponents.qml to CMakeLists to the file also gets installed in the build 2016-09-13 09:50:04 +02:00
Jaime van Kessel
6435e8ce6f Request is now only triggered on right actions 
CURA-2279
 2016-09-13 09:49:17 +02:00
fieldOfView
c5d0942ee2 Add "Connect" and "Request Access" buttons to sidebar monitor 
Functionality is not 100% proven, but the required strings are in
CURA-2277
 2016-09-12 18:54:28 +02:00
fieldOfView
e945403845 Make requesting authentication public 
Contributes to CURA-2277
 2016-09-12 18:53:12 +02:00
fieldOfView
b82889f84e Only show access request message when the user requested access 2016-09-12 15:59:45 +02:00
fieldOfView
0e0569a37c Update user-facing messages for consistency 
Make sure we have a consistent terminology; requesting access vs pairing/authentication.
 2016-09-12 15:40:43 +02:00
fieldOfView
af4cfac6ac Add a link to a network connection troubleshooting guide 
CURA-2035
 2016-09-12 14:19:34 +02:00
fieldOfView
220abd2cdc Fix i18n context 2016-09-12 13:49:00 +02:00
fieldOfView
930dd76109 Merge branch 'master' of https://github.com/Ultimaker/JediWifiPrintingPlugin 2016-09-12 13:36:51 +02:00
fieldOfView
e09de5257a Fix text about connection state in print monitor 2016-09-12 13:36:39 +02:00
Jaime van Kessel
1d91827664 NetworkPrinter now uses printerState to store global state 
CURA-2235
 2016-09-12 13:31:07 +02:00
Jaime van Kessel
f914ef5424 We now save the auth data right away in order to prevent mismatches 
CURA-2279
 2016-09-12 11:59:25 +02:00
Jaime van Kessel
feae612d55 Look at the correct stack for variant 
CURA-2313
 2016-09-12 10:54:57 +02:00
Jaime van Kessel
820d91486f Printer setting mismatches are now also logged as warnings 
CURA-2313
 2016-09-12 10:44:56 +02:00
Jaime van Kessel
ae161748ef Material type is now only checked if we actually use that extruder 
CURA-2313
 2016-09-12 10:39:58 +02:00
Jaime van Kessel
c671815004 Merge branch '2.3' of github.com:Ultimaker/JediWifiPrintingPlugin 2016-09-09 17:29:01 +02:00
Jaime van Kessel
f294d580a9 Zipping the data no longer causes GUI to freeze 
CURA-2286
 2016-09-09 16:46:04 +02:00
Jaime van Kessel
7f0194cce0 We now compress the g-code layer by layer so the GIL won't always lock fully 
CURA-2286
 2016-09-09 15:44:02 +02:00
Jaime van Kessel
3747db0f4d Added logging to see how long compression took 
CURA-2286
 2016-09-09 15:28:37 +02:00
Jaime van Kessel
9de064fdba Fixed issue where large files could no longer be sent 
CURA-2286
 2016-09-09 15:20:08 +02:00
Jaime van Kessel
d223e64349 Merge branch '2.3' of github.com:Ultimaker/JediWifiPrintingPlugin 2016-09-09 11:17:06 +02:00