Commit graph

3755 commits

Author SHA1 Message Date
Lipu Fei
d8c3078d78 Add connectedPrinter to HeatedBedBox
CURA-5943
2018-11-22 14:10:41 +01:00
Lipu Fei
8eb0f66df3 Add connectedPrinter to ExtruderBox
CURA-5943
2018-11-22 14:08:50 +01:00
Lipu Fei
75661d9bba Fix MonitorSidebar due to widget renaming
CURA-5943
2018-11-22 14:08:50 +01:00
Lipu Fei
e65f2d66a6 Add connectedPrinter to MonitorItem
CURA-5943
2018-11-22 14:06:43 +01:00
Lipu Fei
5a16918391 Update ManualPrinterControl
CURA-5943
2018-11-22 14:03:03 +01:00
Lipu Fei
cf0994037c Move MonitorButtonSytle to a separate QML file
CURA-5943
2018-11-22 14:03:03 +01:00
Lipu Fei
45d4f2ad3d Update MonitorSection
CURA-5943
2018-11-22 14:03:03 +01:00
Lipu Fei
698409803d Fix null warning in QML
CURA-5943
2018-11-22 14:03:03 +01:00
Diego Prado Gesto
9720512f50 Add a new printer selector button that is connected to the output
devices and shows labels containing the type of printers that are in the
same group.

Contributes to CURA-5942.
2018-11-22 13:54:10 +01:00
Jaime van Kessel
a1613c7f81 Set the variable types of the Action button to the right kind.
Because of boyscouting; these must be colors (and not generic vars)
2018-11-22 13:53:27 +01:00
Diego Prado Gesto
b890e40e81 Close the popup panel when the user clicks in some of the buttons in the
printer selector.

Contributes to CURA-5942.
2018-11-22 10:54:25 +01:00
Diego Prado Gesto
3434b30ee0 Merge branch 'CURA-5785-Restyle_stage_menu' into CURA-5942_printer_selector 2018-11-21 17:08:15 +01:00
Diego Prado Gesto
cbee18597e Merge branch 'ui_rework_4_0' into CURA-5785-Restyle_stage_menu 2018-11-21 16:59:03 +01:00
Diego Prado Gesto
f866390c7b Fix an issue in the action panel.
When the panel is created while the user is in the preview stage, the
row has no width.

Contributes to CURA-5786.
2018-11-21 16:56:25 +01:00
Diego Prado Gesto
fe7d1825d4 Add styling to the buttons in the printer list.
Contributes to CURA-5942.
2018-11-21 16:54:57 +01:00
Ghostkeeper
a826dfb156
Fix binding loop in height of view selection bar
Since these were part of the childrenRect of the bar, and attached to the bottom of the bar, the childrenRect depended on the position of the children and that depends on the childrenRect again. So just attach it to the top, it's logical.

Contributes to issue CURA-5876.
2018-11-21 16:12:00 +01:00
Ghostkeeper
a052b8ec69
Use Theme.getIcon instead of Theme.icons
This is better for performance, according to the deprecation warning I got.

Contributes to issue CURA-5876.
2018-11-21 16:08:29 +01:00
Ghostkeeper
eb056ee17b
Fix display of custom configuration
Since it had no width, everything was resized to 0.

Contributes to issue CURA-5876.
2018-11-21 16:06:26 +01:00
Diego Prado Gesto
a1f3ebc25b Fix typo.
Contributes to CURA-5785.
2018-11-21 13:58:21 +01:00
Jaime van Kessel
a9672458fd Update extruderIcon to be more in line with the design
CURA-5785
2018-11-21 13:46:50 +01:00
Diego Prado Gesto
406fac9e60 Remove duplicate entries of renderType.
Contributes to CURA-5942.
2018-11-21 13:38:08 +01:00
Jaime van Kessel
c7dbaa3a00 Add rendertype for labels in quickConfigurationSelector
CURA-5785
2018-11-21 13:22:03 +01:00
Diego Prado Gesto
7c9cd75cf9 Merge branch 'CURA-5785-Restyle_stage_menu' into CURA-5942_printer_selector 2018-11-21 13:19:23 +01:00
Jaime van Kessel
bd636e61a0 Minor changes suggested in review
CURA-5785
2018-11-21 13:17:36 +01:00
Aleksei S
bfd8e66657 Removed margins and unused arches
CURA-5941
2018-11-21 12:50:18 +01:00
Diego Prado Gesto
4772972145 Merge branch 'CURA-5785-Restyle_stage_menu' into CURA-5942_printer_selector 2018-11-21 12:18:51 +01:00
Jaime van Kessel
eef6ad662d Added enum for the roundedCorner property
This makes it a whole lot easier to read what is being set.

CURA-5785
2018-11-21 11:50:39 +01:00
Diego Prado Gesto
64bbab9d40 Use the group name to show in the printer list if it's a network
connected printer.

