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

472 Commits

Author SHA1 Message Date
Arjen Hiemstra
3b51c3d339 Remove qmldir from qml resources and use proper Cura namespace for everything 
Since we now properly expose all the qml files in the Cura namespace
we should also use it from there.
 2016-05-31 18:07:33 +02:00
fieldOfView
21e8dd151e Prevent removing the last printer, disable Activate button for current active printer 
Fixes CURA-1631
 2016-05-31 15:48:08 +02:00
fieldOfView
0c7b417244 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-05-30 16:45:57 +02:00
fieldOfView
b1419d8028 Fix activating (quality)profiles on the profiles page 
CURA-1278
 2016-05-30 16:45:36 +02:00
Arjen Hiemstra
d616a72bb1 Display affects/affected by in the tooltip again 
Contributes to CURA-1278
 2016-05-30 16:25:20 +02:00
Arjen Hiemstra
8039184c18 Move setting error checking to StartSliceJob and allow the job to return a proper response 
Now the job can determine if we can continue with slicing or not and if
not, why not.

This also means we can now show a message when we cannot find any
slicable objects.

Contributes to CURA-1278
 2016-05-30 13:03:06 +02:00
Arjen Hiemstra
c63eb3871c Account for the changes to BackendState in Uranium 
Contributes to CURA-1278
 2016-05-30 12:22:12 +02:00
fieldOfView
472012a5b9 Fix debug code introduced in f5fce512380209c1a05687ef83c4d2bf0f8b0bec 2016-05-27 17:46:53 +02:00
fieldOfView
6aa00a951f Fix triggering actions from the extensions menu 
Contributes to CURA-1540, CURA-1278
 2016-05-27 17:21:14 +02:00
fieldOfView
f5fce51238 Fix "Defaults" button on General page 
CURA-1278
 2016-05-27 17:11:54 +02:00
fieldOfView
64a613f407 Fix "Activate" button on the Manage Printers page 
CURA-1278
 2016-05-27 11:47:50 +02:00
Jaime van Kessel
c2a25b131e Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-05-26 15:35:51 +02:00
Jaime van Kessel
c814e47b0e SettingView now works with PreferenceVisibility handler 
CURA-1278
 2016-05-26 15:35:28 +02:00
Arjen Hiemstra
43ec037c55 Do not load ComboBox items asynchronously 
Since there is a bug with Qt 5.5 that will do strange reordering.

Contributes to CURA-1278
 2016-05-26 15:29:56 +02:00
Arjen Hiemstra
8804c2837f Make reset and restore default buttons work properly again 
Contributes to CURA-1278
 2016-05-26 15:28:57 +02:00
Arjen Hiemstra
5975fa1b0d Fix enabled state of setting items 
Contributes to CURA-1278
 2016-05-26 13:29:56 +02:00
fieldOfView
f7f9dc036e Show correct page when opening profile manager 
CURA-1278
 2016-05-26 09:42:44 +02:00
fieldOfView
f0b956c3c6 Add selection "tab" for active extruder 
Only visible for multi-extrusion printers. Doesn't do anything but setting a qml property, but is to be used to change the variant/material per extruder, and to apply a filter to the advanced mode settings.

CURA-340
 2016-05-26 09:42:31 +02:00
fieldOfView
85370dad87 Fix indent 
CURA-340
 2016-05-26 09:42:16 +02:00
fieldOfView
6a77f67c34 Rearrange sidebar top 
CURA-340
 2016-05-26 09:42:04 +02:00
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