From 1177143f7d8d919b9dc4381e095ff2bcc8643c36 Mon Sep 17 00:00:00 2001
From: Nicolas Mailloux <nicolecrivain@gmail.com>
Date: Wed, 27 Oct 2021 19:54:30 -0400
Subject: [PATCH] Sorry, not enough courage to do that...

---
 settings.cpp |   7 -
 settings.h   |   1 -
 settings.ui  | 426 +++++++++++++++++++++++----------------------------
 3 files changed, 193 insertions(+), 241 deletions(-)

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 @@
              </property>
              <item>
               <layout class="QGridLayout" name="gridLayout_10">
-               <item row="27" column="0">
-                <spacer name="verticalSpacer_3">
-                 <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="26" column="0">
-                <layout class="QGridLayout" name="gridLayout_18">
-                 <property name="bottomMargin">
-                  <number>0</number>
-                 </property>
-                </layout>
-               </item>
                <item row="19" column="0">
                 <widget class="Line" name="line_2">
                  <property name="frameShadow">
@@ -556,100 +536,18 @@
                  </property>
                 </widget>
                </item>
-               <item row="17" column="0">
-                <layout class="QGridLayout" name="gridLayout_14">
-                 <property name="bottomMargin">
-                  <number>0</number>
+               <item row="22" column="0">
+                <widget class="QLabel" name="storageEncryptionLabel">
+                 <property name="font">
+                  <font>
+                   <family>Chivo</family>
+                   <italic>true</italic>
+                  </font>
                  </property>
-                 <item row="0" column="1">
-                  <spacer name="horizontalSpacer_10">
-                   <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="updateLabel">
-                   <property name="text">
-                    <string>Update InkBox</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="2">
-                  <widget class="QPushButton" name="updateBtn">
-                   <property name="font">
-                    <font>
-                     <weight>75</weight>
-                     <bold>true</bold>
-                    </font>
-                   </property>
-                   <property name="text">
-                    <string>Update</string>
-                   </property>
-                  </widget>
-                 </item>
-                </layout>
-               </item>
-               <item row="9" column="0">
-                <layout class="QGridLayout" name="gridLayout_8">
-                 <property name="bottomMargin">
-                  <number>0</number>
+                 <property name="text">
+                  <string>Storage encryption</string>
                  </property>
-                 <item row="1" column="2">
-                  <widget class="QLabel" name="uiScaleNumberLabel">
-                   <property name="font">
-                    <font>
-                     <weight>75</weight>
-                     <bold>true</bold>
-                    </font>
-                   </property>
-                   <property name="text">
-                    <string>1</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="1" column="1">
-                  <widget class="QSlider" name="uiScalingSlider">
-                   <property name="minimum">
-                    <number>0</number>
-                   </property>
-                   <property name="maximum">
-                    <number>2</number>
-                   </property>
-                   <property name="singleStep">
-                    <number>1</number>
-                   </property>
-                   <property name="pageStep">
-                    <number>1</number>
-                   </property>
-                   <property name="value">
-                    <number>0</number>
-                   </property>
-                   <property name="orientation">
-                    <enum>Qt::Horizontal</enum>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="1" column="0">
-                  <widget class="QLabel" name="uiScalingLabel">
-                   <property name="text">
-                    <string>UI scaling factor</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-                   </property>
-                  </widget>
-                 </item>
-                </layout>
+                </widget>
                </item>
                <item row="8" column="0">
                 <widget class="QCheckBox" name="enableUiScalingCheckBox">
@@ -658,53 +556,6 @@
                  </property>
                 </widget>
                </item>
-               <item row="24" column="0">
-                <widget class="QCheckBox" name="enableEncryptedStorageCheckBox">
-                 <property name="text">
-                  <string>Enable</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="12" column="0">
-                <layout class="QGridLayout" name="gridLayout_12">
-                 <property name="bottomMargin">
-                  <number>0</number>
-                 </property>
-                 <item row="0" column="0">
-                  <widget class="QLabel" name="label_8">
-                   <property name="text">
-                    <string>Reset this device</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="2">
-                  <widget class="QPushButton" name="resetBtn">
-                   <property name="font">
-                    <font>
-                     <weight>75</weight>
-                     <bold>true</bold>
-                    </font>
-                   </property>
-                   <property name="text">
-                    <string>Reset</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="1">
-                  <spacer name="horizontalSpacer_8">
-                   <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 row="21" column="0">
                 <layout class="QGridLayout" name="gridLayout_13">
                  <property name="bottomMargin">
@@ -745,33 +596,30 @@
                  </item>
                 </layout>
                </item>
-               <item row="6" column="0">
-                <widget class="QLabel" name="softwareLabel">
-                 <property name="font">
-                  <font>
-                   <family>Chivo</family>
-                   <italic>true</italic>
-                  </font>
-                 </property>
+               <item row="10" column="0">
+                <widget class="QCheckBox" name="darkModeCheckBox">
                  <property name="text">
