From 377cbe31f1979e8024445b3869330a3261c17694 Mon Sep 17 00:00:00 2001
From: Nicolas Mailloux <nicolecrivain@gmail.com>
Date: Thu, 15 Sep 2022 01:04:52 -0400
Subject: [PATCH] To-Do app: Beta version

---
 src/apps/todo.cpp                             | 147 +++++-
 src/apps/todo.h                               |   9 +
 src/apps/todo.ui                              | 216 +++++++--
 src/eink.qrc                                  |   2 +
 src/resources/checkbox-checked-small.png      | Bin 0 -> 6590 bytes
 src/resources/checkbox-unchecked-small.png    | Bin 0 -> 5836 bytes
 .../virtualKeyboard/virtualkeyboard.cpp       |   9 +-
 src/widgets/virtualKeyboard/virtualkeyboard.h |   1 +
 .../virtualKeyboard/virtualkeyboard.ui        | 420 +++++++++---------
 9 files changed, 538 insertions(+), 266 deletions(-)
 create mode 100644 src/resources/checkbox-checked-small.png
 create mode 100644 src/resources/checkbox-unchecked-small.png

diff --git a/src/apps/todo.cpp b/src/apps/todo.cpp
index 431c334..48e0a75 100644
--- a/src/apps/todo.cpp
+++ b/src/apps/todo.cpp
@@ -20,17 +20,31 @@ todo::todo(QWidget *parent) :
     ui->newBtn->setProperty("type", "borderless");
     ui->deleteBtn->setProperty("type", "borderless");
     ui->setupBtn->setProperty("type", "borderless");
+    ui->newItemBtn->setProperty("type", "borderless");
+    ui->deleteItemBtn->setProperty("type", "borderless");
+    ui->selectAllItemsBtn->setProperty("type", "borderless");
+    ui->selectItemsModeBtn->setProperty("type", "borderless");
     ui->deleteBtn->setStyleSheet("padding: 10px");
     ui->setupBtn->setStyleSheet("padding: 10px");
+    ui->newItemBtn->setStyleSheet("padding: 10px");
+    ui->deleteItemBtn->setStyleSheet("padding: 10px");
+    ui->selectAllItemsBtn->setStyleSheet("padding: 10px");
+    ui->selectItemsModeBtn->setStyleSheet("padding: 10px");
     ui->closeBtn->setIcon(QIcon(":/resources/close.png"));
     ui->newBtn->setIcon(QIcon(":/resources/new.png"));
+    ui->newItemBtn->setIcon(QIcon(":/resources/plus.png"));
     ui->deleteBtn->setIcon(QIcon(":/resources/x-circle.png"));
     ui->setupBtn->setIcon(QIcon(":/resources/arrow-right.png"));
+    ui->deleteItemBtn->setIcon(QIcon(":/resources/x-circle.png"));
+    ui->selectAllItemsBtn->setIcon(QIcon(":/resources/checkbox-checked-small.png"));
+    ui->selectItemsModeBtn->setIcon(QIcon(":/resources/checkbox-unchecked-small.png"));
     ui->listWidget->setStyleSheet("font-size: 10pt");
     ui->listWidget->setWordWrap(true);
     ui->itemsListWidget->setStyleSheet("font-size: 10pt");
     ui->itemsListWidget->setWordWrap(true);
 
+    ui->editToolbarWidget->hide();
+
     refreshList();
 }
 
@@ -46,28 +60,18 @@ void todo::on_closeBtn_clicked()
     }
     else {
         saveCurrentList();
-        ui->stackedWidget->setCurrentIndex(0);
-        ui->closeBtn->setIcon(QIcon(":/resources/close.png"));
-        ui->deleteBtn->setEnabled(true);
-        ui->setupBtn->setEnabled(true);
-        currentView = currentView::home;
+        switchViewHome();
     }
 }
 
