GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-17 06:06:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,711 Commits 290 Branches 260 Tags
Commit Graph

1050 Commits

Author SHA1 Message Date
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
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
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
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
Jaime van Kessel
450eb5443f Updated text to be more clear 
CURA-2726
 2016-11-03 14:21:13 +01:00
Simon Edwards
cadf2115ac Merge pull request #1058 from Ultimaker/cura-2730 
Changed MachineManager.isActiveStackValid to areStacksValid. CURA-2730
 2016-11-01 16:17:04 +01:00
Ghostkeeper
6fa36f7c09
Merge branch '2.3' 2016-11-01 16:07:18 +01:00
Ghostkeeper
32653c2df4
Blur settings upon discarding current settings 
Otherwise the currently selected setting doesn't get discarded.

Contributes to issue CURA-2866.
 2016-11-01 16:06:56 +01:00
Ghostkeeper
0fa93f2214 Merge branch '2.3' 2016-10-31 17:26:51 +01:00
Ghostkeeper
48b57de6df
Filter materials on compatibility for non-machine-specific materials 
This only listens to whether the 'base' XML profile is marked as compatible in its metadata, but since the machine doesn't have its own materials, the base is the only one that exists. This needs to be changed when we change the filtering on fdmprinter, hence the comment in the code.

Contributes to issue CURA-2837.
 2016-10-31 17:26:36 +01:00
Ghostkeeper
6999a14821
Merge branch '2.3' 2016-10-31 10:55:54 +01:00
Jaime van Kessel
78ab1f1a71 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-10-28 14:50:07 +02:00
Jaime van Kessel
af10438277 Fixed blurSetting 
CURA-2835
 2016-10-28 14:49:42 +02:00
Ghostkeeper
9f43a740a6
Also validate machine name in rename dialogue 
Otherwise you could still circumvent the length limitation.

Contributes to issue CURA-2692.
 2016-10-28 13:33:37 +02:00
Jaime van Kessel
28eb4297c6 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-28 11:38:13 +02:00
Jaime van Kessel
fcf3caba5a Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-10-28 10:46:37 +02: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
Ghostkeeper
717248bd78
Limit number of special characters 
There is also a more advanced attempt that allows more, but I've commented it out because it doesn't quite work yet. Special characters now always count for 12.

Contributes to issue CURA-2652.
 2016-10-27 21:55:58 +02:00
Jaime van Kessel
999380cf1b Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-27 17:15:58 +02:00
Jaime van Kessel
1aa71d6171 Profiles model is now a singleton, to prevent the agressive garbage collecting to break stuff 
CURA-2826
 2016-10-27 14:26:43 +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
Jaime van Kessel
a581942869 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-26 13:13:27 +02:00
Simon Edwards
cc33b3be22 Change for the "Advanced" tab to "Custom". 
CURA-2751 Change settings label "Simple" to "Recommended"
 2016-10-26 10:43:00 +02:00
Jaime van Kessel
dd79be6595 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-25 16:50:55 +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
Ghostkeeper
e3ae3d50f9
Merge branch '2.3' 2016-10-25 11:50:20 +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
aed23ca17e Merge branch '2.3' 
* 2.3:
  Expand logic for showing the inherit button in SettingItem
  Add a method to get overrides for a specified (extruder)stack
  Add global profiles for UM3 so this can be tested without dependencies
  Account for empty material when switching quality changes
  Set the global variant and material to empty for multi-extrusion machines
  Also properly set global profile when changing quality_changes profiles
  Add support for global quality profiles
 2016-10-24 17:10:41 +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
Tim Kuipers
86d682daae Merge branch '2.3' 2016-10-21 16:20:52 +02:00
Ghostkeeper
19678c1126
Display layer height after profile name in drop-down 
There is no styling in this drop-down, as it is provided by the OS. Just a dash and the layer height will do.

Contributes to issue CURA-2737.
 2016-10-21 14:00:43 +02:00
Ghostkeeper
afd3dd6eec
Make separate theme colour for detail text 
I would use the normal font colour with a lower alpha value here, but it seems that rendering text with transparency doesn't work in Qt.

Contributes to issue CURA-2737.
 2016-10-21 13:06:49 +02:00
Ghostkeeper
57b0275384
Show layer height in profile selection menu 
It's shown in the 'inactive' font colour, which isn't entirely semantically correct but has the behaviour we want regardless of how the theme changes in the future.

Contributes to issue CURA-2723.
 2016-10-20 17:16:06 +02:00
Jack Ha
d308cd45bc Moved function out of MachineManager, changed "Valid" to "HaveErrors". 
CURA-2730
 2016-10-20 16:16:33 +02:00
Jack Ha
a23a922eec Drag profile into Cura; added importProfile(s), exportProfile to ContainerManager. CURA-787 2016-10-20 13:55:39 +02:00
Simon Edwards
28f00e2089 Merge branch '2.3' 2016-10-20 12:59:51 +02:00