GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-23 21:19:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,955 Commits 290 Branches 265 Tags
Commit Graph

1660 Commits

Author SHA1 Message Date
Ghostkeeper
7a8956fd0e
Merge branch '2.7' 2017-08-28 16:21:40 +02:00
Jaime van Kessel
8a0f6d969e Merge branch '2.7_stack_context' of github.com:Ultimaker/Cura into 2.7 2017-08-28 16:05:59 +02:00
Ghostkeeper
22b808afb3
Merge branch 'master' of https://github.com/PCDotFan/Cura into PCDotFan-master 2017-08-28 15:29:45 +02:00
Lipu Fei
f85a76b4bd Fix per-object settings qml 2017-08-24 17:38:16 +02:00
Mark
2d0a4d443d Switch material and print core 
CURA-4147
 2017-08-23 10:54:46 +02:00
alekseisasin
9363f93467 Merge pull request #2224 from fieldOfView/fix_multiextruder_menus 
Fix multiextruder menus
 2017-08-23 09:08:48 +02:00
Lipu Fei
28670edf8e Align profile dropdown box correctly 
CURA-4147
 2017-08-22 16:11:15 +02:00
Lipu Fei
e17a88fe11 Merge branch '2.7' 2017-08-22 16:06:36 +02:00
Mark
64f6cd237f Rename Print tab to Monitor 
CURA-4106
 2017-08-22 13:58:01 +02:00
Jaime van Kessel
fd6ee6ee3c Merge branch 'pirate' of github.com:Ultimaker/Cura into 2.7 2017-08-22 10:53:51 +02:00
Lipu Fei
662e3b9cd1 Fix coding style 
CURA-4147
 2017-08-18 13:38:16 +02:00
Ghostkeeper
64753f8c8b
Merge branch '2.7' 2017-08-18 10:42:14 +02:00
alekseisasin
7978b0efe9 Move quality profile, material and print core to it's new location 
CURA-4147
 2017-08-18 09:15:17 +02:00
Lipu Fei
16cfb768d2 Move dont show again checkbox above the buttons 
CURA-4113

The Don't show again checkbox is on the same row with the buttons. In
some translations, the text for the checkbox is very long, which
overlaps with the button.
 2017-08-16 16:07:02 +02:00
Lipu Fei
3a22d1916f Go back to "Recommended/Custom" tabs 
CURA-4146
 2017-08-15 17:42:34 +02:00
alekseisasin
3116ff829c Merge pull request #2200 from fieldOfView/fix_monitoritem_size 
Adapt camera image to available space
 2017-08-15 15:04:18 +02:00
alekseisasin
7ad7fb0a3c Merge pull request #2200 from fieldOfView/fix_monitoritem_size 
Adapt camera image to available space
 2017-08-15 14:45:34 +02:00
alekseisasin
e88f74fe5a Merge branch 'master' of github.com:Ultimaker/cura 2017-08-14 15:07:59 +02:00
Ghostkeeper
7ab6a551c1
Clarify that XML material tags don't get translated 
Some of the translators got this wrong last time. Let's see how good they read this next time...

Contributes to issue CURA-4113.
 2017-08-14 13:54:11 +02:00
alekseisasin
a4ddd28e8f Removed gap between material length and it's measuring unit 
feature_move_printing_time
 2017-08-14 13:09:31 +02:00
Ghostkeeper
5866b759a8
Move material estimate properties to sidebar as well 
That's where they are used after all.

Contributes to issue CURA-4149.
 2017-08-14 12:06:03 +02:00
Ghostkeeper
6a4329c1a0
Align progress bar and save button better 
So that they don't overlap with the now larger fonts and such.

Contributes to issue CURA-4149.
 2017-08-14 10:36:39 +02:00
Ghostkeeper
addf6429e5
Adjust font sizes of time/material estimates 
Emphasize the time estimate.

Contributes to issue CURA-4149.
 2017-08-14 09:45:12 +02:00
Ghostkeeper
bff00d41d0
Add description for print time 
It looks a bit weird right below the print time but we'll discuss that later.

Contributes to issue CURA-4149.
 2017-08-14 09:42:46 +02:00
Ghostkeeper
454293f926
Remove superfluous rectangles 
There's only one item in there. It makes no sense to group them by rows and that only makes the bindings more complicated.

