959 Commits

Author SHA1 Message Date
fieldOfView
a31ffc4ebf Select first extruder when switching to a printer (continued)
The days of the global tab are numbered

CURA-1758
2016-07-21 15:12:28 +02:00
fieldOfView
efa2099912 Remove stray debug code
CURA-1758
2016-07-21 15:12:26 +02:00
fieldOfView
3923d43567 Disable simple mode controls on global tab
CURA-1758
2016-07-21 15:12:26 +02:00
fieldOfView
7302baa7da Add icon to settings that can only be set globally (for all extruders)
CURA-1758
2016-07-21 15:12:25 +02:00
fieldOfView
121cd19e83 Disable the settings in the global tab
CURA-1758
2016-07-21 15:12:24 +02:00
Jack Ha
be1ea9bffd Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-20 11:13:55 +02:00
Jack Ha
79f640e344 Fixed simple sidebar infill label font. CURA-1824 2016-07-20 11:12:44 +02:00
Jaime van Kessel
bb4d4e7807 Moved viewmode in order so the tooltip is displayed over per-object settings panel
CURA-1651
2016-07-20 11:01:38 +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
Arjen Hiemstra
0e6a46c9eb Use a simpler fix for dealing with QML Action's shortcuts not working
It is a bit more magical (hence the added documentation) but it makes
things a lot more transparent. This prevents a lot of future issues.

Contributes to CURA-1603
2016-07-18 16:52:33 +02:00
Jaime van Kessel
3e4ff9241e Moved the BlurSettings signal to cura main window
This reduces the number of focus changes from O(N) to O(1) by the blur event
2016-07-18 15:38:57 +02:00
Jaime van Kessel
3e908824b9 Added workaround for singleton not getting shortcuts
CURA-1603
2016-07-18 15:16:20 +02:00
Jaime van Kessel
dcc3bc8f80 Also refactored name of printlength in jobspecs.qml
CURA-1836
2016-07-15 15:56:39 +02:00
Jaime van Kessel
7a43164654 Both material weights & lengths are now exposed
CURA-1038
2016-07-15 15:49:25 +02:00
fieldOfView
daf03b0a7b Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-14 08:57:13 +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
Jaime van Kessel
c92b2bc385 Changed order of setting properties
CURA-1842
2016-07-13 17:22:54 +02:00
fieldOfView
a7cfe1b5af Emphasize settings that have a value in the user or quality profile
(in a subtle way)
2016-07-11 21:15:09 +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
fieldOfView
4aa95ab317 Prevent showing custom profiles twice and fix separator in the profiles dropdown
CURA-1887
2016-07-11 14:54:08 +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
fieldOfView
6eb502730c Add reusable messagebox based on QML MessageDialog
Contributes to CURA-1730 and CURA-1850
2016-07-08 11:24:37 +02:00
fieldOfView
2f3ffe2a18 Fix tabs when automatically switching to the monitor tab (on print start)
CURA-1036
2016-07-08 11:22:07 +02:00
fieldOfView
08f2143790 Simplify showing each material length individually
CURA-1687
2016-07-07 23:58:14 +02:00
fieldOfView
9c492342cb Show each material length individually
CURA-1687
2016-07-07 22:17:35 +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
Jaime van Kessel
bea9f7590c Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-07 17:02:59 +02:00
Jaime van Kessel
0477955974 Sidebar stuff is now properly done in a loader (and in seperate files)
CURA-1036
2016-07-07 17:02:29 +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
fieldOfView
35efea3d11 Show "ready" state when a printer is connected but jobstate is not yet set
CURA-1036
2016-07-07 09:52:53 +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
0da07b55ce Display brand and color name in the material menu if they are different than "generic"
Contributes to CURA-341
2016-07-07 01:43:18 +02:00
Jaime van Kessel
a5ba68bae3 Ensure that the display matches with the backend active extruder data 2016-07-06 14:09:08 +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
8c002877c3 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-04 18:36:28 +02:00
fieldOfView
7b4137ce20 Tweak color and icon logic (add "pre_print" state)
CURA-1036
2016-07-04 18:35:47 +02:00
Jaime van Kessel
b3adf8a271 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-04 17:11:50 +02:00
Jaime van Kessel
318182495a We now recieve material estimation per extruder
CURA-1687
2016-07-04 17:11:03 +02:00
fieldOfView
bff23598c6 Fix simple mode infill to work with multiple extruders
CURA-1778
2016-07-04 16:23:07 +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