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

6082 Commits

Author SHA1 Message Date
Jaime van Kessel
86019c2df0 Renamed load&save workspace to import&export project 
CURA-1263
 2016-11-30 12:59:09 +01:00
Jack Ha
c27219b1c4 Merge branch 'master' into recommended_sidebar 2016-11-30 12:36:46 +01:00
fieldOfView
9c604bb674 Fixes two minor issues introduced in the feature_find_settings merge 2016-11-26 22:46:21 +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
jack
84759e5808 Merge pull request #1176 from Ultimaker/rework_file_handler 
Rework file handler CURA-1263
 2016-11-24 14:56:05 +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
Jack Ha
b88ed76b7c Solve merge conflict PrinterOutputDevice. CURA-1263 2016-11-24 13:55:22 +01:00
fieldOfView
d045738dc8 Simplify button width logic 2016-11-24 11:51:35 +01:00
fieldOfView
9dd8a88602 Fix review issues 2016-11-24 10:12:11 +01:00
Jack Ha
c3320bb1a4 Change settings to settings/overrides in selected messages. CURA-2898 2016-11-23 13:33:12 +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
fieldOfView
7e4f1dce7b Add button for toggling the find settings textbox 
The toggle is only shown when advanced mode is selected.
 2016-11-21 23:29:18 +01:00
Jaime van Kessel
aca8110edd Merge branch 'master' of github.com:Ultimaker/Cura into rework_file_handler 2016-11-21 13:45:04 +01:00
Jaime van Kessel
d09c2d2fa5 No longer cast ObjectId to int 
Fixes CURA-148
 2016-11-21 13:42:08 +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
Jaime van Kessel
053ea6ad52 Bumped the used API version up by one 
CURA-1263
 2016-11-17 11:44:44 +01:00
Jaime van Kessel
9539774c0b Merge branch 'master' of github.com:Ultimaker/Cura into rework_file_handler 2016-11-17 10:27:28 +01:00
Ghostkeeper
79e8fc210a
Remove commented code 
Contributes to issue CURA-2767.
 2016-11-17 10:24:19 +01:00
Ghostkeeper
d448ed7e08
Code style: Brackets on new line 
Contributes to issue CURA-2767.
 2016-11-17 09:59:14 +01:00
fieldOfView
3da5e9de4e Add a "clear filter" button 2016-11-16 23:21:20 +01:00
Jaime van Kessel
a39d682476 Renamed Load workspace to open Workspace 
CURA-1263
 2016-11-16 16:07:18 +01:00
Jack Ha
3acddddc7c Solve populating Support Extruder Combobox at first time start, adjusted spacings. CURA-2767 2016-11-15 17:09:19 +01:00
Jack Ha
d34c79249b Changed recommended sidebar options, seems to work. CURA-2767 2016-11-15 16:40:04 +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
a70e4c8120 Fixed blurSettings 
UM.MainWindow does not derive from QML Item, so it does not have a forceActiveFocus() method.

CURA-2835
 2016-11-11 10:22:17 +01:00
Jaime van Kessel
f57a17577f Added workspace save option to menu 
CURA-1263
 2016-11-09 14:14:22 +01:00
fieldOfView
189e3e30d9 Fix error about casting undefined to QString 2016-11-09 13:25:04 +01:00
fieldOfView
35a3bdc924 Fix qml error about stopCamera when no printer is connected 2016-11-09 13:18:15 +01:00
Ghostkeeper
a34c3954ce Merge branch 'feature_multiply_options' of https://github.com/fieldOfView/Cura into fieldOfView-feature_multiply_options 2016-11-09 10:24:17 +01:00
fieldOfView
eeff3b65ec Change wording from "duplicate" to "multiply" 2016-11-09 09:27:44 +01:00
Jaime van Kessel
a859c9883c Added loadWorkspace option to menu 
CURA-1263
 2016-11-08 15:33:31 +01:00
Jaime van Kessel
42b8df86d3 Information text is now translated 
CURA-2808
 2016-11-07 16:54:28 +01:00
fieldOfView
0ce4b5f2de Add "..." to Duplicate Model menu entry to indicate there is a dialog 2016-11-07 14:07:06 +01:00
fieldOfView
6752a18435 Add dialog to set number of copies when duplicating models 2016-11-07 14:02:19 +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
Ghostkeeper
070767f0db
Blur focus upon changing profiles, material, variant, etc. 
Otherwise the currently focussed setting gets taken along to after the switch.
 2016-11-04 16:02:08 +01:00
Jaime van Kessel
2eb1c61033 Merge branch 'feature_drag_curaprofile' of github.com:Ultimaker/Cura 2016-11-04 14:31:58 +01:00
Jaime van Kessel
3d30762c41 Improved difference between active and passive infill icons 
CURA-2768
 2016-11-04 09:53:14 +01:00
Jaime van Kessel
c769a05408 Added start & stop camera interface 
CURA-2411
 2016-11-04 09:41:26 +01:00
Jaime van Kessel
a969b45372 Increased width of support extruder combobox 
CURA-2792
 2016-11-03 15:41:15 +01:00
Jaime van Kessel
ab06d692d7 Added showAncestor option to settingvisibility page 
CURA-2859
 2016-11-03 14:59:57 +01:00