GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-23 06:09:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,681 Commits 288 Branches 260 Tags
Commit Graph

124 Commits

Author SHA1 Message Date
Ghostkeeper
ee9de1f11b
Merge branch '3.2' 
Lots of conflicts due to rounding vs. flooring of text element positions for weirdness with the font aliasing.
 2018-02-14 10:53:51 +01:00
Mark
b531c0550d Change Math.floor to Math.round as a last try to fix garbled fonts 
CURA-4941
 2018-02-14 09:28:47 +01:00
Mark
466926fecd Increased the version of QtQuick 2018-02-13 11:07:14 +01:00
Jaime van Kessel
df1bf419d9 Don't show "active print" header if no printer is connected 
CL-541
 2018-01-08 11:44:30 +01:00
Jaime van Kessel
bc8741ef08 Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-12-19 10:40:32 +01:00
ChrisTerBeke
c056fcb23d Fix monitor sidebar machine selection - CURA-4234 2017-12-14 14:58:51 +01:00
Jack Ha
cda6aa2547 CURA-4234 splitted MachineSelection into a separate file and add it to PrintMonitor as well, because now it's part of the sidebar 2017-12-14 14:49:18 +01:00
Jaime van Kessel
339d7ca4c9 Cluster shows default controlItem again when a specific printer is selected 
CL-541
 2017-11-30 14:36:53 +01:00
Jaime van Kessel
5036eccd32 Moved multiple components to their own files 
CL-541
 2017-11-27 10:15:28 +01:00
Jaime van Kessel
57406100ef Fixed status icon in monitor tab 
CL-541
 2017-11-24 10:55:24 +01:00
Jaime van Kessel
9d7cd72691 JobData is now shown in monitor screen again 
CL-541
 2017-11-24 09:38:10 +01:00
Jaime van Kessel
0fe91db636 Moved HeatedBedBox to own qml file 
CL-541
 2017-11-21 16:52:37 +01:00
Jaime van Kessel
34e808d585 PrinterOutputModel now has different extruders if it has more than one. 
It used to just fill the list with references to the first one created.
CL-541
 2017-11-21 16:36:51 +01:00
Jaime van Kessel
e3d07f1806 Moved ExtruderBox and OutputDeviceHeader to their own files. 
This makes it a whole lot easier to get an overview.

CL-541
 2017-11-21 16:06:30 +01:00
Jaime van Kessel
0f78b05802 Connection states changes are now tied into the UI again 
CL-541
 2017-11-21 15:12:23 +01:00
ChrisTerBeke
d32b7f0091 Merge branch 'master' into container_stack_improvements 2017-11-06 09:49:44 +01:00
ChrisTerBeke
d718e6e36c Create extruder stack for single extruder machines on start - CURA-4482 2017-10-31 09:08:20 +01:00
fieldOfView
7dc4975b36 Tweak layout and texts 2017-10-24 11:33:47 +02:00
fieldOfView
46fc478f9d Tweak disabled appearance 2017-10-24 11:15:33 +02:00
fieldOfView
a9f2ad7ca3 Hide manual controls for outputdevices that don't support it 2017-10-24 11:03:51 +02:00
fieldOfView
6294900bc7 Disable controls when manual control is not available 2017-10-24 10:23:07 +02:00
fieldOfView
9cd8869382 Add settable jog distance 2017-10-23 22:27:05 +02:00
fieldOfView
56fa7036b3 Add controls for jogging the head/bed 2017-10-23 21:27:53 +02:00
fieldOfView
29729d2a23 Change renderType for TextInput elements 
Unlike Label elements, which are defined to use Text.NativeRendering, TextInput uses Qt text rendering by default. This can lead to differences in font rendering between input fields and other texts.
 2017-10-14 11:43:18 +02:00
Mark
3a7fbdb173 Changed parseInt to Math.floor 2017-10-11 17:06:13 +02:00
Mark
00205996da Change Text to Label and cast all sizes to int 
CURA-4437
 2017-10-11 14:53:46 +02:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
Ghostkeeper
fcc914cf0d
Make material colour indication a circle instead of square 
The rest of them are circles. This one should be one too.
 2017-09-27 17:28:32 +02:00
Ghostkeeper
3de608cb0f
Fix display of bed temperature before a printer is added 
Otherwise you get an error if you switch to the print monitor before adding a printer.
 2017-09-22 15:14:03 +02:00
Jaime van Kessel
dd7ea80b68 Also added canPreheatBed option 2017-09-04 15:33:04 +02:00
alekseisasin
24c9dc9bee Merge branch 'feature_light_colours_icons' 
CURA-4148
 2017-09-01 19:25:29 +02:00
alekseisasin
e38ec9d5e8 Renamed "Hotend" to "Extruder" 
CURA-4256
 2017-08-31 14:19:01 +02:00
fieldOfView
4d0c77683c Show target hotend temperature(s) 2017-08-29 11:02:37 +02:00
Ghostkeeper
ab444943cb
Rename setting_validation_error/warning and border 
In some places we want to use the bright error or warning colours to display that something is going on. In those places we'd like to refer to the colour setting_validation_error rather than setting_validation_error_border or something, so I'm renaming these four theme items.

Contributes to issue CURA-4148.
 2017-08-23 13:30:25 +02:00
Jaime van Kessel
ccb3f225ff Preheat now shows error color like all other input fields 2017-06-23 15:49:46 +02:00
Ghostkeeper
2fda85a6aa
Hide estimated time left if print is aborted or completed 
In fact, only show it if a time estimate is meaningful. We keep showing the estimate while a print is paused though.

Contributes to issue TRI-1550.
 2017-04-21 14:29:40 +02:00
Mark
bfda8712e1 Change all Label to Text so fonts are rendered correct 
CURA-3389
 2017-04-14 13:16:48 +02: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
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