nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-15 00:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

"Automated only"-flagging for DataProcessors

Browse Source 
* Options > Data Fields > Processors & Automation (renamed from
  "Processing")
  * Modernized the UI
  * Added UI to set Automation (None, On Import, On Save) for all
    processors
  * Added UI to set Automated execution only for all processors
  * Showing the processors description
  * Showing the processors setting (if available) in a more userfriendly
    way
  * Added option to add / delete / edit custom Python processors
  * Enabled editing of Python processors via double click
  * Added option to hide code processors
* Removed the submenu to manage Python Fixes from the Edit-menu
* Renamed the Edit-menu to "Process"
* Hiding "automated only"-processors from Process-menu and
  Batchprocessing-dialog
* DataProcessors
  * Turned configuration of all core processors into forms
  * Changed the technical name of all core processors to match their
    classname
  * Added legacy technical name to all core processors to support existing
    scripts
  * Moved description from config-class to DataProcessor
  * Implemented a migration path for existing persisted processor
    configurations
* GSettings
  * Added method to remove settings by key
This commit is contained in:
Joachim Kohlhammer
2024-11-23 19:54:33 +01:00
committed by Alejandro Martinez
parent c40257911d
commit 000a76983d
40 changed files with 1510 additions and 1015 deletions
Download Patch File Download Diff File Expand all files Collapse all files

192
src/FileIO/FixPyScriptsDialog.cpp
View File

