3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-05 16:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
10800 commits 344 branches 300 tags 764 MiB
Commit graph

4941 commits

Author SHA1 Message Date
Randall Wessel
163543b86b Make background color of toggle button themeable 
Background of toggle button gets same color as toolbar surrounding the
button.
 2017-05-03 14:26:44 +02:00
Jaime van Kessel
5159894d5b Merge pull request #1780 from LipuFei/fix_jobspec_tofix 
Fix TypeError in JobSpec.qml due to material cost being undefined
 2017-05-03 14:12:03 +02:00
Jack Ha
a5033bae54 Enable Support settings that are applicable to support meshes. CURA-2747 2017-05-03 13:40:33 +02:00
Tim Kuipers
2ad8434c27 JSON difficult settings limit_to_extruder (CURA-3740) 2017-05-03 11:23:14 +02:00
Lipu Fei
ac560229a1 Fix TypeError in JobSpec.qml due to material cost being undefined 2017-05-03 10:45:39 +02:00
Tim Kuipers
034f93debc JSON remaining settings limit_to_extruder (CURA-3740) 2017-05-02 18:04:00 +02:00
Tim Kuipers
11d6434b75 JSON speed settings limit_to_extruder (CURA-3740) 2017-05-02 17:53:06 +02:00
Tim Kuipers
e63d9743de JSON shell settings limit_to_extruder (CURA-3740) 2017-05-02 17:46:58 +02:00
Jack Ha
5d15d6e792 Merge branch 'master' into feature_multiextruder_machinesettings 2017-05-02 17:26:27 +02:00
Tim Kuipers
4130308437 JSON infill settings limit_to_extruder (CURA-3740) 2017-05-02 17:26:06 +02:00
Tim Kuipers
202129dc47 JSON resolution settings limit_to_extruder (CURA-3740) 2017-05-02 17:18:02 +02:00
Tim Kuipers
6744bf192d JSON feat: extruder_nr per feature type (CURA-3740) 2017-05-02 16:51:55 +02:00
Ghostkeeper
d006db5b2c
Slightly reduce minimum window size 
This should make it possible to work with Cura on 1024x768 screens. I interpolated this from the 800p screens, since it seems to render smaller on my computer anyway.
 2017-05-02 13:39:12 +02:00
Tim Kuipers
c69000da75 Merge branch 'feature_support_stair_width' 2017-05-02 13:22:19 +02:00
Ghostkeeper
7a9a4ae290
Revert "Change Label to Text because of ugle font rendering" 
This reverts commit 8c9eccd1f4. This element is in a modal window, where the fonts should get the system themeing.
 2017-05-02 12:58:29 +02:00
Mark
0e1748b705 Small layout fix so the comboboxes are aligned 2017-05-02 12:55:37 +02:00
Jaime van Kessel
d7004d3547 Merge branch 'master' of github.com:Ultimaker/Cura into cura_containerstack 2017-05-02 11:42:16 +02:00
Jaime van Kessel
2bc4355f00 Merge branch 'fix_hover_effects' of https://github.com/fieldOfView/Cura 2017-05-02 09:40:08 +02:00
Mark
be21cd7f7d Fix preference category double name 2017-05-01 13:25:13 +02:00
fieldOfView
f18947681a Disambiguate theme name 2017-04-30 23:25:14 +02:00
fieldOfView
93197cd173 Add hover effect to mode switch text labels 2017-04-30 23:21:49 +02:00
fieldOfView
0c6a5328c8 Add hover effect to mode switch control 
While simplifying theme additions
 2017-04-30 22:52:54 +02:00
fieldOfView
98aca20197 Fix hover effect on "enable support" checkbox 2017-04-30 22:27:07 +02:00
fieldOfView
4dea518c72 Add Upgraded Parts action for UM2 to add support for Olsson block 
This adds a set of variants that just set the nozzle diameter and nozzle tip diameter. These variants are not used until the machine action sets the has_variants metadata entry.
 2017-04-30 12:38:46 +02:00
fieldOfView
d12e323853 Add definition for Alya 3d printer 
See https://github.com/Ultimaker/Cura/issues/1759
 2017-04-30 10:53:23 +02:00
