GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-28 17:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,535 Commits 293 Branches 266 Tags
Commit Graph

6110 Commits

Author SHA1 Message Date
Diego Prado Gesto
1093a2d65f Merge branch '4.1' of github.com:Ultimaker/Cura into 4.1 2019-05-06 14:34:40 +02:00
Diego Prado Gesto
11e86512cb Include the prime tower to the time calculations 
Contributes to CURA-6509.
 2019-05-06 14:33:24 +02:00
Lipu Fei
b09c6a4f12 Elide long website URLs 
CURA-6504
 2019-05-06 13:56:20 +02:00
Lipu Fei
53d595f698 Use loader for machine actions in dialog 
CURA-6495
 2019-05-06 13:06:23 +02:00
Ghostkeeper
c9e7f3a245
Fix finding layer numbers 
That seems to have been unreliable. Luckily the original g-code is already broken up in layers, so searching it is completely unnecessary.

Hopefully resolves issue #5630.
 2019-05-06 11:47:13 +02:00
Ghostkeeper
15706b7696
Fix colour of prime tower 2019-05-06 10:26:53 +02:00
Jaime van Kessel
e363f1af94 Remove hardcoded references to Ultimaker machines in QML 
We shouldn't hardocode machines in QML in any case. It also created issues
for other monitor / connection flows.
 2019-05-03 14:10:21 +02:00
Diego Prado Gesto
5b9c4e402e Change the Back button to be a secondary button 
Change also some texts in the More information dialog and the font type of one of the titles in the first use flow

Contributes to CURA-6483.
 2019-05-02 15:38:19 +02:00
Lipu Fei
1e89ce3673 Merge remote-tracking branch 'origin/4.1' into CURA-6483_fix_add_by_ip 2019-05-02 14:06:07 +02:00
Lipu Fei
b9d8b89113 Fix number of extruders not being updated 2019-05-02 09:03:48 +02:00
Lipu Fei
1d4ab98ddc Fix binding loop 
CURA-6483
 2019-05-02 08:25:29 +02:00
Lipu Fei
71e32d94f7 Resolve merge conflicts 
CURA-6483
 2019-05-02 07:45:43 +02:00
Diego Prado Gesto
9500d2d6b8 Modify text in the Send Slice data dialog, according to the experts. 
Contributes to CURA-6434.
 2019-05-01 15:53:54 +02:00
Ian Paschal
7d9b0e0b82
Merge pull request #5677 from Ultimaker/fix_rendering_issues 
Fix rendering issues in Monitor Page
 2019-05-01 15:28:16 +02:00
Ghostkeeper
e750315708
Merge branch 'restyle_send_data' into 4.1 2019-05-01 14:13:25 +02:00
Ghostkeeper
15fae58d9b
Use text wrapping so it's scrollable in Qt 5.12 
I don't know if it's really in Qt 5.12 or maybe it's the Ubuntu implementation or whatever. But this works for me now.

Contributes to issue CURA-6434.
 2019-05-01 14:13:10 +02:00
Ghostkeeper
7258ad8dc2
Fix nesting of ULs 
A <ul> tag is only allowed to have <li> tags inside it, so the nested <ul> tag needs to be inside the <li> tag.

Contributes to issue CURA-6434.
 2019-05-01 14:08:53 +02:00
Lipu Fei
c26dbfd934 Improve example data HTML 
CURA-6434
 2019-05-01 10:27:16 +02:00
Lipu Fei
3578482ea5 Fix connect via network dialog 
CURA-6483

 - Do not add printers that have already been discovered
 - Add IP address validation check
 2019-04-30 15:26:04 +02:00
Lipu Fei
99ec1761e9 Merge remote-tracking branch 'origin/4.1' into CURA-6483_fix_add_by_ip 2019-04-30 14:31:20 +02:00
Jaime van Kessel
d1a29ca87d Merge branch 'fix_ufpreader_libcharon' of https://github.com/fieldOfView/Cura into 4.1 2019-04-30 14:09:22 +02:00
fieldOfView
b0b162c8d5 Fix error when libCharon is not available 2019-04-30 13:03:17 +02:00
Diego Prado Gesto
7249bd3c50 Remove two lines entered by mistake 
Keep it the same as in the base branch.
 2019-04-30 11:33:19 +02:00
Diego Prado Gesto
f62d19aa60 Fix rendering issues in macOS when connecting to secondary screen 
It used to happen before, but just adding native rendering fixes the issue.
 2019-04-30 11:24:01 +02:00
