3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-13 01:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
18762 commits 302 branches 270 tags 770 MiB
Commit graph

3641 commits

Author SHA1 Message Date
Jack Ha
bad637eb14 CURA-4400 fixed merge conflicts 2018-03-05 16:47:40 +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
Diego Prado Gesto
a992487589 CURA-4870 Check wether the current configuration matches one of the unique configurations available on the printer output device. 
Improve some elements in the UI
 2018-03-05 14:39:49 +01:00
Lipu Fei
3004b146ad Fix: move createQualityChanges() to QualityManager 
CURA-4606
 2018-03-05 13:36:13 +01:00
Lipu Fei
6199e8e15a Fix merge conflicts with master 2018-03-05 13:27:00 +01:00
Ghostkeeper
08f114ee6e
Don't make print estimates translateable 
This was very very confusing for our translators. And all of the translators basically came down to the same translation: Leave it untranslated. So let's make it a bit easier on them and don't allow this to be translated.
If we really want the currency to be translated to the correct position, Qt has currency printing in its locale as an option too.
 2018-03-05 13:02:11 +01:00
Diego Prado Gesto
f779a20a6e CURA-4870 Cleanup UI and add buildplate icon 2018-03-05 12:13:46 +01:00
Diego Prado Gesto
871f0a130e CURA-4870 Frontend formatting to show the configurations 2018-03-05 11:44:26 +01:00
Lipu Fei
a29a6122f1 Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-03-05 11:29:21 +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
Diego Prado Gesto
49fcf35d9b CURA-4870 Prepare the UI to show the list of configurations 2018-03-04 17:26:37 +01:00
Diego Prado Gesto
6e35fc5035 CURA-4870 Modify printer menu visibility of the items. Show local or network submenu only when there is local or network printers respectively 2018-03-04 12:53:16 +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
Ghostkeeper
acbc6893f5
Also allow backspace to delete models 
See the documentation in the code as to why. Macintosh keyboards...

Fixes #3257.
 2018-03-02 14:51:13 +01:00
Diego Prado Gesto
135208bfee CURA-4870 Modify the dropdown look and feel 2018-03-02 13:26:04 +01:00
Lipu Fei
93190dde9b Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-03-02 09:55:14 +01:00
Diego Prado Gesto
ae57e23eec Create a mouse area around the sidebar to avoid propagating mouse wheel events. 
Contributes to CURA-4495
 2018-03-01 19:48:41 +01:00
Jack Ha
53ec846436 CURA-4400 introduced value -1 for extruder number setting (not optional_extruder); this one takes the defaultExtruderPosition in MachineManager 2018-03-01 17:21:35 +01:00
Lipu Fei
71e8478419 Rename to selected_position 2018-03-01 16:26:12 +01:00
Jack Ha
2538c689f1 CURA-4400 make extruder combobox disabled items grey 2018-03-01 16:22:40 +01:00
Lipu Fei
e87077802f Change to layer_height and layer_height_unit 2018-03-01 15:55:44 +01:00
Lipu Fei
06ec16d627 Rename quality drop down menu models 2018-03-01 15:37:48 +01:00
Jack Ha
ac76d6ea52 Merge branch 'refactoring_machine_manager' into feature_enable_disable_extruder 2018-03-01 13:14:10 +01:00
Jack Ha
71e631150d CURA-4400 update extruder disabled color 2018-03-01 13:06:12 +01:00
Jack Ha
c94d88cd9d CURA-4400 added context menu on right click extruder in SidebarHeader 2018-03-01 12:58:27 +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
Diego Prado Gesto
6952e3f5c1 CURA-4870 Create a customized popup for the sync dropdown and fill it out with the information about the printers in the group 2018-02-28 19:41:23 +01:00
Lipu Fei
3e23659c79 Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-02-28 15:29:22 +01:00
Ghostkeeper
4757f9dc0c
Remove invalid alias 
This alias was referring to something that didn't exist any more and this broke our application menu.

Contributes to issue CURA-5029.
 2018-02-28 13:49:11 +01:00
Diego Prado Gesto
3aa3729635 CURA-4870 Add printer type selector that show the unique name list of 
all the types of printers in a group.
 2018-02-28 13:36:39 +01:00
Andreea Scorojitu
356e13c225 Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-02-28 13:34:38 +01:00
Andreea Scorojitu
7881dce638 Remove_installed_plug-ins_submenu_CURA-5029 
The Installed plugins from the Plugins menu is replaced by the browser plugin window.
 2018-02-28 13:33:02 +01:00
Jack Ha
86c13e86c7 CURA-4400 first version that disables extruder and updates available quality profiles 2018-02-28 12:56:00 +01:00
Lipu Fei
6b0095014a Fix merge conflicts from master 2018-02-28 12:52:45 +01:00
Lipu Fei
7f5bb70bee Remove redundant setProperties 
CURA-4916
 2018-02-28 12:46:00 +01:00
Aleksei S
e533c4604c Update infill scroll bar if setting is changed in custom mode 
CURA-4916
 2018-02-28 10:52:46 +01:00