1
0
Fork 0

GUI: fix TabOrder error for plugins that add tabs

This commit is contained in:
Duncan Ogilvie 2019-10-14 00:31:31 +02:00
parent cba93ba715
commit 26d60547f2
No known key found for this signature in database
GPG Key ID: FC89E0AAA0C1AAD8
1 changed files with 7 additions and 1 deletions

View File

@ -1126,6 +1126,7 @@ void MainWindow::addMenuEntry(int hMenu, QString title)
newInfo.hParentMenu = hMenu;
QWidget* parent = hMenu == -1 ? this : menu->parent;
QAction* wAction = new QAction(title, parent);
parent->addAction(wAction);
wAction->setObjectName(QString().sprintf("ENTRY|%d", hEntryNew));
wAction->setShortcutContext((!menu || menu->globalMenu) ? Qt::ApplicationShortcut : Qt::WidgetShortcut);
parent->addAction(wAction);
@ -1667,7 +1668,12 @@ void MainWindow::tabMovedSlot(int from, int to)
// Remove space in widget name and append Tab to get config settings (CPUTab, MemoryMapTab, etc...)
//QString tabName = mTabWidget->tabText(i).replace(" ", "") + "Tab";
QString tabName = mTabWidget->getNativeName(i);
Config()->setUint("TabOrder", tabName, i);
auto found = std::find_if(mWidgetList.begin(), mWidgetList.end(), [&tabName](const WidgetInfo & info)
{
return info.nativeName == tabName;
});
if(found != mWidgetList.end())
Config()->setUint("TabOrder", tabName, i);
}
}