From 11cb8aef7a067364d5eba50fda5ef847f88fd8b3 Mon Sep 17 00:00:00 2001 From: Nicolas Mailloux Date: Mon, 5 Sep 2022 11:31:44 -0400 Subject: [PATCH] Replace Python with `split-txt` --- src/reader/reader.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/reader/reader.cpp b/src/reader/reader.cpp index 710764d..066ef2f 100644 --- a/src/reader/reader.cpp +++ b/src/reader/reader.cpp @@ -254,6 +254,7 @@ reader::reader(QWidget *parent) : ui->text->setFont(QFont("Source Serif Pro")); } else { + log("Setting font to '" + checkconfig_str_val + "'", className); if(checkconfig_str_val == "Crimson Pro") { setCrimsonProFont(); } @@ -917,9 +918,9 @@ int reader::setup_book(QString book, int i, bool run_parser) { ; } else { - QString parse_prog ("python3"); + QString parse_prog ("/mnt/onboard/.adds/inkbox/system/bin/split-txt"); QStringList parse_args; - parse_args << "split-txt.py" << checkconfig_str_val; + parse_args << checkconfig_str_val; QProcess * parse_proc = new QProcess(); parse_proc->start(parse_prog, parse_args); parse_proc->waitForFinished(); @@ -936,10 +937,14 @@ int reader::setup_book(QString book, int i, bool run_parser) { content << f.readAll(); f.close(); } + content[i].replace("\n", "
"); + content[i].replace("\t", "    "); ittext = content[i]; return content.size(); } else { + content[i].replace("\n", "
"); + content[i].replace("\t", "    "); ittext = content[i]; } } @@ -1312,7 +1317,7 @@ void reader::on_fontChooser_currentIndexChanged(const QString &arg1) } if(arg1 == "Roboto Mono") { ui->text->setFont(QFont("Roboto Mono")); - writeFile(".config/04-boot/font", "Roboto Mono"); + writeFile(".config/04-book/font", "Roboto Mono"); } if(arg1 == "Libertinus Serif") { QFont libertinus("Libertinus Serif");