mirror of
https://github.com/Rockbox/rockbox.git
synced 2026-10-10 08:03:04 -04:00
1. The "Ignore files" checkbox was saved in the settings but not consulted when starting generation. Patterns from the text field were therefore applied even when the checkbox was unchecked. The pattern list is now passed to TalkFileCreator only when the option is enabled. 2. Ignore patterns were converted to regular expressions by replacing only '*' and '?'. Other regular-expression characters were left unescaped and matches were not properly bounded. The patch uses Qt's wildcardToRegularExpression() conversion instead. 3. The Talk generation dialog initially focused "Strip Extensions" because of widget creation order. It now explicitly focuses the folder tree, matching the task flow and making keyboard and screen-reader use more predictable. 4. The handling of talkclips.ignore is also corrected so that files below a marked directory are skipped recursively. Previously Rockbox Utility could generate talkclips.ignore.talk and clips for files below .rockbox even though .rockbox/talkclips.ignore was present. Change-Id: I1f9f14ed7fc057bc254f62148a7ef8ffb69425ed
201 lines
7.5 KiB
C++
201 lines
7.5 KiB
C++
/***************************************************************************
|
|
* __________ __ ___.
|
|
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
|
|
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
|
|
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
|
|
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
|
|
* \/ \/ \/ \/ \/
|
|
*
|
|
* Copyright (C) 2007 by Dominik Riebeling
|
|
*
|
|
* All files in this archive are subject to the GNU General Public License.
|
|
* See the file COPYING in the source tree root for full license agreement.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
****************************************************************************/
|
|
|
|
#include <QMessageBox>
|
|
#include "installtalkwindow.h"
|
|
#include "ui_installtalkfrm.h"
|
|
|
|
#include "configure.h"
|
|
#include "rbsettings.h"
|
|
#include "Logger.h"
|
|
|
|
InstallTalkWindow::InstallTalkWindow(QWidget *parent) : QDialog(parent)
|
|
{
|
|
ui.setupUi(this);
|
|
|
|
connect(ui.change,&QAbstractButton::clicked,this,&InstallTalkWindow::change);
|
|
|
|
ui.recursive->setChecked(true);
|
|
ui.GenerateOnlyNew->setChecked(true);
|
|
ui.StripExtensions->setChecked(true);
|
|
|
|
fsm = new QFileSystemModel(this);
|
|
QString mp = RbSettings::value(RbSettings::Mountpoint).toString();
|
|
fsm->setRootPath(mp);
|
|
ui.treeView->setModel(fsm);
|
|
ui.treeView->setSelectionMode(QAbstractItemView::ExtendedSelection);
|
|
ui.treeView->setRootIndex(fsm->index(mp));
|
|
fsm->setFilter(QDir::AllDirs | QDir::NoDotAndDotDot);
|
|
for(int i = 1; i < fsm->columnCount(); i++)
|
|
ui.treeView->setColumnHidden(i, true);
|
|
ui.treeView->setHeaderHidden(true);
|
|
|
|
updateSettings();
|
|
ui.treeView->setFocus(Qt::OtherFocusReason);
|
|
}
|
|
|
|
|
|
void InstallTalkWindow::saveSettings(void)
|
|
{
|
|
QString mp = RbSettings::value(RbSettings::Mountpoint).toString();
|
|
QModelIndexList si = ui.treeView->selectionModel()->selectedIndexes();
|
|
QStringList foldersToTalk;
|
|
for(int i = 0; i < si.size(); i++) {
|
|
if(si.at(i).column() == 0) {
|
|
QString current = fsm->filePath(si.at(i));
|
|
foldersToTalk.append(current.remove(QRegularExpression("^" + mp)));
|
|
}
|
|
}
|
|
RbSettings::setValue(RbSettings::TalkFolders, foldersToTalk);
|
|
|
|
RbSettings::setValue(RbSettings::TalkSkipExisting, ui.GenerateOnlyNew->isChecked());
|
|
RbSettings::setValue(RbSettings::TalkRecursive, ui.recursive->isChecked());
|
|
RbSettings::setValue(RbSettings::TalkStripExtensions, ui.StripExtensions->isChecked());
|
|
RbSettings::setValue(RbSettings::TalkProcessFolders, ui.talkFolders->isChecked());
|
|
RbSettings::setValue(RbSettings::TalkProcessFiles, ui.talkFiles->isChecked());
|
|
RbSettings::setValue(RbSettings::TalkIgnoreWildcards, ui.ignoreFiles->text());
|
|
RbSettings::setValue(RbSettings::TalkIgnoreFiles, ui.ignoreEnabled->isChecked());
|
|
|
|
RbSettings::sync();
|
|
}
|
|
|
|
|
|
void InstallTalkWindow::change()
|
|
{
|
|
Config *cw = new Config(this, 4);
|
|
|
|
// make sure the current selected folder doesn't get lost on settings
|
|
// changes.
|
|
connect(cw, &Config::settingsUpdated, this, &InstallTalkWindow::updateSettings);
|
|
|
|
cw->show();
|
|
}
|
|
|
|
void InstallTalkWindow::accept()
|
|
{
|
|
if(workerThread)
|
|
return;
|
|
|
|
saveSettings();
|
|
QStringList foldersToTalk
|
|
= RbSettings::value(RbSettings::TalkFolders).toStringList();
|
|
if(foldersToTalk.size() == 0) {
|
|
QMessageBox::information(this, tr("Empty selection"),
|
|
tr("No files or folders selected. Please select files or "
|
|
"folders first."));
|
|
return;
|
|
}
|
|
|
|
logger = new ProgressLoggerGui(this);
|
|
|
|
connect(logger,&ProgressLoggerGui::closed,this,&QWidget::close);
|
|
logger->show();
|
|
|
|
workerThread = new QThread(this);
|
|
talkcreator = new TalkFileCreator(nullptr);
|
|
|
|
talkcreator->setMountPoint(RbSettings::value(RbSettings::Mountpoint).toString());
|
|
talkcreator->setDirs(foldersToTalk);
|
|
|
|
talkcreator->setGenerateOnlyNew(ui.GenerateOnlyNew->isChecked());
|
|
talkcreator->setRecursive(ui.recursive->isChecked());
|
|
talkcreator->setStripExtensions(ui.StripExtensions->isChecked());
|
|
talkcreator->setTalkFolders(ui.talkFolders->isChecked());
|
|
talkcreator->setTalkFiles(ui.talkFiles->isChecked());
|
|
talkcreator->setIgnoreFiles(ui.ignoreEnabled->isChecked()
|
|
? ui.ignoreFiles->text().split(",", Qt::SkipEmptyParts)
|
|
: QStringList());
|
|
|
|
connect(talkcreator, &TalkFileCreator::done, logger, &ProgressLoggerGui::setFinished);
|
|
connect(talkcreator, &TalkFileCreator::logItem, logger, &ProgressLoggerGui::addItem);
|
|
connect(talkcreator, &TalkFileCreator::logProgress, logger, &ProgressLoggerGui::setProgress);
|
|
connect(logger, &ProgressLoggerGui::aborted,
|
|
talkcreator, &TalkFileCreator::abort, Qt::DirectConnection);
|
|
|
|
talkcreator->moveToThread(workerThread);
|
|
connect(workerThread, &QThread::started,
|
|
talkcreator, &TalkFileCreator::createTalkFiles);
|
|
connect(talkcreator, &TalkFileCreator::done,
|
|
workerThread, &QThread::quit);
|
|
connect(talkcreator, &TalkFileCreator::done,
|
|
talkcreator, &QObject::deleteLater);
|
|
connect(workerThread, &QThread::finished,
|
|
workerThread, &QObject::deleteLater);
|
|
connect(workerThread, &QThread::finished, this, [this]() {
|
|
talkcreator = nullptr;
|
|
workerThread = nullptr;
|
|
});
|
|
workerThread->start(QThread::LowPriority);
|
|
}
|
|
|
|
|
|
void InstallTalkWindow::updateSettings(void)
|
|
{
|
|
QString mp = RbSettings::value(RbSettings::Mountpoint).toString();
|
|
QString ttsName = RbSettings::value(RbSettings::Tts).toString();
|
|
TTSBase* tts = TTSBase::getTTS(this,ttsName);
|
|
if(!tts)
|
|
{
|
|
QMessageBox::critical(this, tr("TTS error"),
|
|
tr("The selected TTS failed to initialize. You can't use this TTS."));
|
|
return;
|
|
}
|
|
if(tts->configOk())
|
|
ui.labelTtsProfile->setText(QString("<b>%1</b>")
|
|
.arg(TTSBase::getTTSName(ttsName)));
|
|
else
|
|
ui.labelTtsProfile->setText(QString("<b>%1</b>")
|
|
.arg("Invalid TTS configuration!"));
|
|
|
|
QStringList folders = RbSettings::value(RbSettings::TalkFolders).toStringList();
|
|
for(int i = 0; i < folders.size(); ++i) {
|
|
QModelIndex mi = fsm->index(mp + folders.at(i));
|
|
ui.treeView->selectionModel()->select(mi, QItemSelectionModel::Select);
|
|
// make sure all parent items are expanded.
|
|
while((mi = mi.parent()) != QModelIndex()) {
|
|
ui.treeView->setExpanded(mi, true);
|
|
}
|
|
}
|
|
ui.GenerateOnlyNew->setChecked(
|
|
RbSettings::value(RbSettings::TalkSkipExisting).toBool());
|
|
ui.recursive->setChecked(
|
|
RbSettings::value(RbSettings::TalkRecursive).toBool());
|
|
ui.StripExtensions->setChecked(
|
|
RbSettings::value(RbSettings::TalkStripExtensions).toBool());
|
|
ui.talkFolders->setChecked(
|
|
RbSettings::value(RbSettings::TalkProcessFolders).toBool());
|
|
ui.talkFiles->setChecked(
|
|
RbSettings::value(RbSettings::TalkProcessFiles).toBool());
|
|
ui.ignoreFiles->setText(
|
|
RbSettings::value(RbSettings::TalkIgnoreWildcards).toString());
|
|
ui.ignoreEnabled->setChecked(
|
|
RbSettings::value(RbSettings::TalkIgnoreFiles).toBool());
|
|
|
|
emit settingsUpdated();
|
|
}
|
|
|
|
|
|
void InstallTalkWindow::changeEvent(QEvent *e)
|
|
{
|
|
if(e->type() == QEvent::LanguageChange) {
|
|
ui.retranslateUi(this);
|
|
updateSettings();
|
|
} else {
|
|
QWidget::changeEvent(e);
|
|
}
|
|
}
|