mirror of
https://github.com/Quill-OS/quill.git
synced 2024-12-26 23:57:22 -08:00
Fine-tune Kobo Mini ePUB rendering, new nightmode switch
This commit is contained in:
parent
f8decc2a5d
commit
1539f9fe0d
7 changed files with 77 additions and 15 deletions
2
eink.qrc
2
eink.qrc
|
@ -44,5 +44,7 @@
|
||||||
<file>resources/kobox-icon.png</file>
|
<file>resources/kobox-icon.png</file>
|
||||||
<file>resources/X11.png</file>
|
<file>resources/X11.png</file>
|
||||||
<file>resources/info.png</file>
|
<file>resources/info.png</file>
|
||||||
|
<file>resources/nightmode-empty.png</file>
|
||||||
|
<file>resources/nightmode-full.png</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
</RCC>
|
</RCC>
|
||||||
|
|
|
@ -323,8 +323,8 @@ namespace {
|
||||||
void defineDefaultPageSize() {
|
void defineDefaultPageSize() {
|
||||||
string_checkconfig_ro("/opt/inkbox_device");
|
string_checkconfig_ro("/opt/inkbox_device");
|
||||||
if(checkconfig_str_val == "n705\n") {
|
if(checkconfig_str_val == "n705\n") {
|
||||||
defaultEpubPageWidth = 425;
|
defaultEpubPageWidth = 365;
|
||||||
defaultEpubPageHeight = 425;
|
defaultEpubPageHeight = 365;
|
||||||
}
|
}
|
||||||
if(checkconfig_str_val == "n905\n") {
|
if(checkconfig_str_val == "n905\n") {
|
||||||
defaultEpubPageHeight = 425;
|
defaultEpubPageHeight = 425;
|
||||||
|
|
43
reader.cpp
43
reader.cpp
|
@ -49,6 +49,7 @@ reader::reader(QWidget *parent) :
|
||||||
ui->saveWordBtn->setProperty("type", "borderless");
|
ui->saveWordBtn->setProperty("type", "borderless");
|
||||||
ui->previousDefinitionBtn->setProperty("type", "borderless");
|
ui->previousDefinitionBtn->setProperty("type", "borderless");
|
||||||
ui->nextDefinitionBtn->setProperty("type", "borderless");
|
ui->nextDefinitionBtn->setProperty("type", "borderless");
|
||||||
|
ui->nightModeBtn->setProperty("type", "borderless");
|
||||||
|
|
||||||
// Icons
|
// Icons
|
||||||
ui->alignLeftBtn->setText("");
|
ui->alignLeftBtn->setText("");
|
||||||
|
@ -108,6 +109,19 @@ reader::reader(QWidget *parent) :
|
||||||
ui->fontChooser->setCurrentText(checkconfig_str_val);
|
ui->fontChooser->setCurrentText(checkconfig_str_val);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Night mode
|
||||||
|
if(checkconfig(".config/10-dark_mode/config") == true) {
|
||||||
|
string_writeconfig("/tmp/invertScreen", "y");
|
||||||
|
ui->nightModeBtn->setText("");
|
||||||
|
ui->nightModeBtn->setIcon(QIcon(":/resources/nightmode-full.png"));
|
||||||
|
isNightModeActive = true;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
string_writeconfig("/tmp/invertScreen", "n");
|
||||||
|
ui->nightModeBtn->setText("");
|
||||||
|
ui->nightModeBtn->setIcon(QIcon(":/resources/nightmode-empty.png"));
|
||||||
|
isNightModeActive = false;
|
||||||
|
}
|
||||||
|
|
||||||
// Stylesheet + misc.
|
// Stylesheet + misc.
|
||||||
QFile stylesheetFile(":/resources/eink.qss");
|
QFile stylesheetFile(":/resources/eink.qss");
|
||||||
|
@ -407,7 +421,16 @@ reader::reader(QWidget *parent) :
|
||||||
infoLabelContent.append(" ― ");
|
infoLabelContent.append(" ― ");
|
||||||
infoLabelContent.append(bookTitle);
|
infoLabelContent.append(bookTitle);
|
||||||
int infoLabelLength = infoLabelContent.length();
|
int infoLabelLength = infoLabelContent.length();
|
||||||
if(infoLabelLength <= 50) {
|
int infoLabelDefinedLength;
|
||||||
|
string_checkconfig_ro("/opt/inkbox_device");
|
||||||
|
if(checkconfig_str_val == "n705\n") {
|
||||||
|
infoLabelDefinedLength = 35;
|
||||||
|
}
|
||||||
|
if(checkconfig_str_val == "n905\n") {
|
||||||
|
infoLabelDefinedLength = 50;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(infoLabelLength <= infoLabelDefinedLength) {
|
||||||
ui->bookInfoLabel->setWordWrap(false);
|
ui->bookInfoLabel->setWordWrap(false);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@ -1312,3 +1335,21 @@ void reader::on_text_selectionChanged() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void reader::on_nightModeBtn_clicked()
|
||||||
|
{
|
||||||
|
if(isNightModeActive == true) {
|
||||||
|
// Disabling night/dark mode
|
||||||
|
string_writeconfig("/tmp/invertScreen", "n");
|
||||||
|
string_writeconfig(".config/10-dark_mode/config", "false");
|
||||||
|
ui->nightModeBtn->setIcon(QIcon(":/resources/nightmode-empty.png"));
|
||||||
|
isNightModeActive = false;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
// Enabling night/dark mode
|
||||||
|
string_writeconfig("/tmp/invertScreen", "y");
|
||||||
|
string_writeconfig(".config/10-dark_mode/config", "true");
|
||||||
|
ui->nightModeBtn->setIcon(QIcon(":/resources/nightmode-full.png"));
|
||||||
|
isNightModeActive = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
2
reader.h
2
reader.h
|
@ -54,6 +54,7 @@ public:
|
||||||
bool remount = true;
|
bool remount = true;
|
||||||
bool showTopbarWidget;
|
bool showTopbarWidget;
|
||||||
bool wordwidgetLock;
|
bool wordwidgetLock;
|
||||||
|
bool isNightModeActive;
|
||||||
QString book_1;
|
QString book_1;
|
||||||
QString book_2;
|
QString book_2;
|
||||||
QString book_3;
|
QString book_3;
|
||||||
|
@ -113,6 +114,7 @@ private slots:
|
||||||
void writeconfig_pagenumber();
|
void writeconfig_pagenumber();
|
||||||
void quit_restart();
|
void quit_restart();
|
||||||
void on_text_selectionChanged();
|
void on_text_selectionChanged();
|
||||||
|
void on_nightModeBtn_clicked();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Ui::reader *ui;
|
Ui::reader *ui;
|
||||||
|
|
41
reader.ui
41
reader.ui
|
@ -801,16 +801,13 @@
|
||||||
<property name="bottomMargin">
|
<property name="bottomMargin">
|
||||||
<number>0</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<item row="0" column="5">
|
<item row="0" column="1">
|
||||||
<widget class="QLabel" name="batteryLabel">
|
<widget class="Line" name="line_15">
|
||||||
<property name="font">
|
<property name="frameShadow">
|
||||||
<font>
|
<enum>QFrame::Plain</enum>
|
||||||
<weight>75</weight>
|
|
||||||
<bold>true</bold>
|
|
||||||
</font>
|
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="orientation">
|
||||||
<string>Battery</string>
|
<enum>Qt::Vertical</enum>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
@ -821,7 +818,14 @@
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="0" column="3">
|
<item row="0" column="4">
|
||||||
|
<widget class="QPushButton" name="nightModeBtn">
|
||||||
|
<property name="text">
|
||||||
|
<string>Night mode</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="7">
|
||||||
<spacer name="horizontalSpacer_2">
|
<spacer name="horizontalSpacer_2">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
<enum>Qt::Horizontal</enum>
|
<enum>Qt::Horizontal</enum>
|
||||||
|
@ -834,7 +838,20 @@
|
||||||
</property>
|
</property>
|
||||||
</spacer>
|
</spacer>
|
||||||
</item>
|
</item>
|
||||||
<item row="0" column="6">
|
<item row="0" column="9">
|
||||||
|
<widget class="QLabel" name="batteryLabel">
|
||||||
|
<property name="font">
|
||||||
|
<font>
|
||||||
|
<weight>75</weight>
|
||||||
|
<bold>true</bold>
|
||||||
|
</font>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Battery</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="10">
|
||||||
<widget class="QLabel" name="batteryIconLabel">
|
<widget class="QLabel" name="batteryIconLabel">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Battery Icon</string>
|
<string>Battery Icon</string>
|
||||||
|
@ -848,7 +865,7 @@
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="0" column="1">
|
<item row="0" column="3">
|
||||||
<widget class="Line" name="line_7">
|
<widget class="Line" name="line_7">
|
||||||
<property name="frameShadow">
|
<property name="frameShadow">
|
||||||
<enum>QFrame::Plain</enum>
|
<enum>QFrame::Plain</enum>
|
||||||
|
|
BIN
resources/nightmode-empty.png
Normal file
BIN
resources/nightmode-empty.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 11 KiB |
BIN
resources/nightmode-full.png
Normal file
BIN
resources/nightmode-full.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 3.1 KiB |
Loading…
Reference in a new issue