GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-28 09:09:30 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,771 Commits 292 Branches 265 Tags
Commit Graph

1518 Commits

Author SHA1 Message Date
Jack Ha
42d939b34e Solved merge conflict. CURA-3321 2017-03-07 10:34:53 +01:00
Jack Ha
3468bae732 Add result type. 2017-03-07 10:31:11 +01:00
Jaime van Kessel
856562236e Merge branch 'feature_CURA-3397_profile_override_dialog_options' of https://github.com/LipuFei/Cura 2017-03-06 16:17:48 +01:00
Tim Kuipers
38a9df9d76 fix: more lenient int-list validator parsing (CURA-3275) 
allow for empty integers
allow the brackets to be omitted
 2017-03-06 14:42:11 +01:00
Tim Kuipers
87c8ff0e08 Merge branch 'mb-infill-line-angles' of https://github.com/smartavionics/Cura into smartavionics-mb-infill-line-angles 2017-03-06 14:31:57 +01:00
Lipu Fei
1c15d24e5b CURA-3397 Reduce tableView height to show buttons 2017-03-06 12:37:29 +01:00
Lipu Fei
c9254a3095 CURA-3397 Enable/disable "keep" and "discard" buttons according to the choice 2017-03-06 12:15:58 +01:00
Jaime van Kessel
2f3998b9db Fixed layout of discard dialog 2017-03-03 14:46:40 +01:00
Jaime van Kessel
419396cc16 Merge branch 'feature_CURA-3397_profile_override_dialog_options' of https://github.com/LipuFei/Cura 2017-03-03 14:43:42 +01:00
Lipu Fei
b65d950181 CURA-3397 Change headers in override profile table 2017-03-03 13:23:32 +01:00
Lipu Fei
67b57129ed CURA-3397 Add options for profile override dialog 2017-03-03 13:23:32 +01:00
Lipu Fei
7997ae55ea CURA-3397 Make discard button default 2017-03-03 13:19:56 +01:00
Jaime van Kessel
cd9a8dbca5 Listbox now scales with window 
CURA-3221
 2017-03-03 10:19:53 +01:00
Jaime van Kessel
8e4f650746 Added a tiny bit of spacing between machine action buttons 2017-03-03 09:47:58 +01:00
Ghostkeeper
c0b4d43995
Add hotkey for reload all models 
Small change. I can't be bothered to make an issue for this.
 2017-03-02 15:42:57 +01:00
Simon Edwards
3e4ee0639c Fixed case of the button text. 
CURA-3398
 2017-03-02 11:46:28 +01:00
Jack Ha
f9a5dc885c Solved merge conflicts #1479 CURA-3321 2017-03-01 14:47:54 +01:00
Jaime van Kessel
0bf0b29a50 Added Create new profile button to Discard or keep profile changes dialog 
CURA-3398
 2017-03-01 14:42:18 +01:00
Jaime van Kessel
a1281bc019 Clarified some of the text in the discard dialog 
CURA-3221
 2017-03-01 11:33:03 +01:00
Jaime van Kessel
af21146fef Layout improvements 
CURA-3221
 2017-02-28 14:07:12 +01:00
Jaime van Kessel
4d7133610d Updated layout of dialog 
CURA-3221
 2017-02-28 13:38:15 +01:00
Jaime van Kessel
85b58c9296 Pressing the discard button now actually discards the changes 
CURA-3221
 2017-02-28 12:35:08 +01:00
Jaime van Kessel
2462699982 Switching profiles now shows a new dialog with all the changes. 
CURA-3221
 2017-02-28 10:25:42 +01:00
Jaime van Kessel
4f74edd421 Project name is now correctly set upon loading project 
CURA-3387
 2017-02-21 14:27:56 +01:00
Jack Ha
057dc2fd7d Solved merge conflicts. CURA-3214 2017-02-21 11:01:20 +01:00
Jaime van Kessel
0b4a05a84c Recommended settings now shows correct status for adhesion when None was selected 
Fixes #1454
 2017-02-20 17:32:20 +01:00
fieldOfView
61e0cd4ff5 Move legacy options to layerview options 2017-02-20 11:09:34 +01:00
Jaime van Kessel
3bbbd4a692 Merge branch 'fix_window_overflow' of https://github.com/fieldOfView/Cura 2017-02-17 15:31:10 +01:00
fieldOfView
9254ac1694 Add libSavitar credit 2017-02-17 13:44:43 +01:00
fieldOfView
11e9a4cdf4 Make About window scrollable 
On some OSes/configurations/screens, the list of credits in the About window doesn't fit until the window is resized. Adding a scrollview helps in these cases.
 2017-02-17 13:41:39 +01:00
fieldOfView
97d20b4242 Make General preference pane scrollable 
On some OSes/configurations/screens, the options on the General pane don't fit until the window is resized. Adding a scrollview helps in these cases.
 2017-02-17 13:39:46 +01:00