-                  <string>System</string>
+                  <string>Enable night mode</string>
                  </property>
                 </widget>
                </item>
-               <item row="14" column="0">
-                <layout class="QGridLayout" name="checkOtaUpdateGridLayout">
+               <item row="13" column="0">
+                <layout class="QGridLayout" name="gridLayout_7">
                  <property name="bottomMargin">
                   <number>0</number>
                  </property>
+                 <property name="verticalSpacing">
+                  <number>0</number>
+                 </property>
                  <item row="0" column="0">
-                  <widget class="QLabel" name="checkOtaUpdateLabel">
+                  <widget class="QLabel" name="label_9">
                    <property name="text">
-                    <string>Check for updates</string>
+                    <string>System info</string>
                    </property>
                   </widget>
                  </item>
                  <item row="0" column="1">
-                  <spacer name="horizontalSpacer_13">
+                  <spacer name="horizontalSpacer_6">
                    <property name="orientation">
                     <enum>Qt::Horizontal</enum>
                    </property>
@@ -784,7 +632,7 @@
                   </spacer>
                  </item>
                  <item row="0" column="2">
-                  <widget class="QPushButton" name="checkOtaUpdateBtn">
+                  <widget class="QPushButton" name="showSystemInfoBtn">
                    <property name="font">
                     <font>
                      <weight>75</weight>
@@ -792,39 +640,26 @@
                     </font>
                    </property>
                    <property name="text">
-                    <string>Check</string>
+                    <string>Show</string>
                    </property>
                   </widget>
                  </item>
                 </layout>
                </item>
-               <item row="18" column="0">
-                <widget class="QLabel" name="securityLabel">
-                 <property name="font">
-                  <font>
-                   <family>Chivo</family>
-                   <italic>true</italic>
-                  </font>
-                 </property>
-                 <property name="text">
-                  <string>Security</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="25" column="0">
-                <layout class="QGridLayout" name="gridLayout_17">
+               <item row="12" column="0">
+                <layout class="QGridLayout" name="gridLayout_12">
                  <property name="bottomMargin">
                   <number>0</number>
                  </property>
-                 <item row="1" column="0">
-                  <widget class="QLabel" name="encryptedStorageChangePasswordLabel">
+                 <item row="0" column="0">
+                  <widget class="QLabel" name="label_8">
                    <property name="text">
-                    <string>Change password</string>
+                    <string>Reset this device</string>
                    </property>
                   </widget>
                  </item>
-                 <item row="1" column="2">
-                  <widget class="QPushButton" name="encryptedStorageChangePasswordBtn">
+                 <item row="0" column="2">
+                  <widget class="QPushButton" name="resetBtn">
                    <property name="font">
                     <font>
                      <weight>75</weight>
@@ -832,12 +667,12 @@
                     </font>
                    </property>
                    <property name="text">
-                    <string>Change</string>
+                    <string>Reset</string>
                    </property>
                   </widget>
                  </item>
-                 <item row="1" column="1">
-                  <spacer name="horizontalSpacer_14">
+                 <item row="0" column="1">
+                  <spacer name="horizontalSpacer_8">
                    <property name="orientation">
                     <enum>Qt::Horizontal</enum>
                    </property>
@@ -851,30 +686,33 @@
                  </item>
                 </layout>
                </item>
-               <item row="20" column="0">
-                <widget class="QCheckBox" name="enableLockscreenCheckBox">
-                 <property name="text">
-                  <string>Enable lock screen and passcode</string>
+               <item row="25" column="0">
+                <layout class="QGridLayout" name="gridLayout_18">
+                 <property name="bottomMargin">
+                  <number>0</number>
                  </property>
-                </widget>
+                </layout>
                </item>
-               <item row="10" column="0">
-                <widget class="QCheckBox" name="darkModeCheckBox">
-                 <property name="text">
-                  <string>Enable night mode</string>
+               <item row="26" column="0">
+                <spacer name="verticalSpacer_3">
+                 <property name="orientation">
+                  <enum>Qt::Vertical</enum>
                  </property>
-                </widget>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>20</width>
+                   <height>40</height>
+                  </size>
+                 </property>
+                </spacer>
                </item>
-               <item row="22" column="0">
-                <widget class="QLabel" name="storageEncryptionLabel">
-                 <property name="font">
-                  <font>
-                   <family>Chivo</family>
-                   <italic>true</italic>
-                  </font>
+               <item row="23" column="0">
+                <widget class="Line" name="line_10">
+                 <property name="frameShadow">
+                  <enum>QFrame::Plain</enum>
                  </property>