@@ -7,71 +7,69 @@
#include "PythonEmbed.h"
#include "PythonSyntax.h"
ManageFixPyScriptsDialog::ManageFixPyScriptsDialog(Context *context)
: context(context)
ManageFixPyScriptsWidget::ManageFixPyScriptsWidget
(Context *context, QWidget *parent)
: QGroupBox(tr("Select a Python Fix to manage"), parent), context(context)
{
setWindowTitle(tr("Manage Python Fixes"));
setMinimumSize(QSize(700 * dpiXFactor, 600 * dpiYFactor));
QVBoxLayout *mainLayout = new QVBoxLayout(this);
QGroupBox *groupBox = new QGroupBox(tr("Select a Python Fix to manage"));
QHBoxLayout *manageBox = new QHBoxLayout();
scripts = new QListWidget;
scripts->setAlternatingRowColors(true);
QDialogButtonBox *manageButtonBox = new QDialogButtonBox();
manageButtonBox->setOrientation(Qt::Vertical);
QPushButton *newButton = manageButtonBox->addButton(tr("New"), QDialogButtonBox::ActionRole);
edit = manageButtonBox->addButton(tr("Edit"), QDialogButtonBox::ActionRole);
del = manageButtonBox->addButton(tr("Delete"), QDialogButtonBox::ActionRole);
QHBoxLayout *manageBox = new QHBoxLayout(this);
manageBox->addWidget(scripts);
manageBox->addWidget(manageButtonBox);
QVBoxLayout *manageButtons = new QVBoxLayout();
edit = new QPushButton(tr("Edit"));
del = new QPushButton(tr("Delete"));
manageButtons->addWidget(edit);
manageButtons->addWidget(del);
manageButtons->addStretch();
manageBox->addLayout(manageButtons);
groupBox->setLayout(manageBox);
mainLayout->addWidget(groupBox);
QPushButton *close = new QPushButton(tr("Close"));
QHBoxLayout *buttons = new QHBoxLayout();
buttons->addStretch();
buttons->addWidget(close);
mainLayout->addLayout(buttons);
connect(newButton, &QPushButton::clicked, this, &ManageFixPyScriptsWidget::newClicked);
connect(scripts, &QListWidget::itemDoubleClicked, this, &ManageFixPyScriptsWidget::editClicked);
connect(scripts, &QListWidget::itemSelectionChanged, this, &ManageFixPyScriptsWidget::scriptSelected);
connect(edit, &QPushButton::clicked, this, &ManageFixPyScriptsWidget::editClicked);
connect(del, &QPushButton::clicked, this, &ManageFixPyScriptsWidget::delClicked);
reload(0);
connect(edit, SIGNAL(clicked()), this, SLOT(editClicked()));
connect(del, SIGNAL(clicked()), this, SLOT(delClicked()));
connect(close, SIGNAL(clicked()), this, SLOT(reject()));
}
void ManageFixPyScriptsDialog::editClicked()
void
ManageFixPyScriptsWidget::newClicked
()
{
QList<QListWidgetItem*> selItems = scripts->selectedItems();
if (selItems.length() == 0) {
EditFixPyScriptDialog editDlg(context, nullptr, this);
if (editDlg.exec() == QDialog::Accepted) {
reload(editDlg.getName());
}
}
void
ManageFixPyScriptsWidget::editClicked
()
{
if (scripts->currentItem() == nullptr) {
return;
}
QListWidgetItem *selItem = selItems[0];
int selRow = scripts->row(selItem);
FixPyScript *script = fixPySettings->getScript(selItem->text());
FixPyScript *script = fixPySettings->getScript(scripts->currentItem()->text());
EditFixPyScriptDialog editDlg(context, script, this);
if (editDlg.exec() == QDialog::Accepted) {
reload(selRow);
reload(editDlg.getName());
}
}
void ManageFixPyScriptsDialog::delClicked()
void
ManageFixPyScriptsWidget::delClicked
()
{
QList<QListWidgetItem*> selItems = scripts->selectedItems();
if (selItems.length() == 0) {
if (scripts->currentItem() == nullptr) {
return;
}
QListWidgetItem *selItem = selItems[0];
QString name = selItem->text();
QString name = scripts->currentItem()->text();
QString msg = QString(tr("Are you sure you want to delete %1?")).arg(name);
QMessageBox::StandardButtons result = QMessageBox::question(this, "GoldenCheetah", msg);
@@ -81,25 +79,78 @@ void ManageFixPyScriptsDialog::delClicked()
fixPySettings->deleteScript(name);
reload(0);
reload(scripts->currentRow());
}
void ManageFixPyScriptsDialog::reload(int selRow)
void
ManageFixPyScriptsWidget::scriptSelected
()
{
edit->setEnabled(scripts->currentItem() != nullptr);
del->setEnabled(scripts->currentItem() != nullptr);
}
void
ManageFixPyScriptsWidget::reload
()
{
scripts->clear();
QList<FixPyScript *> fixes = fixPySettings->getScripts();
QList<FixPyScript*> fixes = fixPySettings->getScripts();
for (int i = 0; i < fixes.size(); i++) {
scripts->addItem(fixes[i]->name);
QListWidgetItem *item = new QListWidgetItem();
item->setText(fixes[i]->name);
scripts->addItem(item);
}
edit->setEnabled(false);
del->setEnabled(false);
}
void
ManageFixPyScriptsWidget::reload
(int selRow)
{
reload();
QList<FixPyScript*> fixes = fixPySettings->getScripts();
if (scripts->count() > 0) {
scripts->setCurrentRow(selRow);
} else {
edit->setEnabled(false);
del->setEnabled(false);
scripts->setCurrentRow(std::max(0, std::min(selRow, scripts->count() - 1)));
}
}
void
ManageFixPyScriptsWidget::reload
(const QString &selName)
{
reload();
QList<FixPyScript*> fixes = fixPySettings->getScripts();
for (int i = 0; i < fixes.size(); i++) {
if (fixes[i]->name == selName) {
scripts->setCurrentRow(i);
return;
}
}
}
ManageFixPyScriptsDialog::ManageFixPyScriptsDialog
(Context *context)
{
setWindowTitle(tr("Manage Python Fixes"));
setMinimumSize(QSize(700 * dpiXFactor, 600 * dpiYFactor));
QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Close);
QVBoxLayout *mainLayout = new QVBoxLayout(this);
mainLayout->addWidget(new ManageFixPyScriptsWidget(context));
mainLayout->addWidget(buttonBox);
connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
}
EditFixPyScriptDialog::EditFixPyScriptDialog(Context *context, FixPyScript *fix, QWidget *parent)
: QDialog(parent), context(context), pyFixScript(fix)
{
@@ -119,16 +170,11 @@ EditFixPyScriptDialog::EditFixPyScriptDialog(Context *context, FixPyScript *fix,
// LHS
QFrame *scriptBox = new QFrame;
scriptBox->setFrameStyle(QFrame::NoFrame);
QVBoxLayout *scriptLayout = new QVBoxLayout;
QFormLayout *scriptLayout = newQFormLayout();
scriptLayout->setContentsMargins(0, 0, 0, 10);
scriptBox->setLayout(scriptLayout);
QHBoxLayout *nameLayout = new QHBoxLayout;
QLabel *scriptNameLbl = new QLabel(tr("Name:"));
scriptName = new QLineEdit(fix ? fix->name : "");
nameLayout->addWidget(scriptNameLbl);
nameLayout->addWidget(scriptName);
scriptLayout->addLayout(nameLayout);
script = new QTextEdit;
script->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
@@ -141,13 +187,15 @@ EditFixPyScriptDialog::EditFixPyScriptDialog(Context *context, FixPyScript *fix,
p.setColor(QPalette::Text, GCColor::invertColor(GColor(CPLOTBACKGROUND)));
script->setPalette(p);
script->setStyleSheet(AbstractView::ourStyleSheet());
scriptLayout->addWidget(script);
// syntax highlighter
setScript(fix ? fix->source : "");
QPushButton *run = new QPushButton(tr("Run"));
scriptLayout->addWidget(run);
scriptLayout->addRow(tr("Name"), scriptName);
scriptLayout->addRow(script);
scriptLayout->addRow(run);
splitter->addWidget(scriptBox);
console = new PythonConsole(context, this, this);
@@ -184,6 +232,19 @@ EditFixPyScriptDialog::EditFixPyScriptDialog(Context *context, FixPyScript *fix,
connect(cancel, SIGNAL(clicked()), this, SLOT(reject()));
}
QString
EditFixPyScriptDialog::getName
() const
{
if (pyFixScript != nullptr) {
return pyFixScript->name;
} else {
return QString();
}
}
void EditFixPyScriptDialog::closeEvent(QCloseEvent *event)
{
if (!isModified()) {
@@ -224,8 +285,8 @@ void EditFixPyScriptDialog::setScript(QString string)
bool EditFixPyScriptDialog::isModified()
{
return scriptName->isModified() ||
script->document()->isModified();
return scriptName->isModified()
|| script->document()->isModified();
}
void EditFixPyScriptDialog::saveClicked()
@@ -284,6 +345,11 @@ void EditFixPyScriptDialog::saveClicked()
pyFixScript->oldPath = pyFixScript->path;
}
// remember old name, for clean up
if (!pyFixScript->name.isEmpty() && pyFixScript->name != name) {
pyFixScript->oldName = pyFixScript->name;
}
pyFixScript->name = name;
pyFixScript->source = script->toPlainText();
pyFixScript->path = path;