179 Commits

Author SHA1 Message Date
Ghostkeeper
5866b759a8
Move material estimate properties to sidebar as well
That's where they are used after all.

Contributes to issue CURA-4149.
2017-08-14 12:06:03 +02:00
Ghostkeeper
6a4329c1a0
Align progress bar and save button better
So that they don't overlap with the now larger fonts and such.

Contributes to issue CURA-4149.
2017-08-14 10:36:39 +02:00
Ghostkeeper
addf6429e5
Adjust font sizes of time/material estimates
Emphasize the time estimate.

Contributes to issue CURA-4149.
2017-08-14 09:45:12 +02:00
Ghostkeeper
bff00d41d0
Add description for print time
It looks a bit weird right below the print time but we'll discuss that later.

Contributes to issue CURA-4149.
2017-08-14 09:42:46 +02:00
Ghostkeeper
454293f926
Remove superfluous rectangles
There's only one item in there. It makes no sense to group them by rows and that only makes the bindings more complicated.

Contributes to issue CURA-4149.
2017-08-14 09:38:40 +02:00
Ghostkeeper
e514a9f474
Fix some binding loops
Contributes to issue CURA-4149.
2017-08-14 09:34:52 +02:00
Ghostkeeper
c4305c7b1e
Rearrange and align time/material estimates
They look correct now but the log says there is a binding loop in here. We'll fix that next.

Contributes to issue CURA-4149.
2017-08-14 09:23:56 +02:00
Ghostkeeper
fb3a0b701c
Remove superfluous item
This item was just transparently being the same size as its parent, no ID or nothing. We can just remove it.

Contributes to issue CURA-4149.
2017-08-14 09:12:21 +02:00
Ghostkeeper
067449192a
Move time/material estimates code to sidebar
It sort of works but is aligned all wrong right now.

Contributes to issue CURA-4149.
2017-08-14 09:04:26 +02:00
Jaime van Kessel
6e55bf2d8f If output device has a contorl item, that one is used.
If a printerOutput device does not define anything, the fallback is used.

CURA-4057
2017-07-20 13:30:57 +02:00
Lipu Fei
d0ef97b02c Remove invalid anchoring for SidebarHeader
CURA-3964

sidebarHeaderBar has been removed and the anchor line is not needed.
2017-07-04 13:06:41 +02:00
Arjen Hiemstra
ec25164731 Cleanup monitoringPrint stuff by properly passing things as properties
Instead of relying on the property magically being propagated from the
root object, which causes crashes.

Contributes to CURA-3964
2017-07-04 11:37:04 +02:00
Jaime van Kessel
680cceb6f5 Switching to monitor tab now shows the correct sidebar again
CURA-3964
2017-07-03 16:12:19 +02:00
Jaime van Kessel
7e07482dec Added topbar to Cura
CURA-3964
2017-07-03 15:44:42 +02:00
Mark
1449f785f7 Fix so that sliding the switch also changes the mode 2017-05-08 15:51:38 +02:00
Randall Wessel
687d326fae Changed color to transparancy and spaces instead of tabs 2017-05-03 15:34:56 +02:00
Randall Wessel
163543b86b Make background color of toggle button themeable
Background of toggle button gets same color as toolbar surrounding the
button.
2017-05-03 14:26:44 +02:00
fieldOfView
f18947681a Disambiguate theme name 2017-04-30 23:25:14 +02:00
fieldOfView
93197cd173 Add hover effect to mode switch text labels 2017-04-30 23:21:49 +02:00
fieldOfView
0c6a5328c8 Add hover effect to mode switch control
While simplifying theme additions
2017-04-30 22:52:54 +02:00
Lipu Fei
7db0f0ebb7 Make toggle button labels clickable 2017-04-19 12:46:25 +02:00
Jack Ha
232f975092 Removed unused code, added ';' to end of lines. CURA-3574 2017-04-19 10:28:16 +02:00
Lipu Fei
61c4631270 Put sizes and numbers for toggle button into theme
CURA-3574
2017-04-19 08:56:11 +02:00
Lipu Fei
c75887be80 Use a toggle button for mode switching
CURA-3574
2017-04-18 16:40:59 +02:00
Mark
bfda8712e1 Change all Label to Text so fonts are rendered correct
CURA-3389
2017-04-14 13:16:48 +02:00
Jaime van Kessel
88704051d1 Filter bar is now always visible
CURA-3574
2017-03-27 15:47:30 +02:00
Jack Ha
ca84fdd767 Merge branch 'master' into feature_auto_slice 2017-02-15 12:42:09 +01:00
Jack Ha
4e65a7034f Added switch for using timer and no timer in CuraEngineBackend. Still have to fix TODO and finish. CURA-3214 2017-02-15 10:32:38 +01:00
Ghostkeeper
2cdf06413b
Remove margin on the left of print monitor
For the other side bar objects this margin was applied doubly, so that makes it very easy to remove.

