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

162 Commits

Author SHA1 Message Date
Simon Edwards
4d3e8592af CURA-2653 Searching in English while other language set 2016-12-08 14:48:29 +01:00
Jack Ha
2924d2bf71 Fix color update in extruder comboboxes. CURA-3033 2016-12-01 14:06:17 +01:00
Jaime van Kessel
6d66ea51ad Setting the support extruder in recommended mode now correctly updates them in custom 
CURA-3033
 2016-11-25 11:28:38 +01:00
Jaime van Kessel
9a81a24512 Merge branch 'feature_find_settings' of https://github.com/fieldOfView/Cura 2016-11-24 14:47:02 +01:00
fieldOfView
9dd8a88602 Fix review issues 2016-11-24 10:12:11 +01:00
Jaime van Kessel
716ffe94ff Don't show inheritance icon for resovled values 
CURA-2860
 2016-11-23 12:41:53 +01:00
Jaime van Kessel
75e067cab7 No longer select last_entry that isn't in the list 
CURA-2860
 2016-11-22 15:24:01 +01:00
fieldOfView
933ed5177f Toggle visibility of filter field when pressing the "search" icon 2016-11-22 13:44:41 +01:00
Jaime van Kessel
9057174691 Resolve is now updated from the base property 
The resolve doesn't update always update well for single extrusion machines, so the wrong value gets used.
There is however, no need for a resolve with a single extrusion machine, so we can disable the resolve for those alltogether.

CURA-2939
 2016-11-21 11:10:23 +01:00
fieldOfView
3da5e9de4e Add a "clear filter" button 2016-11-16 23:21:20 +01:00
fieldOfView
1c92b9ee0e Don't update expandedCategories preference while filtering settings 2016-11-15 16:25:39 +01:00
fieldOfView
7fafcef40b Allow making settings visible from the sidebar 2016-11-15 11:09:58 +01:00
Victor Larchenko
b63f4e0bee T562: Text box expanded and all settings visible while filtering 
# Conflicts:
#	resources/qml/Settings/SettingView.qml
 2016-11-15 10:12:40 +01:00
fieldOfView
e450d10ddb Apply styling to filter field 2016-11-15 10:07:37 +01:00
fieldOfView
479056efef Always show categories when filtering 2016-11-15 10:07:37 +01:00
fieldOfView
f7854225fa Restore expanded categories when clearing filter 2016-11-15 10:07:36 +01:00
Victor Larchenko
829f8893e2 T562: Added searching of settings 
# Conflicts:
#	resources/qml/Settings/SettingView.qml
 2016-11-15 10:07:36 +01:00
fieldOfView
189e3e30d9 Fix error about casting undefined to QString 2016-11-09 13:25:04 +01:00
Tim Kuipers
9b1a41c74c bugfix: comment fail 
sorry!!

             .-.
            o   \     .-.
               .----.'   \
             .'o)  / `.   o
            /         |
            \_)       /-.
              '_.`    \  \
               `.      |  \
                |       \ |
            .--/`-.     / /
          .'.-/`-. `.  .\|
         /.' /`._ `-    '-.
    ____(|__/`-..`-   '-._ \
   |`------.'-._ `      ||\ \
   || #   /-.   `   /   || \|
   ||   #/   `--'  /  /_::_|)__
   `|____|-._.-`  /  ||`--------`
         \-.___.` | / || #      |
          \       | | ||   #  # |
          /`.___.'\ |.`|________|
          | /`.__.'|'.`
        __/ \    __/ \
       /__.-.)  /__.-.)
 2016-11-07 13:24:28 +01:00
Tim Kuipers
e51f9ba678 fix: exclude command line settings from being viewed in the frontend (CURA-566) 2016-11-07 11:54:47 +01:00
Jaime van Kessel
74d8148e0c The right stack is now used for limit to extruder setting property provider for single extrusion machine 
This was mostly an issue when switching between printers, where some ids were set to undefined. CURA-2835
 2016-10-28 10:44:57 +02:00
Jaime van Kessel
4a5d7cbc73 Bindings of inheritance icon now correctly update when switching between machines 
CURA-2752
 2016-10-27 13:08:10 +02:00
Arjen Hiemstra
b0d6d7034a Ensure we re-evaluate the inheritance icon binding when it changes 
Contributes to CURA-2752
 2016-10-25 13:11:04 +02:00
Arjen Hiemstra
bef3666a88 Still show the inherit button even when the revert is visible 
It was not a bug like I assumed

Contributes to CURA-2752
 2016-10-25 11:40:05 +02:00
Arjen Hiemstra
8ce81fec9f Expand logic for showing the inherit button in SettingItem 
Hide it if the revert button is visible and make the overrides check
limit_to_extruder in addition to the active stack.

