GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-29 17:45:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
11,142 Commits 294 Branches 267 Tags
Commit Graph

1985 Commits

Author SHA1 Message Date
Diego Prado Gesto
b3a01d5fcc Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-09-08 16:22:53 +02:00
Diego Prado Gesto
c3d6023418 Fixed an issue that doesn't generate the jobname again once the user removes the models. - CURA-4276 2017-09-08 16:22:45 +02:00
Mark
db77a4690c Made the selected borders a little thicker 
CURA-4148
 2017-09-08 15:18:40 +02:00
fieldOfView
0896899179 Merge branch 'master' into fix_simple_mode_disabled_features 2017-09-08 14:24:05 +02:00
Mark
748c72760b Typo 2017-09-08 13:53:21 +02:00
Mark
c8b199c8f7 Merge pull request #2393 from Ultimaker/feature_change_icons_margins 
CURA-4148: Change icons and margins
 2017-09-08 13:50:16 +02:00
Mark
a50e228ba1 Fix onHover border for extruder buttons 
CURA-4148
 2017-09-08 11:56:37 +02:00
Lipu Fei
c59bd6cc09 Change LayView Mode button to a dropdown 
CURA-4212
 2017-09-07 16:24:49 +02:00
Lipu Fei
dd62367937 Move View mode button and LayerView panel to top right 
CURA-4212
 2017-09-07 16:24:43 +02:00
Lipu Fei
b0916e4b67 Fix job name mismatching 
CURA-4276
 2017-09-06 18:09:19 +02:00
Lipu Fei
24e5c72e47 Update colour for light theme 
CURA-4148
 2017-09-06 16:04:31 +02:00
Lipu Fei
e18528d2ca Fix position of the material compatibility warning 
CURA-4148
 2017-09-06 15:49:54 +02:00
Lipu Fei
d561af63e0 Merge branch 'master' into feature_move_logo_icons 2017-09-06 15:36:22 +02:00
Mark
34f8db5450 Changed some margins to improve alignment 
CURA-4211
 2017-09-06 14:52:16 +02:00
Lipu Fei
e163cc0d84 Remove "Extruder Configuration" text 
CURA-4211
 2017-09-06 12:43:42 +02:00
Lipu Fei
fc7207e77e Remove "Sync" button 
CURA-4211
 2017-09-06 12:17:40 +02:00
Lipu Fei
e15a96263d Update extruder button styles 
CURA-4211
 2017-09-06 12:00:53 +02:00
Lipu Fei
60c7d2f22e Update topbar 
CURA-4213
 2017-09-05 18:05:30 +02:00
Lipu Fei
63e75ec6b7 Merge branch 'master' 
CURA-4213
 2017-09-05 12:42:23 +02:00
Lipu Fei
4b08a5611a Make topbar transparent and update text style 
CURA-4213
 2017-09-05 11:37:05 +02:00
Lipu Fei
3f6f4a1291 Fix merge conflict for topbar monitor button 
CURA-4106
 2017-09-05 11:12:49 +02:00
Lipu Fei
3e3f15d33f Larger gap between the logo and topbar buttons 
CURA-4213
 2017-09-05 11:12:47 +02:00
Jaime van Kessel
bcd8e2ca67 Merge branch 'feature_extruder_buttons' of github.com:Ultimaker/Cura 2017-09-05 09:57:14 +02:00
Lipu Fei
77adfe345d Fix merge conflicts from master 
CURA-4213
 2017-09-05 08:41:44 +02:00
fieldOfView
308e1793bc Fix simple mode adhesion checkbox 2017-09-04 16:56:35 +02:00
fieldOfView
46b333bfc9 Merge branch 'master' into fix_simple_mode_disabled_features 
# Conflicts:
#	resources/qml/SidebarSimple.qml
 2017-09-04 16:44:59 +02:00
fieldOfView
adc1630a20 Merge branch 'master' into fix_simple_mode_disabled_features 
# Conflicts:
#	resources/qml/SidebarSimple.qml
 2017-09-04 16:38:32 +02:00
Mark
e3f319a644 less margin when support extruder pops up 
CURA-4148
 2017-09-04 16:23:19 +02:00
Jaime van Kessel
dd7ea80b68 Also added canPreheatBed option 2017-09-04 15:33:04 +02:00
Jaime van Kessel
8683275d4f Added canAbort & canPause feature to PrinterOutputDevice 2017-09-04 15:16:55 +02:00
Jaime van Kessel
88c74b30c2 Added missing QML properties 2017-09-04 11:48:54 +02:00
Lipu Fei
d0740158b1 Merge branch 'master' into feature_extruder_buttons 
CURA-4211

Resolve merge conflicts.
 2017-09-04 08:29:26 +02:00
Mark
d18d9223a5 refix the alignmet of the support and adhesion chackboxes 
CURA-4148
 2017-09-03 08:18:12 +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
Lipu Fei
aad628a46f Change to new design for extruder number settings 
CURA-4211
 2017-08-31 17:49:24 +02:00
Lipu Fei
c2645d0022 Change extruder tabs to buttons 
CURA-4211

Change extruder tabs to buttons according to the new design.
 2017-08-31 17:49:23 +02:00
Lipu Fei
b75140973e Change extruder tab to use new button style 
CURA-4211

- Use new button style ("Extruder" text with an extruder icon) for
  extruder tabs
- The "Extruder" text will disapear if the width is not enough
 2017-08-31 17:49:23 +02:00
Lipu Fei
7de9ccefaa Change extruder button on the toolbar side 
CURA-4211

Change the extruder button on the toolbar side according to the new
design.
 2017-08-31 17:49:23 +02:00
Ghostkeeper
bec786b140
Move printer status icon outside of the monitor button 
It's positioned on the right side now above the side bar.

Contributes to issue CURA-4213.
 2017-08-31 17:13:56 +02:00
Ghostkeeper
c6d614156f
Move the Cura logo into the top bar 
Looks ugly there, I think, but the colours will be changed eventually so we'll see.

Contributes to issue CURA-4213.
 2017-08-31 16:09:16 +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
alekseisasin
e38ec9d5e8 Renamed "Hotend" to "Extruder" 
CURA-4256
 2017-08-31 14:19:01 +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
Ghostkeeper
c4910503e4
Correct height of tips text 
The contentHeight property seems to indicate the height of only one line, contrary to the documentation...

Contributes to issue CURA-4148.
 2017-08-31 10:18:54 +02:00
Ghostkeeper
526a42f7a0
Put sidebar contents inside a scroll view 
That means that you can't depend on the parent height and such any more. Luckily I already changed that in the previous commit.

Contributes to issue CURA-4148.
 2017-08-31 09:51:19 +02:00
Ghostkeeper
95ba4b9368
Link anchors differently 
Once this is in a scroll view, the width of the parent box isn't fixed any more. We'd have a lot of binding loops. So now this linking is not dependent on the parent width any more but rather on the theme sizes.

Contributes to issue CURA-4148.
 2017-08-31 09:35:27 +02:00
Ghostkeeper
6f77cfc763
Always show plain monitor icon, never with_status 
The status icons are just overlaid on top of the monitor icon.
No need for any specialised icon with a background or anything.

Contributes to issue CURA-4148.
 2017-08-30 15:02:43 +02:00
fieldOfView
4d0c77683c Show target hotend temperature(s) 2017-08-29 11:02:37 +02:00