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

374 Commits

Author SHA1 Message Date
Aleksei S
40c51249f5 Merge branch 'custom_menuitems_in_sidebar' into CURA-5595_add_custom_button_to_menu 2018-07-26 13:51:07 +02:00
Diego Prado Gesto
6850ad4c9d Align the dropdown panel in the combobox with the parent and get rid of 
binding loop messages.
 2018-07-16 14:54:44 +02:00
Lipu Fei
e3a193d6a6 Fix invisible texts in setting dropdown menu on Linux 2018-07-16 09:59:45 +02:00
Aleksei S
c4fa50a8fc Added icon for custom Menu items 2018-06-25 16:51:40 +02:00
Aleksei S
0cf46ca48e Changed SettingView to show custom menu items 2018-06-23 16:14:50 +02:00
Lipu Fei
cf0efea4c3 Fix reset to formula button and use new icon 
CURA-5407
 2018-06-13 12:26:26 +02:00
fieldOfView
19b8ca7c70 Remove vestigial references to "monitoringPrint" 2018-06-06 11:22:35 +02:00
Jack Ha
17b127e8c1 CURA-5249 replaced the extruder value of -1 by the more explicit defaultExtruderPosition, so now Cura is aware of the actual extruder position being used. Fixes linked icon next to support settings, like support_angle. 2018-06-06 11:00:09 +02:00
ChrisTerBeke
409b905045 Only trigger settings filter on enter or after 500ms timeout 2018-05-15 15:43:02 +02:00
Aleksei S
43e535ea54 Rename expandAll to expandRecursive 
CURA-5190
 2018-04-04 11:04:54 +02:00
Ghostkeeper
6d10ac993e
Add option to collapse or expand all setting categories 
Sadly it doesn't display on the category headers themselves, but it works just as well.
 2018-03-30 15:07:50 +02:00
Ghostkeeper
60a217fc84
Rename expandAll to expandRecursive 
Because it doesn't expand all settings, just a category.
 2018-03-30 15:07:42 +02:00
Lipu Fei
fd2abdd9fb
Merge pull request #3507 from guillemavila/Copy-all-values-to-all-extruders 
add Copy all values to all extruders
 2018-03-22 16:16:30 +01:00
Diego Prado Gesto
cd9531b746 Add the correct value to the setting viewer when the type is unknown. 
Contributes to CURA-4495
 2018-03-20 11:42:42 +01:00
Guillem
faf8ed3ba6 Replace only user changed values 
removed machine_settings and settable_per_extruder_check. Not needed.
 2018-03-19 14:57:31 +01:00
Lipu Fei
2660d15857 Make "show all settings" work 
CURA-5088

"Show All Settings" in setting visibility menu now sets all settings
to be visible.
 2018-03-19 10:58:56 +01:00
Lipu Fei
b1c1b04f0d Restore change to SettingView removeUnusedValue 2018-03-15 16:09:01 +01:00
Jack Ha
1dba5629f7 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-15 15:00:22 +01:00
Jack Ha
05cd937df3 CURA-4400 optional_extruders cannot be set to disabled extruders anymore 2018-03-15 15:00:13 +01:00
Lipu Fei
83175b00c2 Change SettingVisibilityPresetsModel to non-singleton 
CURA-5088
 2018-03-15 14:41:34 +01:00
jack
f3f4be5334
Merge pull request #3496 from fieldOfView/fix_textfield_select 
Only select all text when tabbing to fields, not when clicking a field
 2018-03-15 10:28:47 +01:00
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
Guillem
1bb5b8ff3e add Copy all values to all extruders 
context menu option
 2018-03-13 12:31:03 +01:00
Lipu Fei
40d3e09d90 Merge remote-tracking branch 'origin/master' into CURA-5059_reset_icon_visibility 2018-03-13 10:25:01 +01:00
Aleksei S
7574ab0883 Connect infill Lines checkbox did not work 2018-03-12 15:52:16 +01:00
Aleksei S
c3b659c5d4 Fix: reset icon dissapears for default values 
CURA-5059
 2018-03-12 15:15:19 +01:00
Jack Ha
552618fcd4 CURA-4400 added function to find model index by extruder position in SettingExtruder 2018-03-12 09:56:08 +01:00
fieldOfView
7123441db8 Fix keeping settings visible when showing all settings 2018-03-09 16:51:46 +01:00
Jack Ha
5135a972a2 CURA-4400 code style 2018-03-08 14:32:10 +01:00
fieldOfView
d9eb4406bf Speed up showing all settings 2018-03-05 23:49:06 +01:00
fieldOfView
97d7354839 Merge branch 'master' into feature_setting_visibility_profiles 2018-03-05 23:09:51 +01:00
Jack Ha
bad637eb14 CURA-4400 fixed merge conflicts 2018-03-05 16:47:40 +01:00
Lipu Fei
93190dde9b Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-03-02 09:55:14 +01:00
Diego Prado Gesto
ae57e23eec Create a mouse area around the sidebar to avoid propagating mouse wheel events. 
Contributes to CURA-4495
 2018-03-01 19:48:41 +01:00
Jack Ha
53ec846436 CURA-4400 introduced value -1 for extruder number setting (not optional_extruder); this one takes the defaultExtruderPosition in MachineManager 2018-03-01 17:21:35 +01:00
Jack Ha
2538c689f1 CURA-4400 make extruder combobox disabled items grey 2018-03-01 16:22:40 +01:00
Lipu Fei
6e5fed6b5e WIP: Fix quality name in SettingView 2018-02-21 11:21:16 +01:00
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
Jaime van Kessel
4a0a9f521c Bumped the required version numbers down again, as they should specifcy a min version number. 
As the summary describes; We should use *min* version numbers. If we have a higher version installed as defined, it will have the bugfixes and not the features. Increasing version nr should therefore only be done if we want new features.
 2018-02-16 11:13:40 +01:00
fieldOfView
85aed830a6 Merge branch 'master' into feature_setting_visibility_profiles 2018-02-15 11:56:36 +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
fieldOfView
32d677295f Set rendertype for units in SettingTextField 2018-02-15 11:38:51 +01:00
fieldOfView
593dad7cca Fix categories too 2018-02-15 11:34:46 +01:00
fieldOfView
ec1cf4065e Set renderType to Text.NativeRendering for qtquick controls 2 Labels 
Apparently, the qtquickcontrols 2 Label no longer defaults to using renderType: Text.NativeRendering
This causes text to render with QtRendering which looks subtly different on Windows and succinctly broken on some OSX installations.
 2018-02-15 11:12:19 +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