GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-06 20:18:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
10,881 Commits 290 Branches 260 Tags
Commit Graph

10881 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon Edwards
b68707d29c Show the printer unreachable status in the Cura Connect tab when needed. 
CL-508
 2017-10-11 13:52:45 +02:00
ChrisTerBeke
23d0201f6b Merge branch 'fix_garbled_fonts_part_2' 2017-10-11 13:41:33 +02:00
Lipu Fei
4927a639cd Always update the job name with the loaded project 
CURA-4348
 2017-10-11 12:49:22 +02:00
Mark
d4a8dbdee7 Change Text to Label and cast all sizes to int 
CURA-4437
 2017-10-11 12:48:42 +02:00
ChrisTerBeke
a5aa13f853 Merge pull request #2585 from Ultimaker/CL-555_manual_ip_connect_bug 
CL-555 Don't blow up at plugin start up due to the plugin path not being ready yet
 2017-10-11 12:40:50 +02:00
ChrisTerBeke
496791db7f simplify updating max layers changed - CURA-4432 2017-10-11 11:55:54 +02:00
Simon Edwards
3c69442ceb Don't blow up at plugin start up due to the plugin path not being ready yet 
CL-555
 2017-10-11 11:54:00 +02:00
Lipu Fei
0e7f209efa Fix updating upper handle in layer view 
CURA-4432
 2017-10-11 11:46:22 +02:00
Ghostkeeper
cadfa14fb4
Fix mistake in verb vs. noun of 'Print' 
The translator misunderstood this. It's not 'to print the details', but 'details of the print'.

Contributes to issue CURA-4341.
 2017-10-11 11:22:08 +02:00
Ghostkeeper
69f6a7de73
Fix mistaken negation 
The translator read this one wrong.

Contributes to issue CURA-4341.
 2017-10-11 11:16:59 +02:00
ChrisTerBeke
ea01d6ad01 Set focus on text field when slider handle is active - CURA-4432 2017-10-11 11:13:04 +02:00
Ghostkeeper
d3853815ea
Add missing strings for broken string freeze 
Bad. Bad!

Contributes to issue CURA-4341.
 2017-10-11 11:10:42 +02:00
Ghostkeeper
3df98ecfc5
Change error/success messages for checking cluster-capability 
This breaks the string freeze. The developers of this plug-in are well aware. However, it turns out that for these two strings the string freeze had already broken. We'll change these strings first then translate them out of band. I hate this sort of menial administration that could've been prevented...

Contributes to issue CURA-4341.
 2017-10-11 11:10:08 +02:00
Diego Prado Gesto
71e8de13a8 Fix retrieving setting values with "extruderValues()" and "resolveOrValue()" 
CURA-4358

Using the context for override the extruderValues() and resolveOrValue()
functions, for getting the correct values. Also indicate in the context
to skip the first container in the stacks (user container)
 2017-10-11 11:05:01 +02:00
ChrisTerBeke
a7368e1751 Re-added active handler functionality in layer slider - CURA-4432 2017-10-10 17:12:13 +02:00
ChrisTerBeke
bc59d421de Add message when model could not be loaded because of small size - CURA-4431 2017-10-10 16:44:25 +02:00
ChrisTerBeke
30c9ccfb7f Merge branch '3.0' 2017-10-10 16:31:29 +02:00
ChrisTerBeke
1b0576947d Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-10-10 16:31:04 +02:00
ChrisTerBeke
216dcd33e0 Make sure we do not have a crash when model is very small - CURA-4431 2017-10-10 16:27:14 +02:00
ChrisTerBeke
301485dc53 Revert "Fixed: Very small objects less then 0.1mm creates critical issues" 
This reverts commit 7f887413954152f2de7dbfd0f6e985dcd63875b8.
 2017-10-10 16:22:54 +02:00
A.Sasin
2cdec7e47f Merge branch 'layerview-slider-refactor' 
CURA-4412
 2017-10-10 16:22:29 +02:00
A.Sasin
ed8e5309b5 Remove Comment TODO 
CURA-4412
 2017-10-10 16:20:17 +02:00
A.Sasin
5b52ad441b Merge branch '3.0' of github.com:Ultimaker/cura into 3.0 2017-10-10 15:51:19 +02:00
A.Sasin
acb1feb8e7 Merge branch 'master' of github.com:Ultimaker/cura 2017-10-10 15:48:20 +02:00
A.Sasin
7f88741395 Fixed: Very small objects less then 0.1mm creates critical issues 
CURA-4431
 2017-10-10 15:47:18 +02:00