-
 void todo::on_newBtn_clicked()
 {
     global::keyboard::embed = false;
     virtualkeyboard * virtualKeyboardWidget = new virtualkeyboard(this);
     virtualKeyboardWidget->setAttribute(Qt::WA_DeleteOnClose);
-    if(currentView == currentView::home) {
-        QObject::connect(virtualKeyboardWidget, &virtualkeyboard::enterBtnPressed, this, &todo::createNewList);
-        ui->statusLabel->setText("Enter the list's name");
-    }
-    else {
-        QObject::connect(virtualKeyboardWidget, &virtualkeyboard::enterBtnPressed, this, &todo::addItem);
-        ui->statusLabel->setText("Enter the item's name");
-    }
+    QObject::connect(virtualKeyboardWidget, &virtualkeyboard::enterBtnPressed, this, &todo::createNewList);
+    QObject::connect(virtualKeyboardWidget, &virtualkeyboard::closeBtnPressed, this, &todo::setDefaultHomePageStatusText);
+    ui->statusLabel->setText("Enter the list's name");
     virtualKeyboardWidget->show();
 }
 
@@ -167,7 +171,10 @@ void todo::setupList(QString listName) {
         }
         ui->itemsListWidget->addItem(item);
     }
-    ui->closeBtn->setIcon(QIcon(":/resources/check.png"));
+    // I know it's confusing; think about it twice, or better, have a device at hand to see how this behaves in reality
+    ui->closeBtn->setIcon(QIcon(":/resources/arrow-left.png"));
+    ui->line_2->hide();
+    ui->newBtn->hide();
     ui->statusLabel->setText("Select or create a new item");
 }
 
@@ -211,5 +218,113 @@ void todo::saveCurrentList() {
 
 void todo::on_deleteBtn_clicked()
 {
-
+    QJsonDocument document = readTodoDatabase();
+    QJsonObject object = document.object();
+    QJsonArray mainArray = object["List"].toArray();
+    for(int i = 0; i < mainArray.count(); i++) {
+        if(mainArray.at(i).toArray().at(0).toString() == ui->listWidget->currentItem()->text()) {
+            mainArray.removeAt(i);
+        }
+    }
+    object["List"] = mainArray;
+    document.setObject(object);
+    writeTodoDatabase(document);
+    refreshList();
+}
+
+void todo::on_newItemBtn_clicked()
+{
+    global::keyboard::embed = false;
+    virtualkeyboard * virtualKeyboardWidget = new virtualkeyboard(this);
+    virtualKeyboardWidget->setAttribute(Qt::WA_DeleteOnClose);
+    QObject::connect(virtualKeyboardWidget, &virtualkeyboard::enterBtnPressed, this, &todo::addItem);
+    QObject::connect(virtualKeyboardWidget, &virtualkeyboard::closeBtnPressed, this, &todo::setDefaultListPageStatusText);
+    ui->statusLabel->setText("Enter the item's name");
+    virtualKeyboardWidget->show();
+}
+
+void todo::switchViewHome() {
+    ui->itemsListWidget->clear();
+    switchItemsSelectionMode(false);
+    ui->stackedWidget->setCurrentIndex(0);
+    ui->closeBtn->setIcon(QIcon(":/resources/close.png"));
+    ui->line_2->show();
+    ui->newBtn->show();
+    ui->deleteBtn->setEnabled(true);
+    ui->setupBtn->setEnabled(true);
+    setDefaultHomePageStatusText();
+    currentView = currentView::home;
+}
+
+void todo::on_selectItemsModeBtn_clicked()
+{
+    if(selectItemsMode == false) {
+        switchItemsSelectionMode(true);
+    }
+    else {
+        switchItemsSelectionMode(false);
+    }
+}
+
+void todo::switchItemsSelectionMode(bool selectionMode) {
+    if(selectionMode == true) {
+        log("Entering selection mode", className);
+        saveCurrentList();
+        ui->newItemBtn->setEnabled(false);
+        ui->selectItemsModeBtn->setStyleSheet("padding: 10px; background-color: lightGray;");
+        ui->editToolbarWidget->show();
+        ui->statusLabel->setText("Selection mode");
+        selectItemsMode = true;
+    }
+    else {
+        log("Exiting selection mode", className);
+        setupList(readTodoDatabase().object()["List"].toArray().at(listIndex).toArray().at(0).toString());
+        ui->selectItemsModeBtn->setStyleSheet("padding: 10px; background-color: white;");
+        ui->editToolbarWidget->hide();
+        ui->newItemBtn->setEnabled(true);
+        ui->statusLabel->setText("Select or create a new item");
+        selectItemsMode = false;
+    }
+    QTimer::singleShot(500, this, SLOT(repaint()));
+}
+
+void todo::on_deleteItemBtn_clicked()
+{
+    log("Deleting list item(s)", className);
+    QJsonDocument document = readTodoDatabase();
+    QJsonObject object = document.object();
+    QJsonArray mainArray = object["List"].toArray();
+    QJsonArray listArray = mainArray.at(listIndex).toArray();
+    int itemsRemoved = 0;
+    for(int i = 1; i < ui->itemsListWidget->count() + 1; i++) {
+        if(ui->itemsListWidget->item(i - 1)->checkState() == Qt::Checked) {
+            listArray.removeAt(i - itemsRemoved);
+            itemsRemoved++;
+        }
+    }
+
+    // Adding item array to list array
+    mainArray.replace(listIndex, listArray);
+    object["List"] = mainArray;
+
+    document.setObject(object);
+    writeTodoDatabase(document);
+
+    setupList(listArray.at(0).toString());
+}
+
+void todo::on_selectAllItemsBtn_clicked()
+{
+    int range = ui->itemsListWidget->count();
+    for(int i = 0; i < range; i++) {
+        ui->itemsListWidget->item(i)->setCheckState(Qt::Checked);
+    }
+}
+
+void todo::setDefaultHomePageStatusText() {
+    ui->statusLabel->setText("Select or create a new list");
+}
+
+void todo::setDefaultListPageStatusText() {
+    ui->statusLabel->setText("Select or create a new item");
 }
diff --git a/src/apps/todo.h b/src/apps/todo.h
index 7dc488f..b8d38e1 100644
--- a/src/apps/todo.h
+++ b/src/apps/todo.h
@@ -22,6 +22,7 @@ public:
         home,
         list
     };
