Companion enhancements for checklist editor, model print and compare (2 3 branch) (#6434)

* Model print and compare include GFs enhancement

* Model print and compare include checklist contents

* Add missing brackets and code tidy up

* Print message if cannot open or read checklist file

* Missing GV label translation
Move some checklist code to helpers

* Refactor to use helpers and add cursor position

* Move improved version of removeAccents to helpers and apply to checklist

* Force fixed width font for edit window
This commit is contained in:
Neil Horne
2019-05-20 18:56:23 +02:00
committed by Bertrand Songis
parent 0544846dc3
commit b4175eade3
11 changed files with 181 additions and 50 deletions
+18 -12
View File
@@ -20,16 +20,12 @@
#include "checklistdialog.h"
#include "ui_checklistdialog.h"
#include "appdata.h"
#include "helpers.h"
#include <QFile>
#include <QTextStream>
extern AppData g;
ChecklistDialog::ChecklistDialog(QWidget *parent, const QString modelName):
ChecklistDialog::ChecklistDialog(QWidget *parent, const ModelData * model):
QDialog(parent),
ui(new Ui::ChecklistDialog),
mDirty(false)
@@ -37,17 +33,21 @@ ChecklistDialog::ChecklistDialog(QWidget *parent, const QString modelName):
ui->setupUi(this);
setWindowIcon(CompanionIcon("edit.png"));
mChecklistFolder = g.profile[g.id()].sdPath() + "/MODELS/";
QString name = modelName;
name.replace(" ", "_");
mModelChecklist = QDir::toNativeSeparators(mChecklistFolder + name + ".txt");
mChecklistFolder = Helpers::getChecklistsPath();
mModelChecklist = Helpers::getChecklistFilePath(model);
ui->file->setText("File: " + mModelChecklist);
ui->pteCheck->setPlainText(readFile(mModelChecklist,QFile::exists(mModelChecklist)));
ui->pteCheck->setPlainText(readFile(mModelChecklist, QFile::exists(mModelChecklist)));
QFont f("Courier", 12, QFont::Normal); // fixed width font
ui->pteCheck->setFont(f);
connect(ui->pteCheck, SIGNAL(textChanged()), this, SLOT(changed()));
connect(ui->pteCheck, SIGNAL(cursorPositionChanged()), this, SLOT(cursorChanged()));
connect(ui->pbImport, SIGNAL(clicked()), this, SLOT(import()));
connect(ui->pbCancel, SIGNAL(clicked()), this, SLOT(reject()));
connect(ui->pbOK, SIGNAL(clicked()), this, SLOT(update()));
cursorChanged(); // force label to update
}
ChecklistDialog::~ChecklistDialog()
@@ -78,7 +78,7 @@ void ChecklistDialog::update()
else {
QTextStream out(&file);
if (out.status()==QTextStream::Ok) {
out << ui->pteCheck->toPlainText();
out << Helpers::removeAccents(ui->pteCheck->toPlainText());
if (!(out.status()==QTextStream::Ok)) {
QMessageBox::critical(this, tr("Model Checklist"), tr("Cannot write to file %1:\n%2.").arg(mModelChecklist, file.errorString()));
if (!file.flush()) {
@@ -105,7 +105,7 @@ QString ChecklistDialog::readFile(const QString & filepath, const bool exists)
else {
QTextStream in(&file);
if (in.status()==QTextStream::Ok) {
data = in.readAll();
data = Helpers::removeAccents(in.readAll());
if (!(in.status()==QTextStream::Ok)) {
QMessageBox::critical(this, tr("Model Checklist"), tr("Cannot read file %1:\n%2.").arg(QDir::toNativeSeparators(filepath), file.errorString()));
data = "";
@@ -116,3 +116,9 @@ QString ChecklistDialog::readFile(const QString & filepath, const bool exists)
}
return data;
}
void ChecklistDialog::cursorChanged()
{
QTextCursor tc = ui->pteCheck->textCursor();
ui->lblCursorPos->setText(tr("Line %1, Col %2").arg(tc.blockNumber() + 1).arg(tc.positionInBlock() + 1));
}