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

681 Commits

Author SHA1 Message Date
fieldOfView
1808c44d02 Change behavior of the "Close" button on a machineaction dialog 
Pressing close now "rejects" the action, similar to pressing "cancel" in the add machine wizard (instead of accepting, like pressing "ok").

CURA-2019
 2016-08-01 15:36:43 +02:00
fieldOfView
0c8d0a11a9 Fix a couple of qml casting errors 2016-08-01 15:22:21 +02:00
fieldOfView
a9ed562a58 Allow machine actions to reference the dialog they are shown in 
This way they can respond to the onAccepted and onRejected actions of the dialog
Contributes to CURA-2019
 2016-08-01 15:21:12 +02:00
Jaime van Kessel
b9a1d50e05 Added option to only display top layers in layerview 2016-07-29 13:17:41 +02:00
fieldOfView
f584b49af2 Add "Close" button to (single) machine actions dialog 
CURA-2019
 2016-07-29 11:27:03 +02:00
Arjen Hiemstra
570a67556a Fix exporting and importing materials on OSX 
OSX's file dialog is stupid and does not understand extensions with
a . in them. So instead just use everything after the last .

Fixes CURA-1987
 2016-07-28 18:08:17 +02:00
Jack Ha
dc6d415cf5 Disabled duplicate material, because it has a lot of issues. 
CURA-1969.
 2016-07-28 09:13:35 +02:00
Jack Ha
7731f9406c Dialog_profile/material/load_path is now saved and used. 
CURA-1900
 2016-07-19 15:59:44 +02:00
fieldOfView
2c5644ff08 Only show Machine Actions for the currently active machine 
Many machine actions act on the currently active printer, because they don't have a pointer to the printer selected on the Printer manager.
 2016-07-14 08:55:53 +02:00
fieldOfView
cd09017328 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-11 17:26:19 +02:00
fieldOfView
151bf1f8de Make style of sections on the Materials page match sections on the profiles page 
CURA-342
 2016-07-11 17:25:59 +02:00
Arjen Hiemstra
5393beb8de Fix binding loop warnings that would sometimes occur when editing Brand entry 
Contributes to CURA-342
 2016-07-11 16:41:57 +02:00
fieldOfView
7a63f957cb More gracefully handle cases where no profile is selected in the profiles list 2016-07-11 15:48:41 +02:00
Arjen Hiemstra
4d2d889604 Do not complain when currentItem is null 
Contributes to CURA-342
 2016-07-11 14:57:28 +02:00
Arjen Hiemstra
d6ba70c552 Do not try to set a material's metadata when we know it has not changed 
Contributes to CURA-342
 2016-07-11 14:57:28 +02:00
Arjen Hiemstra
898c621b6f Recreate editingFinished signal behaviour without using TextArea::editingFinished 
Apparently, editingFinished was only added in Qt 5.6, so we cannot use
it. So we have to manually recreate the behaviour.

Contributes to CURA-342
 2016-07-11 11:36:21 +02:00
awhiemstra
90af9e3986 Merge pull request #846 from Ultimaker/feature_material_editing 
Material Editing Support
 2016-07-07 17:34:57 +02:00
Arjen Hiemstra
6b9689c2c7 Use clearer styling of disabled entry fields on the materials page 
Contributes to CURA-342
 2016-07-07 17:32:49 +02:00
Arjen Hiemstra
7df5008d3c Disable spool weight etc. fields since they are not yet functional 
Contributes to CURA-342
 2016-07-07 17:32:11 +02:00
Arjen Hiemstra
975106b90e Also update description and adhesion info when they change 
Contributes to CURA-342
 2016-07-07 17:31:12 +02:00
Jack Ha
342d4f1b82 Changed tooltip extremely small. 
CURA-1671
 2016-07-07 16:23:27 +02:00
Arjen Hiemstra
d8555fe57d Merge branch 'master' of github.com:ultimaker/Cura into feature_material_editing 
* 'master' of github.com:ultimaker/Cura: (38 commits)
  Fixed profile file case-sensitivity.
  Fix UMO Checkup button size
  Remove debug statement and commented-out code CURA-1385
  Show "ready" state when a printer is connected but jobstate is not yet set
  Added deepcopy function
  Made exception handling of slice info plugin way more robust
  Restart timer after slicing is performed when not enabled.
  Update GUID for PLA to match the GUID in the official repository
  Set default extruder index to -1 (so global is default)
  Ensure that the display matches with the backend active extruder data
  Update UM2 Extended build volume height to value published in marketing materials
  Fixed firmware upgrade for um2+
  Capitalise setting label
  CHeckup action now correctly resets every time you start it
  Remove unused name/id when importing a profile from a gcode file
  Just a little typo
  BQ Hephestos2: Heat up nozzle while leveling
  Saving g-code no longer crashes
  Removed update firmware from extensions; This is now handled by machine actions
  Changing active extruder no longer trigger re-slice
  ...
 2016-07-07 11:29:18 +02:00
Arjen Hiemstra
17ff92bdc9 Add support for import/export to the Materials page 
Contributes to CURA-341
 2016-07-07 01:43:44 +02:00
Arjen Hiemstra
aba60b0105 Remove "Rename" button from Materials page and make the other ones work 
Since the name is generated from the metadata

Contributes to CURA-341
 2016-07-05 16:48:43 +02:00
