96 Commits

Author SHA1 Message Date
Jack Ha
c3320bb1a4 Change settings to settings/overrides in selected messages. CURA-2898 2016-11-23 13:33:12 +01:00
Ghostkeeper
070767f0db
Blur focus upon changing profiles, material, variant, etc.
Otherwise the currently focussed setting gets taken along to after the switch.
2016-11-04 16:02:08 +01:00
Ghostkeeper
afd3dd6eec
Make separate theme colour for detail text
I would use the normal font colour with a lower alpha value here, but it seems that rendering text with transparency doesn't work in Qt.

Contributes to issue CURA-2737.
2016-10-21 13:06:49 +02:00
Ghostkeeper
57b0275384
Show layer height in profile selection menu
It's shown in the 'inactive' font colour, which isn't entirely semantically correct but has the behaviour we want regardless of how the theme changes in the future.

Contributes to issue CURA-2723.
2016-10-20 17:16:06 +02:00
Simon Edwards
c3cf762451 Show the warning color for unsupported materials/qualities by using the new 'supported' metadata flag.
CURA-2271
2016-10-12 15:57:50 +02:00
fieldOfView
34630fa646 Also show the "unsupported" warning when a custom profile is selected
...by making sure we're looking at the quality container (not quality_changes) of the active extruder/stack

CURA-2271
2016-10-11 16:36:32 +02:00
fieldOfView
fea0dfdfa1 Put material selection in warning state for unsupported materials
CURA-2271
2016-10-10 13:19:20 +02:00
fieldOfView
cf7a6730d1 Add a menuitem to load the nozzle/material loaded on the printer
CURA-2276
2016-09-14 17:39:49 +02:00
fieldOfView
6334f74fc6 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-14 08:52:05 +02:00
fieldOfView
21e413ca4f Hide extruder, nozzle & material selection in Print Monitor 2016-09-14 08:19:57 +02:00
fieldOfView
e422eb6ee5 Fix sidebar height when switching to UM2
When switching from a multiextrusion printer to the UM2, sometimes too much whitespace would be left for the sidebar header
2016-09-14 08:15:43 +02:00
Jaime van Kessel
4d84584f59 Simplified statement as per review
CURA-2271
2016-09-13 17:31:15 +02:00
Ghostkeeper
12b967ddb2
Remove debug code
Don't know who it was or why or when, but it shouldn't be there.
2016-09-12 12:58:35 +02:00
Jaime van Kessel
ec587eb0dd If a combination material does not like the setup, we now mark it in red.
CURA-2271
2016-09-09 11:59:55 +02:00
Jaime van Kessel
3227507297 An empty quality container will now give a "not supported" warning
CURA-2236
2016-09-05 13:31:36 +02:00
fieldOfView
35fedbdad6 Don't break the currentExtruderIndex binding
CURA-2177
2016-08-23 17:12:55 +02:00
fieldOfView
8c63216fdf Get how we name variants from the machine definition
CURA-2116
2016-08-16 10:18:57 +02:00
fieldOfView
f817d30abc Change colour to color for consistency 2016-08-09 09:56:23 +02:00
fieldOfView
dd78561e25 Remove global tab
CURA-1758
2016-07-21 15:35:20 +02:00
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
121cd19e83 Disable the settings in the global tab
CURA-1758
2016-07-21 15:12:24 +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
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
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
Jaime van Kessel
91bfd2de27 Force focus instead of requesting it.
Fixes CURA-1778
2016-07-01 11:04:23 +02:00
Arjen Hiemstra
842015ea10 Move all the menus to individual QML files to make it easier to reuse them
Contributes to CURA-342
2016-06-28 17:32:50 +02:00
fieldOfView
540cc55b65 Fix warning about unknown property "index" in SidebarHeader
CURA-333
2016-06-28 16:59:00 +02:00
fieldOfView
6adc4ef284 Revert "Change spelling of "colour" to "color" for consistency"
This reverts commit 963a2092efefb62f8f8b1216f0a7d05bbebb884d.

