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

3755 Commits

Author SHA1 Message Date
fieldOfView
098cf515df Fix tooltips for simple mode helpers 
CURA-790
 2016-05-26 09:41:49 +02:00
fieldOfView
fe53a43819 Combine support checkbox & support extruder selection & remove main extruder selection 
CURA-790
 2016-05-26 09:41:25 +02:00
Jaime van Kessel
808f117785 Merge branch 'settings_rework' of https://github.com/Ultimaker/Cura 2016-05-25 15:44:08 +02:00
Arjen Hiemstra
386aec32a8 Merge branch 'settings_rework' 
Contributes to CURA-1278

* settings_rework: (224 commits)
  Improve slice trigger documentation
  Import Cura in materials preferences page so we can use the active definition id
  Add layer height to high quality profile so we have something that changes
  Update example XML material to use the right product names
  Filter available materials by the machine definition
  Show the add machine dialog when we do not have an active machine
  Create machine-specific material containers for machine specific overrides in XML material files
  When creating a new container stack, add empty containers for things where we cannot find containers
  Add preferred variant, material and quality to UM2+ definition
  Account for global container stack being None in the backend plugin
  Use the global stack instance variable and account for it potentially being None
  Store the global container stack as an instance property
  Added wildcard to filtering
  Per object settings filter now uses correct bool types (instead of strings)
  Removed stray = sign.
  Fix creating print job name
  Disable asynchronous loading of SettingItem when Qt Version < 5.5
  Document QTbug
  Properly serialise all settings to g-code file
  Document GCodeWriter class
  ...
 2016-05-25 15:12:25 +02:00
fieldOfView
f349221fa6 Make simple mode extruder selection work with settings_rework 
CURA-1278 & CURA-790
 2016-05-25 14:56:05 +02:00
Arjen Hiemstra
9bb4917ae7 Import Cura in materials preferences page so we can use the active definition id 2016-05-25 11:31:48 +02:00
Arjen Hiemstra
b2a8810d04 Filter available materials by the machine definition 
Since we now have some machine-specific materials
 2016-05-25 11:31:48 +02:00
Arjen Hiemstra
2654033fae Show the add machine dialog when we do not have an active machine 2016-05-25 11:31:48 +02:00
Ghostkeeper
c80455c6bc
Fix creating print job name 
Also fixed up the code style of that bit.

Perhaps this should've been done in Python, but that is for later.

Contributes to issue CURA-1278.
 2016-05-24 15:04:08 +02:00
Arjen Hiemstra
332321b991 Disable asynchronous loading of SettingItem when Qt Version < 5.5 2016-05-24 11:50:39 +02:00
Ghostkeeper
b1d5cad898
Document QTbug 
Took a while to find!

Contributes to issue CURA-1278.
 2016-05-24 11:43:57 +02:00
Arjen Hiemstra
f90be96bc6 Add back the Profiles page 2016-05-23 18:21:23 +02:00
Arjen Hiemstra
8284ab9de5 Insert printers and materials pages at the right location 2016-05-23 18:21:23 +02:00
Ghostkeeper
c996bcb191 Remove extruder drive upgrade option 
It was originally included with the thought that there would be different firmware for this, but there isn't. So this setting is not needed.

Contributes to issue CURA-1278.
 2016-05-23 17:19:18 +02:00
Arjen Hiemstra
f68a9ae90f Fix materials page so it displays the proper data 
Also, make sure the code is reasonably clean
 2016-05-23 14:43:56 +02:00
fieldOfView
4877c35f06 Fix layout of SettingTextField items 
CURA-1278
 2016-05-23 13:35:52 +02:00
Arjen Hiemstra
b452cf7ba4 Add a materials management page 
Based off Aldo's work which is in a different branch
 2016-05-23 02:19:11 +02:00
fieldOfView
570910187f Fix typo in method name 
CURA-1278
 2016-05-19 16:27:51 +02:00
Jaime van Kessel
6d25d21126 getting id of definition when none was found no longer causes exception 
CURA-1278
 2016-05-17 12:55:40 +02:00
Jaime van Kessel
12fd002e67 Active quality is now displayed (and changable) again 
CURA-1278
 2016-05-17 10:50:01 +02:00
Arjen Hiemstra
3531e4c3e8 Nest all controls inside the mousearea of SettingItem 
This makes hover events work properly without all the hassle
 2016-05-16 18:22:37 +02:00
