GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-22 21:59:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,764 Commits 287 Branches 260 Tags
Commit Graph

1636 Commits

Author SHA1 Message Date
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
Lipu Fei
b274f63df0 Use the right stack to retrieve infill values in Recommended mode 
CURA-3932
 2017-08-04 14:19:14 +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
Ghostkeeper
54ef959cfc
Fix translation of 'Polish' 
Yeah, Wikipedia wasn't very clear on that.

Contributes to issue CURA-3998.
 2017-07-18 14:06:44 +02:00
Ghostkeeper
b2853ef139
Add Polish language to drop-down 
The translation is complete for 2.6 (albeit apparently wrong in several places). It is not yet complete for master, but that will come during the translation update for the 2.7 beta.

Contributes to issue CURA-3998.
 2017-07-18 13:46:10 +02:00
Ghostkeeper
c1a68379f5
Clarify context of automatic nozzle detection translation string 
Otherwise a translator will only see 'Automatic: %1', '%1 is the value from the printer', without knowing what kind of value that is then.

Found while working on CURA-3998.
 2017-07-18 13:10:17 +02:00
Ghostkeeper
390981bbb5
Fix superfluous space in translated text 
Found while working on CURA-3998.
 2017-07-18 13:10:17 +02:00
fieldOfView
b5d7ec5bd2 Round fractional widths and heights in system-themed qml 2017-07-14 12:58:07 +02:00
Jaime van Kessel
549e2c12c8 Calculated values now show calculated instead of a formula 
CURA-3385
 2017-07-14 11:39:10 +02:00
fieldOfView
82d3a98f95 Hide the extruder button for Custom FDM Printers with 1 extruder 2017-07-12 14:47:38 +02:00
Ghostkeeper
4ad9ebc444
Merge branch 'master' of https://github.com/tsaaristo/Cura into tsaaristo-master 2017-07-10 09:14:41 +02:00
Ghostkeeper
4edd91de23
Fig passing signals to topbar 
Topbar is now in the lead on whether the print monitor should be shown or not. As it should be.

Contributes to issue CURA-4010.
 2017-07-07 13:37:31 +02:00
Ghostkeeper
d277b16807
Capitalise '3D' 
3d looks ugly to me.
 2017-07-07 13:37:30 +02:00
Lipu Fei
89c5fb2d15 Merge pull request #2037 from Ultimaker/feature_zoom_to_mouse 
Added zoom to mouse preference
 2017-07-07 11:40:26 +02:00
Ghostkeeper
ef89fab126
Fix spaces after comma according to code style 
Contributes to issue CURA-3587.
 2017-07-06 16:13:42 +02:00
tsaaristo
ad87f154f3 Speed up sidebar-settings scrolling 
Scroll three rows in one scroll event instead of one
 2017-07-06 15:58:32 +03:00
Jaime van Kessel
cd7c8bb753 Merge branch 'master' of github.com:Ultimaker/Cura 2017-07-06 10:46:59 +02:00
Jaime van Kessel
95cacb8300 Added missing translate to topbar 2017-07-06 10:46:29 +02:00
Ghostkeeper
9dd3527504
Blur setting text fields when clicking buttons 
Otherwise the setting is not applied yet by the time you duplicate or export a profile.

Contributes to issue CURA-4011.
 2017-07-05 16:04:11 +02:00
Jaime van Kessel
84b522a4c8 Merge branch 'feature_pointing_rectangle_borders' of https://github.com/fieldOfView/Cura 2017-07-05 10:22:54 +02:00
Lipu Fei
d0ef97b02c Remove invalid anchoring for SidebarHeader 
CURA-3964

sidebarHeaderBar has been removed and the anchor line is not needed.
 2017-07-04 13:06:41 +02:00
Jaime van Kessel
1627a65513 Viewport overlay now shows correctly when switching between monitor & settings 
CURA-3964
 2017-07-04 11:58:04 +02:00
Arjen Hiemstra
ec25164731 Cleanup monitoringPrint stuff by properly passing things as properties 
Instead of relying on the property magically being propagated from the
root object, which causes crashes.

Contributes to CURA-3964
 2017-07-04 11:37:04 +02:00
Jaime van Kessel
680cceb6f5 Switching to monitor tab now shows the correct sidebar again 
CURA-3964
 2017-07-03 16:12:19 +02:00
fieldOfView
5fec3d4f6d Replace mock borders with true borders 2017-07-03 16:04:18 +02:00