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

10743 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
eda61f1ff9
Merge branch 'update_printer_blocked_icon' into 3.0 2017-10-12 14:49:07 +02:00
Ghostkeeper
e6f613248c
Merge branch 'CL-508_correct_status_msg_when_disconnected' into 3.0 2017-10-12 14:48:36 +02:00
Ghostkeeper
56ccc2e8b8
Merge branch 'CL-555_fix_incorrect_msg_in_discovery' into 3.0 2017-10-12 14:45:11 +02:00
Simon Edwards
8ed7918b60 Update the icon used to show that a printer is blocked. 
This applies to the printer status icons shown in the monitor tab when connected via Cura Connect.
 2017-10-12 14:02:19 +02:00
Simon Edwards
eef4d61402 Correct the status message when a printer needs a config change but is unreachable 
CL-508
 2017-10-12 13:44:03 +02:00
A.Sasin
624aca324e Updated changelog, except Cross infill 
CURA-4391
 2017-10-12 13:42:21 +02:00
Simon Edwards
427afdbe23 Correctly set up the cluster output device instances with the cluster size 
This fixes the Cura Connect messages shown in the network printer selection dialog.

CL-555
 2017-10-12 12:41:21 +02:00
A.Sasin
8d20f62dc9 Changed back to previous commit 2017-10-12 11:57:02 +02:00
A.Sasin
a3b8642a4e Added text.elideRight on SidebarSimple 2017-10-12 11:45:25 +02:00
A.Sasin
372e86e39b Merge branch '3.0' of github.com:Ultimaker/cura into 3.0 2017-10-12 11:42:24 +02:00
Ghostkeeper
bb1dd0e3d4
Merge branch 'CL-584_no_selecting_disabled_printers' into 3.0 2017-10-12 11:01:58 +02:00
Simon Edwards
af3c34b6fd Don't let the user select unreachable printers in the Cura Connect monitor tab 
CL-584
 2017-10-12 10:46:25 +02:00
Ghostkeeper
ca28748bc3
Add missing translations from broken string freeze 
These texts were added later after the strings were frozen. Bad! But this is the German translation for it, retrieved from a secondary speaker here at the office.

Contributes to issue CURA-4341.
 2017-10-12 10:26:38 +02:00
Ghostkeeper
f94954e9ca
Improved end g-code 
This one removes the hair at the end of this print a bit better.

Contributes to issue EM-1859.
 2017-10-12 09:28:50 +02:00
A.Sasin
a6a58c8c84 Merge branch '3.0' of github.com:Ultimaker/cura into 3.0 2017-10-12 09:22:52 +02:00
Mark
3a7fbdb173 Changed parseInt to Math.floor 2017-10-11 17:06:13 +02:00
ChrisTerBeke
331574eec0 Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0 2017-10-11 14:53:59 +02:00
Mark
00205996da Change Text to Label and cast all sizes to int 
CURA-4437
 2017-10-11 14:53:46 +02:00
Ghostkeeper
be268a88dc
Fix order of commented-out translations 
Apparently it's not allowed to put a comment halfway through a translation item.

Contributes to issue CURA-4341.
 2017-10-11 14:53:18 +02:00
Ghostkeeper
e4580b6cd2
Delete unused cura.po file 
To crevent ponfusion.

Contributes to issue CURA-4341.
 2017-10-11 14:39:50 +02:00
Ghostkeeper
92e931e02e
Add translations out-of-band for string freeze violations 
These texts were added after the string freeze. Bad! We've now translated half of these with a native speaker in the office, and the other half via Google and some clever copying from existing translations.

Contributes to issue CURA-4341.
 2017-10-11 14:35:05 +02:00
Ghostkeeper
c4339955b3
Merge branch '3.0' into CL-508_show_lost_connection_status 2017-10-11 14:05:10 +02:00
Ghostkeeper
bf1baa2791 Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0 2017-10-11 14:04:17 +02:00
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
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
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
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
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
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
A.Sasin
5b52ad441b Merge branch '3.0' of github.com:Ultimaker/cura into 3.0 2017-10-10 15:51:19 +02:00
Lipu Fei
c7ccc3c1b8 Fix long text display in mode toggle buttons 
CURA-4341
 2017-10-10 14:47:13 +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
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
ChrisTerBeke
e5c5f213a9 Fix info message when cluster has 0 machines 2017-10-10 12:58:43 +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
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
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