Contributes to CURA-2752
 2016-10-24 17:10:26 +02:00
Jack Ha
8b61215270 Added infill_mesh and infill_mesh_order to excluded list in SettingView. CURA-1993 2016-10-06 15:23:04 +02:00
Ghostkeeper
6f412c0825
Improve translation context for some labels 
These translations went sort of wrong in the Turkish translation, because the context was unclear. I've tried to clarify it better.

Contributes to issue CURA-570.
 2016-10-05 11:39:29 +02:00
Arjen Hiemstra
5a14c5e5ba Replace manual function calls to updateCurrentIndex with an explicit binding 
This is mostly in support of Uranium PR #165 . That changes
SettingPropertyProvider so that the "properties" property does not
always change. However, in general this is the more correct approach.

Relates to CURA-2232
 2016-10-04 13:22:20 +02:00
Jack Ha
1ad39a3332 Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-04 11:13:47 +02:00
Jack Ha
7c18d320c4 SettingView: Only removeUnusedValue when no resolve. Contributes to CURA-2232 2016-10-04 11:13:33 +02:00
Jaime van Kessel
faf98e40f8 Inherit button now correctly removes values if needed for multi extrusion machines 
CURA-2374
 2016-10-04 10:46:13 +02:00
fieldOfView
9499acf0d5 Fix expand/collapse icon when using the inherit icon to expand a category 
CURA-2361
 2016-09-22 10:36:38 +02:00
Jaime van Kessel
70212e2cb7 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-21 15:01:40 +02:00
Jaime van Kessel
6c7a0d73c3 Resolve now also returns value if resolve was undefined 
CURA-2319
 2016-09-21 15:01:08 +02:00
fieldOfView
7238a7b029 Expand category when clicking its inheritance button 
CURA-2361
 2016-09-21 14:50:02 +02:00
Jaime van Kessel
482ea83284 Hiding a setting forces settingInheritance manager to re-evaluate 
CURA-2361
 2016-09-16 15:32:16 +02:00
Jaime van Kessel
4f547fff8d Category setting icon now becomes invible if clicked 
CURA-2361
 2016-09-16 13:58:26 +02:00
Jaime van Kessel
132ed1d258 Pressing inheritance button for category now makes all inherited children visible 
CURA-2361
 2016-09-16 13:10:14 +02:00
Jaime van Kessel
e3d78c17ea SettingItem now uses settingInheritanceManager for visibility check 
CURA-2361
 2016-09-16 11:22:50 +02:00
Jaime van Kessel
5d84490d70 SettingInheritance manager now has a complete list of all settings that have inheritance overridden 
CURA-2361
 2016-09-16 11:18:20 +02:00
Jaime van Kessel
50f7c41ae4 Added SettingsInheritanceManager 
CURA-2361
 2016-09-16 09:38:52 +02:00
Tim Kuipers
479f9ea6d2 refactor: global_inherits_stack ==> limit_to_extruder (CURA-2308) 2016-09-14 10:46:57 +02:00
Simon Edwards
0fdd9279bb Resolvement strategy for bed adhesion and prime tower enable. 
Contributes to CURA-2232 No resolvement strategy for prime_tower_enable and platform adhesion
 2016-09-13 14:07:18 +02:00
Simon Edwards
8086646de1 When reverting a user setting be sure to delete it from all of the stacks, global and extruder. 
Contributes to CURA-2232 No resolvement strategy for prime_tower_enable and platform adhesion
 2016-09-13 11:33:33 +02:00
Jack Ha
1c1be7d444 Undo material edit update resolve, breaks UM3. Contributes to CURA-2159 2016-09-12 16:16:02 +02:00
Jack Ha
8304f17efd Fix updating resolved values when changing material. Contributes to CURA-2159 2016-09-12 15:48:30 +02:00
fieldOfView
be6bfdd4af Add a "linked" icon to settings that have "global_inherits_stack" set 2016-09-08 13:58:13 +02:00
fieldOfView
b921540703 Remove superfluous margin left by hidden settings 
Each setting that was made visible, but was disabled due to the value of another setting, would leave a 1 px margin (eg settings in the support category when support was not enabled). Hidden settings now eat that margin, leaving nothing behind.
 2016-09-08 08:58:40 +02:00
Jaime van Kessel
9d6c60ec60 Setting state is now set to calculated after setting the value 
This ensures that the setting of the value does not overide the state

CURA-2221
 2016-09-01 13:00:54 +02:00
Jaime van Kessel
114899dc91 Merge branch 'cura-2007' of github.com:Ultimaker/Cura 2016-08-24 12:39:33 +02:00