GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-31 02:25:57 +08:00
Code Issues Packages Projects Releases Wiki Activity
11,142 Commits 294 Branches 267 Tags
Commit Graph

1985 Commits

Author SHA1 Message Date
Lipu Fei
8af1cc886f Use .definition to access DefinitionContainer in qml 
CURA-3810
 2017-05-30 12:49:12 +02:00
Lipu Fei
7be05229d8 Fix material info button tooltip position 
CURA-3810
 2017-05-30 11:47:49 +02:00
Lipu Fei
9333ed1e35 Update copyright in comments 
CURA-3810
 2017-05-30 09:16:58 +02:00
Lipu Fei
68bd5a6e37 Use Item and anchors to set material row layout 
CURA-3810
 2017-05-30 09:16:28 +02:00
Lipu Fei
c80e1b67a5 Only show material info button for multi-extrusion machines 
CURA-3810
 2017-05-29 18:00:46 +02:00
Lipu Fei
b797fcc74d Use global stack to evaluate limit_to_extruder value 
CURA-3738

Getting limit_to_extruder from definition in QML returns a
SettingFunction which hasn't been evaluated. This causes the comparison
not to be working. We change it to use the global stack to evaluate so
we can get an actual extruder number string.
 2017-05-29 15:44:57 +02:00
Ghostkeeper
b8f290d835
Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-29 15:40:24 +02:00
Lipu Fei
85e875257b Use "/<version>/<machineName>" as the material info URL suffix 
CURA-3810
 2017-05-29 15:23:52 +02:00
Lipu Fei
9b67fa94b4 Add material info button to show Ultimaker.com materials page 
CURA-3810

Add a new info button for materials. When a user clicks on the button,
it will open the materials information page on the Ultimaker website.
 2017-05-29 14:52:05 +02:00
Jaime van Kessel
ca922e9e9d The monitor item is now actually used to display information on monitor page 
The UM3 now provides camera image in this way

CURA-3826
 2017-05-29 13:47:41 +02:00
fieldOfView
817de9d39e Get a list of available themes instead of the hardcoded list 2017-05-24 17:42:11 +02:00
Lipu Fei
64ae8bb595 Use global stack to evaluate limit_to_extruder value 
CURA-3738

Getting limit_to_extruder from definition in QML returns a
SettingFunction which hasn't been evaluated. This causes the comparison
not to be working. We change it to use the global stack to evaluate so
we can get an actual extruder number string.
 2017-05-24 10:17:13 +02:00
Jaime van Kessel
5aba1731f5 Renamed useOptionalExtruder to addOptional extruder 
This is more in line with the other properties

CURA-3814
 2017-05-22 14:05:10 +02:00
Jaime van Kessel
20cb3ea01f Added "optional_extruder" setting type 
CURA-3814
 2017-05-22 13:24:41 +02:00
Arjen Hiemstra
20e46f4d8b Make Extruder setting type update its color properly 
The binding for the material color would not get updated properly when
the model changes. This fixes that.

Contributes to CURA-3804
 2017-05-17 11:30:48 +02:00
Arjen Hiemstra
616ee34be5 Simplify SettingExtruder setting item 
This way it properly updates when a parent setting changes.

Contributes to CURA-3804
 2017-05-16 17:43:24 +02:00
jack
85a29e967f Merge pull request #1757 from fieldOfView/fix_material_uniqueness 
Fix material uniqueness
 2017-05-16 09:44:10 +02:00
Ghostkeeper
4b28e9bf43
Re-enable Japanese from language selection menu 
Contributes to issue CURA-3817.
 2017-05-16 09:38:39 +02:00
Mark
b100050ee2 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-12 16:44:17 +02:00
Mark
aee3b43227 Row element was not used 2017-05-12 16:43:50 +02:00
Ghostkeeper
0cc4f90920
Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-12 16:34:19 +02:00
Mark
08c0779dde Remove unused file, context menu takes care of the multiply object dialog 2017-05-12 16:18:46 +02:00
Mark
f60765c56c Fix workspace dialog layout so checkbox and buttons dont get hidden 2017-05-12 13:24:58 +02:00
Jaime van Kessel
7508a0a981 Changed infill buttons so they work with all languages 
CURA-3634
 2017-05-12 10:24:15 +02:00
