diff --git a/generaldialog.ui b/generaldialog.ui
index 14eaa8c..fd7c8f8 100644
--- a/generaldialog.ui
+++ b/generaldialog.ui
@@ -16,31 +16,7 @@
-
-
-
-
-
- 0
-
-
-
-
-
-
- Inter
- 75
- true
-
-
-
- Header
-
-
- Qt::AlignCenter
-
-
-
-
-
- -
+
-
0
@@ -135,20 +111,31 @@
- -
-
-
- Qt::Vertical
+
-
+
+
+ 0
-
-
- 20
- 40
-
-
-
+ -
+
+
+
+ Inter
+ 75
+ true
+
+
+
+ Header
+
+
+ Qt::AlignCenter
+
+
+
+
- -
+
-
0
@@ -237,19 +224,6 @@
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
diff --git a/reader.cpp b/reader.cpp
index 0ec7511..84e355b 100644
--- a/reader.cpp
+++ b/reader.cpp
@@ -361,7 +361,6 @@ reader::reader(QWidget *parent) :
// Retrieve split_total from tmpfs
string_checkconfig("/tmp/inkboxPageNumber");
split_total = checkconfig_str_val.toInt();
- qDebug() << "been there too";
setup_book(book_file, 0, true);
}
@@ -1156,12 +1155,40 @@ void reader::openCriticalBatteryAlertWindow() {
alertWindow->setGeometry(QRect(QPoint(0,0), screen()->geometry ().size()));
alertWindow->show();
}
+
void reader::convertMuPdfVars() {
mupdf::fontSize = 12;
mupdf::width = 400;
- mupdf::height = 500;
+ mupdf::height = 460;
mupdf::fontSize_qstr = QString::number(mupdf::fontSize);
mupdf::width_qstr = QString::number(mupdf::width);
mupdf::height_qstr = QString::number(mupdf::height);
mupdf::epubPageNumber_qstr = QString::number(mupdf::epubPageNumber);
}
+
+void reader::setPageStyle() {
+ // General page size
+ string_checkconfig_ro("/opt/inkbox_device");
+ if(checkconfig_str_val == "n705\n") {
+ string_checkconfig_ro(".config/04-book/font");
+ if(checkconfig_str_val == "Crimson Pro") {
+ mupdf::width = 415;
+ mupdf::height = 490;
+ }
+ else {
+ mupdf::width = 400;
+ mupdf::height = 460;
+ }
+ }
+ else if(checkconfig_str_val == "n905\n") {
+ string_checkconfig_ro(".config/04-book/font");
+ if(checkconfig_str_val == "Crimson Pro") {
+ mupdf::width = 415;
+ mupdf::height = 490;
+ }
+ else {
+ mupdf::width = 400;
+ mupdf::height = 460;
+ }
+ }
+}
diff --git a/reader.h b/reader.h
index a37409a..f039a19 100644
--- a/reader.h
+++ b/reader.h
@@ -85,6 +85,7 @@ public:
void openCriticalBatteryAlertWindow();
void convertMuPdfVars();
void refreshScreen();
+ void setPageStyle();
private slots:
void on_nextBtn_clicked();
diff --git a/settings.ui b/settings.ui
index fa9c5f5..7b640f4 100644
--- a/settings.ui
+++ b/settings.ui
@@ -524,13 +524,128 @@ OK
-
-
-
-
+
-
+
+
+
+ Chivo
+ true
+
+
- Enable UI scaling
+ Security
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+ QFrame::Plain
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ System info
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+
+ 75
+ true
+
+
+
+ Show
+
+
+
+
+
+ -
+
+
+ 0
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ Update InkBox
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 75
+ true
+
+
+
+ Update
+
+
+
+
+
-
@@ -581,19 +696,6 @@ OK
- -
-
-
-
- Chivo
- true
-
-
-
- System
-
-
-
-
@@ -646,7 +748,27 @@ OK
- -
+
-
+
+
+
+ Chivo
+ true
+
+
+
+ System
+
+
+
+ -
+
+
+ Enable night mode
+
+
+
+ -
0
@@ -686,132 +808,17 @@ OK
- -
-
-
- Enable night mode
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
- QFrame::Plain
-
-
- Qt::Horizontal
-
-
-
- -
+
-
Enable lock screen and passcode
- -
-
-
- 0
-
-
- 0
-
-
-
-
-
-
- 75
- true
-
-
-
- Update
-
-
-
- -
-
-
- System info
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- Update InkBox
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
-
-
-
- -
-
-
-
- 75
- true
-
-
-
- Show
-
-
-
-
-
- -
-
-
-
- Chivo
- true
-
-
+
-
+
- Security
+ Enable UI scaling