Contributes to issue CURA-3161.
2017-02-08 09:41:42 +01:00
Ghostkeeper
5c2f1a935a
Move monitorLabel into PrintMonitor.qml
It's a label that belongs to the print monitor after all. Let the print monitor file decide how it's going to look.

Contributes to issue CURA-3161.
2017-02-01 17:31:36 +01:00
fieldOfView
e2a9fc0d79 Rename header tab status overlays to make them reusable
The "settings" tab could use a status overlay to show setting errors and slicing paused states.
2017-01-26 14:32:47 +01:00
fieldOfView
5939ff9b81 Make header tab button color stylable
The monitor tab icon is split up in a base monitor tab icon and a status overlay, each with their own color.
2017-01-26 14:17:07 +01:00
fieldOfView
3e369c2494 Hide profiles selection (variant/material/quality) when hiding settings 2017-01-11 18:31:33 +01:00
Youness Alaoui
f095e9050f T466: Hide the search icon from printer setup
When in custom mode in the printer setup pane and a gcode file gets loaded
the search icon needs to disappear as well.
Reported by @GhostKeeper, and fix provided by @victor9999
2017-01-05 13:14:33 -05:00
Victor Larchenko
26fe0ddbb5 D6: Refactoring 2016-12-23 15:53:16 -05:00
Victor Larchenko
1631045d7a D5: Refactoring 2016-12-23 15:53:16 -05:00
Victor Larchenko
1f84ad7084 T466: Added explanation text on settings panel 2016-12-23 15:53:15 -05:00
Victor Larchenko
8987aa2048 T466: Revert the previous commit since it messed up the file rights. 2016-12-23 15:53:15 -05:00
Victor Larchenko
64d7bb0c2a T466: Added ability to print loaded gcode 2016-12-23 15:53:14 -05:00
Victor Larchenko
2ee5e2cb0b T466: Added hiding of properties menu 2016-12-23 15:53:13 -05:00
fieldOfView
f9ed6af6d6 Tweak the hovered state of the machine selection to match the rest of the header 2016-12-20 14:35:00 +01:00
Jack Ha
a32615fb12 Added 50ms fade in on hover machine selection. CURA-2763 2016-12-08 14:48:50 +01:00
Jack Ha
054e73383d Added hover color for machine selection. CURA-2763 2016-12-08 11:12:48 +01:00
fieldOfView
d67395b42b Codestyle & documentation update 2016-12-07 22:23:06 +01:00
fieldOfView
18fb379fbe Add tooltips for Setup/Monitor and Recommended/Custom tabs 2016-12-07 19:40:33 +01:00
fieldOfView
e642b4ebe9 Tweak 2.4 sidebar changes
* Make extruder-tabs more clear on badly calibrated displays
* Make infill selection same width as other "Recommended" controls
* Move printer selection to the top bar
* Add animation to support extruder selection combobox
2016-12-07 17:41:04 +01:00
Jack Ha
67f1afb9ce Revert "Show extruder tabs only in custom mode. CURA-2763"
This reverts commit f916c9b4cfc47e8fa99c7a9888b0d12f118503af.
2016-12-07 14:32:40 +01:00
Jack Ha
f916c9b4cf Show extruder tabs only in custom mode. CURA-2763 2016-12-06 16:32:34 +01:00
fieldOfView
9c604bb674 Fixes two minor issues introduced in the feature_find_settings merge 2016-11-26 22:46:21 +01:00
fieldOfView
d045738dc8 Simplify button width logic 2016-11-24 11:51:35 +01:00