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

1704 Commits

Author SHA1 Message Date
fieldOfView
ed6f4d851c
Update documentation 2017-06-14 10:41:39 +02:00
fieldOfView
1f49a87acb
Update material_diameter when editing the material in MaterialView.qml 2017-06-14 10:41:02 +02:00
Ghostkeeper
baef713f50
Disable incomplete languages 
These translations are incomplete for the 2.6 release.

Contributes to issue CURA-3885.
 2017-06-14 09:37:55 +02:00
Mark
8ab5c7e4cd Merge pull request #1910 from Ultimaker/fix_dialog_sizes 
Fix dialog sizes.
Tested on different OSes and screens, all looked good.
 2017-06-13 13:14:44 +02:00
Mark
9f66bc8090 Merge pull request #1910 from Ultimaker/fix_dialog_sizes 
Fix dialog sizes.
Tested on different OSes and screens, all looked good.
 2017-06-08 11:08:56 +02:00
Ghostkeeper
3d8c932bcc
Clarify context of Print Selected Model With button description 2017-06-01 16:20:40 +02:00
Ghostkeeper
2fb7821972
Merge branch '2.6' 2017-05-31 17:17:32 +02:00
Jaime van Kessel
ccec148243 Plugins can now also be installed by dropping them onto the application 
CURA-3712
 2017-05-31 14:40:17 +02:00
Mark
4398960264 Give text in labels specific width so icons stay aligned 2017-05-31 12:46:07 +02:00
Mark
a66f0d4781 resize the rename-dialog 2017-05-31 12:46:07 +02:00
Mark
7bc715a9bd fixed too big dialogs and hidden checkboxes 2017-05-31 12:46:07 +02:00
Mark
4e03eeca8e Anchor the i-button to materialVariantContainer 
CURA-3810
 2017-05-31 12:00:44 +02:00
Mark
3177d99bcf Anchor the i-button to materialVariantContainer 
CURA-3810
 2017-05-31 11:59:05 +02:00
Mark
4fe4c759bd Anchor the i-button to materialVariantContainer 
CURA-3810
 2017-05-31 11:57:48 +02:00
Mark
a934cc4182 Make the icon a litle bit smaller 
CURA-3810
 2017-05-31 10:50:49 +02:00
Mark
6311563909 Realign the selectboxes 
CURA-3810
 2017-05-31 10:50:49 +02:00
Mark
7676975fcb Make the icon a litle bit smaller 
CURA-3810
 2017-05-31 09:37:20 +02:00
Mark
4c88b82b99 Realign the selectboxes 
CURA-3810
 2017-05-31 09:35:22 +02:00
Ghostkeeper
cbe4891784
Merge branch '2.6' 2017-05-30 13:36:04 +02:00
Ghostkeeper
9132a025d6
Merge branch 'feature_CURA-3810_material_info_button' of https://github.com/LipuFei/Cura into LipuFei-feature_CURA-3810_material_info_button 2017-05-30 13:32:03 +02:00
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