Ghostkeeper
9de041ade5
Remove theme font from system-themed dialogue 
See commit 36dedabd11a36bd40669fbcf3b0e1f820c47acf1.
 2017-05-12 09:45:53 +02:00
fieldOfView
a727e4ffd0 Make sure all materials are shown 
Without this workaround, some materials that are listed above the generic materials do not show up untill the user scrolls the scrollview.
 2017-05-11 18:17:11 +02:00
fieldOfView
6fa83a9110 Fix selecting a material when an edit field has the focus 2017-05-11 13:22:14 +02:00
fieldOfView
e45f04f391 Merge branch 'master' into fix_material_uniqueness 2017-05-11 12:23:01 +02:00
Ghostkeeper
e3236bec4d
Make wording more consistent 
Contributes to issue CURA-3732.
 2017-05-11 11:22:18 +02:00
Jaime van Kessel
8e7637ae62 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-11 11:08:47 +02:00
Jaime van Kessel
e2b39e7e33 Fixed spacing of infill options 
CURA-3732
 2017-05-11 11:08:23 +02:00
Ghostkeeper
00aff6d2f2
Make feature labels more accurate for support 
It's used a bit differently.

Contributes to issue CURA-3773.
 2017-05-11 10:29:18 +02:00
Ghostkeeper
32ea311762
Merge branch 'time_estimate_per_feature' of https://github.com/14bitVoid/Cura into 14bitVoid-time_estimate_per_feature 2017-05-11 09:53:50 +02:00
Mark
04611b06af Fix two spelling errors 
TRI-1450
 2017-05-10 20:14:03 +02:00
Jaime van Kessel
51c08d4f53 Merge branch 'feature_extra_gradual_infill_icon' of github.com:Ultimaker/Cura 2017-05-10 14:00:15 +02:00
fieldOfView
8f792b2504 Tweak Print Settings layout to match the rest of the UI. 2017-05-09 13:03:49 +02:00
Lipu Fei
19ee790cd7 Remove device pixel ratio from DiscardOrKeepProfileChangesDialog 2017-05-09 12:05:01 +02:00
Lipu Fei
36dedabd11 Fix DPI issue with DiscardOrKeepProfileChangesDialog 2017-05-09 11:47:55 +02:00
Jaime van Kessel
eb677f5625 Merge branch 'feature_cutting_mesh' of github.com:Ultimaker/Cura 2017-05-09 10:20:27 +02:00
Mark
1449f785f7 Fix so that sliding the switch also changes the mode 2017-05-08 15:51:38 +02:00
fieldOfView
836cf27266 Keep material selected when editing its name, brand or type 
Editing a material name, brand or type may change its position in the materials list. We now reselect the material after editing one of these values.
 2017-05-08 11:37:19 +02:00
fieldOfView
b4f56d10d7 Set currentIndex to a more logical successor when deleting a material 2017-05-08 11:17:10 +02:00
fieldOfView
00f3cf409b Select newly created material 2017-05-08 10:38:25 +02:00
Mark
e3b17579e8 Merge branch 'feature_extra_gradual_infill_icon' of github.com:Ultimaker/Cura into feature_extra_gradual_infill_icon 2017-05-05 19:21:13 +02:00
Ghostkeeper
fc1a5e89c3
Change gradual infill upon clicking infill buttons 
It sets the gradual infill to the value stored in the listmodel.

Contributes to issue CURA-3732.
 2017-05-05 17:16:18 +02:00
Ghostkeeper
ad1b1e0455
Detect whether the current infill is gradual 
And highlight the correct infill button in that case.

Contributes to issue CURA-3732.
 2017-05-05 17:13:32 +02:00
Ghostkeeper
df0a971326
Improve tooltip wording for gradual infill button 
Contributes to issue CURA-3732.
 2017-05-05 16:59:35 +02:00
14bitVoid
e9d70a8a70 Translate features for time estimates 2017-05-05 02:36:22 +02:00
14bitVoid
05f46c47f7 Dynamically fill tooltip with time estimates 2017-05-05 02:31:16 +02:00
14bitVoid
69a95e37a5 Show time estimates per feature in tooltip 2017-05-05 01:34:09 +02:00