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

161 Commits

Author SHA1 Message Date
Mark
dcb630a24e Move text back to label and remove unused font 2017-10-03 14:02:07 +02:00
Mark
b4154b8cc0 Merge branch '3.0' 2017-09-28 13:01:10 +02:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
Ghostkeeper
c4fc4a7198
Add better descriptions for abbreviated units 
This should help the translators next time to find better translations.

Contributes to issue CURA-4341.
 2017-09-27 17:34:12 +02:00
alekseisasin
ea65457920 After first start (no machine added) the controls on right side are invisible 
CURA-4357
 2017-09-22 14:45:23 +02:00
Diego Prado Gesto
0e1b9d8c5d Changed the way in which print times are shown in Sidebar - CURA-4232 2017-09-15 10:46:01 +02:00
alekseisasin
aa0ade2e74 Merge branch 'master' of github.com:Ultimaker/cura 2017-09-14 18:05:28 +02:00
alekseisasin
98ab571483 Removed 14bitVoid code accord to a new LGPL license 
CURA-4232
 2017-09-14 18:03:31 +02:00
ChrisTerBeke
e7ad4b7f17 Merge branch 'master' into feature_slider_for_quality 2017-09-14 10:34:34 +02:00
Lipu Fei
5df5dfec02 Auto-adjust mode tab position based on text length 
CURA-4322
 2017-09-14 08:50:25 +02:00
Lipu Fei
3d6648fc59 Rearrange quality profile slider and dropdown box 
CURA-4182

- Remove the quality profile dropdown box from Recommended mode
- Move the quality profile dropdown box to Custom mode
 2017-09-13 17:12:51 +02:00
Mark
766bc9ae97 Changed bold fonts to normal 
CURA-4148
 2017-09-12 14:37:29 +02:00
Mark
3b12e39ba8 Selected state font is not bold anymore for custom and recommended 
CURA-4148
 2017-09-08 16:35:08 +02:00
Mark
db77a4690c Made the selected borders a little thicker 
CURA-4148
 2017-09-08 15:18:40 +02:00
Lipu Fei
24e5c72e47 Update colour for light theme 
CURA-4148
 2017-09-06 16:04:31 +02:00
Mark
34f8db5450 Changed some margins to improve alignment 
CURA-4211
 2017-09-06 14:52:16 +02:00
alekseisasin
24c9dc9bee Merge branch 'feature_light_colours_icons' 
CURA-4148
 2017-09-01 19:25:29 +02:00
Jaime van Kessel
9ec7ef8dba Made print spec invisible when monitoring print 2017-09-01 13:07:00 +02:00
Ghostkeeper
062957c249
Hide the header if it would be empty 
It would be empty if the machine is single extrusion and has no materials or variants.

Contributes to issue CURA-4241.
 2017-08-31 15:51:51 +02:00
Ghostkeeper
0fc40d571a
Only make separator visible if the element above and below it are visible 
The behaviour should be the same, if it was implemented correctly previously.

Contributes to issue CURA-4241.
 2017-08-31 15:47:29 +02:00
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