jh163888/UEFITool
1
0
Fork 0
mirror of https://github.com/LongSoft/UEFITool.git synced 2025-02-13 15:22:42 +08:00
Code Issues Projects Releases Wiki Activity

Allow to use enter/return key within list widgets to navigate (#200)

Browse Source
This commit is contained in:
p-state 2020-03-12 20:38:22 +03:00 committed by GitHub
parent ac1f24ec77
commit 07dbfa3f96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
UEFITool/uefitool.cpp
View File

@ -160,6 +160,11 @@ void UEFITool::init()
connect(ui->builderMessagesListWidget, SIGNAL(itemEntered(QListWidgetItem*)), this, SLOT(enableMessagesCopyActions(QListWidgetItem*))); connect(ui->builderMessagesListWidget, SIGNAL(itemEntered(QListWidgetItem*)), this, SLOT(enableMessagesCopyActions(QListWidgetItem*)));
connect(ui->fitTableWidget, SIGNAL(itemDoubleClicked(QTableWidgetItem*)), this, SLOT(scrollTreeView(QTableWidgetItem*))); connect(ui->fitTableWidget, SIGNAL(itemDoubleClicked(QTableWidgetItem*)), this, SLOT(scrollTreeView(QTableWidgetItem*)));
connect(ui->messagesTabWidget, SIGNAL(currentChanged(int)), this, SLOT(currentTabChanged(int))); connect(ui->messagesTabWidget, SIGNAL(currentChanged(int)), this, SLOT(currentTabChanged(int)));
// allow enter/return pressing to scroll tree view
ui->parserMessagesListWidget->installEventFilter(this);
ui->finderMessagesListWidget->installEventFilter(this);
ui->builderMessagesListWidget->installEventFilter(this);
} }
void UEFITool::populateUi(const QItemSelection &selected) void UEFITool::populateUi(const QItemSelection &selected)
@ -193,11 +198,11 @@ void UEFITool::populateUi(const QModelIndex &current)
ui->menuFileActions->setEnabled(type == Types::File); ui->menuFileActions->setEnabled(type == Types::File);
ui->menuSectionActions->setEnabled(type == Types::Section); ui->menuSectionActions->setEnabled(type == Types::Section);
ui->menuEntryActions->setEnabled(type == Types::Microcode ui->menuEntryActions->setEnabled(type == Types::Microcode
|| type == Types::SlicData || type == Types::SlicData
|| type == Types::NvarEntry || type == Types::NvarEntry
|| type == Types::VssEntry || type == Types::VssEntry
|| type == Types::FsysEntry || type == Types::FsysEntry
|| type == Types::EvsaEntry || type == Types::EvsaEntry
|| type == Types::FlashMapEntry || type == Types::FlashMapEntry
|| type == Types::IfwiHeader || type == Types::IfwiHeader
|| type == Types::IfwiPartition || type == Types::IfwiPartition
@ -210,19 +215,19 @@ void UEFITool::populateUi(const QModelIndex &current)
|| type == Types::CpdExtension || type == Types::CpdExtension
|| type == Types::CpdSpiEntry || type == Types::CpdSpiEntry
); );
ui->menuStoreActions->setEnabled(type == Types::VssStore ui->menuStoreActions->setEnabled(type == Types::VssStore
|| type == Types::Vss2Store || type == Types::Vss2Store
|| type == Types::FdcStore || type == Types::FdcStore
|| type == Types::FsysStore || type == Types::FsysStore
|| type == Types::EvsaStore || type == Types::EvsaStore
|| type == Types::FtwStore || type == Types::FtwStore
|| type == Types::FlashMapStore || type == Types::FlashMapStore
|| type == Types::CmdbStore || type == Types::CmdbStore
|| type == Types::FptStore || type == Types::FptStore
|| type == Types::BpdtStore || type == Types::BpdtStore
|| type == Types::CpdStore || type == Types::CpdStore
); );
// Enable actions // Enable actions
ui->actionHexView->setDisabled(model->hasEmptyHeader(current) && model->hasEmptyBody(current) && model->hasEmptyTail(current)); ui->actionHexView->setDisabled(model->hasEmptyHeader(current) && model->hasEmptyBody(current) && model->hasEmptyTail(current));
ui->actionBodyHexView->setDisabled(model->hasEmptyBody(current)); ui->actionBodyHexView->setDisabled(model->hasEmptyBody(current));
@ -370,7 +375,7 @@ void UEFITool::goToData()
// Get parent // Get parent
QModelIndex parent = model->parent(index); QModelIndex parent = model->parent(index);
for (int i = index.row(); i < model->rowCount(parent); i++) { for (int i = index.row(); i < model->rowCount(parent); i++) {
if (model->hasEmptyParsingData(index)) if (model->hasEmptyParsingData(index))
continue; continue;
@ -383,7 +388,7 @@ void UEFITool::goToData()
ui->structureTreeView->scrollTo(index, QAbstractItemView::PositionAtCenter); ui->structureTreeView->scrollTo(index, QAbstractItemView::PositionAtCenter);
ui->structureTreeView->selectionModel()->select(index, QItemSelectionModel::Select | QItemSelectionModel::Rows | QItemSelectionModel::Clear); ui->structureTreeView->selectionModel()->select(index, QItemSelectionModel::Select | QItemSelectionModel::Rows | QItemSelectionModel::Clear);
} }
for (int j = i + 1; j < model->rowCount(parent); j++) { for (int j = i + 1; j < model->rowCount(parent); j++) {
QModelIndex currentIndex = parent.child(j, 0); QModelIndex currentIndex = parent.child(j, 0);
if (model->hasEmptyParsingData(currentIndex)) if (model->hasEmptyParsingData(currentIndex))
@ -461,7 +466,7 @@ void UEFITool::extract(const UINT8 mode)
QMessageBox::critical(this, tr("Extraction failed"), errorCodeToUString(result), QMessageBox::Ok); QMessageBox::critical(this, tr("Extraction failed"), errorCodeToUString(result), QMessageBox::Ok);
return; return;
} }
name = QDir::toNativeSeparators(currentDir + QDir::separator() + name); name = QDir::toNativeSeparators(currentDir + QDir::separator() + name);
//ui->statusBar->showMessage(name); //ui->statusBar->showMessage(name);
@ -503,12 +508,12 @@ void UEFITool::extract(const UINT8 mode)
switch (type) { switch (type) {
case Types::Capsule: path = QFileDialog::getSaveFileName(this, tr("Save capsule body to image file"), name + ".rom", tr("Image files (*.rom *.bin);;All files (*)")); break; case Types::Capsule: path = QFileDialog::getSaveFileName(this, tr("Save capsule body to image file"), name + ".rom", tr("Image files (*.rom *.bin);;All files (*)")); break;
case Types::Volume: path = QFileDialog::getSaveFileName(this, tr("Save volume body to file"), name + ".vbd", tr("Volume body files (*.vbd *.bin);;All files (*)")); break; case Types::Volume: path = QFileDialog::getSaveFileName(this, tr("Save volume body to file"), name + ".vbd", tr("Volume body files (*.vbd *.bin);;All files (*)")); break;
case Types::File: case Types::File:
if (subtype == EFI_FV_FILETYPE_ALL if (subtype == EFI_FV_FILETYPE_ALL
|| subtype == EFI_FV_FILETYPE_RAW) path = QFileDialog::getSaveFileName(this, tr("Save FFS file body to raw file"), name + ".raw", tr("Raw files (*.raw *.bin);;All files (*)")); || subtype == EFI_FV_FILETYPE_RAW) path = QFileDialog::getSaveFileName(this, tr("Save FFS file body to raw file"), name + ".raw", tr("Raw files (*.raw *.bin);;All files (*)"));
else path = QFileDialog::getSaveFileName(this, tr("Save FFS file body to file"), name + ".fbd", tr("FFS file body files (*.fbd *.bin);;All files (*)")); else path = QFileDialog::getSaveFileName(this, tr("Save FFS file body to file"), name + ".fbd", tr("FFS file body files (*.fbd *.bin);;All files (*)"));
break; break;
case Types::Section: case Types::Section:
if (subtype == EFI_SECTION_COMPRESSION if (subtype == EFI_SECTION_COMPRESSION
|| subtype == EFI_SECTION_GUID_DEFINED || subtype == EFI_SECTION_GUID_DEFINED
|| subtype == EFI_SECTION_DISPOSABLE) path = QFileDialog::getSaveFileName(this, tr("Save encapsulation section body to FFS body file"), name + ".fbd", tr("FFS file body files (*.fbd *.bin);;All files (*)")); || subtype == EFI_SECTION_DISPOSABLE) path = QFileDialog::getSaveFileName(this, tr("Save encapsulation section body to FFS body file"), name + ".fbd", tr("FFS file body files (*.fbd *.bin);;All files (*)"));
@ -734,7 +739,7 @@ void UEFITool::clearMessages()
if (ffsBuilder) ffsBuilder->clearMessages(); if (ffsBuilder) ffsBuilder->clearMessages();
ui->builderMessagesListWidget->clear(); ui->builderMessagesListWidget->clear();
} }
ui->menuMessageActions->setEnabled(false); ui->menuMessageActions->setEnabled(false);
ui->actionMessagesCopy->setEnabled(false); ui->actionMessagesCopy->setEnabled(false);
ui->actionMessagesCopyAll->setEnabled(false); ui->actionMessagesCopyAll->setEnabled(false);
@ -747,6 +752,23 @@ void UEFITool::toggleBootGuardMarking(bool enabled)
markingEnabled = enabled; markingEnabled = enabled;
} }
/* emit double click signal of QListWidget on enter/return key pressed */
bool UEFITool::eventFilter(QObject* obj, QEvent* event)
{
if (event->type() == QEvent::KeyPress) {
QKeyEvent* key = static_cast<QKeyEvent*>(event);
if (key->key() == Qt::Key_Enter || key->key() == Qt::Key_Return) {
QListWidget* list = qobject_cast<QListWidget*>(obj);
if (list != NULL && list->currentItem() != NULL)
emit list->itemDoubleClicked(list->currentItem());
}
}
return QObject::eventFilter(obj, event);
}
void UEFITool::dragEnterEvent(QDragEnterEvent* event) void UEFITool::dragEnterEvent(QDragEnterEvent* event)
{ {
if (event->mimeData()->hasFormat("text/uri-list")) if (event->mimeData()->hasFormat("text/uri-list"))

5
UEFITool/uefitool.h
View File

@ -76,7 +76,7 @@ private slots:
void openImageFile(); void openImageFile();
void openImageFileInNewWindow(); void openImageFileInNewWindow();
void saveImageFile(); void saveImageFile();
void search(); void search();
void goToBase(); void goToBase();
void goToAddress(); void goToAddress();
@ -84,7 +84,7 @@ private slots:
void hexView(); void hexView();
void bodyHexView(); void bodyHexView();
void goToData(); void goToData();
void extract(const UINT8 mode); void extract(const UINT8 mode);
void extractAsIs(); void extractAsIs();
void extractBody(); void extractBody();
@ -146,6 +146,7 @@ private:
bool enableExtractBodyUncompressed(const QModelIndex &current); bool enableExtractBodyUncompressed(const QModelIndex &current);
bool eventFilter(QObject* obj, QEvent* event);
void dragEnterEvent(QDragEnterEvent* event); void dragEnterEvent(QDragEnterEvent* event);
void dropEvent(QDropEvent* event); void dropEvent(QDropEvent* event);
void contextMenuEvent(QContextMenuEvent* event); void contextMenuEvent(QContextMenuEvent* event);