+    bool selectItemsMode = false;
     currentView currentView = currentView::home;
     int listIndex;
 
@@ -33,9 +34,17 @@ private slots:
     void refreshList();
     void saveCurrentList();
     void setupList(QString listName);
+    void switchViewHome();
+    void switchItemsSelectionMode(bool selectionMode);
+    void setDefaultHomePageStatusText();
+    void setDefaultListPageStatusText();
     void on_setupBtn_clicked();
     void on_listWidget_itemClicked(QListWidgetItem *item);
     void on_deleteBtn_clicked();
+    void on_newItemBtn_clicked();
+    void on_selectItemsModeBtn_clicked();
+    void on_deleteItemBtn_clicked();
+    void on_selectAllItemsBtn_clicked();
 
 private:
     Ui::todo *ui;
diff --git a/src/apps/todo.ui b/src/apps/todo.ui
index 474ded7..568282d 100644
--- a/src/apps/todo.ui
+++ b/src/apps/todo.ui
@@ -18,6 +18,26 @@
     <layout class="QGridLayout" name="gridLayout">
      <item row="1" column="0">
       <layout class="QGridLayout" name="gridLayout_2">
+       <item row="0" column="5">
+        <spacer name="horizontalSpacer_2">
+         <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="QPushButton" name="closeBtn">
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
        <item row="0" column="4">
         <widget class="QLabel" name="statusLabel">
          <property name="font">
@@ -30,24 +50,13 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="6">
-        <widget class="QLabel" name="todoLabel">
-         <property name="font">
-          <font>
-           <family>Inter</family>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
+       <item row="0" column="1">
+        <widget class="Line" name="line_2">
+         <property name="frameShadow">
+          <enum>QFrame::Plain</enum>
          </property>
-         <property name="text">
-          <string>To-Do</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="0">
-        <widget class="QPushButton" name="closeBtn">
-         <property name="text">
-          <string/>
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
          </property>
         </widget>
        </item>
@@ -64,19 +73,6 @@
          </property>
         </spacer>
        </item>
-       <item row="0" column="5">
-        <spacer name="horizontalSpacer_2">
-         <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="2">
         <widget class="QPushButton" name="newBtn">
          <property name="text">
@@ -84,13 +80,17 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="1">
-        <widget class="Line" name="line_2">
-         <property name="frameShadow">
-          <enum>QFrame::Plain</enum>
+       <item row="0" column="6">
+        <widget class="QLabel" name="todoLabel">
+         <property name="font">
+          <font>
+           <family>Inter</family>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
          </property>
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
+         <property name="text">
+          <string>To-Do</string>
          </property>
         </widget>
        </item>
