GerbilSoft/rvthtool
1
Fork 0
mirror of https://github.com/GerbilSoft/rvthtool.git synced 2025-06-18 11:35:33 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

[qrvthtool] Use process-stop for the "Cancel" button icon.

Browse Source 
dialog-close is black in the KDE Breeze theme.
process-stop is red.

Add process-stop from KDE Oxygen.

Un-indent some stuff and add more braces.

Fix "~/." for the home directory, similar to "./." for the
application directory.
This commit is contained in:
David Korth 2025-05-29 23:01:34 -04:00
parent e36c938ced
commit fafc331c26
7 changed files with 69 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qrvthtool/PathFuncs.cpp
View File

@ -42,10 +42,12 @@ QString makeRelative(const QString &basePath, const QString &filePath, const QSt
if (fileIsInBase) {
QString qs_ret = prefix + baseDir.relativeFilePath(filePath);
// WORKAROUND: If this is the application's directory, the relative path
// may end up being "./.".
// WORKAROUND: If this is the application's directory or the user's home directory,
// the relative path may end up being "./." or "~/.".
if (qs_ret == QLatin1String("./.")) {
qs_ret = QLatin1String(".");
} else if (qs_ret == QLatin1String("~/.")) {
qs_ret = QLatin1String("~");
}
return qs_ret;
}

BIN
src/qrvthtool/resources/oxygen/16x16/process-stop.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 672 B

BIN
src/qrvthtool/resources/oxygen/22x22/process-stop.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
src/qrvthtool/resources/oxygen/32x32/process-stop.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
src/qrvthtool/resources/oxygen/48x48/process-stop.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

5
src/qrvthtool/resources/oxygen/oxygen.qrc
View File

@ -55,5 +55,10 @@
<file>22x22/help-about.png</file>
<file>32x32/help-about.png</file>
<file>48x48/help-about.png</file>
<file>16x16/process-stop.png</file>
<file>22x22/process-stop.png</file>
<file>32x32/process-stop.png</file>
<file>48x48/process-stop.png</file>
</qresource>
</RCC>

111
src/qrvthtool/windows/QRvtHToolWindow.cpp
View File

@ -374,48 +374,50 @@ void QRvtHToolWindowPrivate::updateActionEnableStatus(void)
ui.actionImport->setEnabled(false);
ui.actionDelete->setEnabled(false);
ui.actionUndelete->setEnabled(false);
} else {
// RVT-H Reader image is loaded.
// TODO: Disable open, scan, and save (all) if we're scanning.
ui.actionClose->setEnabled(true);
return;
}
// If a bank is selected, enable the actions.
const RvtH_BankEntry *const entry = ui.bevBankEntryView->bankEntry();
if (entry) {
// Enable Extract if the bank is *not* empty.
ui.actionExtract->setEnabled(entry->type != RVTH_BankType_Empty);
// RVT-H Reader image is loaded.
// TODO: Disable open, scan, and save (all) if we're scanning.
ui.actionClose->setEnabled(true);
// d->write_enabled indicates if we can use writing functions.
// True if using an actual RVT-H Reader with valid NHCD table;
// false otherwise.
if (this->write_enabled) {
if (entry->type == RVTH_BankType_Empty) {
// Bank is empty.
// Enable Import; disable Delete and Undelete.
ui.actionImport->setEnabled(true);
ui.actionDelete->setEnabled(false);
ui.actionUndelete->setEnabled(false);
} else {
// Bank is not empty.
// Enable Import and Undelete if the bank is deleted.
// Enable Delete if the bank is not deleted.
ui.actionImport->setEnabled(entry->is_deleted);
ui.actionUndelete->setEnabled(entry->is_deleted);
ui.actionDelete->setEnabled(!entry->is_deleted);
}
} else {
// Not an RVT-H Reader. Disable all writing functions.
ui.actionImport->setEnabled(false);
ui.actionDelete->setEnabled(false);
ui.actionUndelete->setEnabled(false);
}
} else {
// No entry. Disable everything.
ui.actionExtract->setEnabled(false);
ui.actionImport->setEnabled(false);
// If a bank is selected, enable the actions.
const RvtH_BankEntry *const entry = ui.bevBankEntryView->bankEntry();
if (!entry) {
// No entry. Disable everything.
ui.actionExtract->setEnabled(false);
ui.actionImport->setEnabled(false);
ui.actionDelete->setEnabled(false);
ui.actionUndelete->setEnabled(false);
return;
}
// Enable Extract if the bank is *not* empty.
ui.actionExtract->setEnabled(entry->type != RVTH_BankType_Empty);
// d->write_enabled indicates if we can use writing functions.
// True if using an actual RVT-H Reader with valid NHCD table;
// false otherwise.
if (this->write_enabled) {
if (entry->type == RVTH_BankType_Empty) {
// Bank is empty.
// Enable Import; disable Delete and Undelete.
ui.actionImport->setEnabled(true);
ui.actionDelete->setEnabled(false);
ui.actionUndelete->setEnabled(false);
} else {
// Bank is not empty.
// Enable Import and Undelete if the bank is deleted.
// Enable Delete if the bank is not deleted.
ui.actionImport->setEnabled(entry->is_deleted);
ui.actionUndelete->setEnabled(entry->is_deleted);
ui.actionDelete->setEnabled(!entry->is_deleted);
}
} else {
// Not an RVT-H Reader. Disable all writing functions.
ui.actionImport->setEnabled(false);
ui.actionDelete->setEnabled(false);
ui.actionUndelete->setEnabled(false);
}
}
@ -532,11 +534,8 @@ void QRvtHToolWindowPrivate::initToolbar(void)
// Recryption key.
ui.toolBar->insertSeparator(ui.actionAbout);
lblRecryptionKey = new QLabel(QRvtHToolWindow::tr("Recryption Key:"), q);
lblRecryptionKey = new QLabel(q);
lblRecryptionKey->setObjectName(QStringLiteral("lblRecryptionKey"));
lblRecryptionKey->setToolTip(QRvtHToolWindow::tr(
"Set the encryption key to use when extracting disc images.\n"
"Default is None, which retains the original key."));
lblRecryptionKey->setContentsMargins(4, 0, 4, 0);
ui.toolBar->insertWidget(ui.actionAbout, lblRecryptionKey);
@ -546,7 +545,7 @@ void QRvtHToolWindowPrivate::initToolbar(void)
cboRecryptionKey->addItem(QString(), RVL_CryptoType_Retail); // Retail (fakesigned)
cboRecryptionKey->addItem(QString(), RVL_CryptoType_Korean); // Korean (fakesigned)
cboRecryptionKey->addItem(QString(), RVL_CryptoType_Debug); // Debug (fakesigned)
//cboRecryptionKey->addItem(QString(), RVL_CryptoType_Debug); // vWii (fakesigned) [FIXME: Not usable for discs...}
//cboRecryptionKey->addItem(QString(), RVL_CryptoType_vWii); // vWii (fakesigned) [FIXME: Not usable for discs...}
cboRecryptionKey->setCurrentIndex(0);
ui.toolBar->insertWidget(ui.actionAbout, cboRecryptionKey);
@ -573,6 +572,7 @@ void QRvtHToolWindowPrivate::retranslateToolbar(void)
cboRecryptionKey->setItemText(1, QRvtHToolWindow::tr("Retail (fakesigned)"));
cboRecryptionKey->setItemText(2, QRvtHToolWindow::tr("Korean (fakesigned)"));
cboRecryptionKey->setItemText(3, QRvtHToolWindow::tr("Debug (realsigned)"));
//cboRecryptionKey->setItemText(4, "vWii (fakesigned)"); // FIXME: Not usable for discs...
cboRecryptionKey->setCurrentIndex(0);
}
@ -592,6 +592,9 @@ QString QRvtHToolWindowPrivate::lastPath(void) const
if (path == QLatin1String(".")) {
// Application directory
path = QCoreApplication::applicationDirPath();
} else if (path == QLatin1String("~")) {
// Home directory
path = QDir::home().absolutePath();
} else if (path.startsWith(QLatin1String("./"))) {
// Path is relative to the application directory.
QDir applicationDir(QCoreApplication::applicationDirPath());
@ -639,12 +642,14 @@ int QRvtHToolWindowPrivate::selectedBankNumber(void) const
{
// Only one bank can be selected.
QItemSelectionModel *const selectionModel = ui.lstBankList->selectionModel();
if (!selectionModel->hasSelection())
if (!selectionModel->hasSelection()) {
return -1;
}
QModelIndex index = ui.lstBankList->selectionModel()->currentIndex();
if (!index.isValid())
QModelIndex index = selectionModel->currentIndex();
if (!index.isValid()) {
return -1;
}
return proxyModel->mapToSource(index).row();
}
@ -730,8 +735,8 @@ QRvtHToolWindow::QRvtHToolWindow(QWidget *parent)
d->btnCancel->setFocusPolicy(Qt::NoFocus);
d->btnCancel->setToolTip(tr("Cancel the current operation."));
d->btnCancel->setStyleSheet(QStringLiteral("margin: 0px; padding: 0px;"));
if (QIcon::hasThemeIcon(QStringLiteral("dialog-close"))) {
d->btnCancel->setIcon(QIcon::fromTheme(QStringLiteral("dialog-close")));
if (QIcon::hasThemeIcon(QStringLiteral("process-stop"))) {
d->btnCancel->setIcon(QIcon::fromTheme(QStringLiteral("process-stop")));
} else {
d->btnCancel->setIcon(style()->standardIcon(
QStyle::SP_DialogCloseButton, nullptr, d->btnCancel));
@ -1182,12 +1187,14 @@ void QRvtHToolWindow::on_actionExtract_triggered(void)
// Only one bank can be selected.
QItemSelectionModel *const selectionModel = d->ui.lstBankList->selectionModel();
if (!selectionModel->hasSelection())
if (!selectionModel->hasSelection()) {
return;
}
QModelIndex index = d->ui.lstBankList->selectionModel()->currentIndex();
if (!index.isValid())
if (!index.isValid()) {
return;
}
const unsigned int bank = d->proxyModel->mapToSource(index).row();
@ -1198,8 +1205,9 @@ void QRvtHToolWindow::on_actionExtract_triggered(void)
// TODO: Remove extra space from the filename filter?
tr("GameCube/Wii Disc Images") + QStringLiteral(" (*.gcm);;") +
tr("All Files") + QStringLiteral(" (*)"));
if (filename.isEmpty())
if (filename.isEmpty()) {
return;
}
// Disable the main UI widgets.
markUiBusy();
@ -1282,8 +1290,9 @@ void QRvtHToolWindow::on_actionImport_triggered(void)
// TODO: Remove extra space from the filename filter?
tr("GameCube/Wii Disc Images") + QStringLiteral(" (*.gcm *.wbfs *.ciso);;") +
tr("All Files") + QStringLiteral(" (*)"));
if (filename.isEmpty())
if (filename.isEmpty()) {
return;
}
// Disable the main UI widgets.
markUiBusy();