diff --git a/functions.h b/functions.h index 7f97b5b..8065d4b 100644 --- a/functions.h +++ b/functions.h @@ -293,12 +293,11 @@ namespace { string_checkconfig_ro("/external_root/opt/isa/version"); global::systemInfoText.append(checkconfig_str_val); global::systemInfoText.append(""); - global::systemInfoText.append("\nDevice UID: "); + global::systemInfoText.append("
Device UID: "); global::systemInfoText.append(deviceUID); - global::systemInfoText.append("\n"); - global::systemInfoText.append("Kernel version: "); + global::systemInfoText.append("
Kernel version: "); global::systemInfoText.append(kernelVersion); - global::systemInfoText.append("\n"); + global::systemInfoText.append("
"); } void resetKoboxUserData() { global::kobox::resetKoboxUserDataBool = true; diff --git a/reader.cpp b/reader.cpp index c4e33c4..d696f92 100644 --- a/reader.cpp +++ b/reader.cpp @@ -125,12 +125,10 @@ reader::reader(QWidget *parent) : ui->wordWidget->setVisible(false); if(checkconfig(".config/11-menubar/sticky") == true) { ui->menuWidget->setVisible(true); - ui->spacerWidget->setVisible(true); ui->statusBarWidget->setVisible(true); } else { ui->menuWidget->setVisible(false); - ui->spacerWidget->setVisible(false); ui->statusBarWidget->setVisible(false); } @@ -1004,13 +1002,6 @@ void reader::menubar_show() { else { ui->brightnessWidget->setVisible(true); } - if(checkconfig(".config/11-menubar/sticky") == true) { - ui->spacerWidget->setVisible(false); - } - else { - // Safety measure - ui->spacerWidget->setVisible(false); - } menubar_shown = true; } @@ -1028,11 +1019,9 @@ void reader::menubar_hide() { ui->optionsBtn->show(); ui->menuBarWidget->setVisible(false); if(checkconfig(".config/11-menubar/sticky") == true) { - ui->spacerWidget->setVisible(true); ui->statusBarWidget->setVisible(true); } else { - ui->spacerWidget->setVisible(false); ui->statusBarWidget->setVisible(false); ui->menuWidget->setVisible(false); } diff --git a/reader.ui b/reader.ui index 0f64ecd..9c696ff 100644 --- a/reader.ui +++ b/reader.ui @@ -7,7 +7,7 @@ 0 0 490 - 676 + 726 @@ -16,7 +16,7 @@ - + @@ -402,6 +402,12 @@ + + + 75 + true + + InkBox @@ -440,43 +446,6 @@ - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Qt::Vertical - - - - 20 - 37 - - - - - - - - - @@ -905,7 +874,7 @@ - + @@ -981,20 +950,7 @@ - - - - Qt::Vertical - - - - 20 - 40 - - - - - + @@ -1022,7 +978,7 @@ - + QFrame::Plain @@ -1035,19 +991,6 @@ - - - - Qt::Vertical - - - - 20 - 40 - - - - diff --git a/settings.ui b/settings.ui index 7b640f4..5eb220a 100644 --- a/settings.ui +++ b/settings.ui @@ -396,7 +396,7 @@ OK - Words number per page + Words number per page (plain text files) diff --git a/textwidget.ui b/textwidget.ui index 59a098d..fcfa2ed 100644 --- a/textwidget.ui +++ b/textwidget.ui @@ -36,6 +36,18 @@ 50 + + QFrame::NoFrame + + + QFrame::Plain + + + 0 + + + Qt::NoTextInteraction +