@@ -200,6 +200,150 @@
          </property>
          <item>
           <layout class="QVBoxLayout" name="listVerticalLayout">
+           <item>
+            <layout class="QHBoxLayout" name="horizontalLayout_2">
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <item>
+              <spacer name="horizontalSpacer_3">
+               <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>
+              <widget class="QPushButton" name="newItemBtn">
+               <property name="text">
+                <string/>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="Line" name="line_5">
+               <property name="frameShadow">
+                <enum>QFrame::Plain</enum>
+               </property>
+               <property name="orientation">
+                <enum>Qt::Vertical</enum>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QPushButton" name="selectItemsModeBtn">
+               <property name="text">
+                <string/>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QStackedWidget" name="editToolbarWidget">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="currentIndex">
+                <number>0</number>
+               </property>
+               <widget class="QWidget" name="page">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <layout class="QVBoxLayout" name="verticalLayout_3">
+                 <property name="leftMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="topMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="rightMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="bottomMargin">
+                  <number>0</number>
+                 </property>
+                 <item>
+                  <layout class="QHBoxLayout" name="horizontalLayout_3">
+                   <item>
+                    <widget class="Line" name="line_7">
+                     <property name="frameShadow">
+                      <enum>QFrame::Plain</enum>
+                     </property>
+                     <property name="orientation">
+                      <enum>Qt::Vertical</enum>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QPushButton" name="deleteItemBtn">
+                     <property name="text">
+                      <string/>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="Line" name="line_6">
+                     <property name="frameShadow">
+                      <enum>QFrame::Plain</enum>
+                     </property>
+                     <property name="orientation">
+                      <enum>Qt::Vertical</enum>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QPushButton" name="selectAllItemsBtn">
+                     <property name="text">
+                      <string/>
+                     </property>
+                    </widget>
+                   </item>
+                  </layout>
+                 </item>
+                </layout>
+               </widget>
+               <widget class="QWidget" name="page_2"/>
+              </widget>
+             </item>
+             <item>
+              <spacer name="horizontalSpacer_4">
+               <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>
+            <widget class="Line" name="line_8">
+             <property name="frameShadow">
+              <enum>QFrame::Plain</enum>
+             </property>
+             <property name="lineWidth">
+              <number>4</number>
+             </property>
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+            </widget>
+           </item>
            <item>
             <widget class="QListWidget" name="itemsListWidget"/>
            </item>
diff --git a/src/eink.qrc b/src/eink.qrc
index 1479da5..358328c 100644
--- a/src/eink.qrc
+++ b/src/eink.qrc
@@ -99,5 +99,7 @@
         <file>resources/wifi-100.png</file>
         <file>resources/log.png</file>
         <file>resources/new.png</file>
+        <file>resources/checkbox-unchecked-small.png</file>
+        <file>resources/checkbox-checked-small.png</file>
     </qresource>
 </RCC>
diff --git a/src/resources/checkbox-checked-small.png b/src/resources/checkbox-checked-small.png
new file mode 100644
index 0000000000000000000000000000000000000000..3906dec4c29beb460afbed81273fa68a77f9b16f
GIT binary patch
literal 6590
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

literal 0
HcmV?d00001

diff --git a/src/resources/checkbox-unchecked-small.png b/src/resources/checkbox-unchecked-small.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f9cad4f44829ef7268b94d9ad1bc6e510bc1428
GIT binary patch
literal 5836
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

literal 0
HcmV?d00001

diff --git a/src/widgets/virtualKeyboard/virtualkeyboard.cpp b/src/widgets/virtualKeyboard/virtualkeyboard.cpp
index a82ba4f..04a7617 100644
--- a/src/widgets/virtualKeyboard/virtualkeyboard.cpp
+++ b/src/widgets/virtualKeyboard/virtualkeyboard.cpp
@@ -130,7 +130,7 @@ virtualkeyboard::virtualkeyboard(QWidget *parent) :
         ui->eraseBtn->setStyleSheet("font-weight: bold; font-size: 9pt; padding: 27px");
         ui->shiftBtn->setStyleSheet("font-weight: bold; font-size: 9pt; padding: 27px");
         ui->spt->setStyleSheet("font-weight: bold; font-size: 9pt; padding: 27px");
