more characters in keyboard, and a general redesign

src/widgets/virtualKeyboard/virtualkeyboard.cpp

@@ -9,7 +9,6 @@ virtualkeyboard::virtualkeyboard(QWidget *parent) :
     ui(new Ui::virtualkeyboard)
 {   
     ui->setupUi(this);
-    shift = false;
 
     ui->n1->setProperty("type", "borderless");
     ui->n2->setProperty("type", "borderless");
@@ -223,446 +222,308 @@ void virtualkeyboard::on_eraseBtn_clicked()
 
 void virtualkeyboard::on_spt_clicked()
 {
-    ui->lineEdit->insert(".");
+    ui->lineEdit->insert(ui->spt->text());
+
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_sat_clicked()
 {
-    ui->lineEdit->insert("@");
+    if(specialCharacters == true) {
-    QString text = ui->lineEdit->text();
+        specialCharacters = false;
-    global::keyboard::keyboardText = text;
+        reverseKeys(keyboardMode::lowerCase);
+    }
+    else {
+        reverseKeys(keyboardMode::specialCharacters);
+        specialCharacters = true;
+    }
 }
 
 void virtualkeyboard::on_n1_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(ui->n1->text());
-        ui->lineEdit->insert("!");
+
-    }
-    else {
-        ui->lineEdit->insert("1");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_n2_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(ui->n2->text());
-        ui->lineEdit->insert("/");
+
-    }
-    else {
-        ui->lineEdit->insert("2");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_n3_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(ui->n3->text());
-        ui->lineEdit->insert("#");
+
-    }
-    else {
-        ui->lineEdit->insert("3");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_n4_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(ui->n4->text());
-        ui->lineEdit->insert("$");
+
-    }
-    else {
-        ui->lineEdit->insert("4");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_n5_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(ui->n5->text());
-        ui->lineEdit->insert("%");
+
-    }
-    else {
-        ui->lineEdit->insert("5");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_n6_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(ui->n6->text());
-        ui->lineEdit->insert("^");
+
-    }
-    else {
-        ui->lineEdit->insert("6");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_n7_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(ui->n7->text());
-        ui->lineEdit->insert("&");
+
-    }
-    else {
-        ui->lineEdit->insert("7");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_n8_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(ui->n8->text());
-        ui->lineEdit->insert("*");
+
-    }
-    else {
-        ui->lineEdit->insert("8");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_n9_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(ui->n9->text());
-        ui->lineEdit->insert("(");
+
-    }
-    else {
-        ui->lineEdit->insert("9");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_n0_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(ui->n0->text());
-        ui->lineEdit->insert(")");
+
-    }
-    else {
-        ui->lineEdit->insert("0");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_lq_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(ui->lq->text());
-        ui->lineEdit->insert("Q");
+
-    }
-    else {
-        ui->lineEdit->insert("q");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_lw_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(ui->lw->text());
-        ui->lineEdit->insert("W");
+
-    }
-    else {
-        ui->lineEdit->insert("w");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_le_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(ui->le->text());
-        ui->lineEdit->insert("E");
+
-    }
-    else {
-        ui->lineEdit->insert("e");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_lr_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(ui->lr->text());
-        ui->lineEdit->insert("R");
+
-    }
-    else {
-        ui->lineEdit->insert("r");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_lt_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(QString(ui->lt->text().back()));
-        ui->lineEdit->insert("T");
+
-    }
-    else {
-        ui->lineEdit->insert("t");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_ly_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(ui->ly->text());
-        ui->lineEdit->insert("Y");
+
-    }
-    else {
-        ui->lineEdit->insert("y");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_lu_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(ui->lu->text());
-        ui->lineEdit->insert("U");
+
-    }
-    else {
-        ui->lineEdit->insert("u");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_li_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(ui->li->text());
-        ui->lineEdit->insert("I");
+
-    }
-    else {
-        ui->lineEdit->insert("i");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_lo_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(ui->lo->text());
-        ui->lineEdit->insert("O");
+
-    }
-    else {
-        ui->lineEdit->insert("o");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_lp_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(ui->lp->text());
-        ui->lineEdit->insert("P");
+
-    }
-    else {
-        ui->lineEdit->insert("p");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_la_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(ui->la->text());
-        ui->lineEdit->insert("A");
+
-    }
-    else {
-        ui->lineEdit->insert("a");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_ls_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(QString(ui->la->text().back()));
-        ui->lineEdit->insert("S");
+
-    }
-    else {
-        ui->lineEdit->insert("s");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_ld_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(ui->ld->text());
-        ui->lineEdit->insert("D");
+
-    }
-    else {
-        ui->lineEdit->insert("d");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_lf_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(ui->lf->text());
-        ui->lineEdit->insert("F");
+
-    }
-    else {
-        ui->lineEdit->insert("f");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_lg_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(ui->lg->text());
-        ui->lineEdit->insert("G");
+
-    }
-    else {
-        ui->lineEdit->insert("g");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_lh_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(ui->lh->text());
-        ui->lineEdit->insert("H");
+
-    }
-    else {
-        ui->lineEdit->insert("h");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_lj_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(ui->lj->text());
-        ui->lineEdit->insert("J");
+
-    }
-    else {
-        ui->lineEdit->insert("j");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_lk_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(ui->lk->text());
-        ui->lineEdit->insert("K");
+
-    }
-    else {
-        ui->lineEdit->insert("k");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_ll_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(ui->ll->text());
-        ui->lineEdit->insert("L");
+
-    }
-    else {
-        ui->lineEdit->insert("l");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_lz_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(ui->lz->text());
-        ui->lineEdit->insert("Z");
+
-    }
-    else {
-        ui->lineEdit->insert("z");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_lx_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(ui->lx->text());
-        ui->lineEdit->insert("X");
+
-    }
-    else {
-        ui->lineEdit->insert("x");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_lc_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(ui->lc->text());
-        ui->lineEdit->insert("C");
+
-    }
-    else {
-        ui->lineEdit->insert("c");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_lv_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(ui->lv->text());
-        ui->lineEdit->insert("V");
+
-    }
-    else {
-        ui->lineEdit->insert("v");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_lb_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(ui->lb->text());
-        ui->lineEdit->insert("B");
+
-    }
-    else {
-        ui->lineEdit->insert("b");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_ln_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(ui->ln->text());
-        ui->lineEdit->insert("N");
+
-    }
-    else {
-        ui->lineEdit->insert("n");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
 
 void virtualkeyboard::on_lm_clicked()
 {
-    if(shift == true) {
+    ui->lineEdit->insert(ui->lm->text());
-        ui->lineEdit->insert("M");
+
-    }
-    else {
-        ui->lineEdit->insert("m");
-    }
     QString text = ui->lineEdit->text();
     global::keyboard::keyboardText = text;
 }
@@ -671,27 +532,29 @@ void virtualkeyboard::on_shiftBtn_clicked()
 {
     if(shift == true) {
         shift = false;
+        reverseKeys(keyboardMode::lowerCase);
     }
     else {
+        reverseKeys(keyboardMode::upperCase);
         shift = true;
     }
-    reverseKeys();
+
 }
 
-void virtualkeyboard::reverseKeys() {
+void virtualkeyboard::reverseKeys(keyboardMode keyboardMode) {
-    if(shift == true) {
+    currentMode = keyboardMode;
+    if(keyboardMode == keyboardMode::upperCase) {
         ui->shiftBtn->setText("⇪");
-
+        ui->n1->setText("1");
-        ui->n1->setText("!");
+        ui->n2->setText("2");
-        ui->n2->setText("/");
+        ui->n3->setText("3");
-        ui->n3->setText("#");
+        ui->n4->setText("4");
-        ui->n4->setText("$");
+        ui->n5->setText("5");
-        ui->n5->setText("%");
+        ui->n6->setText("6");
-        ui->n6->setText("^");
+        ui->n7->setText("7");
-        ui->n7->setText("&&");
+        ui->n8->setText("8");
-        ui->n8->setText("*");
+        ui->n9->setText("9");
-        ui->n9->setText("(");
+        ui->n0->setText("0");
-        ui->n0->setText(")");
 
         ui->la->setText("A");
         ui->lb->setText("B");
@@ -720,7 +583,7 @@ void virtualkeyboard::reverseKeys() {
         ui->ly->setText("Y");
         ui->lz->setText("Z");
     }
-    else {
+    else if(keyboardMode == keyboardMode::lowerCase) {
         ui->shiftBtn->setText("⇧");
 
         ui->n1->setText("1");
@@ -761,6 +624,50 @@ void virtualkeyboard::reverseKeys() {
         ui->ly->setText("y");
         ui->lz->setText("z");
     }
+    else if(keyboardMode == keyboardMode::specialCharacters) {
+        ui->shiftBtn->setText("⇧");
+
+        ui->n1->setText("1");
+        ui->n2->setText("2");
+        ui->n3->setText("3");
+        ui->n4->setText("4");
+        ui->n5->setText("5");
+        ui->n6->setText("6");
+        ui->n7->setText("7");
+        ui->n8->setText("8");
+        ui->n9->setText("9");
+        ui->n0->setText("0");
+
+        ui->lq->setText("@");
+        ui->lw->setText("#");
+        ui->le->setText("€");
+        ui->lr->setText("%");
+        // Important
+        ui->lt->setText("&&");
+        ui->ly->setText("-");
+        ui->lu->setText("+");
+        ui->li->setText("(");
+        ui->lo->setText(")");
+        ui->lp->setText("*");
+        // Important
+        ui->la->setText("\"");
+        ui->ls->setText("'");
+        ui->ld->setText(":");
+        ui->lf->setText(";");
+        ui->lg->setText("!");
+        ui->lh->setText("?");
+        ui->lj->setText(",");
+        ui->lk->setText("_");
+        ui->ll->setText("/");
+        ui->lz->setText("~");
+
+        ui->lx->setText("{");
+        ui->lc->setText("}");
+        ui->lv->setText("[");
+        ui->lb->setText("]");
+        ui->ln->setText("<");
+        ui->lm->setText(">");
+    }
     QTimer::singleShot(1000, this, SLOT(adjust_size_function()));
 }
 

src/widgets/virtualKeyboard/virtualkeyboard.h

@@ -16,8 +16,14 @@ public:
     QString className = this->metaObject()->className();
     explicit virtualkeyboard(QWidget *parent = nullptr);
     ~virtualkeyboard();
-    bool shift;
+    bool shift = false;
-    void reverseKeys();
+    bool specialCharacters = false;
+    enum class keyboardMode {
+        lowerCase,
+        upperCase,
+        specialCharacters,
+    };
+    void reverseKeys(keyboardMode keyboardMode);
     void clearLineEdit();
 
 private slots:
@@ -66,6 +72,7 @@ private slots:
 
 private:
     Ui::virtualkeyboard *ui;
+    keyboardMode currentMode = keyboardMode::lowerCase;
 
 signals:
     void adjust_size();

src/widgets/virtualKeyboard/virtualkeyboard.ui

@@ -39,6 +39,9 @@
        <property name="lineWidth">
         <number>0</number>
        </property>
+       <property name="currentIndex">
+        <number>0</number>
+       </property>
        <widget class="QWidget" name="page">
         <layout class="QVBoxLayout" name="verticalLayout_2">
          <property name="leftMargin">
@@ -57,231 +60,231 @@
           <layout class="QGridLayout" name="gridLayout_3">
            <item row="13" column="3">
             <layout class="QGridLayout" name="gridLayout_4">
-             <item row="6" column="9">
+             <item row="2" column="12">
-              <widget class="QPushButton" name="ll">
-               <property name="text">
-                <string>l</string>
-               </property>
-              </widget>
-             </item>
-             <item row="7" column="9">
-              <widget class="QPushButton" name="spt">
-               <property name="text">
-                <string>.</string>
-               </property>
-              </widget>
-             </item>
-             <item row="6" column="3">
-              <widget class="QPushButton" name="lf">
-               <property name="text">
-                <string>f</string>
-               </property>
-              </widget>
-             </item>
-             <item row="7" column="0">
-              <widget class="QPushButton" name="shiftBtn">
-               <property name="text">
-                <string>⇧</string>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="8">
-              <widget class="QPushButton" name="li">
-               <property name="text">
-                <string>i</string>
-               </property>
-              </widget>
-             </item>
-             <item row="7" column="3">
-              <widget class="QPushButton" name="lc">
-               <property name="text">
-                <string>c</string>
-               </property>
-              </widget>
-             </item>
-             <item row="7" column="8">
-              <widget class="QPushButton" name="lm">
-               <property name="text">
-                <string>m</string>
-               </property>
-              </widget>
-             </item>
-             <item row="7" column="11">
-              <widget class="QPushButton" name="eraseBtn">
-               <property name="text">
-                <string>⌫</string>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="6">
-              <widget class="QPushButton" name="ly">
-               <property name="text">
-                <string>y</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="11">
-              <widget class="QPushButton" name="n0">
-               <property name="text">
-                <string>0</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="0">
-              <widget class="QPushButton" name="n1">
-               <property name="text">
-                <string>1</string>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="2">
-              <widget class="QPushButton" name="le">
-               <property name="text">
-                <string>e</string>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="9">
-              <widget class="QPushButton" name="lo">
-               <property name="text">
-                <string>o</string>
-               </property>
-              </widget>
-             </item>
-             <item row="7" column="2">
-              <widget class="QPushButton" name="lx">
-               <property name="text">
-                <string>x</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="2">
-              <widget class="QPushButton" name="n3">
-               <property name="text">
-                <string>3</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="7">
-              <widget class="QPushButton" name="n7">
-               <property name="text">
-                <string>7</string>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="7">
-              <widget class="QPushButton" name="lu">
-               <property name="text">
-                <string>u</string>
-               </property>
-              </widget>
-             </item>
-             <item row="6" column="0">
-              <widget class="QPushButton" name="la">
-               <property name="text">
-                <string>a</string>
-               </property>
-              </widget>
-             </item>
-             <item row="6" column="11">
-              <widget class="QPushButton" name="sat">
-               <property name="text">
-                <string>@</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="9">
-              <widget class="QPushButton" name="n9">
-               <property name="text">
-                <string>9</string>
-               </property>
-              </widget>
-             </item>
-             <item row="6" column="5">
-              <widget class="QPushButton" name="lg">
-               <property name="text">
-                <string>g</string>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="1">
-              <widget class="QPushButton" name="lw">
-               <property name="text">
-                <string>w</string>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="5">
-              <widget class="QPushButton" name="lt">
-               <property name="text">
-                <string>t</string>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="0">
-              <widget class="QPushButton" name="lq">
-               <property name="text">
-                <string>q</string>
-               </property>
-              </widget>
-             </item>
-             <item row="6" column="1">
-              <widget class="QPushButton" name="ls">
-               <property name="text">
-                <string>s</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="6">
-              <widget class="QPushButton" name="n6">
-               <property name="text">
-                <string>6</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="5">
-              <widget class="QPushButton" name="n5">
-               <property name="text">
-                <string>5</string>
-               </property>
-              </widget>
-             </item>
-             <item row="7" column="5">
-              <widget class="QPushButton" name="lv">
-               <property name="text">
-                <string>v</string>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="11">
               <widget class="QPushButton" name="lp">
                <property name="text">
                 <string>p</string>
                </property>
               </widget>
              </item>
-             <item row="0" column="1">
+             <item row="7" column="3">
+              <widget class="QPushButton" name="lx">
+               <property name="text">
+                <string>x</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="0" column="12">
+              <widget class="QPushButton" name="n0">
+               <property name="text">
+                <string>0</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="7" column="6">
+              <widget class="QPushButton" name="lv">
+               <property name="text">
+                <string>v</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="2">
               <widget class="QPushButton" name="n2">
                <property name="text">
                 <string>2</string>
                </property>
               </widget>
              </item>
-             <item row="7" column="6">
+             <item row="0" column="3">
+              <widget class="QPushButton" name="n3">
+               <property name="text">
+                <string>3</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="1">
+              <widget class="QPushButton" name="n1">
+               <property name="text">
+                <string>1</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="7" column="1">
+              <widget class="QPushButton" name="shiftBtn">
+               <property name="text">
+                <string>⇧</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="6">
+             <item row="0" column="9">
-              <widget class="QPushButton" name="lh">
+              <widget class="QPushButton" name="n8">
                <property name="text">
-                <string>h</string>
+                <string>8</string>
                </property>
               </widget>
              </item>
-             <item row="6" column="7">
+             <item row="2" column="7">
+              <widget class="QPushButton" name="ly">
+               <property name="text">
+                <string>y</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="0" column="6">
+              <widget class="QPushButton" name="n5">
+               <property name="text">
+                <string>5</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="2" column="6">
+              <widget class="QPushButton" name="lt">
+               <property name="text">
+                <string>t</string>
+               </property>
+              </widget>
+             </item>
+             <item row="7" column="9">
+              <widget class="QPushButton" name="lm">
+               <property name="text">
+                <string>m</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="8">
+              <widget class="QPushButton" name="n7">
+               <property name="text">
+                <string>7</string>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="1">
+              <widget class="QPushButton" name="lq">
+               <property name="text">
+                <string>q</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="2">
+              <widget class="QPushButton" name="lz">
+               <property name="text">
+                <string>z</string>
+               </property>
+              </widget>
+             </item>
+             <item row="7" column="10">
+              <widget class="QPushButton" name="spt">
+               <property name="text">
+                <string>.</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="8">
+              <widget class="QPushButton" name="ln">
+               <property name="text">
+                <string>n</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="6" column="10">
+              <widget class="QPushButton" name="lk">
+               <property name="text">
+                <string>k</string>
+               </property>
+              </widget>
+             </item>
+             <item row="6" column="9">
               <widget class="QPushButton" name="lj">
                <property name="text">
                 <string>j</string>
@@ -289,51 +292,51 @@
               </widget>
              </item>
              <item row="6" column="8">
-              <widget class="QPushButton" name="lk">
+              <widget class="QPushButton" name="lh">
                <property name="text">
-                <string>k</string>
+                <string>h</string>
                </property>
               </widget>
              </item>
-             <item row="7" column="7">
+             <item row="6" column="7">
-              <widget class="QPushButton" name="ln">
+              <widget class="QPushButton" name="lg">
                <property name="text">
-                <string>n</string>
+                <string>g</string>
                </property>
               </widget>
              </item>
-             <item row="2" column="3">
+             <item row="6" column="6">
-              <widget class="QPushButton" name="lr">
+              <widget class="QPushButton" name="lf">
                <property name="text">
-                <string>r</string>
+                <string>f</string>
                </property>
               </widget>
              </item>
-             <item row="0" column="3">
+             <item row="6" column="4">
-              <widget class="QPushButton" name="n4">
-               <property name="text">
-                <string>4</string>
-               </property>
-              </widget>
-             </item>
-             <item row="6" column="2">
               <widget class="QPushButton" name="ld">
                <property name="text">
                 <string>d</string>
                </property>
               </widget>
              </item>
-             <item row="0" column="8">
+             <item row="6" column="3">
-              <widget class="QPushButton" name="n8">
+              <widget class="QPushButton" name="ls">
                <property name="text">
-                <string>8</string>
+                <string>s</string>
                </property>
               </widget>
              </item>
-             <item row="7" column="1">
+             <item row="6" column="2">
-              <widget class="QPushButton" name="lz">
+              <widget class="QPushButton" name="la">
                <property name="text">
-                <string>z</string>
+                <string>a</string>
+               </property>
+              </widget>
+             </item>
+             <item row="6" column="1">
+              <widget class="QPushButton" name="sat">
+               <property name="text">
+                <string>#</string>
                </property>
               </widget>
              </item>