I still say we should use "colour" for consistency, but that change should not be part of this branch.

CURA-333
2016-06-22 10:19:44 +02:00
fieldOfView
b17d621243 Disable nozzle/material selection on the global tab
The global tab has no nozzle/material by definition.
CURA-333
2016-06-22 09:55:25 +02:00
fieldOfView
6fa1fb9d2f Select "Global" tab when switching to a machine that has multiple extruders.
CURA-333
2016-06-22 09:55:24 +02:00
fieldOfView
963a2092ef Change spelling of "colour" to "color" for consistency
I know "colour" is the more correct spelling, but Qt uses the spelling "color" and we have already adopted that spelling in a number of places.

CURA-333
2016-06-22 09:55:23 +02:00
fieldOfView
eba2451cf2 Add tooltip to extruder-tabs
CURA-333
2016-06-22 09:55:21 +02:00
fieldOfView
61db0a7660 Fix extruder tabs for >2 extruders or long extruder names
CURA-340
2016-06-15 09:45:55 +02:00
fieldOfView
4ece9b0997 Add swatch to extruder tabs
CURA-340
2016-06-14 10:42:33 +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
c6b1706460 Fix customisedSettings button (profiles dropdown) layout and behavior
CURA-1685
2016-06-09 17:49:33 +02:00
fieldOfView
887a5f4f80 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-09 15:51:40 +02:00
fieldOfView
38c6c3cb01 Minor fixes to SidebarHeader
CURA-1689
2016-06-09 15:51:28 +02:00
Arjen Hiemstra
90ddff1c7f Remove obsolete debug statement
Contributes to 1685
2016-06-09 15:35:37 +02:00
Arjen Hiemstra
3a75e1fb79 Fix setting the active extruder
Contributes to CURA-340
2016-06-09 15:12:37 +02:00
Arjen Hiemstra
88d87e8e85 Cleanup sidebarheader and fix extruder selection
Contributes to CURA-340
2016-06-09 14:32:13 +02:00
Arjen Hiemstra
725086b0dd Remove ProfileSetup and move its contents to SidebaarHeader
Contributes to CURA-340
2016-06-09 14:32:13 +02:00
Ghostkeeper
6a520cad47
Change focus upon extruder switch
This applies a setting that is currently being typed by the user. Otherwise it would take the currently being typed value along to the next tab, since it can't update a setting value while it is in focus.

Contributes to issues CURA-340 and CURA-1278.
2016-06-09 11:48:37 +02:00
Ghostkeeper
7dbafa06d1
Make SidebarHeader use ExtrudersModel
This model is also used by the extruder selection drop-downs, and it's automatically filled already so that was double logic.

Contributes to issues CURA-340 and CURA-1278.
2016-06-08 16:36:01 +02:00
Ghostkeeper
dff94b4559
Make ExtruderManager a QML context item
There were two singletons of this manager: One created by QML and managed by QML, and one created by us and managed by our own singleton pattern. That won't work! So we now manage just our own singleton type, and make it a context item for QML so it can use the manager too.

Contributes to issues CURA-340 and CURA-1278.
2016-06-07 11:55:14 +02:00
Ghostkeeper
927d33145f Move creating extruder manager logic to ExtruderManager
This logic was both in Extruder.py and in MachineManagerModel.py due to a planning mishap.

Contributes to issues CURA-1278 and CURA-340.
2016-06-06 15:15:33 +02:00
Jaime van Kessel
1e44abb9be Added activeExtruder stack to machineManager model
CURA-340
2016-06-05 12:01:46 +02:00
Arjen Hiemstra
6a3b321e5a Re-enable commented code 2016-06-04 19:23:46 +02:00
Arjen Hiemstra
ceb21ce89b Filter material/quality by machine only when we should filter
Contributes to CURA-1612
2016-06-02 08:10:55 +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