-        ui->sat->setStyleSheet("font-weight: bold; font-size: 9pt; padding: 27px");
+        ui->sat->setStyleSheet("font-weight: bold; font-size: 7pt; padding: 27px");
         ui->spaceBtn->setStyleSheet("font-weight: bold; font-size: 9pt; padding: 15px; border: 1px solid black");
     }
     else if(global::deviceID == "n437\n") {
@@ -175,7 +175,7 @@ virtualkeyboard::virtualkeyboard(QWidget *parent) :
         ui->eraseBtn->setStyleSheet("font-weight: bold; font-size: 9pt; padding: 20px");
         ui->shiftBtn->setStyleSheet("font-weight: bold; font-size: 9pt; padding: 20px");
         ui->spt->setStyleSheet("font-weight: bold; font-size: 9pt; padding: 20px");
-        ui->sat->setStyleSheet("font-weight: bold; font-size: 9pt; padding: 20px");
+        ui->sat->setStyleSheet("font-weight: bold; font-size: 7pt; padding: 20px");
         ui->spaceBtn->setStyleSheet("font-weight: bold; font-size: 9pt; padding: 15px; border: 1px solid black");
     }
     else {
@@ -220,7 +220,7 @@ virtualkeyboard::virtualkeyboard(QWidget *parent) :
         ui->eraseBtn->setStyleSheet("font-weight: bold; font-size: 9pt; padding: 13px");
         ui->shiftBtn->setStyleSheet("font-weight: bold; font-size: 9pt; padding: 13px");
         ui->spt->setStyleSheet("font-weight: bold; font-size: 9pt; padding: 13px");
-        ui->sat->setStyleSheet("font-weight: bold; font-size: 9pt; padding: 13px");
+        ui->sat->setStyleSheet("font-weight: bold; font-size: 7pt; padding: 13px");
         ui->spaceBtn->setStyleSheet("font-weight: bold; font-size: 9pt; padding: 10px; border: 1px solid black");
     }
 
@@ -446,7 +446,7 @@ void virtualkeyboard::on_la_clicked()
 
 void virtualkeyboard::on_ls_clicked()
 {
-    ui->lineEdit->insert(QString(ui->la->text().back()));
+    ui->lineEdit->insert(ui->ls->text());
 
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
@@ -734,5 +734,6 @@ void virtualkeyboard::on_enterBtn_clicked()
 void virtualkeyboard::on_closeBtn_clicked()
 {
     global::keyboard::keyboardText = "";
+    emit closeBtnPressed();
     this->close();
 }
diff --git a/src/widgets/virtualKeyboard/virtualkeyboard.h b/src/widgets/virtualKeyboard/virtualkeyboard.h
index 35cf300..5219725 100644
--- a/src/widgets/virtualKeyboard/virtualkeyboard.h
+++ b/src/widgets/virtualKeyboard/virtualkeyboard.h
@@ -81,6 +81,7 @@ private:
 signals:
     void adjust_size();
     void enterBtnPressed(QString string);
+    void closeBtnPressed();
 };
 
 #endif // VIRTUALKEYBOARD_H
diff --git a/src/widgets/virtualKeyboard/virtualkeyboard.ui b/src/widgets/virtualKeyboard/virtualkeyboard.ui
index e6fad82..eb45460 100644
--- a/src/widgets/virtualKeyboard/virtualkeyboard.ui
+++ b/src/widgets/virtualKeyboard/virtualkeyboard.ui
@@ -115,17 +115,10 @@
               <layout class="QGridLayout" name="gridLayout_3">
                <item row="13" column="3">
                 <layout class="QGridLayout" name="gridLayout_4">
-                 <item row="7" column="12">
-                  <widget class="QPushButton" name="eraseBtn">
+                 <item row="2" column="7">
+                  <widget class="QPushButton" name="ly">
                    <property name="text">
-                    <string>⌫</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="3">
-                  <widget class="QPushButton" name="n3">
-                   <property name="text">
-                    <string>3</string>
+                    <string>y</string>
                    </property>
                   </widget>
                  </item>
@@ -136,13 +129,6 @@
                    </property>
                   </widget>
                  </item>
-                 <item row="6" column="4">
-                  <widget class="QPushButton" name="ld">
-                   <property name="text">
-                    <string>d</string>
-                   </property>
-                  </widget>
-                 </item>
                  <item row="2" column="1">
                   <widget class="QPushButton" name="lq">
                    <property name="text">
