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,706 Commits 290 Branches 260 Tags
Commit Graph

10706 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Ghostkeeper
b9045f6b24
Give warning if using some patterns with gradual 
Cross, Cross 3D, Concentric and Concentric 3D don't work well with Gradual Infill. Lines and zigzag don't work well with Gradual Support Infill (in addition to the previously mentioned patterns) since they aren't alternating in support.

Contributes to issue CURA-4095.
 2017-10-06 16:01:53 +02:00
Cláudio Sampaio (Patola)
8bbdd9cca1 Updated brazilian portuguese strings 2017-10-06 10:10:23 -03:00
Jaime van Kessel
fddb829273 Added check to see if selectedPrinter is set 
CL-500
 2017-10-06 14:15:15 +02:00
Jaime van Kessel
a2dabc6442 Re-added elide properties that seem to have gone lost in re-work 
CL-521
 2017-10-06 13:51:18 +02:00
Jaime van Kessel
8913a64fdc Removed some hardcoded UI values 2017-10-06 13:46:17 +02:00
Jaime van Kessel
af0615f985 Codestyle fixes 
CL-524
 2017-10-06 13:37:48 +02:00
Jaime van Kessel
21ad2548b7 Also check the status of the job if it's not printing 
CL-524
 2017-10-06 13:32:06 +02:00
Lipu Fei
e9462b17c8 Add try-excepts for signal disconnections 2017-10-06 12:04:16 +02:00
Lipu Fei
ba12d9dff8 Move robot to the left 
CURA-4416
 2017-10-06 12:03:37 +02:00
Lipu Fei
c76b35ce3a Update splash screen 
CURA-4416
 2017-10-06 11:11:44 +02:00
ChrisTerBeke
9f0b85952a Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0 2017-10-06 10:45:25 +02:00
ChrisTerBeke
798649bce8 Merge branch 'TheAssasin-master' into 3.0 2017-10-06 10:40:34 +02:00
Ghostkeeper
5a3677688f
Fix top/bottom speed for CPE+ faster profiles 
I think these were some typos or mistakes in someone's spreadsheet.
 2017-10-06 09:59:17 +02:00
Lipu Fei
39fc03c550 Revert "Replace new message string with a logging line" 
This reverts commit e052c3ba83f1e90777375f51e2612ec1df17fc55.

CURA-4398
 2017-10-06 09:57:45 +02:00
Lipu Fei
e052c3ba83 Replace new message string with a logging line 
CURA-4398
 2017-10-06 09:50:03 +02:00
Lipu Fei
71f794f76d Upgrade ultimaker2 quality_changes 
CURA-4420

Ultimaker 2 quality_changes profiles were saved with definition =
fdmprinter in Cura 2.7. In Cura 3.0, that should be "ultimaker2".
 2017-10-06 09:38:10 +02:00
Diego Prado Gesto
c9e8f7c743 Block sending several files now works even if there is a mismatching - CURA-4398 2017-10-05 18:16:53 +02:00