Contributes to CURA-5942.
2018-11-21 11:50:00 +01:00
Diego Prado Gesto
de650300e2 Add the buttons to add printer and manage printers in the bottom of the
print selector panel.

Contributes to CURA-5942.
2018-11-21 11:43:20 +01:00
Jaime van Kessel
b826a42026 Add the RoundedRectangle as background to the ExpandableComponent
This way the expandable components can have rounded corners only on one side,
thus preventing the need to do add backgrounds to the rows that they are in.

CURA-5785
2018-11-21 11:37:58 +01:00
Diego Prado Gesto
8e47d04756 Adjust sizes and alignments to the print selector panel.
Contributes to CURA-5942.
2018-11-21 11:12:59 +01:00
Diego Prado Gesto
23744e42d1 Remove SaveButton file, since it's not used anymore.
Contributes to CURA-5942
2018-11-21 09:15:18 +01:00
ChrisTerBeke
60ed0ddc24
Revert "Revert "Merge branch 'fix-oauth2-client' into CURA-5785-Restyle_stage_menu""
This reverts commit 791929d689.
2018-11-20 23:49:33 +01:00
ChrisTerBeke
791929d689
Revert "Merge branch 'fix-oauth2-client' into CURA-5785-Restyle_stage_menu"
This reverts commit 4caf770a62, reversing
changes made to 0cdcd61ff2.
2018-11-20 23:47:46 +01:00
Aleksei S
4bccd2b7b5 Restyle printer settings dropdown
CURA-5941
2018-11-20 23:46:03 +01:00
ChrisTerBeke
4caf770a62
Merge branch 'fix-oauth2-client' into CURA-5785-Restyle_stage_menu
* fix-oauth2-client:
  Switch Ultimaker Account OAuth2 client
  Fix the title's top margin size in the add machine dialog.
2018-11-20 20:48:52 +01:00
Diego Prado Gesto
669648d3e1 Improve the toolbar style by modifying the rectangles and the behavior
to get a rounded rectangle on the right-top and right-bottom.

Contributes to CURA-5962.
2018-11-20 16:28:21 +01:00
Ghostkeeper
6de24250ed
Make icon height equal to text height
This seems to be about the same actually as what it was. But now the relation is in there.
I also made the right icon inherit as much as possible from the left icon so that if we change something, we only have to change it in the left icon.

Contributes to issue CURA-5876.
2018-11-20 14:50:12 +01:00
Ghostkeeper
d42ddad606
Add icons on left and right side of text
For this I had to implement functionality in ActionButton to be able to display the icon on either side.

Contributes to issue CURA-5876.
2018-11-20 14:47:41 +01:00
Ghostkeeper
dca286cea5
Give action button a sane default height
We don't want to give it a default width since that should just adjust to its contents by default, which is fine.

Contributes to issue CURA-5876.
2018-11-20 14:34:06 +01:00
Ghostkeeper
a1068a3ef2
Rename action_panel_button theme entry to action_button
Because it's not just used in the save panel.

Contributes to issue CURA-5876.
2018-11-20 14:24:09 +01:00
Ghostkeeper
42d73836f4
Move default margin by default to Cura's action buttons
So we don't have to repeat that every time you create a new button.

Contributes to issue CURA-5876.
2018-11-20 14:19:55 +01:00
Ghostkeeper
cbd5238738
Don't show custom/auto toggle buttons when not connected
In order to prevent suddenly switching to the other side when the connection is lost or restored, we only evaluate this upon opening the popup. This way you might be surprised that closing and then opening it can show something else, but it will never surprise you while working on the popup itself as a user.

Contributes to issue CURA-5876.
2018-11-20 13:55:28 +01:00
Diego Prado Gesto
76f2aeb43c Fix the title's top margin size in the add machine dialog. 2018-11-20 11:27:45 +01:00
Ghostkeeper
a04db164e6
Make it possible to swap between auto and custom configuration
We're going to need to make this disappear when the printer is not connected. But that is for later.

Contributes to issue CURA-5876.
2018-11-19 17:11:51 +01:00
Ghostkeeper
16deeb0951
Remove old QuickConfigurationSelector
It doesn't exist any more.

Contributes to issue CURA-5876.
2018-11-19 17:10:29 +01:00
Diego Prado Gesto
fa39ba9132 Fix typo. Remove parenthesis. 2018-11-19 16:37:12 +01:00
Diego Prado Gesto
df38e7db85 Do not allow the user to activate a material if the printer is not
defined to have materials.

Contributes to #4550.
2018-11-19 16:31:15 +01:00
Ghostkeeper
00a49fff26
Rename QuickConfigurationSelector to ConfigurationMenu
This is going to function as our main item for the configuration menu. It contains the part in the top bar and the glue item for the part in the popup.

Contributes to issue CURA-5876.
2018-11-19 14:39:19 +01:00
Ghostkeeper
7a210087ff
Add header for configuration selector
It currently always says 'Custom', but we will want to make that dynamic at some point.

Contributes to issue CURA-5876.
2018-11-19 14:35:34 +01:00