Jaime van Kessel
3f47ffeae7 Use only the active extruders when sending slice message 
Fixes #5671
 2019-04-30 10:50:57 +02:00
Diego Prado Gesto
24d57f6168 Change text according to experts 
Also make the bottom text a bit longer so the link goes completely in the second line.

Contributes to CURA-6434.
 2019-04-30 09:51:21 +02:00
Diego Prado Gesto
46f1f00cb9 Change example data to contain HTML instead of JSON format 
Then it's easier for us to show a more readable information about the data we collect

Contributes to CURA-6434.
 2019-04-29 17:24:51 +02:00
Lipu Fei
bed13bf42b Cleanup and make sure that group_name is set 2019-04-29 15:53:08 +02:00
Lipu Fei
d16da3da3a Add group_id and fix remove printer 
CURA-6483

 - Added a unique group_id (a GUID) to all created GlobalStack.
 - Changed version upgrade to generate unique group_ids for
   GlobalStacks.
 - RemoveMachine() now uses group_ids to remove hidden GlobalStacks.
 2019-04-29 15:53:08 +02:00
Lipu Fei
04c39824cb Fix typing 2019-04-26 15:39:28 +02:00
Jaime van Kessel
a86311fea3 Merge branch '4.1' of github.com:Ultimaker/Cura into 4.1 2019-04-26 15:25:58 +02:00
Jaime van Kessel
0d8b625bf8 Properly cache slice values to speed up sending the slice 2019-04-26 15:25:31 +02:00
Ghostkeeper
1fb336ed3d
Merge branch 'CURA-6483_fix_manual_printer_discovery' into 4.1 2019-04-26 14:15:07 +02:00
Jaime van Kessel
ac8cca31d1
Merge pull request #5667 from Ultimaker/CURA-6478_drag_expandable_component 
Make Expandable Components Draggable [CURA-6478]
 2019-04-26 11:03:52 +02:00
Remco Burema
c3a9ceaa18 Remove a line of commented-out code. [CURA-6478] 2019-04-25 22:42:52 +02:00
Remco Burema
c4265c1f67 Scale instead of center for preview/prepare-menus. [CURA-6478] 2019-04-25 21:50:24 +02:00
Jaime van Kessel
5f76070f05 Fix situation where authtoken wasnt updated for the toolbox request headers 2019-04-25 16:16:44 +02:00
Remco Burema
194f01f840 Add preferences for draggable/expandable-component. [CURA-6478] 2019-04-25 14:50:29 +02:00
Lipu Fei
4f05ea578c Cancel the network request when cancel the manual ip request 
CURA-6483
 2019-04-25 11:55:49 +02:00
Ghostkeeper
cf9ab5a5cd
Don't serialize 'compatible' metadata key 
It is already serialised in the 'hardware compatible' settings.
 2019-04-25 10:55:17 +02:00
Lipu Fei
372e9026e4 Move add by ip device discovery into DiscoveredPrintersModel 
CURA-6483
 2019-04-25 08:44:55 +02:00
Simon Edwards
da539b34f5
Merge pull request #5661 from Ultimaker/CL-1055_show_sliced_for_pills_on_print_jobs 
CL-1055 show sliced for pills on print jobs
 2019-04-24 14:59:50 +02:00
Lipu Fei
1b9bf6f0b9 Add optional empty placeholder for CuraView 
CURA-6469
 2019-04-24 09:10:21 +02:00
Ian Paschal
213a8fa6f3 Don't use compatible machien families for pills 
Contriutes to CL-1055
 2019-04-23 14:40:03 +02:00
Ian Paschal
6f762c676e Set the printer type on printer configuration 
No idea why we didn't already do this
Contributes to CL-1055
 2019-04-23 14:38:07 +02:00
Lipu Fei
905889214a Fix typing 2019-04-23 10:31:13 +02:00
Lipu Fei
4423fc82b0 Fix typing 2019-04-23 09:39:46 +02:00
Lipu Fei
97def2f6b1 Handle requests ConnectionErrors in Backup plugin 
CURA-6471
 2019-04-23 09:07:19 +02:00
Jaime van Kessel
50ad4e4d4e Speed up the rendering of the solid view by caching support_angle property 2019-04-19 14:55:28 +02:00
ChrisTerBeke
3b0cfc270f Fix unit test for device name 2019-04-18 14:43:53 +02:00