@@ -150,181 +136,6 @@
                    </property>
                   </widget>
                  </item>
-                 <item row="0" column="2">
-                  <widget class="QPushButton" name="n2">
-                   <property name="text">
-                    <string>2</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="6" column="7">
-                  <widget class="QPushButton" name="lg">
-                   <property name="text">
-                    <string>g</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="7" column="2">
-                  <widget class="QPushButton" name="lz">
-                   <property name="text">
-                    <string>z</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="10">
-                  <widget class="QPushButton" name="n9">
-                   <property name="text">
-                    <string>9</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="4">
-                  <widget class="QPushButton" name="n4">
-                   <property name="text">
-                    <string>4</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="7" column="3">
-                  <widget class="QPushButton" name="lx">
-                   <property name="text">
-                    <string>x</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="9">
-                  <widget class="QPushButton" name="n8">
-                   <property name="text">
-                    <string>8</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="2" column="2">
-                  <widget class="QPushButton" name="lw">
-                   <property name="text">
-                    <string>w</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="6" column="12">
-                  <widget class="QPushButton" name="ll">
-                   <property name="text">
-                    <string>l</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="2" column="3">
-                  <widget class="QPushButton" name="le">
-                   <property name="text">
-                    <string>e</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="7" column="7">
-                  <widget class="QPushButton" name="lb">
-                   <property name="text">
-                    <string>b</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="6" column="9">
-                  <widget class="QPushButton" name="lj">
-                   <property name="text">
-                    <string>j</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="7" column="4">
-                  <widget class="QPushButton" name="lc">
-                   <property name="text">
-                    <string>c</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="2" column="8">
-                  <widget class="QPushButton" name="lu">
-                   <property name="text">
-                    <string>u</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="6" column="8">
-                  <widget class="QPushButton" name="lh">
-                   <property name="text">
-                    <string>h</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="8">
-                  <widget class="QPushButton" name="n7">
-                   <property name="text">
-                    <string>7</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="6" column="10">
-                  <widget class="QPushButton" name="lk">
-                   <property name="text">
-                    <string>k</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="12">
-                  <widget class="QPushButton" name="n0">
-                   <property name="text">
-                    <string>0</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="2" column="10">
-                  <widget class="QPushButton" name="lo">
-                   <property name="text">
-                    <string>o</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="6" column="6">
-                  <widget class="QPushButton" name="lf">
-                   <property name="text">
-                    <string>f</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="2" column="9">
-                  <widget class="QPushButton" name="li">
-                   <property name="text">
-                    <string>i</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="7" column="1">
-                  <widget class="QPushButton" name="shiftBtn">
-                   <property name="text">
-                    <string>⇧</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="6" column="3">
-                  <widget class="QPushButton" name="ls">
-                   <property name="text">
-                    <string>s</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="7" column="10">
-                  <widget class="QPushButton" name="spt">
-                   <property name="text">
-                    <string>.</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="2" column="6">
-                  <widget class="QPushButton" name="lt">
-                   <property name="text">
-                    <string>t</string>
-                   </property>
-                  </widget>
-                 </item>
                  <item row="7" column="8">
                   <widget class="QPushButton" name="ln">
                    <property name="text">
@@ -332,17 +143,52 @@
                    </property>
                   </widget>
                  </item>
-                 <item row="6" column="1">
-                  <widget class="QPushButton" name="sat">
+                 <item row="0" column="10">
+                  <widget class="QPushButton" name="n9">
                    <property name="text">
-                    <string>#</string>
+                    <string>9</string>
                    </property>
                   </widget>
                  </item>
-                 <item row="6" column="2">
-                  <widget class="QPushButton" name="la">
+                 <item row="7" column="4">
+                  <widget class="QPushButton" name="lc">
                    <property name="text">
-                    <string>a</string>
+                    <string>c</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="2" column="4">
+                  <widget class="QPushButton" name="lr">
+                   <property name="text">
+                    <string>r</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="0" column="8">
+                  <widget class="QPushButton" name="n7">
+                   <property name="text">
+                    <string>7</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="0" column="6">
+                  <widget class="QPushButton" name="n5">
+                   <property name="text">
+                    <string>5</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="0" column="9">
+                  <widget class="QPushButton" name="n8">
+                   <property name="text">
+                    <string>8</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="0" column="3">
+                  <widget class="QPushButton" name="n3">
+                   <property name="text">
+                    <string>3</string>
                    </property>
                   </widget>
                  </item>
