3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 22:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
292 commits 313 branches 275 tags 718 MiB
Commit graph

292 commits

This branch
This branch
All branches
Author SHA1 Message Date
fieldOfView
8dd8fd740c Add UI for managing manually added printers 
CURA-2483
 2016-09-28 23:05:53 +02:00
fieldOfView
8e26d63390 Get a list of ipadresses/hosts to check for UM3 printers... 
...in case discovery does not work. This uses the API to look up info on the printer instead of relying on zeroconf.

CURA-2483
 2016-09-28 17:45:56 +02:00
fieldOfView
1ed3fc7c37 Don't reset zeroconf until after (most) printers have been found 
CURA-2060
 2016-09-28 11:31:52 +02:00
awhiemstra
fb371f5556 Remove some more references to Jedi 
Contributes to CURA-2342
 2016-09-27 15:57:01 +02:00
awhiemstra
7408f31738 Change install location to UM3NetworkPrinting 
Contributes to CURA-2342
 2016-09-27 15:53:33 +02:00
awhiemstra
fefa111b5a Update references to JediWifiPrinting to UM3NetworkPrinting 
Contributes to CURA-2342
 2016-09-27 15:52:31 +02:00
fieldOfView
720dd9c50c Use the semantically more correct infinity 2016-09-26 16:28:06 +02:00
fieldOfView
58d31beeb8 Merge branch 'master' of https://github.com/Ultimaker/JediWifiPrintingPlugin 2016-09-26 14:07:31 +02:00
fieldOfView
368851b910 Check if a request was made recently before claiming a timeout occurred 
If the main thread locks up for longer than the network timeout period, the connection may incorrectly seem to have reached a timeout.

CURA-2440
 2016-09-26 14:07:16 +02:00
Ghostkeeper
b4ba7a64a9
Only update printer list after printer is added/removed 
This makes it emit a signal only after addPrinter and removePrinter has completed executing, so we know that updating the list is done by the time it refreshes the list view in QML.

Contributes to issue CURA-2393.
 2016-09-26 12:04:59 +02:00
fieldOfView
c0839bcfbb Correct and format the documentation example json 2016-09-23 16:50:57 +02:00
fieldOfView
64571bff0b Revert exception logging 2016-09-21 16:42:02 +02:00
fieldOfView
bc76744ddb Add (more) logging to authentication denied state 
CURA-2270
 2016-09-21 16:40:42 +02:00
Jaime van Kessel
9bc50c59e5 Merge branch 'master' of github.com:Ultimaker/JediWifiPrintingPlugin 2016-09-21 15:59:46 +02:00
Jaime van Kessel
24827ba5a1 Added more logging when authentication was denied 
CURA-2270
 2016-09-21 15:59:26 +02:00
fieldOfView
d8f0b634af Switch back to Print Setup when canceling sending a print to the printer 
CURA-2384
 2016-09-21 14:01:05 +02:00
fieldOfView
ba53b0109b Fix connecting to the selected printer when pressing "Finish" in add machine wizard 2016-09-21 14:00:11 +02:00
Jaime van Kessel
2a349214cf Merge branch 'master' of github.com:Ultimaker/JediWifiPrintingPlugin 2016-09-20 17:46:58 +02:00
Jaime van Kessel
df9f940ff4 Added cancel button to upload print 
CURA-2384
 2016-09-20 17:46:46 +02:00
fieldOfView
f75e8c9537 Add version number 2016-09-20 11:53:14 +02:00
fieldOfView
400360cb34 Add check if additional components were successfully created 2016-09-19 15:05:33 +02:00
Jaime van Kessel
7da05e0f36 Post reply is now set to None after abort 
CURA-2295
 2016-09-19 13:38:52 +02:00
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