fieldOfView
9229027001 Refactor properties that start with 'get' to avoid confusion between slots & properties 
Case in point: LayerViewProxy.getLayerViewType was decorated as a property but was used/intended as a slot.
 2017-02-17 13:35:01 +01:00
Jack Ha
600a5d85e4 Added comments, changed text of NotStarted. CURA-3214 2017-02-16 15:07:26 +01:00
Ghostkeeper
f956436c32
Align tooltips better 
We want the tooltip area to point at the vertical centre. However, we want the tooltip of pure text elements to point at the vertical centre between the base line and the middle line (centre of lowercase letters). Therefore the offset for those elements is a quarter of the height rather than half (which is good enough of an approximation).

Contributes to issue CURA-3161.
 2017-02-16 15:02:48 +01:00
Ghostkeeper
b77e5f5d0c
Fix border colour hovering of preheat temperature input 
The ID was wrong.

Contributes to issue CURA-3161.
 2017-02-16 14:47:47 +01:00
Ghostkeeper
67b72ee6df
Add tooltips for elements of extruder box 
All things that need a tooltip now have their tooltip. The tooltips don't seem to align well though.

Contributes to issue CURA-3161.
 2017-02-16 14:46:15 +01:00
Jack Ha
18318348b6 Fixed last bugs in manual slicing. CURA-3214 2017-02-16 14:44:45 +01:00
Ghostkeeper
3d8afa9deb
Add tooltip for target bed temperature 
Contributes to issue CURA-3161.
 2017-02-16 14:36:40 +01:00
Ghostkeeper
739775421a
Add tooltip for current bed temperature 
Contributes to issue CURA-3161.
 2017-02-16 14:34:16 +01:00
Ghostkeeper
e142f51e12
Add tooltip for pre-heat input field 
Just to clarify what you need to put there.

Contributes to issue CURA-3161.
 2017-02-16 14:30:19 +01:00
Ghostkeeper
c7793238f7
Disallow pre-heat temperature of 0 explicitly 
Because that signals to the printer that it should cancel pre-heating.

Contributes to issue CURA-3161.
 2017-02-16 14:20:35 +01:00
Ghostkeeper
253b4bce03
Don't disable pre-heat text if temperature is invalid 
Otherwise you can't change the temperature to make it valid again...

Contributes to issue CURA-3161.
 2017-02-16 14:17:13 +01:00
Ghostkeeper
84f695821d
Disable text field when pre-heat button is disabled 
More consistent user experience.

Contributes to issue CURA-3161.
 2017-02-16 14:01:42 +01:00
Ghostkeeper
2498ee9726
Also disable pre-heat if printer is paused or pausing 
The UM3 also doesn't allow pre-heating during this period. Other printers tend to keep the bed hot during pausing.

Contributes to issue CURA-3161.
 2017-02-16 13:37:44 +01:00
Ghostkeeper
abf092512a
Don't show temperature if print core is removed in UM3 
The empty string as hotend ID is interpreted as there being no hotend, since this is what the UM3 returns in that case.

Contributes to issue CURA-3161.
 2017-02-16 13:23:20 +01:00
Ghostkeeper
140d5204c3
Fix error message when not connected in preheatUpdateTimer 
Can't get preheatBedRemainingTime from null.

Contributes to issue CURA-3161.
 2017-02-16 12:58:40 +01:00
Ghostkeeper
b002e367e3
Only update bed temperature on switching to tab 
The problem was that the bed temperature for pre-heat was being updated when focus was lost. It now only updates on component being completed. Since print monitor is a component that is switched out with a Loader, it is completed every time the monitor tab is clicked, thus causing this update. It is not pretty to be dependent on this, but it's quite practical considering the alternatives.

This causes the pre-heat temperature to not update when you switch machines. Whether this is desirable or not is up for debate. In any case the bed temperature is now always equal for all machines so it doesn't matter anyway.

Contributes to issue CURA-3161.
 2017-02-16 12:58:39 +01:00
Ghostkeeper
d2fa6dbae2
Notify to update remaining time when it drastically changes 
When the time passes normally it doesn't trigger this signal but just go on counting, but when the pre-heat starts or cancels it updates via this signal. This is handy for the future, when we want to update the remaining time from the printer information. However for now it is also nice because we can make the pre-heat timer dependent on this signal so we know when to have it running. This fixes the problem that the pre-heat seems to have been cancelled in the GUI when you switch away the tab, because the timer running is now dependent on the property rather than always false.

Contributes to issue CURA-3161.
 2017-02-16 12:58:39 +01:00
Ghostkeeper
9a5b355f2b
Make countdown visibility dependent on its own text 
No need to 'update' that in the update timer. We can just link it and it updates on its own.

Contributes to issue CURA-3161.
 2017-02-16 12:58:39 +01:00
Ghostkeeper
d363736fdd
Rename preheatCountdownTimer to preheatUpdateTimer 
It is a timer that triggers every 100ms to update the state of the pre-heating process, after all.

Contributes to issue CURA-3161.
 2017-02-16 12:58:39 +01:00