@@ -353,6 +199,76 @@
                    </property>
                   </widget>
                  </item>
+                 <item row="2" column="6">
+                  <widget class="QPushButton" name="lt">
+                   <property name="text">
+                    <string>t</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="2" column="9">
+                  <widget class="QPushButton" name="li">
+                   <property name="text">
+                    <string>i</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="0" column="12">
+                  <widget class="QPushButton" name="n0">
+                   <property name="text">
+                    <string>0</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="7" column="7">
+                  <widget class="QPushButton" name="lb">
+                   <property name="text">
+                    <string>b</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="0" column="4">
+                  <widget class="QPushButton" name="n4">
+                   <property name="text">
+                    <string>4</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="2" column="10">
+                  <widget class="QPushButton" name="lo">
+                   <property name="text">
+                    <string>o</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="7" column="1">
+                  <widget class="QPushButton" name="shiftBtn">
+                   <property name="text">
+                    <string>⇧</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="7" column="2">
+                  <widget class="QPushButton" name="lz">
+                   <property name="text">
+                    <string>z</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="7" column="12">
+                  <widget class="QPushButton" name="eraseBtn">
+                   <property name="text">
+                    <string>⌫</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="0" column="7">
+                  <widget class="QPushButton" name="n6">
+                   <property name="text">
+                    <string>6</string>
+                   </property>
+                  </widget>
+                 </item>
                  <item row="0" column="1">
                   <widget class="QPushButton" name="n1">
                    <property name="text">
@@ -367,31 +283,115 @@
                    </property>
                   </widget>
                  </item>
-                 <item row="0" column="7">
-                  <widget class="QPushButton" name="n6">
+                 <item row="7" column="10">
+                  <widget class="QPushButton" name="spt">
                    <property name="text">
-                    <string>6</string>
+                    <string>.</string>
                    </property>
                   </widget>
                  </item>
-                 <item row="2" column="7">
-                  <widget class="QPushButton" name="ly">
+                 <item row="7" column="3">
+                  <widget class="QPushButton" name="lx">
                    <property name="text">
-                    <string>y</string>
+                    <string>x</string>
                    </property>
                   </widget>
                  </item>
-                 <item row="0" column="6">
-                  <widget class="QPushButton" name="n5">
+                 <item row="0" column="2">
+                  <widget class="QPushButton" name="n2">
                    <property name="text">
-                    <string>5</string>
+                    <string>2</string>
                    </property>
                   </widget>
                  </item>
-                 <item row="2" column="4">
-                  <widget class="QPushButton" name="lr">
+                 <item row="2" column="2">
+                  <widget class="QPushButton" name="lw">
                    <property name="text">
-                    <string>r</string>
+                    <string>w</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="2" column="8">
+                  <widget class="QPushButton" name="lu">
+                   <property name="text">
+                    <string>u</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="2" column="3">
+                  <widget class="QPushButton" name="le">
+                   <property name="text">
+                    <string>e</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="6" column="1">
+                  <widget class="QPushButton" name="la">
+                   <property name="text">
+                    <string>a</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="6" column="2">
+                  <widget class="QPushButton" name="ls">
+                   <property name="text">
+                    <string>s</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="6" column="3">
+                  <widget class="QPushButton" name="ld">
+                   <property name="text">
+                    <string>d</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="6" column="4">
+                  <widget class="QPushButton" name="lf">
+                   <property name="text">
+                    <string>f</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="6" column="6">
+                  <widget class="QPushButton" name="lg">
+                   <property name="text">
+                    <string>g</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="6" column="7">
+                  <widget class="QPushButton" name="lh">
+                   <property name="text">
+                    <string>h</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="6" column="8">
+                  <widget class="QPushButton" name="lj">
+                   <property name="text">
+                    <string>j</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="6" column="9">
+                  <widget class="QPushButton" name="lk">
+                   <property name="text">
+                    <string>k</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="6" column="10">
+                  <widget class="QPushButton" name="ll">
+                   <property name="text">
+                    <string>l</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="6" column="12">
+                  <widget class="QPushButton" name="sat">
+                   <property name="text">
+                    <string>#?</string>
                    </property>
                   </widget>
                  </item>