michael/quill
1
0
Fork 0
mirror of https://github.com/Quill-OS/quill.git synced 2024-12-26 23:57:22 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

settings removed spin box + wifi logger removed ugly frame

Browse source
This commit is contained in:
Szybet 2022-09-05 22:29:23 +02:00 committed by Nicolas Mailloux
parent 67686c6be6
commit d10d1a1213
4 changed files with 490 additions and 314 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

120
src/settings/settings.cpp
View file

@ -113,37 +113,50 @@ settings::settings(QWidget *parent) :
// Words number // Words number
string_checkconfig(".config/07-words_number/config"); string_checkconfig(".config/07-words_number/config");
if(checkconfig_str_val == "") { if(checkconfig_str_val == "") {
; if(global::deviceID == "n705\n") {
wordNumberSaved = 120;
} else if(global::deviceID == "n873\n") {
wordNumberSaved = 250;
} else {
wordNumberSaved = 175;
}
} }
else { else {
int words_number = checkconfig_str_val.toInt(); QString words_number = checkconfig_str_val;
ui->wordsNumber->setValue(words_number); ui->wordNumberShowLabel->setText(words_number);
wordNumberSaved = checkconfig_str_val.toInt();
} }
// ePUB page size // ePUB page size
if(checkconfig(".config/13-epub_page_size/set") == true) { if(checkconfig(".config/13-epub_page_size/set") == true) {
string_checkconfig_ro(".config/13-epub_page_size/width"); string_checkconfig_ro(".config/13-epub_page_size/width");
if(checkconfig_str_val != "") { if(checkconfig_str_val != "") {
int pageWidth = checkconfig_str_val.toInt(); QString pageWidth = checkconfig_str_val;
ui->pageSizeWidthSpinBox->setValue(pageWidth); ui->pageSizeWidthLabel->setText(pageWidth);
pageSizeWidthSaved = pageWidth.toInt();
} }
else { else {
// Failsafe: setting default // Failsafe: setting default
ui->pageSizeWidthSpinBox->setValue(defaultEpubPageWidth); ui->pageSizeWidthLabel->setText(QString::number(defaultEpubPageWidth));
pageSizeWidthSaved = defaultEpubPageWidth;
} }
string_checkconfig_ro(".config/13-epub_page_size/height"); string_checkconfig_ro(".config/13-epub_page_size/height");
if(checkconfig_str_val != "") { if(checkconfig_str_val != "") {
int pageHeight = checkconfig_str_val.toInt(); QString pageHeight = checkconfig_str_val;
ui->pageSizeHeightSpinBox->setValue(pageHeight); ui->pageSizeHeightLabel->setText(pageHeight);
pageSizeHeightSaved = pageHeight.toInt();
} }
else { else {
// Failsafe: setting default // Failsafe: setting default
ui->pageSizeHeightSpinBox->setValue(defaultEpubPageHeight); ui->pageSizeHeightLabel->setText(QString::number(defaultEpubPageHeight));
pageSizeHeightSaved = defaultEpubPageHeight;
} }
} }
else { else {
ui->pageSizeWidthSpinBox->setValue(defaultEpubPageWidth); ui->pageSizeWidthLabel->setText("Width: " + QString::number(defaultEpubPageWidth));
ui->pageSizeHeightSpinBox->setValue(defaultEpubPageHeight); ui->pageSizeHeightLabel->setText("Height: " + QString::number(defaultEpubPageHeight));
pageSizeHeightSaved = defaultEpubPageHeight;
pageSizeWidthSaved = defaultEpubPageWidth;
} }
// QTextEdit scroll bar in Reader framework // QTextEdit scroll bar in Reader framework
@ -361,8 +374,34 @@ settings::~settings()
{ {
delete ui; delete ui;
} }
/*
void settings::on_pageSizeWidthSpinBox_valueChanged(int arg1)
{
std::string value = std::to_string(arg1);
string_writeconfig(".config/13-epub_page_size/width", value);
string_writeconfig(".config/13-epub_page_size/set", "true");
log("Set ePUB page size width to " + QString::number(arg1), className);
}
void settings::on_pageSizeHeightSpinBox_valueChanged(int arg1)
{
std::string value = std::to_string(arg1);
string_writeconfig(".config/13-epub_page_size/height", value);
string_writeconfig(".config/13-epub_page_size/set", "true");
log("Set ePUB page size height to " + QString::number(arg1), className);
}
*/
void settings::on_okBtn_clicked() { void settings::on_okBtn_clicked() {
// Save things
string_writeconfig(".config/07-words_number/config", QString::number(wordNumberSaved).toStdString());
log("Set text files words number to " + QString::number(wordNumberSaved), className);
string_writeconfig(".config/13-epub_page_size/width", QString::number(pageSizeWidthSaved).toStdString());
string_writeconfig(".config/13-epub_page_size/set", "true");
string_writeconfig(".config/13-epub_page_size/height", QString::number(pageSizeHeightSaved).toStdString());
string_writeconfig(".config/13-epub_page_size/set", "true");
// Prevent potential unknown damage launching via shell script this could do // Prevent potential unknown damage launching via shell script this could do
if(launch_sh == true) { if(launch_sh == true) {
if(ui_enable_changed == true) { if(ui_enable_changed == true) {
@ -795,22 +834,6 @@ void settings::on_showSystemInfoBtn_clicked()
generalDialogWindow->setAttribute(Qt::WA_DeleteOnClose); generalDialogWindow->setAttribute(Qt::WA_DeleteOnClose);
} }
void settings::on_pageSizeWidthSpinBox_valueChanged(int arg1)
{
std::string value = std::to_string(arg1);
string_writeconfig(".config/13-epub_page_size/width", value);
string_writeconfig(".config/13-epub_page_size/set", "true");
log("Set ePUB page size width to " + QString::number(arg1), className);
}
void settings::on_pageSizeHeightSpinBox_valueChanged(int arg1)
{
std::string value = std::to_string(arg1);
string_writeconfig(".config/13-epub_page_size/height", value);
string_writeconfig(".config/13-epub_page_size/set", "true");
log("Set ePUB page size height to " + QString::number(arg1), className);
}
void settings::on_readerScrollBarCheckBox_toggled(bool checked) void settings::on_readerScrollBarCheckBox_toggled(bool checked)
{ {
QString settingString = "scrollbar display if necessary"; QString settingString = "scrollbar display if necessary";
@ -1036,3 +1059,46 @@ void settings::on_exportHighlightsBtn_clicked()
writeFile("/mnt/onboard/onboard/highlights-" + QDateTime::currentDateTime().toString("dd-MM-yy_hh.mm.ss") + ".json", QJsonDocument(jsonObject).toJson()); writeFile("/mnt/onboard/onboard/highlights-" + QDateTime::currentDateTime().toString("dd-MM-yy_hh.mm.ss") + ".json", QJsonDocument(jsonObject).toJson());
showToast("Highlights exported successfully"); showToast("Highlights exported successfully");
} }
void settings::on_wordNumberAddBtn_clicked()
{
wordNumberSaved = wordNumberSaved + 5;
ui->wordNumberShowLabel->setText(QString::number(wordNumberSaved));
}
void settings::on_wordNumberDelBtn_clicked()
{
if(wordNumberSaved > 10) {
wordNumberSaved = wordNumberSaved - 5;
ui->wordNumberShowLabel->setText(QString::number(wordNumberSaved));
}
}
void settings::on_pageSizeHeightDelBtn_clicked()
{
if(pageSizeHeightSaved > 100) {
pageSizeHeightSaved = pageSizeHeightSaved - 5;
ui->pageSizeHeightLabel->setText(QString::number(pageSizeHeightSaved));
}
}
void settings::on_pageSizeHeightAddBtn_clicked()
{
pageSizeHeightSaved = pageSizeHeightSaved + 5;
ui->pageSizeHeightLabel->setText(QString::number(pageSizeHeightSaved));
}
void settings::on_pageSizeWidthDelBtn_clicked()
{
if(pageSizeWidthSaved > 100) {
pageSizeWidthSaved = pageSizeWidthSaved - 5;
ui->pageSizeWidthLabel->setText(QString::number(pageSizeWidthSaved));
}
}
void settings::on_pageSizeWidthAddBtn_clicked()
{
pageSizeWidthSaved = pageSizeWidthSaved + 5;
ui->pageSizeWidthLabel->setText(QString::number(pageSizeWidthSaved));
}

18
src/settings/settings.h
View file

@ -52,8 +52,6 @@ private slots:
void on_enableLockscreenCheckBox_toggled(bool checked); void on_enableLockscreenCheckBox_toggled(bool checked);
void on_enableUiScalingCheckBox_toggled(bool checked); void on_enableUiScalingCheckBox_toggled(bool checked);
void on_showSystemInfoBtn_clicked(); void on_showSystemInfoBtn_clicked();
void on_pageSizeWidthSpinBox_valueChanged(int arg1);
void on_pageSizeHeightSpinBox_valueChanged(int arg1);
void on_readerScrollBarCheckBox_toggled(bool checked); void on_readerScrollBarCheckBox_toggled(bool checked);
void brightnessDown(); void brightnessDown();
void on_globalReadingSettingsCheckBox_toggled(bool checked); void on_globalReadingSettingsCheckBox_toggled(bool checked);
@ -73,6 +71,18 @@ private slots:
void on_tzComboBox_currentTextChanged(const QString &arg1); void on_tzComboBox_currentTextChanged(const QString &arg1);
void on_exportHighlightsBtn_clicked(); void on_exportHighlightsBtn_clicked();
void on_wordNumberAddBtn_clicked();
void on_wordNumberDelBtn_clicked();
void on_pageSizeHeightDelBtn_clicked();
void on_pageSizeHeightAddBtn_clicked();
void on_pageSizeWidthDelBtn_clicked();
void on_pageSizeWidthAddBtn_clicked();
signals: signals:
void showToast(QString messageToDisplay); void showToast(QString messageToDisplay);
void closeIndefiniteToast(); void closeIndefiniteToast();
@ -83,6 +93,10 @@ private:
generalDialog *generalDialogWindow; generalDialog *generalDialogWindow;
otaManager *otaManagerWindow; otaManager *otaManagerWindow;
toast *toastWindow; toast *toastWindow;
int pageSizeHeightSaved;
int pageSizeWidthSaved;
int wordNumberSaved;
}; };
#endif // SETTINGS_H #endif // SETTINGS_H

633
src/settings/settings.ui
View file

@ -16,6 +16,26 @@
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="31" column="0">
<widget class="QPushButton" name="aboutBtn">
<property name="text">
<string>About InkBox</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="Line" name="line_4">
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="lineWidth">
<number>5</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="30" column="0"> <item row="30" column="0">
<widget class="Line" name="line_5"> <widget class="Line" name="line_5">
<property name="frameShadow"> <property name="frameShadow">
@ -49,7 +69,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>457</width> <width>457</width>
<height>657</height> <height>667</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_4"> <layout class="QVBoxLayout" name="verticalLayout_4">
@ -98,8 +118,25 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0"> <item row="22" column="0">
<widget class="QLabel" name="label_7"> <widget class="Line" name="line_3">
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="13" column="0">
<widget class="QCheckBox" name="demoCheckBox">
<property name="text">
<string>Disable &quot;Welcome to InkBox&quot; message</string>
</property>
</widget>
</item>
<item row="21" column="0">
<widget class="QLabel" name="label_3">
<property name="font"> <property name="font">
<font> <font>
<family>Chivo</family> <family>Chivo</family>
@ -107,54 +144,7 @@
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>Reading</string> <string>USB networking</string>
</property>
</widget>
</item>
<item row="23" column="0">
<layout class="QGridLayout" name="gridLayout_3">
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="1">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Request DHCP lease</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="requestLeaseBtn">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Request</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="12" column="0">
<widget class="QCheckBox" name="quoteCheckBox">
<property name="text">
<string>Disable authors quotes</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -163,7 +153,9 @@
<property name="font"> <property name="font">
<font> <font>
<family>Chivo</family> <family>Chivo</family>
<weight>50</weight>
<italic>true</italic> <italic>true</italic>
<bold>false</bold>
</font> </font>
</property> </property>
<property name="text"> <property name="text">
@ -171,26 +163,101 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="20" column="0"> <item row="6" column="0">
<layout class="QGridLayout" name="gridLayout_4"> <widget class="QCheckBox" name="readerScrollBarCheckBox">
<property name="text">
<string>Show scroll bar if needed</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_7">
<property name="font">
<font>
<family>Chivo</family>
<weight>50</weight>
<italic>true</italic>
<bold>false</bold>
</font>
</property>
<property name="text">
<string>Reading</string>
</property>
</widget>
</item>
<item row="19" column="0">
<widget class="Line" name="line_7">
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QCheckBox" name="globalReadingSettingsCheckBox">
<property name="text">
<string>Global reading settings</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="Line" name="line_8">
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="11" column="0">
<widget class="QCheckBox" name="clockCheckBox">
<property name="text">
<string>Clock: Show seconds</string>
</property>
</widget>
</item>
<item row="10" column="0">
<widget class="Line" name="line_6">
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QLabel" name="label_2">
<property name="font">
<font>
<family>Chivo</family>
<weight>50</weight>
<italic>true</italic>
<bold>false</bold>
</font>
</property>
<property name="text">
<string>Home</string>
</property>
</widget>
</item>
<item row="12" column="0">
<widget class="QCheckBox" name="quoteCheckBox">
<property name="text">
<string>Disable authors quotes</string>
</property>
</widget>
</item>
<item row="3" column="0">
<layout class="QGridLayout" name="gridLayout_15">
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="2">
<widget class="QPushButton" name="usbmsBtn">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Go</string>
</property>
</widget>
</item>
<item row="0" column="1"> <item row="0" column="1">
<spacer name="horizontalSpacer_2"> <spacer name="horizontalSpacer_11">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
@ -202,13 +269,98 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="0" column="0"> <item row="0" column="3">
<widget class="QLabel" name="label_6"> <widget class="QPushButton" name="pageSizeWidthDelBtn">
<property name="text"> <property name="text">
<string>Enter USB Mass Storage session</string> <string/>
</property>
<property name="icon">
<iconset resource="../eink.qrc">
<normaloff>:/resources/minus.png</normaloff>:/resources/minus.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="8">
<widget class="QPushButton" name="pageSizeHeightDelBtn">
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../eink.qrc">
<normaloff>:/resources/minus.png</normaloff>:/resources/minus.png</iconset>
</property>
</widget>
</item>
<item row="0" column="10">
<widget class="QPushButton" name="pageSizeHeightAddBtn">
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../eink.qrc">
<normaloff>:/resources/plus.png</normaloff>:/resources/plus.png</iconset>
</property>
</widget>
</item>
<item row="0" column="5">
<widget class="QPushButton" name="pageSizeWidthAddBtn">
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../eink.qrc">
<normaloff>:/resources/plus.png</normaloff>:/resources/plus.png</iconset>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="pageSizePageSizeLabel">
<property name="text">
<string>ePUB size:</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLabel" name="label_12">
<property name="text">
<string>Width:</string>
</property>
</widget>
</item>
<item row="0" column="4">
<widget class="QLabel" name="pageSizeWidthLabel">
<property name="text">
<string>450</string>
</property>
</widget>
</item>
<item row="0" column="7">
<widget class="QLabel" name="label_13">
<property name="text">
<string>Height:</string>
</property>
</widget>
</item>
<item row="0" column="9">
<widget class="QLabel" name="pageSizeHeightLabel">
<property name="text">
<string>450</string>
</property>
</widget>
</item>
<item row="0" column="6">
<spacer name="horizontalSpacer_17">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
@ -216,6 +368,24 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item row="1" column="4">
<widget class="QPushButton" name="wordNumberAddBtn">
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../eink.qrc">
<normaloff>:/resources/plus.png</normaloff>:/resources/plus.png</iconset>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QLabel" name="wordNumberShowLabel">
<property name="text">
<string>30</string>
</property>
</widget>
</item>
<item row="1" column="1"> <item row="1" column="1">
<spacer name="horizontalSpacer_5"> <spacer name="horizontalSpacer_5">
<property name="orientation"> <property name="orientation">
@ -237,42 +407,57 @@
</widget> </widget>
</item> </item>
<item row="1" column="2"> <item row="1" column="2">
<widget class="QSpinBox" name="wordsNumber"> <widget class="QPushButton" name="wordNumberDelBtn">
<property name="minimum"> <property name="text">
<number>20</number> <string/>
</property> </property>
<property name="maximum"> <property name="icon">
<number>300</number> <iconset resource="../eink.qrc">
</property> <normaloff>:/resources/minus.png</normaloff>:/resources/minus.png</iconset>
<property name="singleStep">
<number>20</number>
</property>
<property name="value">
<number>20</number>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </item>
<item row="21" column="0"> <item row="8" column="0">
<widget class="QLabel" name="label_3"> <layout class="QGridLayout" name="gridLayout_16">
<property name="font"> <property name="bottomMargin">
<font> <number>0</number>
<family>Chivo</family>
<italic>true</italic>
</font>
</property> </property>
<property name="text"> <item row="0" column="0">
<string>Networking</string> <widget class="QLabel" name="exportHighlightsLabel">
</property> <property name="text">
</widget> <string>Export highlights</string>
</item> </property>
<item row="11" column="0"> </widget>
<widget class="QCheckBox" name="clockCheckBox"> </item>
<property name="text"> <item row="0" column="2">
<string>Clock: Show seconds</string> <widget class="QPushButton" name="exportHighlightsBtn">
</property> <property name="font">
</widget> <font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Export</string>
</property>
</widget>
</item>
<item row="0" column="1">
<spacer name="horizontalSpacer_12">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item> </item>
<item row="4" column="0"> <item row="4" column="0">
<layout class="QGridLayout" name="gridLayout_9"> <layout class="QGridLayout" name="gridLayout_9">
@ -345,72 +530,45 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="9" column="0"> <item row="20" column="0">
<widget class="QLabel" name="label_2"> <layout class="QGridLayout" name="gridLayout_4">
<property name="font"> <property name="bottomMargin">
<font> <number>0</number>
<family>Chivo</family>
<italic>true</italic>
</font>
</property> </property>
<property name="text"> <item row="0" column="2">
<string>Home</string> <widget class="QPushButton" name="usbmsBtn">
</property> <property name="font">
</widget> <font>
</item> <weight>75</weight>
<item row="13" column="0"> <bold>true</bold>
<widget class="QCheckBox" name="demoCheckBox"> </font>
<property name="text"> </property>
<string>Disable &quot;Welcome to InkBox&quot; message</string> <property name="text">
</property> <string>Go</string>
</widget> </property>
</item> </widget>
<item row="22" column="0"> </item>
<widget class="Line" name="line_3"> <item row="0" column="1">
<property name="frameShadow"> <spacer name="horizontalSpacer_2">
<enum>QFrame::Plain</enum> <property name="orientation">
</property> <enum>Qt::Horizontal</enum>
<property name="orientation"> </property>
<enum>Qt::Horizontal</enum> <property name="sizeHint" stdset="0">
</property> <size>
</widget> <width>40</width>
</item> <height>20</height>
<item row="5" column="0"> </size>
<widget class="QCheckBox" name="globalReadingSettingsCheckBox"> </property>
<property name="text"> </spacer>
<string>Global reading settings</string> </item>
</property> <item row="0" column="0">
</widget> <widget class="QLabel" name="label_6">
</item> <property name="text">
<item row="10" column="0"> <string>Enter USB Mass Storage session</string>
<widget class="Line" name="line_6"> </property>
<property name="frameShadow"> </widget>
<enum>QFrame::Plain</enum> </item>
</property> </layout>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="Line" name="line_8">
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="19" column="0">
<widget class="Line" name="line_7">
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item> </item>
<item row="7" column="0"> <item row="7" column="0">
<widget class="QCheckBox" name="menuBarCheckBox"> <widget class="QCheckBox" name="menuBarCheckBox">
@ -419,67 +577,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0"> <item row="23" column="0">
<widget class="QCheckBox" name="readerScrollBarCheckBox"> <layout class="QGridLayout" name="gridLayout_3">
<property name="text">
<string>Show scroll bar if needed</string>
</property>
</widget>
</item>
<item row="24" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="3" column="0">
<layout class="QGridLayout" name="gridLayout_15">
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="4">
<widget class="QLabel" name="pageSizeHeightLabel">
<property name="text">
<string>Height:</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLabel" name="pageSizeWidthLabel">
<property name="text">
<string>Width:</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QSpinBox" name="pageSizeWidthSpinBox">
<property name="minimum">
<number>300</number>
</property>
<property name="maximum">
<number>700</number>
</property>
<property name="singleStep">
<number>25</number>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="epubPageSizeLabel">
<property name="text">
<string>ePUB page size</string>
</property>
</widget>
</item>
<item row="0" column="1"> <item row="0" column="1">
<spacer name="horizontalSpacer_11"> <spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
@ -491,35 +595,15 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="0" column="5">
<widget class="QSpinBox" name="pageSizeHeightSpinBox">
<property name="minimum">
<number>300</number>
</property>
<property name="maximum">
<number>700</number>
</property>
<property name="singleStep">
<number>25</number>
</property>
</widget>
</item>
</layout>
</item>
<item row="8" column="0">
<layout class="QGridLayout" name="gridLayout_16">
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="exportHighlightsLabel"> <widget class="QLabel" name="label_4">
<property name="text"> <property name="text">
<string>Export highlights</string> <string>Request DHCP lease</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2"> <item row="0" column="2">
<widget class="QPushButton" name="exportHighlightsBtn"> <widget class="QPushButton" name="requestLeaseBtn">
<property name="font"> <property name="font">
<font> <font>
<weight>75</weight> <weight>75</weight>
@ -527,25 +611,28 @@
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>Export</string> <string>Request</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1">
<spacer name="horizontalSpacer_12">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</item> </item>
<item row="24" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>
@ -1120,26 +1207,6 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="32" column="0">
<widget class="Line" name="line">
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="lineWidth">
<number>2</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="31" column="0">
<widget class="QPushButton" name="aboutBtn">
<property name="text">
<string>About InkBox</string>
</property>
</widget>
</item>
<item row="34" column="0"> <item row="34" column="0">
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<property name="bottomMargin"> <property name="bottomMargin">
@ -1162,13 +1229,13 @@ OK
</item> </item>
</layout> </layout>
</item> </item>
<item row="1" column="0"> <item row="32" column="0">
<widget class="Line" name="line_4"> <widget class="Line" name="line">
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Plain</enum> <enum>QFrame::Plain</enum>
</property> </property>
<property name="lineWidth"> <property name="lineWidth">
<number>5</number> <number>2</number>
</property> </property>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -1179,6 +1246,8 @@ OK
</item> </item>
</layout> </layout>
</widget> </widget>
<resources/> <resources>
<include location="../eink.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>

33
src/widgets/dialogs/wifi/wifilogger.ui
View file

@ -22,6 +22,15 @@
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="1" column="0"> <item row="1" column="0">
<widget class="QScrollArea" name="scrollArea"> <widget class="QScrollArea" name="scrollArea">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="lineWidth">
<number>0</number>
</property>
<property name="widgetResizable"> <property name="widgetResizable">
<bool>true</bool> <bool>true</bool>
</property> </property>
@ -30,8 +39,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>460</width> <width>458</width>
<height>210</height> <height>226</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
@ -53,7 +62,7 @@
<number>0</number> <number>0</number>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>3</number>
</property> </property>
<widget class="QWidget" name="page_0"> <widget class="QWidget" name="page_0">
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
@ -389,6 +398,15 @@
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTextBrowser" name="fancyLogsText"> <widget class="QTextBrowser" name="fancyLogsText">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="lineWidth">
<number>0</number>
</property>
<property name="textInteractionFlags"> <property name="textInteractionFlags">
<set>Qt::NoTextInteraction</set> <set>Qt::NoTextInteraction</set>
</property> </property>
@ -412,6 +430,15 @@
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTextBrowser" name="allLogsText"> <widget class="QTextBrowser" name="allLogsText">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="lineWidth">
<number>0</number>
</property>
<property name="textInteractionFlags"> <property name="textInteractionFlags">
<set>Qt::NoTextInteraction</set> <set>Qt::NoTextInteraction</set>
</property> </property>