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

10736 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ghostkeeper
d962ffb8d8
Merge branch '3.0' 2017-10-10 14:36:38 +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
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
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
A.Sasin
99d9961297 Cura crashed because of RuntimeError after switching between monitor and prepare view 
CURA-4376
 2017-10-10 09:16:35 +02:00
Lipu Fei
9996c829d8 Only schedule re-slice when there is none in progress 
CURA-4427

After the stack error check is done, only schedule a re-slice when there
is none in progress and a re-slice is needed.
 2017-10-10 08:50:22 +02:00
Lipu Fei
b14ef41056 Increase the minimumHeight of the workspace summary dialog 
CURA-4428
 2017-10-10 08:30:18 +02:00
Lipu Fei
60726ce179 Increase minimumHeight of the Print Address dialog 
CURA-4428
 2017-10-10 08:24:47 +02:00
Lipu Fei
7ca2ae9771 Adjust alignments for ComboBoxes in MachineSettings dialog 
CURA-4428
 2017-10-10 08:20:39 +02:00
Lipu Fei
7b6faf0030 Adjust column width for Materials "Print Settings" page 
CURA-4428
 2017-10-10 08:03:08 +02:00
Simon Edwards
ebb8437bff Avoid using fractional pixel sizes and positions. It causes poor text rendering on Windows (and may be others) 2017-10-09 16:39:57 +02:00
Simon Edwards
0191215215 Let the printer state text wrap too 
CL-521
 2017-10-09 16:39:57 +02:00
Diego Prado Gesto
1d70426224 onVisibilityChanged function removed because it's never called - CURA-4405 2017-10-09 16:36:48 +02:00
ChrisTerBeke
f8a1187a8c Re-sending after cancelling print job now really works - CURA-4398 2017-10-09 16:14:02 +02:00
Lipu Fei
8a25605413 Fix lock issue with workspace dialog 
CURA-4405

- Add try-except around lock release
- Fix closing the dialog with ESC
 2017-10-09 15:17:56 +02:00
ChrisTerBeke
f8122320d4 Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0 2017-10-09 14:49:48 +02:00
ChrisTerBeke
cbd0bcd1b5 Manually trigger upload finished callback after request finished - CURA-4398 2017-10-09 14:49:18 +02:00
Lipu Fei
1c5d352b88 Fix the case when active_extruder is None 2017-10-09 14:35:30 +02:00
A.Sasin
14936f7999 Merge branch '3.0' of github.com:Ultimaker/cura into 3.0 2017-10-09 14:24:43 +02:00
A.Sasin
97c107d011 Change log update for version 3.0.0 Beta 2017-10-09 14:23:52 +02:00
Lipu Fei
2b06d04327 Fix container indices in upgrade script from 2.5 to 2.6 2017-10-09 13:54:17 +02:00
Lipu Fei
7d8fa71c4c Exclude other UM2 machine during quality profile upgrade 
CURA-4420
 2017-10-09 13:04:55 +02:00
Lipu Fei
f10397acf9 Always set finish flag when finalizing post_reply 
CURA-4398
 2017-10-09 12:38:18 +02:00
Mark
2e957069a8 first hide the dialog then release the lock 
CURA-4405
 2017-10-09 11:58:58 +02:00
Mark
daad5a3a97 Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0 2017-10-09 11:58:13 +02:00
Mark
59fbbef43e first hide the dialog then release the lock 
CURA-4405
 2017-10-09 11:58:00 +02:00
ChrisTerBeke
6c51034e5f Fix sending another file after aborting an upload - CURA-4398 2017-10-09 11:31:32 +02:00
A.Sasin
c0da9cc072 Merge branch 'master' of github.com:Ultimaker/cura 2017-10-06 18:57:29 +02:00
A.Sasin
2288997697 Fixed: while project loading pass call upgrade plugin for preferences 
CURA-4344
 2017-10-06 18:56:17 +02:00
Ghostkeeper
65b92ca0e7
Merge branch '3.0' 2017-10-06 17:35:43 +02:00
Ghostkeeper
d3b1563369
Add out-of-band translations 
These strings were added too late, after the string freeze. Now I have to figure out the translations from a secondary source...

Contributes to issue CURA-4341.
 2017-10-06 17:35:12 +02:00
Ghostkeeper
e5df65ed88
Update Polish translations 
I removed a double space somewhere but otherwise it was excellent.

Contributes to issue CURA-4341.
 2017-10-06 17:32:40 +02:00
Ghostkeeper
23042a458b
Add out-of-band translations for too late strings 
These strings were added after the string freeze. We obtained them from a different translator.

Contributes to issue CURA-4341.
 2017-10-06 17:23:57 +02:00
Ghostkeeper
a0f7800a0d
Merge branch '3.0' 2017-10-06 17:17:30 +02:00
Ghostkeeper
47582195f1
Fix headers of Portuguese translation files 
The language and country codes are not in the file format specification.

Contributes to issue CURA-4341.
 2017-10-06 17:13:37 +02:00
Ghostkeeper
009f41e2ed
Merge branch '3.0' of https://github.com/Patola/Cura into Patola-3.0 2017-10-06 17:11:58 +02:00