fieldOfView
6933430185 Flow MachineActions on the manage Printes page. 
CURA-1385
 2016-07-04 12:47:16 +02:00
Arjen Hiemstra
7008e047f6 Merge branch 'master' of github.com:ultimaker/Cura into feature_material_editing 
* 'master' of github.com:ultimaker/Cura: (76 commits)
  Added UMO upgrade selection
  Added stubs for UMO upgrade selection
  Machine action labels are now translatable
  Code style CURA-1676
  Using the correct placeholder
  SplashScreen: Using system-default fontfamily
  USBPrinting: Let's "Print via USB"
  BQ Hephestos2 - Preheating temperature fix When starting a print with the "custom" GCode by BQ, the printer resets the nozzle temperature to 210°C when printing via SD card (no matter what you set on Cura) and only preheats the nozzle to 180°C when printing via USB. So currently the printer begins to print via USB at 180°C and reaches the correct temperature eg.g while printing the brim.
  Fix warning about missing color in theme
  Automatically show the Print Monitor when starting a print
  Fix USBPrinterOutputDevice to work with the Print Monitor
  Properly prevent warning when no printer is connected.
  ZOffset decorator is now correctly copied
  Force focus instead of requesting it.
  Fix two "critical errors" on startup
  Minor check machine action GUI improvements
  Prevent warning when no printer is connected.
  Fix empty material/quality profiles when switching variants
  Disable monitor buttons when there is no job running
  Move message stack "above" the viewport overlay
  ...
 2016-07-04 11:45:59 +02:00
Arjen Hiemstra
df3275a10a Update Machine and Profile pages with the changes made to ManagementPage 
Since all the individual properties are removed and we now just need to
handle the buttons ourself.

Contributes to CURA-342
 2016-07-04 11:43:27 +02:00
Arjen Hiemstra
eb48a4e768 Set the new metadata when editing a material 
Contributes to CURA-342
 2016-06-30 17:32:43 +02:00
Arjen Hiemstra
419326132f Use ContainerPropertyProvider to provide properties for the materials page 
Contributes to CURA-342
 2016-06-30 01:54:58 +02:00
Arjen Hiemstra
3798a6e26a Update MaterialsPage with the new way of handling buttons 
Contributes to CURA-342
 2016-06-30 01:54:25 +02:00
Arjen Hiemstra
f7e4b91569 Update styling of Material management page 
Contributes to CURA-342
 2016-06-28 17:44:19 +02:00
Arjen Hiemstra
47079dc2dd Start enabling some material management things 2016-06-28 17:43:52 +02:00
Arjen Hiemstra
68a8bcb009 Fix width of materials properties tab 2016-06-27 13:33:38 +02:00
Arjen Hiemstra
b2ef607cb6 Fix the material setting list to use a simple placeholder 
Contributes to CURA-342
 2016-06-23 17:34:35 +02:00
Arjen Hiemstra
1cb836aea5 Add a ReadOnlySpinBox control that provides a spinBox with a readOnly property 
Contributes to CURA-342
 2016-06-23 17:33:55 +02:00
Arjen Hiemstra
f71ddc4b9f Start implementing view and edit support in the materials page 
Contributes to CURA-342
 2016-06-23 17:31:50 +02:00
Jaime van Kessel
85942583b1 Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-23 16:39:09 +02:00
Jaime van Kessel
0b02a5f12b Machine actions are now when selected (instead of active) machine change 
CURA-1385
 2016-06-23 16:38:04 +02:00
fieldOfView
0faecf9b34 Rearrange MachineActions on Machines page 
CURA-1385
 2016-06-23 14:15:39 +02:00
Jaime van Kessel
d5b07d29de Actions are now reset before every run 
CURA-1385
 2016-06-22 14:39:41 +02:00
Jaime van Kessel
65751d7400 Added completed signal to machine action, so model can notify display that it is completed 
CURA-1385
 2016-06-21 16:19:44 +02:00
Jaime van Kessel
181d16aad8 Running machine actions outside of first run is now possible 
CURA-1385
 2016-06-21 14:34:53 +02:00
Jaime van Kessel
924af37dff Fleshing out of bedleveling action 
CURA-1385
 2016-06-21 13:30:36 +02:00
Jaime van Kessel
8237047907 Actions are now added as buttons to machinePages 
CURA-1385
 2016-06-20 13:46:05 +02:00
Simon Edwards
175b5429b4 Refactor the profile and Cura specific import/export code, put the cura stuff in Cura itself. 
Contributes to CURA-1667 Profile import/export
 2016-06-14 11:44:38 +02:00
fieldOfView
24e165b964 Remove error on ProfilesPage 
CURA-1585
 2016-06-14 10:41:06 +02:00
fieldOfView
aeccfe3509 Rearrange preferences 
Merges general & view into a single page
Introduces sections on general page
Cleans up code
 2016-06-12 15:25:39 +02:00
fieldOfView
7d2a7bd157 Abbreviate headers 
CURA-1668
 2016-06-09 21:40:07 +02:00
fieldOfView
0d7a7d9299 Update wording to make storing/updating/discarding current settings more clear 
CURA-970
 2016-06-09 19:18:46 +02:00
fieldOfView
d34d398e96 Change the implementation of creating a profile from the current settings 
The newly created profile now combines the settings of the active quality profile and the current settings

CURA-970, CURA-1585
 2016-06-09 18:40:42 +02:00