3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 06:45:09 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge remote-tracking branch 'upstream/3.0'

Browse source
This commit is contained in:
Lipu Fei 2017-10-05 15:49:18 +02:00
commit 185c350a19
14 changed files with 322 additions and 289 deletions
Download patch file Download diff file Expand all files Collapse all files

49
resources/qml/Topbar.qml
View file

@ -221,40 +221,51 @@ Rectangle
ComboBox
{
id: viewModeButton
anchors
{
anchors {
verticalCenter: parent.verticalCenter
right: parent.right
rightMargin: UM.Theme.getSize("sidebar").width + UM.Theme.getSize("default_margin").width
}
style: UM.Theme.styles.combobox
visible: !base.monitoringPrint
model: UM.ViewModel { }
textRole: "name"
onCurrentIndexChanged:
{
UM.Controller.setActiveView(model.getItem(currentIndex).id);
// Update the active flag
for (var i = 0; i < model.rowCount; ++i)
{
const is_active = i == currentIndex;
model.getItem(i).active = is_active;
// update the model's active index
function updateItemActiveFlags () {
currentIndex = getActiveIndex()
for (var i = 0; i < model.rowCount(); i++) {
model.getItem(i).active = (i == currentIndex)
}
}
currentIndex:
{
for (var i = 0; i < model.rowCount; ++i)
{
if (model.getItem(i).active)
{
return i;
// get the index of the active model item on start
function getActiveIndex () {
for (var i = 0; i < model.rowCount(); i++) {
if (model.getItem(i).active) {
return i
}
}
return 0;
return 0
}
// set the active index
function setActiveIndex (index) {
UM.Controller.setActiveView(index)
// the connection to UM.ActiveView will trigger update so there is no reason to call it manually here
}
onCurrentIndexChanged: viewModeButton.setActiveIndex(model.getItem(currentIndex).id)
currentIndex: getActiveIndex()
// watch the active view proxy for changes made from the menu item
Connections
{
target: UM.ActiveView
onActiveViewChanged: viewModeButton.updateItemActiveFlags()
}
}