3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-14 10:17:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
13521 commits 302 branches 270 tags 773 MiB
Commit graph

435 commits

Author SHA1 Message Date
Lipu Fei
984e6ddd08
Merge pull request #3274 from fieldOfView/feature_setting_visibility_profiles 
Setting Visibility Presets sidebar menu
 2018-03-14 13:25:59 +01:00
Ian Paschal
a5ba4799f0 CURA-4870 Final icon changes from Luke 2018-03-12 14:48:39 +01:00
Ian Paschal
ae2a286e3f Improved Icons & Styling 2018-03-09 14:07:29 +01:00
Ian Paschal
1a57e9323b Improved status icon size 2018-03-08 12:54:59 +01:00
Ian Paschal
ffccdd99c0 Added status icon 2018-03-08 10:55:29 +01:00
Ian Paschal
a02486e85a Added status icon 2018-03-07 17:15:56 +01:00
Diego Prado Gesto
813f4e83e0 CURA-4870 Adjust colors for the selected configuration 
Remove the printer icon since it doesn't look as expected
 2018-03-07 09:56:38 +01:00
Ian Paschal
5b2ff705e7 CURA-4870 Add menu icons 2018-03-06 17:03:44 +01:00
fieldOfView
97d7354839 Merge branch 'master' into feature_setting_visibility_profiles 2018-03-05 23:09:51 +01:00
Diego Prado Gesto
a992487589 CURA-4870 Check wether the current configuration matches one of the unique configurations available on the printer output device. 
Improve some elements in the UI
 2018-03-05 14:39:49 +01:00
Diego Prado Gesto
f779a20a6e CURA-4870 Cleanup UI and add buildplate icon 2018-03-05 12:13:46 +01:00
Ian Paschal
1bdd50e17f CURA-4790 Removed "bold" property 2018-02-20 11:04:23 +01:00
Ian Paschal
c7f8044a32 CURA-4790 Changed light weights back to normal 2018-02-20 10:46:01 +01:00
Ian Paschal
1d4d592d45 CURA-4790 Added weight properties to theme 2018-02-19 16:52:32 +01:00
Mark
38e84b962d Make the large text a little bigger 
CURA-4790
 2018-02-15 14:19:45 +01:00
fieldOfView
a17160f52d Merge branch 'master' into feature_setting_visibility_profiles 
# Conflicts:
#	resources/qml/Settings/SettingView.qml
 2018-02-15 11:54:45 +01:00
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
7493fae667 Fix to make sure margins cant have partial values 
CURA-4941
 2018-02-13 07:32:10 +01:00
Mark
7ea654df3d Fix to make sure margins cant have partial values 
CURA-4941
 2018-02-13 07:31:02 +01:00
Ghostkeeper
03b4213e92
Merge branch '3.2' 
Conflicts in Cura.qml and SaveButton.qml from people fixing positioning rounding at the same time...
 2018-02-12 13:10:24 +01:00
Mark
461da709ff Checked all divisions (again..) and multiplications on rounding errors 
CURA-4941
 2018-02-10 12:45:36 +01:00
Mark
b52bf6decf resolve conflict 2018-02-09 13:01:56 +01:00
Mark
8fca183a5e Fix rounding errors for garbled text 
CURA-4941
 2018-02-09 11:30:56 +01:00
Ian Paschal
bc849805fb CURA-4790 Change font to Noto Sans 
Included Noto Sans Display as well for experimentation.
 2018-02-08 17:23:14 +01:00
Ian Paschal
e7e476cb15 Revert "CURA-4790 Change font to Noto Sans" 
This reverts commit 977518e824.
 2018-02-08 16:50:41 +01:00
fieldOfView
69d7bf4130 Merge branch 'master' into feature_setting_visibility_profiles 2018-02-08 16:06:48 +01:00
Ian Paschal
977518e824 CURA-4790 Change font to Noto Sans 
Some weirdness still exists with pixel alignments and such. See JIRA for details.
 2018-02-08 15:39:17 +01:00
