3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 23:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch '4.0' into unify_font_types

Browse source
This commit is contained in:
Ghostkeeper 2018-12-28 15:51:54 +01:00
commit b54312fb9b
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
30 changed files with 266 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml
View file

@ -18,6 +18,10 @@ Item
height: centerSection.height
width: maximumWidth
// Enable keyboard navigation
Keys.onLeftPressed: navigateTo(currentIndex - 1)
Keys.onRightPressed: navigateTo(currentIndex + 1)
Item
{

9
plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml
View file

@ -24,6 +24,11 @@ Component
}
}
width: maximumWidth
// Enable keyboard navigation. NOTE: This is done here so that we can also potentially
// forward to the queue items in the future. (Deleting selected print job, etc.)
Keys.forwardTo: carousel
Component.onCompleted: forceActiveFocus()
UM.I18nCatalog
{
@ -59,7 +64,9 @@ Component
}
width: parent.width
height: 264 * screenScaleFactor // TODO: Theme!
MonitorCarousel {}
MonitorCarousel {
id: carousel
}
}
MonitorQueue