-                 <property name="text">
-                  <string>Storage encryption</string>
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
                  </property>
                 </widget>
                </item>
@@ -947,23 +785,20 @@
                  </item>
                 </layout>
                </item>
-               <item row="13" column="0">
-                <layout class="QGridLayout" name="gridLayout_7">
+               <item row="14" column="0">
+                <layout class="QGridLayout" name="checkOtaUpdateGridLayout">
                  <property name="bottomMargin">
                   <number>0</number>
                  </property>
-                 <property name="verticalSpacing">
-                  <number>0</number>
-                 </property>
                  <item row="0" column="0">
-                  <widget class="QLabel" name="label_9">
+                  <widget class="QLabel" name="checkOtaUpdateLabel">
                    <property name="text">
-                    <string>System info</string>
+                    <string>Check for updates</string>
                    </property>
                   </widget>
                  </item>
                  <item row="0" column="1">
-                  <spacer name="horizontalSpacer_6">
+                  <spacer name="horizontalSpacer_13">
                    <property name="orientation">
                     <enum>Qt::Horizontal</enum>
                    </property>
@@ -976,7 +811,7 @@
                   </spacer>
                  </item>
                  <item row="0" column="2">
-                  <widget class="QPushButton" name="showSystemInfoBtn">
+                  <widget class="QPushButton" name="checkOtaUpdateBtn">
                    <property name="font">
                     <font>
                      <weight>75</weight>
@@ -984,7 +819,7 @@
                     </font>
                    </property>
                    <property name="text">
-                    <string>Show</string>
+                    <string>Check</string>
                    </property>
                   </widget>
                  </item>
@@ -1000,13 +835,138 @@
                  </property>
                 </widget>
                </item>
-               <item row="23" column="0">
-                <widget class="Line" name="line_10">
-                 <property name="frameShadow">
-                  <enum>QFrame::Plain</enum>
+               <item row="17" column="0">
+                <layout class="QGridLayout" name="gridLayout_14">
+                 <property name="bottomMargin">
+                  <number>0</number>
                  </property>
-                 <property name="orientation">
-                  <enum>Qt::Horizontal</enum>
+                 <item row="0" column="1">
+                  <spacer name="horizontalSpacer_10">
+                   <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="updateLabel">
+                   <property name="text">
+                    <string>Update InkBox</string>
+                   </property>
+                   <property name="alignment">
+                    <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="0" column="2">
+                  <widget class="QPushButton" name="updateBtn">
+                   <property name="font">
+                    <font>
+                     <weight>75</weight>
+                     <bold>true</bold>
+                    </font>
+                   </property>
+                   <property name="text">
+                    <string>Update</string>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </item>
+               <item row="6" column="0">
+                <widget class="QLabel" name="softwareLabel">
+                 <property name="font">
+                  <font>
+                   <family>Chivo</family>
+                   <italic>true</italic>
+                  </font>
+                 </property>
+                 <property name="text">
+                  <string>System</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="18" column="0">
+                <widget class="QLabel" name="securityLabel">
+                 <property name="font">
+                  <font>
+                   <family>Chivo</family>
+                   <italic>true</italic>
+                  </font>
+                 </property>
+                 <property name="text">
+                  <string>Security</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="9" column="0">
+                <layout class="QGridLayout" name="gridLayout_8">
+                 <property name="bottomMargin">
+                  <number>0</number>
+                 </property>
+                 <item row="1" column="2">
+                  <widget class="QLabel" name="uiScaleNumberLabel">
+                   <property name="font">
+                    <font>
+                     <weight>75</weight>
+                     <bold>true</bold>
+                    </font>
+                   </property>
+                   <property name="text">
+                    <string>1</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="1" column="1">
+                  <widget class="QSlider" name="uiScalingSlider">
+                   <property name="minimum">
+                    <number>0</number>
+                   </property>
+                   <property name="maximum">
+                    <number>2</number>
+                   </property>
+                   <property name="singleStep">
+                    <number>1</number>
+                   </property>
+                   <property name="pageStep">
+                    <number>1</number>
+                   </property>
+                   <property name="value">
+                    <number>0</number>
+                   </property>
+                   <property name="orientation">
+                    <enum>Qt::Horizontal</enum>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="1" column="0">
+                  <widget class="QLabel" name="uiScalingLabel">
+                   <property name="text">
+                    <string>UI scaling factor</string>
+                   </property>
+                   <property name="alignment">
+                    <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </item>
+               <item row="24" column="0">
+                <widget class="QCheckBox" name="enableEncryptedStorageCheckBox">
+                 <property name="text">
+                  <string>Enable</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="20" column="0">
+                <widget class="QCheckBox" name="enableLockscreenCheckBox">
+                 <property name="text">
+                  <string>Enable lock screen and passcode</string>
                  </property>
                 </widget>
                </item>