Diego Prado Gesto
da4c98b204 Merge branch 'master' into feature_multiple_BP 2018-01-16 09:59:21 +01:00
Diego Prado Gesto
cd4b162b86 CURA-4461 Change sizes and theme colors for the separator 2018-01-16 09:47:33 +01:00
Ghostkeeper
064a8e6f6c
Elide labels next to checkboxes 
To the available width, if there is a width.
This won't work for right-to-left languages though...

Contributes to issue CURA-4692.
 2018-01-15 16:41:33 +01:00
fieldOfView
3f11b8a756 Merge branch 'master' into feature_setting_visibility_profiles 2018-01-04 11:06:51 +01:00
Jack Ha
bfa33c721c CURA-4525 solved merge conflicts 2018-01-03 13:52:55 +01:00
Jack Ha
cb1484ee63 CURA-4525 update size and margins of objects list 2018-01-03 12:52:32 +01:00
Jack Ha
c8243a0ddd CURA-4525 fix convex hull, changed size of object list 2018-01-03 12:47:09 +01:00
Ghostkeeper
10f9ae4082
Resolve binding loop 
Let's align the icons to the text instead of the text to the icons. This makes it all align from left to right and allows the button to take the width of the childrenRect properly.
 2017-12-28 16:21:29 +01:00
Jack Ha
663ceab069 Undo emit transformationChanges (caused a crash), themed objects in objects list. CURA-4525 2017-12-21 16:53:43 +01:00
Jack Ha
a47107448e Moved objects menu to lower left and made it collapsible. CURA-4525 2017-12-21 11:39:37 +01:00
Jack Ha
5152b2ae65 Solved merge conflicts. CURA-4525 2017-12-21 10:52:51 +01:00
ChrisTerBeke
0668f80792
Merge pull request #2758 from fieldOfView/feature_mesh_types 
Improved mesh type UX (Per Model Settings)
 2017-11-29 13:24:38 +01:00
Diego Prado Gesto
fa00a17c78 Make UI changes in the Simulation View for adapting the color gradient 
in the Feedrate color scheme. Due to the travel speed is normally very
high compared with the other speeds in the model, the gradient is now
gradual instead of linear in order to show more changes in the low
values and less changes in the high values.
Adapt also the button styles and themes' colors.
Set the play/pause button to the left and reduce the size.
 2017-11-26 21:21:18 +01:00
Diego Prado Gesto
d0c1569da6 Merge branch 'fieldOfView-feature_simulation_ux_tweaks' 2017-11-24 15:48:39 +01:00
Mark
3477b902ab
Merge pull request #2834 from Ultimaker/CURA-4527_view_orientation 
Cura 4527 view orientation
 2017-11-23 09:56:26 +01:00
Aleksei S
d7b230269b The icons changed 
CURA-4527
 2017-11-22 11:10:25 +01:00
Diego Prado Gesto
b6e997c88d CURA-4526 Delete LayerView plugin because it will be replaced with the 
SimulationView.
This commit also adapts the code in order to accept the messages coming
from the engine, with information about feedrates and line thicknesses.
Add also some changes in the GCodeReader that reads feedrates and
line thickness from the gcode file.
 2017-11-21 10:47:29 +01:00
fieldOfView
1924946b59 Merge branch 'master' into feature_mesh_types 
# Conflicts:
#	plugins/SolidView/SolidView.py
 2017-11-18 11:28:15 +01:00
Andreea Scorojitu
7aeaf661ae Change_Color_UI_elements_CURA-4548 2017-11-15 13:40:46 +01:00
Aleksei S
3d2868c336 Added icons 
CURA-4527
 2017-11-15 00:43:17 +01:00
fieldOfView
8f8bdc059a Render non-printing objects as semi transparent objects in Solid View 2017-11-09 12:55:03 +01:00
Andreea Scorojitu
477e295e70 Change_Color_UI_elements_CURA-4548 2017-11-09 12:02:01 +01:00