Skip to content

FE/Qt: Fix: when several machines are selected, the refresh feature o… #805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tvataire wants to merge 1 commit into
base: main
Choose a base branch
from
+47 −15
Open

FE/Qt: Fix: when several machines are selected, the refresh feature o… #805

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 47 additions & 15 deletions src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -916,14 +916,30 @@ void UIChooserModel::startOrShowSelectedItems()

void UIChooserModel::refreshSelectedMachineItems()
{
/* Remember selected items */
QStringList selectedItemDefinitions;
foreach (UIChooserItem *pSelectedItem, selectedItems())
{
AssertPtrReturnVoid(pSelectedItem);
selectedItemDefinitions << pSelectedItem->definition();
}

/* Remember current item */
UIChooserItem *pCurItem = currentItem();
AssertPtrReturnVoid(pCurItem);
QString currentItemDefinition = pCurItem->definition();

/* Remember scrolling location */
const int iScrollLocation = m_pRoot ? m_pRoot->toGroupItem()->scrollingValue() : 0;

/* Gather list of current unique inaccessible machine-items: */
QList<UIChooserItemMachine*> inaccessibleMachineItemList;
UIChooserItemMachine::enumerateMachineItems(selectedItems(), inaccessibleMachineItemList,
UIChooserItemMachineEnumerationFlag_Unique |
UIChooserItemMachineEnumerationFlag_Inaccessible);

/* Prepare item to be selected: */
UIChooserItem *pSelectedItem = 0;
/* Ids of all local machines to refresh */
QList<QUuid> localMachineItemIds;

/* For each machine-item: */
foreach (UIChooserItemMachine *pItem, inaccessibleMachineItemList)
Expand All @@ -939,15 +955,10 @@ void UIChooserModel::refreshSelectedMachineItems()
/* Became accessible? */
if (pItem->accessible())
{
/* Acquire machine ID: */
const QUuid uId = pItem->id();
/* Reload this machine: */
sltReloadMachine(uId);
/* Select first of reloaded items: */
if (!pSelectedItem)
pSelectedItem = root()->searchForItem(uId.toString(),
UIChooserItemSearchFlag_Machine |
UIChooserItemSearchFlag_ExactId);
/* Call to the sltReloadMachine method have to be delayed because after the first call to this
* method, cache type of remaining items become UIVirtualMachineItemType_Invalid so related
* machines are not refreshed. */
localMachineItemIds << pItem->id();
}

break;
Expand Down Expand Up @@ -978,12 +989,33 @@ void UIChooserModel::refreshSelectedMachineItems()
}
}

/* Some item to be selected? */
if (pSelectedItem)
foreach (QUuid uId, localMachineItemIds) {
sltReloadMachine(uId);
}

/* Restore selected items */
QList<UIChooserItem*> itemsToSelect;
foreach (const QString &strSelectedItemDefinition, selectedItemDefinitions)
{
pSelectedItem->makeSureItsVisible();
setSelectedItem(pSelectedItem);
UIChooserItem *pItemToSelect = searchItemByDefinition(strSelectedItemDefinition);
if (pItemToSelect)
{
itemsToSelect << pItemToSelect;
}
}
setSelectedItems(itemsToSelect);
makeSureAtLeastOneItemSelected();

/* Restore current item */
pCurItem = searchItemByDefinition(currentItemDefinition);
if (!pCurItem || !selectedItems().contains(pCurItem))
{
pCurItem = firstSelectedItem();
}
setCurrentItem(pCurItem);

/* Restore scrolling location: */
m_pRoot->toGroupItem()->setScrollingValue(iScrollLocation);
}

void UIChooserModel::sortSelectedGroupItem()
Expand Down