GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-02 16:54:23 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,662 Commits 291 Branches 260 Tags
Commit Graph

553 Commits

Author SHA1 Message Date
Lipu Fei
a115956575 Do not show a material itself in its linked material list 2018-03-16 10:40:16 +01:00
Diego Prado Gesto
d0e6e59845 Set the frame visible for the materials and profiles page in 
preferences.
 2018-03-15 16:46:25 +01:00
Lipu Fei
8e39849aad Refactor setting visibility preset 
CURA-5088
 2018-03-15 14:41:34 +01:00
Lipu Fei
83175b00c2 Change SettingVisibilityPresetsModel to non-singleton 
CURA-5088
 2018-03-15 14:41:34 +01:00
Lipu Fei
984e6ddd08
Merge pull request #3274 from fieldOfView/feature_setting_visibility_profiles 
Setting Visibility Presets sidebar menu
 2018-03-14 13:25:59 +01:00
Diego Prado Gesto
2bf6d071d1 Merge branch 'master' into feature_sync_button 2018-03-13 13:54:22 +01:00
Diego Prado Gesto
d807ce57a5 CURA-4870 Disable rename button in MachinesPage when the selected item 
is a network printer since the name is the name of the host printer (or
group)
 2018-03-13 10:49:29 +01:00
Ghostkeeper
b4a40915bb
Code style: Brackets on new line 
Contributes to issue CURA-4606.
 2018-03-13 09:28:01 +01:00
Ghostkeeper
d904f677bc
Store extruder position of quality groups as int 
Instead of as a string with a number in it.
For the actual global stack's extruders we still need to convert to string, sadly. I could go refactor that too, but then I won't be going home until 23 o'clock or something.

Contributes to issue CURA-4606.
 2018-03-12 17:08:13 +01:00
Diego Prado Gesto
85d6919ce6 Merge branch 'master' into feature_sync_button 2018-03-09 16:59:18 +01:00
fieldOfView
711d60e8c7 Allow switching back to the "Custom" set 2018-03-09 16:44:27 +01:00
Diego Prado Gesto
472ae8e044 CURA-4870 Create a custom model for the machines in order to show the 
printers grouped by local or networked.
 2018-03-09 16:35:23 +01:00
fieldOfView
4c66c935af Merge branch 'master' into feature_setting_visibility_profiles 2018-03-09 15:45:24 +01:00
Lipu Fei
3550ef80e0 Fix quality management page QML 
CURA-5063
 2018-03-09 11:00:39 +01:00
Lipu Fei
31b7374689 Fix material settings saving upon dialog close 
CURA-4606

Force to trigger a lose focus on all editing fields so their
onEditingFinished callback will get triggered.
 2018-03-06 13:40:32 +01:00
Lipu Fei
ff0d694e72 Select the activated material when material management page shows up 
CURA-4606
 2018-03-06 11:55:24 +01:00
fieldOfView
97d7354839 Merge branch 'master' into feature_setting_visibility_profiles 2018-03-05 23:09:51 +01:00
Jaime van Kessel
2de587a8c6 Made some changes so the code also works with lower versions of Qt & pyQt 2018-03-05 15:32:46 +01:00
Lipu Fei
3004b146ad Fix: move createQualityChanges() to QualityManager 
CURA-4606
 2018-03-05 13:36:13 +01:00
Lipu Fei
eb5ce04229 Fix code style in materialspage 2018-03-05 10:59:10 +01:00
Lipu Fei
caca5e5021 Fix code style in materialspage 2018-03-05 10:57:36 +01:00
Lipu Fei
6a14e39610 Remove outdated TODOs in ProfilesPage 2018-03-03 16:34:31 +01:00
Lipu Fei
730048d2b2 Simplify code in MaterialsPage.qml 2018-03-03 16:32:29 +01:00
Lipu Fei
86b75ae3b6 Remove outdated TODO 2018-03-03 16:29:31 +01:00
Lipu Fei
0e5aff84e9 Remove outdated comment in MaterialsPage.qml 2018-03-03 16:26:03 +01:00
Lipu Fei
575f38e63e Fix code style in MaterialView.qml 2018-03-03 16:25:09 +01:00
Lipu Fei
d24bc0b41b Fix code style in MaterialView.qml 2018-03-03 16:23:54 +01:00
Lipu Fei
c93643bc2f Move createMaterial() to MaterialManager 2018-03-02 17:30:19 +01:00
Lipu Fei
5f0bb3a283 Move removeMaterial() to MaterialManager 2018-03-02 17:20:26 +01:00
Lipu Fei
7642afb9fe Move duplicateMaterial() to MaterialManager 2018-03-02 17:16:35 +01:00
Lipu Fei
ca785c9df3 Move duplicateQualityChanges() to QualityManager 2018-03-02 17:08:58 +01:00
Lipu Fei
355b8cbac3 Move renameQualityChangesGroup() into QualityManager 2018-03-02 16:58:50 +01:00
Lipu Fei
8324f4f44e Move removeQualityChangesGroup() into QualityManager 2018-03-02 16:47:25 +01:00
Lipu Fei
c6128ef5ba Move setMaterialName() into MaterialManager 2018-03-02 16:22:22 +01:00
Lipu Fei
71e8478419 Rename to selected_position 2018-03-01 16:26:12 +01:00
Lipu Fei
580244a546 Split material models into separate files 2018-03-01 11:50:55 +01:00
Lipu Fei
b5cf6b7531 Rename selectedQualityItem and add docs 2018-03-01 11:16:22 +01:00
Jack Ha
df46241225 CURA-4606 CURA-5012 corrected and moved approximateMaterialDiameter to ExtruderStack 2018-02-27 13:03:08 +01:00
Jack Ha
d79206301d CURA-4606 CURA-5012 fix incompatible diameter update message in materialview 2018-02-27 11:43:54 +01:00
Jack Ha
22cf5abec2 Merge branch 'master' into refactoring_machine_manager 2018-02-27 10:24:56 +01:00
Jack Ha
c23827cfa1 CURA-4606 CURA-5003 activate duplicated material and always switch to correct material after some material change 2018-02-26 16:33:25 +01:00
Ghostkeeper
c16214e0f3
Traditional Chinese is complete again 
At least, complete for 3.2.
 2018-02-26 15:48:04 +01:00
Jack Ha
11be94c735 Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager 2018-02-26 09:30:33 +01:00
Lipu Fei
f487c5b084 Fix profile management page 2018-02-22 23:31:41 +01:00
Lipu Fei
dec7ad25e2 Fix activate newly created custom quality profile 2018-02-22 23:08:26 +01:00
Jack Ha
cad6a3bb3d CURA-4606 CURA-5003 select and activate material after create, duplicate 2018-02-22 17:14:23 +01:00
Lipu Fei
d2ffd59431 Switch to the new quality profile when it is created 2018-02-22 16:53:13 +01:00
Jack Ha
b23a85aa37 Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager 2018-02-22 16:14:24 +01:00
Jack Ha
b209badf68 CURA-4606 CURA-5003 fix density and diameter in material manager 2018-02-22 16:14:11 +01:00
Lipu Fei
32e1015f25 WIP: Cleanup PrintInformation 2018-02-22 16:07:56 +01:00