Arjen Hiemstra
f5e97c5001 Make SettingComboBox work (mostly) properly 
=
 2016-05-16 18:22:37 +02:00
Arjen Hiemstra
06432c3b0b Make SettingCheckBox properly handle the value 2016-05-16 18:22:37 +02:00
Arjen Hiemstra
5b31634d3c Make SettingTextField work 2016-05-16 18:22:37 +02:00
Arjen Hiemstra
e4fe1c6e21 Add PropertyProviders to SidebarSimple and use them for property values 2016-05-16 18:22:37 +02:00
Arjen Hiemstra
b1df8e9448 Use MachineManager and PropertyProvider to restore several bits of behavioiur 2016-05-16 18:22:37 +02:00
Arjen Hiemstra
442d2b6e71 Use the right tooltip for SettingCategory 2016-05-16 18:22:37 +02:00
Arjen Hiemstra
adc699c63b Add a SettingPropertyProvider object to the setting items 2016-05-16 18:16:42 +02:00
fieldOfView
12638f3601 Make machine prefix for jobname optional 
CURA-1480
 2016-05-13 19:04:32 +02:00
fieldOfView
da872871bd Add back option to turn off automatic update check if the UpdateChecker plugin is available 
CURA-1540
 2016-05-13 18:35:41 +02:00
fieldOfView
5df7c519c2 Removed option to turn off automatic updated check from GeneralPage.qml 
UpdateChecker is not a required plugin, so we cannot rely on there being functionality to automatically check for updates. Note that the preference is still there, so the user can still turn off automatic update checking by editing the cura.cfg file.

CURA-1540
 2016-05-13 17:29:49 +02:00
Jaime van Kessel
dd24e488a8 Materials & variants are now correctly checked when active 
CURA-1278
 2016-05-13 12:04:38 +02:00
Jaime van Kessel
5dbe0bdc03 Machine variants can now be selected from dropdown menu 
CURA-1278
 2016-05-13 11:46:54 +02:00
Jaime van Kessel
6ffde62bcf Added stubs for hasVariants & hasMaterials 
CURA-1278
 2016-05-13 11:42:29 +02:00
Jaime van Kessel
f3384b043d Only variants of active machine are now shown 
CURA-1278
 2016-05-13 11:26:08 +02:00
Jaime van Kessel
b3e741e90c Added variant selection 
CURA-1278
 2016-05-13 10:16:58 +02:00
Jaime van Kessel
f5e63f2e71 Changing the material is now possible 
CURA-1278
 2016-05-12 17:38:43 +02:00
Jaime van Kessel
89c0644e4b Added activeMaterial property 
CURA-1278
 2016-05-12 17:01:47 +02:00
Jaime van Kessel
44f5559db3 Moved addMachine to machineManager 
CURA-1278
 2016-05-12 15:18:13 +02:00
fieldOfView
021bb97fc4 Add a preference for automatic update checking 
CURA-1540
 2016-05-12 14:03:03 +02:00
Jaime van Kessel
65022c3d18 Fixed adding machine in printer dialog 
CURA-1278
 2016-05-12 11:53:01 +02:00
Jaime van Kessel
78e9545ece Machines can now be removed 
CURA-1278
 2016-05-12 11:46:28 +02:00
Jaime van Kessel
d8e4aa9078 Moved machinePage to Cura 
CURA-1278
 2016-05-12 11:24:09 +02:00
fieldOfView
9b1867cdaf Hide output device selection when there is only one option 
CURA-1539
 2016-05-12 11:23:05 +02:00
Jaime van Kessel
133229d086 Merge branch 'settings_rework' of https://github.com/Ultimaker/Cura into settings_rework 2016-05-12 09:31:43 +02:00
fieldOfView
7c154c78bf Add keyboard shortcuts for grouping/ungrouping 
Contributes (in a way) to CURA-1054, \sa CURA-1531
 2016-05-11 17:58:10 +02:00
Jaime van Kessel
ac9b391e7f Fixed available printers in dropdown menu 
CURA-1278
 2016-05-11 17:20:09 +02:00
Arjen Hiemstra
3514d4839d Fix combo box setting item so it displays the right things 2016-05-11 17:19:31 +02:00
Arjen Hiemstra
d1d2dc04c5 Display the correct tooltips for reset and inherits buttons 2016-05-11 17:19:31 +02:00
Arjen Hiemstra
d4b5cd519b Fix SettingCheckbox so it displays correctly 2016-05-11 17:19:31 +02:00