diff --git a/settings.cpp b/settings.cpp
index 2a60686..b5088fe 100644
--- a/settings.cpp
+++ b/settings.cpp
@@ -32,7 +32,6 @@ settings::settings(QWidget *parent) :
ui->resetBtn->setProperty("type", "borderless");
ui->showSystemInfoBtn->setProperty("type", "borderless");
ui->checkOtaUpdateBtn->setProperty("type", "borderless");
- ui->encryptedStorageChangePasswordBtn->setProperty("type", "borderless");
ui->previousBtn->setProperty("type", "borderless");
ui->nextBtn->setProperty("type", "borderless");
ui->aboutBtn->setStyleSheet("font-size: 9pt");
@@ -45,7 +44,6 @@ settings::settings(QWidget *parent) :
ui->comboBox->setStyleSheet("font-size: 9pt");
ui->sleepTimeoutComboBox->setStyleSheet("font-size: 9pt");
ui->setPasscodeBtn->setStyleSheet("font-size: 9pt");
- ui->encryptedStorageChangePasswordBtn->setStyleSheet("font-size: 9pt");
ui->previousBtn->setText("");
ui->previousBtn->setIcon(QIcon(":/resources/chevron-left.png"));
@@ -880,11 +878,6 @@ void settings::quit_restart() {
qApp->quit();
}
-void settings::on_encryptedStorageChangePasswordBtn_clicked()
-{
-
-}
-
void settings::on_enableEncryptedStorageCheckBox_toggled(bool checked)
{
if(checked == true) {
diff --git a/settings.h b/settings.h
index c1af5ce..d039b69 100644
--- a/settings.h
+++ b/settings.h
@@ -64,7 +64,6 @@ private slots:
void closeIndefiniteToastNative();
void usbms_launch();
void quit_restart();
- void on_encryptedStorageChangePasswordBtn_clicked();
void on_enableEncryptedStorageCheckBox_toggled(bool checked);
void disableStorageEncryption();
void cancelDisableStorageEncryption();
diff --git a/settings.ui b/settings.ui
index b2fea67..a092f25 100644
--- a/settings.ui
+++ b/settings.ui
@@ -526,26 +526,6 @@
-
-
-
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
- 0
-
-
-
-
@@ -556,100 +536,18 @@
- -
-
-
- 0
+
-
+
+
+
+ Chivo
+ true
+
-
-
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- Update InkBox
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
-
-
-
- -
-
-
-
- 75
- true
-
-
-
- Update
-
-
-
-
-
- -
-
-
- 0
+
+ Storage encryption
-
-
-
-
-
- 75
- true
-
-
-
- 1
-
-
-
- -
-
-
- 0
-
-
- 2
-
-
- 1
-
-
- 1
-
-
- 0
-
-
- Qt::Horizontal
-
-
-
- -
-
-
- UI scaling factor
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
-
-
-
-
+
-
@@ -658,53 +556,6 @@
- -
-
-
- Enable
-
-
-
- -
-
-
- 0
-
-
-
-
-
- Reset this device
-
-
-
- -
-
-
-
- 75
- true
-
-
-
- Reset
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
-
@@ -745,33 +596,30 @@
- -
-
-
-
- Chivo
- true
-
-
+
-
+
- System
+ Enable night mode
- -
-
+
-
+
0
+
+ 0
+
-
-
+
- Check for updates
+ System info
-
-
+
Qt::Horizontal
@@ -784,7 +632,7 @@
-
-
+
75
@@ -792,39 +640,26 @@
- Check
+ Show
- -
-
-
-
- Chivo
- true
-
-
-
- Security
-
-
-
- -
-
+
-
+
0
-
-
-
+
-
+
- Change password
+ Reset this device
- -
-
+
-
+
75
@@ -832,12 +667,12 @@
- Change
+ Reset
- -
-
+
-
+
Qt::Horizontal
@@ -851,30 +686,33 @@
- -
-
-
- Enable lock screen and passcode
+
-
+
+
+ 0
-
+
- -
-
-
- Enable night mode
+
-
+
+
+ Qt::Vertical
-
+
+
+ 20
+ 40
+
+
+
- -
-
-
-
- Chivo
- true
-
+
-
+
+
+ QFrame::Plain
-
- Storage encryption
+
+ Qt::Horizontal
@@ -947,23 +785,20 @@
- -
-
+
-
+
0
-
- 0
-
-
-
+
- System info
+ Check for updates
-
-
+
Qt::Horizontal
@@ -976,7 +811,7 @@
-
-
+
75
@@ -984,7 +819,7 @@
- Show
+ Check
@@ -1000,13 +835,138 @@
- -
-
-
- QFrame::Plain
+
-
+
+
+ 0
-
- Qt::Horizontal
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ Update InkBox
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 75
+ true
+
+
+
+ Update
+
+
+
+
+
+ -
+
+
+
+ Chivo
+ true
+
+
+
+ System
+
+
+
+ -
+
+
+
+ Chivo
+ true
+
+
+
+ Security
+
+
+
+ -
+
+
+ 0
+
+
-
+
+
+
+ 75
+ true
+
+
+
+ 1
+
+
+
+ -
+
+
+ 0
+
+
+ 2
+
+
+ 1
+
+
+ 1
+
+
+ 0
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+ UI scaling factor
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
+
+
+
+
+
+ -
+
+
+ Enable
+
+
+
+ -
+
+
+ Enable lock screen and passcode