ChrisTerBeke
fc1282773a Merge branch 'thopiekar-remove-cura-under-cura-logo' 2017-10-10 15:43:21 +02:00
Lipu Fei
c7ccc3c1b8 Fix long text display in mode toggle buttons 
CURA-4341
 2017-10-10 14:47:13 +02:00
Ghostkeeper
d962ffb8d8
Merge branch '3.0' 2017-10-10 14:36:38 +02:00
Diego Prado Gesto
72ff384c48 Parsing traceback to get more information about the crash - CURA-4195 2017-10-10 14:35:44 +02:00
Lipu Fei
444204f6a1 Fix "Print Speed" text width for some translations 
CURA-4341
 2017-10-10 14:35:07 +02:00
Lipu Fei
0e45ec1197 Fix auto-adjust for "Print Setup" text 
CURA-4341
 2017-10-10 14:26:55 +02:00
ChrisTerBeke
c17493af3e Remove untrue comment line 2017-10-10 14:23:57 +02:00
Ghostkeeper
b86f98c444
Remove mistakenly translated setting labels 
Not all labels were translated so it looked very inconsistent.
Using a bunch of fun regular expressions, I filtered out all translations that were actually translated and left them in but commented out. There were also a lot that were exactly the same as the original English, so I've just emptied those translations.

Contributes to issue CURA-4341.
 2017-10-10 14:19:46 +02:00
Ghostkeeper
a74dfafdd1
Remove unused .po file 
The Korean translation only translates the setting descriptions, so there is no data here. Let's remove it to avoid confusion.
 2017-10-10 14:16:52 +02:00
Ghostkeeper
ab2e761423
Remove unused .po file 
The Japanese translation only translates the setting descriptions, so there is no data here. Let's remove it to avoid confusion.
 2017-10-10 14:16:46 +02:00
ChrisTerBeke
a2520b6b56 Fix maximum value range handle drag movement - CURA-4412 2017-10-10 14:13:32 +02:00
ChrisTerBeke
e5c5f213a9 Fix info message when cluster has 0 machines 2017-10-10 12:58:43 +02:00
Lipu Fei
245eec9314 Hide settings visibility row if it is not in preferences 
CURA-4344

Hide the row which shows the number of settings that are visible on the
project file loading dialog if this information is not available.
 2017-10-10 11:31:37 +02:00
Lipu Fei
57b1cb3bc8 Refactor camera request fix 
CURA-4376

- Simplify the exception handling
- Use isFinished() to check the state of the network request
 2017-10-10 10:54:35 +02:00
Lipu Fei
d11b229118 Merge pull request #2575 from Ultimaker/CL-554_blue_color_in_monitor_tab 
CL-554 Make the blue color on the monitor tab consistent
 2017-10-10 10:53:35 +02:00
Simon Edwards
c6f4e263fb Make the blue color on the monitor tab consistent 
CL-554
 2017-10-10 10:49:04 +02:00
Lipu Fei
ac05843831 Merge pull request #2574 from Ultimaker/appstream-install 
Install AppStream metadata into share/metainfo
 2017-10-10 10:34:16 +02:00
awhiemstra
f02cc66e81 Install AppStream metadata into share/metainfo 
Rather than share/appstream. This is what is suggested by the specification.

Fixes #2563
 2017-10-10 08:30:56 +00:00
Lipu Fei
666ee81fb3 Set label width based on the column width 
CURA-4428

- Remove the magic number solution
- Use a fixed width for labels so the right side widgets can be properly
  left-aligned.
 2017-10-10 10:28:46 +02:00
A.Sasin
19e9336214 Revert "Adjust column width for Materials "Print Settings" page" 
This reverts commit 7b6faf0030d9455f772c364ce4c9f16ae0bf1e21.
 2017-10-10 09:43:43 +02:00
ChrisTerBeke
0b5fac28b9 fix merge conflicts 2017-10-10 09:43:16 +02:00
ChrisTerBeke
284e4d47b8 Merge branch '3.0' into layerview-slider-refactor 2017-10-10 09:30:43 +02:00
ChrisTerBeke
91e8e5812b add back missing function 2017-10-10 09:24:48 +02:00
ChrisTerBeke
641b3c21f7 fix merge conflicts 2017-10-10 09:21:31 +02:00
A.Sasin
d1bee922ab Merge branch '3.0' of github.com:Ultimaker/cura into 3.0 2017-10-10 09:17:56 +02:00