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

141 Commits

Author SHA1 Message Date
Ghostkeeper
ed7e204cc0
Fix colour of time estimates text 
I'd like it to be the same colour as the text underneath it, so subtext it is.

Contributes to issue CURA-4148.
 2017-08-31 10:21:28 +02:00
Lipu Fei
3fbdb27e8e Merge branch 'master' into feature_dark_colours_icons 
CURA-4148

Resolve merge conflicts.
 2017-08-28 11:13:38 +02:00
Ghostkeeper
165665247f
Remove unused property valueWarning 
It is unused here. There is such a property being used by the profile selection drop-down but that one uses the valueWarning property in SidebarHeader.qml which is exactly the same.

Contributes to issue CURA-4148.
 2017-08-25 14:03:54 +02:00
Ghostkeeper
09a5cf1de2
Shift sidebar tooltips with the arrow outside of sidebar 
Because now the arrow has the same colour as the sidebar so you won't see it otherwise.

Contributes to issue CURA-4148.
 2017-08-23 17:53:00 +02:00
Ghostkeeper
11f8204644
Change margins in the side bar 
These are more or less all margins in the side bar.

Contributes to issue CURA-4148.
 2017-08-23 16:28:28 +02:00
Lipu Fei
28670edf8e Align profile dropdown box correctly 
CURA-4147
 2017-08-22 16:11:15 +02:00
Ghostkeeper
b2338d9c2e
Re-use action button styling now that toggle is gone 
We should keep these two types of buttons in sync, so have them share a theme.

Contributes to issue CURA-4148.
 2017-08-21 15:11:07 +02:00
Ghostkeeper
d94956dd23
Give time estimate a different text colour 
Apparently it needs to be highlit a bit more than the rest.

Contributes to issue CURA-4148.
 2017-08-21 13:51:36 +02:00
Lipu Fei
662e3b9cd1 Fix coding style 
CURA-4147
 2017-08-18 13:38:16 +02:00
alekseisasin
7978b0efe9 Move quality profile, material and print core to it's new location 
CURA-4147
 2017-08-18 09:15:17 +02:00
Lipu Fei
3a22d1916f Go back to "Recommended/Custom" tabs 
CURA-4146
 2017-08-15 17:42:34 +02:00
alekseisasin
a4ddd28e8f Removed gap between material length and it's measuring unit 
feature_move_printing_time
 2017-08-14 13:09:31 +02:00
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