fieldOfView
577a8d0a3e Fix MaterialView layout issues 
Make scrollview look more in line with the scrollview on the profiles page
 2017-04-30 10:28:03 +02:00
fieldOfView
a1d9b1a37f Force update after unlinking material. 2017-04-29 21:19:54 +02:00
fieldOfView
67b8302d40 Add a notice to linked materials and allow "unlinking" a material. 2017-04-29 21:08:48 +02:00
fieldOfView
23cd6b1c2c Fix rendering of readonly description/adhesion info 2017-04-29 16:43:26 +02:00
Mark
b05954f99f Merge pull request #1740 from Ultimaker/feature_extruder_buttons 
Add Extruder selection buttons to the Toolbar
 2017-04-28 15:02:47 +02:00
Lipu Fei
37ec14c239 Merge pull request #1710 from alephobjects/theme-picker 
Theme picker
 2017-04-27 15:32:14 +02:00
Victor Larchenko
58a857403c Added resetting of theme 2017-04-27 16:37:01 +06:00
fieldOfView
02b978272f Add "Create" button to create a new, unique material. 
The new custom material is still based on generic_pla, but it gets a new GUID and uses itself as base_file so it is not conjoined to another material.
 2017-04-27 11:19:46 +02:00
Arjen Hiemstra
60339eb44b Minor codestyle fix 2017-04-26 16:18:23 +02:00
Arjen Hiemstra
80bf6988ca Remove unnecessary Catalog and SettingPropertyProvider 2017-04-26 16:18:14 +02:00
Arjen Hiemstra
b4f27f0af7 Remove checkable property and MouseArea in favor of onClicked on the button 
It turns out, setting checkable: true causes binding breakage. Without
checkable, checked still works and we can use onClicked of the button
directly.
 2017-04-26 16:17:54 +02:00
Mark
d0a95426cb Remove space.. 2017-04-26 13:19:01 +02:00
Mark
f573802e8d Fix to make the extruders line up below the label 
CURA-3609
 2017-04-26 13:01:14 +02:00
Lipu Fei
a5079bfcb3 Merge pull request #1726 from fieldOfView/fix_general_page_scrolling 
Make the general settings page options draggable only vertically
 2017-04-26 11:19:47 +02:00
Jaime van Kessel
1739abbca0 Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-26 09:56:28 +02:00
fieldOfView
0b9f451103 Apply color to layerview legend labels directly 
The Label style property should not be confused with e TextField style property
 2017-04-25 18:15:04 +02:00
fieldOfView
2493bd6fe6 Merge branch 'master' into themed-layer-view 2017-04-25 18:06:12 +02:00
Ghostkeeper
6e5f7ac28a
Merge branch 'feature_support_top_bottom_speed' 
Contributes to issue CURA-3491.
 2017-04-25 16:46:30 +02:00
Arjen Hiemstra
89e6313143 Add buttons to select the extruder for the selection to the toolbar 
Contributes to CURA-3577
 2017-04-25 16:11:31 +02:00
Arjen Hiemstra
48baf272b4 Fix the extruder icons to have a proper square aspect ratio 
Contributes to CURA-3577
 2017-04-25 16:10:44 +02:00
Arjen Hiemstra
c85f635125 Add support for overriding the background color of a Tool button 
Contributes to CURA-3577
 2017-04-25 16:09:51 +02:00
Lipu Fei
268a9c9bac Add priming_enabled option into fdm_printer 
CURA-3634
 2017-04-25 16:07:32 +02:00
Arjen Hiemstra
09f23f5f91 Styling fixes in Toolbar QML 2017-04-25 11:31:59 +02:00
Ghostkeeper
15593de404
Fix extruder number dependency of support roof pattern 
It was depending on support bottom extruder.

Contributes to issue CURA-3491.
 2017-04-24 17:31:07 +02:00
Jaime van Kessel
33d92f9596 Merge branch 'master' of github.com:Ultimaker/Cura into feature_extruder_buttons 2017-04-24 16:39:15 +02:00