mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-08-03 10:34:14 +02:00
Report salvaged and unreadable font descriptions after opening a project
Until now a font description that could not be parsed only produced console warnings most users never see, so nobody learned that their texts silently lost their formatting (see the reports in issue #553). Count in QETUtils::fontFromString() how many descriptions were salvaged from a foreign or corrupt format and how many stayed unreadable, and show a message box after opening a project when either happened: salvaged descriptions are rewritten in the stable format on the next save, unreadable ones fall back to the default font. Projects without font issues open exactly as before, and non-interactive opens only log the counters. Verified with a Qt 5.15 build on a project carrying 52 19-field and one 21-field description: the dialog reports 53 restored descriptions; the same file on a Qt 6.11 build (which parses those formats natively) shows no dialog. See issue #553.
This commit is contained in:
@@ -43,6 +43,7 @@
|
|||||||
#include "ui/backupdialog.h"
|
#include "ui/backupdialog.h"
|
||||||
#include "ui/dialogwaiting.h"
|
#include "ui/dialogwaiting.h"
|
||||||
#include "undocommand/addelementtextcommand.h"
|
#include "undocommand/addelementtextcommand.h"
|
||||||
|
#include "utils/qetutils.h"
|
||||||
#include "undocommand/rotateselectioncommand.h"
|
#include "undocommand/rotateselectioncommand.h"
|
||||||
#include "undocommand/rotatetextscommand.h"
|
#include "undocommand/rotatetextscommand.h"
|
||||||
#include "diagram.h"
|
#include "diagram.h"
|
||||||
@@ -1168,6 +1169,11 @@ bool QETDiagramEditor::openAndAddProject(
|
|||||||
//Create the project
|
//Create the project
|
||||||
DialogWaiting::instance(this);
|
DialogWaiting::instance(this);
|
||||||
|
|
||||||
|
//Per-project window for the font counters reported below; the folios
|
||||||
|
//(and with them the stored font descriptions) are built between here
|
||||||
|
//and the end of addProject().
|
||||||
|
QETUtils::resetFontRestorationCounters();
|
||||||
|
|
||||||
QETProject *project = new QETProject(filepath);
|
QETProject *project = new QETProject(filepath);
|
||||||
if (project -> state() != QETProject::Ok)
|
if (project -> state() != QETProject::Ok)
|
||||||
{
|
{
|
||||||
@@ -1194,6 +1200,42 @@ bool QETDiagramEditor::openAndAddProject(
|
|||||||
addProject(project);
|
addProject(project);
|
||||||
DialogWaiting::dropInstance();
|
DialogWaiting::dropInstance();
|
||||||
|
|
||||||
|
//Report font descriptions which could not be read as-is (written by
|
||||||
|
//an incompatible Qt version or corrupted), so the user learns about
|
||||||
|
//it from somewhere else than the console. See issue #553.
|
||||||
|
const int salvaged_fonts = QETUtils::salvagedFontCount();
|
||||||
|
const int unreadable_fonts = QETUtils::unreadableFontCount();
|
||||||
|
if (salvaged_fonts || unreadable_fonts)
|
||||||
|
{
|
||||||
|
qInfo().nospace() << "Project font descriptions: "
|
||||||
|
<< salvaged_fonts << " salvaged from a foreign format, "
|
||||||
|
<< unreadable_fonts << " unreadable (default font applies)";
|
||||||
|
}
|
||||||
|
if (interactive && (salvaged_fonts || unreadable_fonts))
|
||||||
|
{
|
||||||
|
QStringList details;
|
||||||
|
if (salvaged_fonts) {
|
||||||
|
details << tr("%n description(s) de police écrite(s) dans un "
|
||||||
|
"format étranger ou corrompu ont été restaurée(s). "
|
||||||
|
"Elles seront réécrites dans un format stable au "
|
||||||
|
"prochain enregistrement du projet.",
|
||||||
|
"message box content",
|
||||||
|
salvaged_fonts);
|
||||||
|
}
|
||||||
|
if (unreadable_fonts) {
|
||||||
|
details << tr("%n description(s) de police n'ont pas pu être "
|
||||||
|
"lue(s) ; la police par défaut sera utilisée pour "
|
||||||
|
"ces textes.",
|
||||||
|
"message box content",
|
||||||
|
unreadable_fonts);
|
||||||
|
}
|
||||||
|
QET::QetMessageBox::information(
|
||||||
|
this,
|
||||||
|
tr("Polices du projet", "message box title"),
|
||||||
|
details.join("\n\n")
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
BackupDialog backup_dialog(this);
|
BackupDialog backup_dialog(this);
|
||||||
if (backup_dialog.exec() == QDialog::Accepted)
|
if (backup_dialog.exec() == QDialog::Accepted)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -153,6 +153,12 @@ void QETUtils::pixelSizedFont(QFont &font)
|
|||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
|
/* Counters for fontFromString(), reset per project load so the editor
|
||||||
|
* can report how many stored font descriptions needed salvaging or were
|
||||||
|
* unreadable. Font parsing only happens on the main thread. */
|
||||||
|
int salvaged_font_count = 0;
|
||||||
|
int unreadable_font_count = 0;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Legacy (Qt 5) weight <- OpenType weight, closest match,
|
* Legacy (Qt 5) weight <- OpenType weight, closest match,
|
||||||
* same table Qt uses when parsing a 10/11 field string.
|
* same table Qt uses when parsing a 10/11 field string.
|
||||||
@@ -235,6 +241,10 @@ QString QETUtils::fontToString(const QFont &font)
|
|||||||
*/
|
*/
|
||||||
bool QETUtils::fontFromString(QFont &font, const QString &description)
|
bool QETUtils::fontFromString(QFont &font, const QString &description)
|
||||||
{
|
{
|
||||||
|
if (description.trimmed().isEmpty()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
QFont parsed(font);
|
QFont parsed(font);
|
||||||
if (parsed.fromString(description)) {
|
if (parsed.fromString(description)) {
|
||||||
font = parsed;
|
font = parsed;
|
||||||
@@ -271,8 +281,10 @@ bool QETUtils::fontFromString(QFont &font, const QString &description)
|
|||||||
|
|
||||||
if (parsed.fromString(legacy)) {
|
if (parsed.fromString(legacy)) {
|
||||||
font = parsed;
|
font = parsed;
|
||||||
|
++salvaged_font_count;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
++unreadable_font_count;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -284,7 +296,41 @@ bool QETUtils::fontFromString(QFont &font, const QString &description)
|
|||||||
if (count > 11
|
if (count > 11
|
||||||
&& parsed.fromString(QStringList(l.mid(0, 11)).join(comma))) {
|
&& parsed.fromString(QStringList(l.mid(0, 11)).join(comma))) {
|
||||||
font = parsed;
|
font = parsed;
|
||||||
|
++salvaged_font_count;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
++unreadable_font_count;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief QETUtils::resetFontRestorationCounters
|
||||||
|
* Reset the counters incremented by fontFromString(), to be called before
|
||||||
|
* loading a project so the numbers reported afterwards are per-project.
|
||||||
|
*/
|
||||||
|
void QETUtils::resetFontRestorationCounters()
|
||||||
|
{
|
||||||
|
salvaged_font_count = 0;
|
||||||
|
unreadable_font_count = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief QETUtils::salvagedFontCount
|
||||||
|
* @return How many font descriptions fontFromString() restored from a
|
||||||
|
* foreign or corrupt format since the counters were last reset. Such
|
||||||
|
* descriptions are rewritten in the stable format on the next save.
|
||||||
|
*/
|
||||||
|
int QETUtils::salvagedFontCount()
|
||||||
|
{
|
||||||
|
return salvaged_font_count;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief QETUtils::unreadableFontCount
|
||||||
|
* @return How many font descriptions fontFromString() could not restore at
|
||||||
|
* all since the counters were last reset (the caller's default font applies).
|
||||||
|
*/
|
||||||
|
int QETUtils::unreadableFontCount()
|
||||||
|
{
|
||||||
|
return unreadable_font_count;
|
||||||
|
}
|
||||||
|
|||||||
@@ -34,6 +34,9 @@ namespace QETUtils
|
|||||||
void pixelSizedFont (QFont &font);
|
void pixelSizedFont (QFont &font);
|
||||||
QString fontToString (const QFont &font);
|
QString fontToString (const QFont &font);
|
||||||
bool fontFromString (QFont &font, const QString &description);
|
bool fontFromString (QFont &font, const QString &description);
|
||||||
|
void resetFontRestorationCounters ();
|
||||||
|
int salvagedFontCount ();
|
||||||
|
int unreadableFontCount ();
|
||||||
|
|
||||||
bool sortBeginIntString(const QString &str_a, const QString &str_b);
|
bool sortBeginIntString(const QString &str_a, const QString &str_b);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user