From d3362890bebcfd9be7b9c7bbec29fdfe0c234953 Mon Sep 17 00:00:00 2001 From: Nicolas Mailloux Date: Sun, 28 Mar 2021 22:18:48 -0400 Subject: [PATCH] First steps to control brightness from MainWindow and show battery level/status --- eink.qrc | 1 + mainwindow.cpp | 23 +++- mainwindow.h | 11 ++ mainwindow.ui | 273 +++++++++++++++++++++------------------ resources/frontlight.png | Bin 0 -> 5471 bytes 5 files changed, 179 insertions(+), 129 deletions(-) create mode 100644 resources/frontlight.png diff --git a/eink.qrc b/eink.qrc index 64c2b48..15c62d8 100644 --- a/eink.qrc +++ b/eink.qrc @@ -30,5 +30,6 @@ resources/battery_charging.png resources/alert.png resources/eink_dark.qss + resources/frontlight.png diff --git a/mainwindow.cpp b/mainwindow.cpp index d4a7b23..64a25b4 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -30,12 +30,14 @@ MainWindow::MainWindow(QWidget *parent) ui->quitBtn->setProperty("type", "borderless"); ui->searchBtn->setProperty("type", "borderless"); ui->pushButton->setProperty("type", "borderless"); + ui->brightnessBtn->setProperty("type", "borderless"); ui->settingsBtn->setText(""); ui->appsBtn->setText(""); ui->pushButton->setText(""); ui->quitBtn->setText(""); ui->searchBtn->setText(""); + ui->brightnessBtn->setText(""); // Getting the screen's size float sW = QGuiApplication::screens()[0]->size().width(); @@ -44,15 +46,21 @@ MainWindow::MainWindow(QWidget *parent) float stdIconWidth; float stdIconHeight; + float brightnessIconWidth; + float brightnessIconHeight; string_checkconfig("/opt/inkbox_device"); if(checkconfig_str_val == "n705\n") { stdIconWidth = sW / 12; stdIconHeight = sH / 12; + brightnessIconWidth = sW / 30; + brightnessIconHeight = sH / 30; } else { stdIconWidth = sW / 14; stdIconHeight = sH / 14; + brightnessIconWidth = sW / 28; + brightnessIconHeight = sH / 28; } // Setting icons up @@ -67,11 +75,18 @@ MainWindow::MainWindow(QWidget *parent) ui->quitBtn->setIcon(QIcon(":/resources/power.png")); ui->quitBtn->setIconSize(QSize(stdIconWidth, stdIconHeight)); + ui->brightnessBtn->setIcon(QIcon(":/resources/frontlight.png")); + ui->brightnessBtn->setIconSize(QSize(brightnessIconWidth, brightnessIconHeight)); + ui->book1Btn->setStyleSheet("font-size: 11pt; padding: 25px"); ui->book2Btn->setStyleSheet("font-size: 11pt; padding: 25px"); ui->book3Btn->setStyleSheet("font-size: 11pt; padding: 25px"); ui->book4Btn->setStyleSheet("font-size: 11pt; padding: 25px"); + ui->brightnessBtn->setStyleSheet("font-size: 9pt; padding-bottom: 5px; padding-top: 5px; padding-left: 10px; padding-right: 10px;"); + ui->batteryIcon->setStyleSheet("font-size: 5pt"); + ui->batteryIcon->setText(""); + ui->book1Btn->hide(); ui->book2Btn->hide(); ui->book3Btn->hide(); @@ -167,10 +182,10 @@ MainWindow::MainWindow(QWidget *parent) QTimer *t = new QTimer(this); t->setInterval(500); connect(t, &QTimer::timeout, [&]() { - QString date = QDateTime::currentDateTime().toString("yyyy-MM-dd"); QString time = QTime::currentTime().toString("hh:mm:ss"); + get_battery_level(); ui->timeLabel->setText(time); - ui->dateLabel->setText(date); + ui->batteryLabel->setText(batt_level); } ); t->start(); } @@ -178,10 +193,10 @@ MainWindow::MainWindow(QWidget *parent) QTimer *t = new QTimer(this); t->setInterval(500); connect(t, &QTimer::timeout, [&]() { - QString date = QDateTime::currentDateTime().toString("yyyy-MM-dd"); QString time = QTime::currentTime().toString("hh:mm"); + get_battery_level(); ui->timeLabel->setText(time); - ui->dateLabel->setText(date); + ui->batteryLabel->setText(batt_level); } ); t->start(); } diff --git a/mainwindow.h b/mainwindow.h index 74cf972..d3373c6 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -26,8 +26,10 @@ public: bool checked_box = false; bool existing_recent_books = false; bool reboot_after_update = false; + int batt_level_int; QString checkconfig_str_val; QString relative_path; + QString batt_level; bool checkconfig(QString file) { QFile config(file); config.open(QIODevice::ReadOnly); @@ -48,6 +50,15 @@ public: fhandler << config << boolalpha << checked_box << endl; fhandler.close(); } + void get_battery_level() { + QFile batt_level_file("/sys/devices/platform/pmic_battery.1/power_supply/mc13892_bat/capacity"); + batt_level_file.open(QIODevice::ReadOnly); + batt_level = batt_level_file.readAll(); + batt_level = batt_level.trimmed(); + batt_level_int = batt_level.toInt(); + batt_level = batt_level.append("%"); + batt_level_file.close(); + } int brightness_checkconfig(QString file) { QFile config(file); config.open(QIODevice::ReadWrite); diff --git a/mainwindow.ui b/mainwindow.ui index 74badf8..937ea49 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -17,34 +17,50 @@ - - - - Qt::Horizontal + + + + Brightness - - - 40 - 20 - - - + - - - - Qt::Horizontal + + + + + 11 + - - - 40 - 20 - + + Welcome to InkBox - + + Qt::AlignCenter + + - - + + + + + 75 + true + + + + batteryLevel + + + + + + + batteryIcon + + + + + ― @@ -67,39 +83,46 @@ - - - - - 11 - + + + + Qt::Horizontal - - Welcome to InkBox + + + 40 + 20 + - - Qt::AlignCenter - - + - - + + ― - - - - - 11 - 75 - true - + + + + Qt::Horizontal - - date + + + 40 + 20 + + + + + + + + QFrame::Plain + + + Qt::Vertical @@ -140,22 +163,6 @@ - - - - - Chivo - true - - - - Recently read books will appear here. - - - Qt::AlignCenter - - - @@ -185,6 +192,84 @@ + + + + + Chivo + true + + + + Recently read books will appear here. + + + Qt::AlignCenter + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + 0 + + + + + 0 + + + + + Book 1 + + + + + + + Book 2 + + + + + + + + + 0 + + + + + Book 3 + + + + + + + Book 4 + + + + + + + @@ -277,68 +362,6 @@ - - - - 0 - - - - - 0 - - - - - Book 1 - - - - - - - Book 2 - - - - - - - - - 0 - - - - - Book 3 - - - - - - - Book 4 - - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - diff --git a/resources/frontlight.png b/resources/frontlight.png new file mode 100644 index 0000000000000000000000000000000000000000..5799f629af5684263123d5cceac9165a9b8027d5 GIT binary patch literal 5471 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 literal 0 HcmV?d00001