Contributes to issue CURA-4149.
 2017-08-14 09:38:40 +02:00
Ghostkeeper
e514a9f474
Fix some binding loops 
Contributes to issue CURA-4149.
 2017-08-14 09:34:52 +02:00
Ghostkeeper
c4305c7b1e
Rearrange and align time/material estimates 
They look correct now but the log says there is a binding loop in here. We'll fix that next.

Contributes to issue CURA-4149.
 2017-08-14 09:23:56 +02:00
Ghostkeeper
fb3a0b701c
Remove superfluous item 
This item was just transparently being the same size as its parent, no ID or nothing. We can just remove it.

Contributes to issue CURA-4149.
 2017-08-14 09:12:21 +02:00
Ghostkeeper
0430a274d9
Make slicing status text smaller 
Makes more room for the time/material estimates.

Contributes to issue CURA-4149.
 2017-08-14 09:10:35 +02:00
Ghostkeeper
067449192a
Move time/material estimates code to sidebar 
It sort of works but is aligned all wrong right now.

Contributes to issue CURA-4149.
 2017-08-14 09:04:26 +02:00
Ghostkeeper
5f057f46ea
Add Pirate language only on Talk Like a Pirate Day 
Let's see who finds this.
 2017-08-10 20:26:35 +02:00
fieldOfView
0630559472 Fix setting variant of non-active extruder through menu 2017-08-08 11:41:15 +02:00
fieldOfView
8d72ba5fe7 Fix setting material of non-active extruder through menu 2017-08-08 11:32:34 +02:00
Lipu Fei
3bc7e9012d Use the right stack to retrieve infill values in Recommended mode 
CURA-3932
 2017-08-07 10:53:19 +02:00
Lipu Fei
b274f63df0 Use the right stack to retrieve infill values in Recommended mode 
CURA-3932
 2017-08-04 14:19:14 +02:00
alekseisasin
b984b99c30
Translated text overlaps GUI 
CURA-3799
 2017-08-03 13:05:53 +02:00
alekseisasin
3cbf0640a5 Added method to close the application (after clicking quit button) to prevent loss of custom material 
CURA-3298
 2017-08-03 11:57:27 +02:00
fieldOfView
4d88d56ebf Make sure camera image does not overlap topbar 2017-08-03 10:57:03 +02:00
fieldOfView
d6d4617356 Resize camera image to fit small windows if necessary 2017-08-03 10:56:21 +02:00
alekseisasin
153d1f2d0c Added method to close the application (after clicking quit button) to prevent loss of custom material 
CURA-3298
 2017-08-02 16:32:09 +02:00
Lipu Fei
05d7e15d4c Merge remote-tracking branch 'upstream/2.7' 2017-08-02 08:48:15 +02:00
alekseisasin
d6c1a231ac Translated text overlaps GUI 
CURA-3799
 2017-08-01 15:50:55 +02:00
Lipu Fei
cf25515b90 Make SettingView update its value upon global stack change 
CURA-4105

Cleaner way to make SettingView update its value when the global stack
gets changed.
 2017-08-01 10:25:50 +02:00
Lipu Fei
96f8e70e40 Update containerStackId for limit_to_extruder settings when active machine has been changed 
CURA-4105
 2017-07-31 17:58:49 +02:00
Jaime van Kessel
021425ee06 Merge branch 'fix_system_text_rendering' of https://github.com/fieldOfView/Cura 2017-07-26 16:49:28 +02:00
Lipu Fei
3d378ebc5f Merge remote-tracking branch 'upstream/CURA-4057' 2017-07-21 14:14:27 +02:00
Ghostkeeper
a768234cad
Merge branch 'master' of github.com:Ultimaker/Cura 2017-07-21 10:41:03 +02:00
Jaime van Kessel
121fc17064 Multiply objects dialog is now application modal 
CURA-3768
 2017-07-20 15:15:03 +02:00
Jaime van Kessel
6e55bf2d8f If output device has a contorl item, that one is used. 
If a printerOutput device does not define anything, the fallback is used.

CURA-4057
 2017-07-20 13:30:57 +02:00
Ghostkeeper
d4824a8ff1
Make time estimates tooltip also appear on clock icon 
Perhaps that reduces the complaints we have about that thing not appearing.
 2017-07-20 09:43:31 +02:00