GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-01 00:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,340 Commits 291 Branches 260 Tags
Commit Graph

230 Commits

Author SHA1 Message Date
Jack Ha
c3349baf39 CURA-4606 fix bug concerning activeMaterialsCompatible; factor out activeQualityName 2018-02-21 10:36:51 +01:00
Jack Ha
ad6548a5dc CURA-4606 factored activeMaterialName out 2018-02-21 10:35:17 +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
12b2348309 Revert "Use QTQuick 2.2 to fix garbled fonts" 
This reverts commit 0d5bb952efc468522b55cbf903349aaf7f979af9.
 2018-02-13 14:37:05 +01:00
Mark
0d5bb952ef Use QTQuick 2.2 to fix garbled fonts 
CURA-4941
 2018-02-13 12:42:31 +01:00
Mark
466926fecd Increased the version of QtQuick 2018-02-13 11:07:14 +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
fieldOfView
74fe281e1d Sync currently selected preset between visibility-page and -menu 2018-02-09 18:54:04 +01:00
fieldOfView
f79e787f2c Refactor SettingVisibilityProfiles to SettingVisibilityPresets 
This is closer to the current Cura intend
 2018-02-09 09:01:39 +01:00
fieldOfView
080979caeb Move setting visibility presets into a model 
Handling of "Custom" is still under consideration
 2018-02-08 23:07:45 +01:00
fieldOfView
872efd16b2 Fix selecting presets from menu 
Switching back to Custom is not yet implemented, and the menu selection does not yet change if the preset is changed in the preferences
 2018-02-08 17:13:59 +01:00
fieldOfView
69d7bf4130 Merge branch 'master' into feature_setting_visibility_profiles 2018-02-08 16:06:48 +01:00
Ghostkeeper
e7c5120f9c
Merge branch '3.2' 2018-01-15 16:52:28 +01:00
Lipu Fei
616615067c Fix quality name in selected profile box 
CURA-4796
 2018-01-15 15:17:15 +01:00
Ian Paschal
dac67ef2fc
Merge pull request #3134 from Ultimaker/3.2 
Fix for CURA-4789
 2018-01-15 14:41:23 +01:00
Lipu Fei
03bd4d8d22 Fix profile menu text for custom profiles based on not supported 
CURA-4796
 2018-01-15 14:29:52 +01:00
Jaime van Kessel
ed9634ebe0 Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2018-01-08 10:56:12 +01:00
Lipu Fei
84adbc5f41 Use the 5.8 versions of QtQuick modules in QMLs 
CURA-4758
 2018-01-04 13:26:14 +01:00
fieldOfView
3f11b8a756 Merge branch 'master' into feature_setting_visibility_profiles 2018-01-04 11:06:51 +01:00
Lipu Fei
392be23281 Fix SettingView stakc ID binding 
CURA-4708
 2018-01-03 15:58:30 +01:00
Lipu Fei
f6168c07f0 Fix material_diameter bindings for metarial menu and page 
CURA-4708
 2018-01-03 11:27:30 +01:00
Diego Prado Gesto
4a211c6ac6 CURA-4495 Change property name and add default values 2017-12-18 11:58:34 +01:00
ChrisTerBeke
b74ebc57b4 Fix per extruder setting value depending on extruder count - CURA-4627 2017-11-27 17:00:57 +01:00
ChrisTerBeke
657a91c525 Merge pull request #2685 from Ultimaker/container_stack_improvements 
Container stack improvements
 2017-11-20 17:42:26 +01:00
fieldOfView
5638ebe8cf Tweak appearance of the menu button 2017-10-26 11:05:59 +02:00
Chris ter Beke
b95ba24530 Remove some changes, debugging - CURA-4451 
WIP - CURA-4451

correctly show not supported when any of the extruders has a not supported profile - CURA-4451

Clean up and add comments - CURA-4451
 2017-10-26 09:23:27 +02:00
fieldOfView
078fd074e5 Add initial menu stub 2017-10-26 00:00:07 +02:00
fieldOfView
4bb67fbd82 Add setting visibility profile menu button 2017-10-25 17:04:23 +02:00
ChrisTerBeke
35684e0aa4 Move profiles dropdown text generator to separate method 2017-10-24 09:57:48 +02:00
Mark
eaa7b75f0e Changed parseInt to Math.floor 2017-10-11 16:47:40 +02:00
Mark
d4a8dbdee7 Change Text to Label and cast all sizes to int 
CURA-4437
 2017-10-11 12:48:42 +02:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
Lipu Fei
3d6648fc59 Rearrange quality profile slider and dropdown box 
CURA-4182

- Remove the quality profile dropdown box from Recommended mode
- Move the quality profile dropdown box to Custom mode
 2017-09-13 17:12:51 +02:00
Ghostkeeper
09a5cf1de2
Shift sidebar tooltips with the arrow outside of sidebar 
Because now the arrow has the same colour as the sidebar so you won't see it otherwise.

Contributes to issue CURA-4148.
 2017-08-23 17:53:00 +02:00
Ghostkeeper
11f8204644
Change margins in the side bar 
These are more or less all margins in the side bar.

Contributes to issue CURA-4148.
 2017-08-23 16:28:28 +02:00
Ghostkeeper
078b9e8b66
Fix placeholder text colour 
It should use the same colour as the normal text, for now.

Contributes to issue CURA-4148.
 2017-08-23 15:32:42 +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
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
fieldOfView
0f9cfa0304 Fix tab order after expanding categories or using search 
This reimplements the behavior of pressing tab/backtab to force the correct order of items in the listview.
 2017-06-26 14:35:37 +02:00
fieldOfView
8917762ed5 Animate scrolling focussed item into view 2017-06-26 13:03:28 +02:00
fieldOfView
edee53b0b1 Scroll setting with active focus into view 2017-06-26 13:00:59 +02:00
Jaime van Kessel
20cb3ea01f Added "optional_extruder" setting type 
CURA-3814
 2017-05-22 13:24:41 +02:00
Jaime van Kessel
eb677f5625 Merge branch 'feature_cutting_mesh' of github.com:Ultimaker/Cura 2017-05-09 10:20:27 +02:00
fieldOfView
4d12ab1296 Merge branch 'master' into feature_multiextruder_machinesettings 2017-04-21 19:31:44 +02:00