[*] merge branch 'master' into support-2715

CellFrameDashboardGUI/DapScreenHistoryModel.cpp

@@ -99,6 +99,8 @@ QVariant DapScreenHistoryModel::data(const QModelIndex &index, int role) const
             QDateTime currentTime = QDateTime::currentDateTime();
             QDateTime itemDate = m_elementList.at(index.row()).Date;
             if(currentTime.date() == itemDate.date()) return QString("Today");
+            else if(currentTime.daysTo(itemDate) == -1) return QString("Yesterday");
+            else if(currentTime.date().year() < itemDate.date().year()) return itemDate.toString(MASK_FOR_MODEL_WITH_YEAR);
             return itemDate.toString(MASK_FOR_MODEL);
         }
         case DisplayNameTokenRole:      return m_elementList.at(index.row()).TokenName;

CellFrameDashboardGUI/DapScreenHistoryModel.h

@@ -10,7 +10,8 @@
 #include "DapHistoryType.h"
 #include "DapChainConvertor.h"
 
-#define MASK_FOR_MODEL QString("MMMM, dd")
+#define MASK_FOR_MODEL QString("MMMM, d")
+#define MASK_FOR_MODEL_WITH_YEAR QString("MMMM, d, yyyy")
 
 class DapScreenHistoryModel : public QAbstractListModel
 {

CellFrameDashboardGUI/qml.qrc

@@ -37,6 +37,9 @@
         <file>res/icons/icon_settings.png</file>
         <file>res/icons/icon_settings_hover.png</file>
         <file>res/icons/new-payment_icon.png</file>
+        <file>res/icons/new-wallet_icon_dark.png</file>
+        <file>res/icons/new-wallet_icon_dark_hover.png</file>
+        <file>res/icons/icon_arrow_down.png</file>
         <file>screen/DapUiQmlScreen.qml</file>
         <file>screen/DapUiQmlScreenMainWindow.qml</file>
         <file>screen/DapUiQmlScreenMainWindowForm.ui.qml</file>
@@ -78,6 +81,8 @@
         <file>screen/LastAction/DapUiQmlWidgetRightPanelForm.ui.qml</file>
         <file>screen/LastAction/DapUiQmlWidgetScreenDialogAddWallet.ui.qml</file>
         <file>screen/LastAction/DapUiQmlWidgetSignatureTypeComboBox.qml</file>
+        <file>screen/LastAction/DapUiQmlWidgetSignatureTypeComboBox.qml</file>
+        <file>screen/LastAction/DapRadioButton.qml</file>
         <file>screen/Log/DapUiQmlWidgetChainNodeLogs.qml</file>
         <file>screen/Log/DapUiQmlWidgetChainNodeLogsForm.ui.qml</file>
         <file>screen/Settings/DapUiQmlScreenSettings.qml</file>
@@ -94,6 +99,5 @@
         <file>screen/VPN/DapUiQmlWidgetSettingsVpn.qml</file>
         <file>screen/VPN/DapUiQmlWidgetSettingsVpnComboBox.qml</file>
         <file>screen/VPN/DapUiQmlWidgetSettingsVpnComboBoxForm.ui.qml</file>
-        <file>screen/VPN/DapUiQmlWidgetSettingsVpnForm.ui.qml</file>
     </qresource>
 </RCC>

CellFrameDashboardGUI/screen/DapUiQmlWidgetStatusBarComboBox.qml

@@ -6,6 +6,7 @@ ComboBox {
     property alias headerTextColor: headerText.color
     property alias widthArrow: arrow.width
     property alias heightArrow: arrow.height
+    property alias sourceArrow: arrow.source
 
     id: customComboBox
     width: 190 * pt
@@ -30,7 +31,7 @@ ComboBox {
         anchors.fill: parent
         anchors.leftMargin: 12 * pt
         anchors.rightMargin: 48 * pt
-        anchors.topMargin: 10 * pt
+        anchors.topMargin: 0 * pt
         text: parent.displayText
         font.family: fontRobotoRegular.name
         font.pixelSize: 14 * pt

CellFrameDashboardGUI/screen/LastAction/DapRadioButton.qml

+import QtQuick 2.12
+import QtQuick.Controls 2.12
+
+RadioButton {
+    property alias textButton: nameButton.text
+    property string colorName: nameButton.color
+
+    id: button
+    text: qsTr("template")
+    contentItem: Text {
+        id: nameButton
+        anchors.left: parent.left
+        anchors.leftMargin: button.indicator.width + button.spacing
+        verticalAlignment: Text.AlignVCenter
+        anchors.verticalCenter: parent.verticalCenter
+        color: "#3E3853"
+        font.pointSize: 14 * pt
+        font.wordSpacing: 0
+        font.family: "Roboto"
+        horizontalAlignment: Text.AlignLeft
+    }
+
+    spacing: 16
+    checked: false
+    display: AbstractButton.TextBesideIcon
+    autoExclusive: true
+}
+
+
+/*##^##
+Designer {
+    D{i:0;autoSize:true;height:480;width:640}
+}
+##^##*/

CellFrameDashboardGUI/screen/LastAction/DapUiQmlRecoveryNotesForm.ui.qml

@@ -4,6 +4,9 @@ import QtQuick.Layouts 1.0
 import "../"
 
 DapUiQmlScreen {
+    property alias pressedNextButton: nextButton.pressed
+    property bool isWordsCopied: copyNotesButton.checked
+
     id: recoveryNoteMenu
     color: "#edeff2"
 
@@ -27,7 +30,7 @@ DapUiQmlScreen {
             anchors.topMargin: 8
             anchors.left: parent.left
             anchors.leftMargin: 16
-            font.pointSize: 10
+            font.pointSize: 12
             horizontalAlignment: Text.AlignLeft
             font.family: "Roboto"
             font.styleName: "Normal"
@@ -53,7 +56,7 @@ DapUiQmlScreen {
             color: "#FF0300"
 
             font {
-                pointSize: 10
+                pointSize: 16
                 family: "Roboto"
                 styleName: "Normal"
                 weight: Font.Normal
@@ -63,7 +66,7 @@ DapUiQmlScreen {
 
     Rectangle {
         id: recoveryWords
-        height: 210
+        height: 270
         anchors.top: saveNotesDescription.bottom
         anchors.topMargin: 24
         anchors.right: parent.right
@@ -113,23 +116,23 @@ DapUiQmlScreen {
         }
 
         RowLayout {
+            height: 270
             spacing: 60
-            height: parent.height
             anchors.right: parent.right
             anchors.rightMargin: 1
             anchors.left: parent.left
             anchors.leftMargin: 1
 
             ListView {
-                height: parent.height
                 Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
                 width: 50
+                height: 300
                 model: listRecoveryWords
                 delegate: Text {
                     text: word
                     color: "#070023"
                     font {
-                        pointSize: 12
+                        pointSize: 16
                         family: "Roboto"
                         styleName: "Normal"
                         weight: Font.Normal
@@ -138,15 +141,15 @@ DapUiQmlScreen {
             }
 
             ListView {
-                height: parent.height
                 Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
                 width: 50
+                height: 300
                 model: listRecoveryWords
                 delegate: Text {
                     text: word
                     color: "#070023"
                     font {
-                        pointSize: 12
+                        pointSize: 16
                         family: "Roboto"
                         styleName: "Normal"
                         weight: Font.Normal
@@ -192,8 +195,8 @@ DapUiQmlScreen {
         Button {
             id: nextButton
             height: 44
-            Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
             width: 130
+            Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
 
             Text {
                 id: nextButtonText
@@ -204,7 +207,7 @@ DapUiQmlScreen {
                 font.family: "Roboto"
                 font.styleName: "Normal"
                 font.weight: Font.Normal
-                font.pointSize: 16
+                font.pointSize: 18
                 horizontalAlignment: Text.AlignLeft
             }
 
@@ -231,7 +234,7 @@ DapUiQmlScreen {
                 font.family: "Roboto"
                 font.styleName: "Normal"
                 font.weight: Font.Normal
-                font.pointSize: 16
+                font.pointSize: 18
                 horizontalAlignment: Text.AlignLeft
             }
 

CellFrameDashboardGUI/screen/LastAction/DapUiQmlRecoveryQrForm.ui.qml

@@ -3,6 +3,9 @@ import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.0
 
 Rectangle {
+    property alias pressedNextButton: nextButton.pressed
+    property bool isQRCodeCopied: saveQrCodeButton.checked
+
     id: recoveryQrMenu
     color: "#edeff2"
 
@@ -24,7 +27,7 @@ Rectangle {
             anchors.topMargin: 8
             anchors.left: parent.left
             anchors.leftMargin: 16
-            font.pointSize: 10
+            font.pointSize: 12
             horizontalAlignment: Text.AlignLeft
             font.family: "Roboto"
             font.styleName: "Normal"
@@ -46,7 +49,7 @@ Rectangle {
         Text {
             anchors.fill: parent
             text: qsTr("Keep these QR-code in a safe place. They will be\nrequired to restore your wallet in case of loss of\naccess to it")
-            font.pointSize: 10
+            font.pointSize: 14
             verticalAlignment: Text.AlignVCenter
             horizontalAlignment: Text.AlignHCenter
             color: "#FF0300"
@@ -62,12 +65,13 @@ Rectangle {
     Rectangle {
         id: qrCodeImageArea
         height: 200
+        width: 200
         anchors.top: saveQrCodeDescription.bottom
         anchors.topMargin: 24
-        anchors.left: parent.left
-        anchors.right: parent.right
+        anchors.horizontalCenter: parent.horizontalCenter
         color: "#EDEFF2"
-        anchors.leftMargin: 1
+        border.width: 1
+        border.color: "#C7C6CE"
 
         Image {
             id: qrCodeImage
@@ -140,8 +144,8 @@ Rectangle {
         Button {
             id: saveQrCodeButton
             height: 44
-            Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
             width: 130
+            Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
             checkable: true
 
             Text {

CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWallet.qml

@@ -4,6 +4,8 @@ DapUiQmlScreenDialogAddWalletForm {
     id: dialogAddWallet
     focus: true
 
+    sourceCustomArrow: popup.visible ? "qrc:/res/icons/ic_arrow_drop_up.png" : "qrc:/res/icons/icon_arrow_down.png"
+
     Connections {
         target: nextButton
         onClicked: {
@@ -31,4 +33,20 @@ DapUiQmlScreenDialogAddWalletForm {
             }
         }
     }
+
+    Connections {
+        target: rightPanel.content.currentItem
+        onPressedNextButtonChanged: {
+            if(rightPanel.content.currentItem.isWordsCopied || rightPanel.content.currentItem.isQRCodeCopied) {
+                rightPanel.header.push("DapUiQmlWalletCreatedHeader.qml", {"rightPanel": rightPanel });
+                rightPanel.content.push("DapUiQmlWalletCreated.qml", {"rightPanel": rightPanel} )
+            }
+        }
+    }
+}
+
+/*##^##
+Designer {
+    D{i:0;autoSize:true;height:480;width:640}
 }
+##^##*/

CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml

@@ -5,12 +5,15 @@ import "../"
 
 DapUiQmlScreen {
     property alias nextButton: nextButton
+    property alias sourceCustomArrow: comboBoxChooseSignatureType.sourceArrow
     property bool isWordsRecoveryMethodChecked: selectionWords.checked
     property bool isQRCodeRecoveryMethodChecked: selectionQRcode.checked
     property bool isExportToFileRecoveryMethodChecked: selectionExportToFile.checked
 
     id: addWalletMenu
-    color: "#EDEFF2"
+    color: "#F8F7FA"
+    border.width: 1 * pt
+    border.color: "#E3E2E6"
 
     Rectangle {
         id: nameWalletTextArea
@@ -25,9 +28,9 @@ DapUiQmlScreen {
             color: "#ffffff"
             text: qsTr("Name of wallet")
             anchors.left: parent.left
-            anchors.leftMargin: 16
+            anchors.leftMargin: 16 * pt
             anchors.verticalCenter: parent.verticalCenter
-            font.pointSize: 12
+            font.pixelSize: 12 * pt
             horizontalAlignment: Text.AlignLeft
             font.family: "Roboto"
             font.styleName: "Normal"
@@ -38,7 +41,7 @@ DapUiQmlScreen {
     Rectangle {
         id: inputNameWalletArea
         height: 68
-        color: "#EDEFF2"
+        color: "#F8F7FA"
         anchors.left: parent.left
         anchors.leftMargin: 1
         anchors.right: parent.right
@@ -50,7 +53,7 @@ DapUiQmlScreen {
             anchors.left: parent.left
             anchors.verticalCenter: parent.verticalCenter
             anchors.leftMargin: 20
-            font.pointSize: 16
+            font.pixelSize: 16 * pt
             color: "#070023"
             font.family: "Roboto"
             font.styleName: "Normal"
@@ -73,7 +76,7 @@ DapUiQmlScreen {
             id: chooseSignatureTypeText
             color: "#ffffff"
             text: qsTr("Choose signature type")
-            font.pointSize: 12
+            font.pixelSize: 12 * pt
             anchors.leftMargin: 16
             horizontalAlignment: Text.AlignLeft
             font.styleName: "Normal"
@@ -87,7 +90,7 @@ DapUiQmlScreen {
     Rectangle {
         id: chooseSignatureTypeArea
         height: 68
-        color: "#EDEFF2"
+        color: "#F8F7FA"
         anchors.leftMargin: 1
         anchors.left: parent.left
         anchors.right: parent.right
@@ -95,14 +98,15 @@ DapUiQmlScreen {
 
         DapUiQmlWidgetSignatureTypeComboBox {
             id: comboBoxChooseSignatureType
-            height: 20 * pt
+            width: 368
+            height: 20
             anchors {
                 verticalCenter: chooseSignatureTypeArea.verticalCenter
-                left: parent.left
-                right: parent.right
+                fill: parent
+                topMargin: 24
+                bottomMargin: 24
                 leftMargin: 8
                 rightMargin: 32
-                verticalCenterOffset: 0
             }
         }
     }
@@ -124,7 +128,7 @@ DapUiQmlScreen {
             font.styleName: "Normal"
             font.weight: Font.Normal
             anchors.left: parent.left
-            font.pointSize: 12
+            font.pixelSize: 12 * pt
             horizontalAlignment: Text.AlignLeft
             anchors.leftMargin: 16
             anchors.verticalCenter: parent.verticalCenter
@@ -134,61 +138,33 @@ DapUiQmlScreen {
     ColumnLayout {
         id: chooseRecoveryMethod
         height: 272
-        anchors.leftMargin: 1
         spacing: 32
         anchors.top: recoveryMethodTextArea.bottom
+        anchors.topMargin: 32
         anchors.left: parent.left
+        anchors.leftMargin: 16
         anchors.right: parent.right
+        Layout.alignment: Qt.AlignLeft | Qt.AlignTop
 
-        RadioButton {
+        DapRadioButton {
             id: selectionWords
-            text: qsTr("24 words")
-            Layout.alignment: Qt.AlignLeft | Qt.AlignTop
-            Layout.topMargin: 32
+            textButton: qsTr("24 words")
             checked: true
-            spacing: 16
-            autoExclusive: true
-            display: AbstractButton.TextBesideIcon
-            font.pointSize: 14
-            font.wordSpacing: 0
-            font.family: "Roboto"
-            Layout.leftMargin: 16
         }
 
-        RadioButton {
+        DapRadioButton {
             id: selectionQRcode
-            y: 120
-            text: qsTr("QR code")
-            Layout.alignment: Qt.AlignLeft | Qt.AlignTop
-            Layout.topMargin: 0
-            Layout.leftMargin: 16
-            spacing: 16
-            font.pointSize: 14
-            font.family: "Roboto"
+            textButton: qsTr("QR code")
         }
 
-        RadioButton {
+        DapRadioButton {
             id: selectionExportToFile
-            text: qsTr("Export to file")
-            spacing: 16
-            font.pointSize: 14
-            font.family: "Roboto"
-            Layout.alignment: Qt.AlignLeft | Qt.AlignTop
-            Layout.topMargin: 0
-            Layout.leftMargin: 16
+            textButton: qsTr("Export to file")
         }
 
-        RadioButton {
+        DapRadioButton {
             id: selectionNothing
-            y: 235
-            text: qsTr("Nothing")
-            spacing: 16
-            checked: false
-            font.family: "Roboto"
-            font.pointSize: 14
-            Layout.alignment: Qt.AlignLeft | Qt.AlignTop
-            Layout.topMargin: 0
-            Layout.leftMargin: 16
+            textButton: qsTr("Nothing")
         }
     }
 
@@ -209,12 +185,11 @@ DapUiQmlScreen {
             font.family: "Roboto"
             font.styleName: "Normal"
             font.weight: Font.Normal
-            font.pointSize: 18
+            font.pixelSize: 18 * pt
             horizontalAlignment: Text.AlignHCenter
             verticalAlignment: Text.AlignVCenter
         }
 
-
         background: Rectangle {
             implicitWidth: parent.width
             implicitHeight: parent.height
@@ -222,3 +197,10 @@ DapUiQmlScreen {
         }
     }
 }
+
+/*##^##
+Designer {
+    D{i:0;autoSize:true;height:480;width:640}
+}
+##^##*/
+

CellFrameDashboardGUI/screen/LastAction/DapUiQmlScreenDialogAddWalletHeader.qml

@@ -4,7 +4,9 @@ import "../"
 
 DapUiQmlScreen {
     height: 36 * pt
-    color: "#edeff2"
+    color: "#F8F7FA"
+    border.width: 1 * pt
+    border.color: "#E3E2E6"
 
     property string backButtonNormal : "qrc:/res/icons/close_icon.png"
     property string backButtonHovered : "qrc:/res/icons/close_icon_hover.png"
@@ -19,8 +21,8 @@ DapUiQmlScreen {
         spacing: 12
 
         Rectangle {
-            width: 20
-            height: 20
+            width: 16
+            height: 16
             color: "transparent"
 
             Image {
@@ -46,7 +48,12 @@ DapUiQmlScreen {
 
         Text {
             text: title
-            font.pointSize: 14
+            horizontalAlignment: Qt.AlignLeft
+            font.pointSize: 14 * pt
+            font.family: "Roboto"
+            font.weight: Font.Normal
+            font.styleName: "Normal"
+            color: "#3E3853"
         }
     }
 }

CellFrameDashboardGUI/screen/LastAction/DapUiQmlWalletCreatedForm.ui.qml

@@ -34,8 +34,6 @@ DapUiQmlScreen {
             implicitHeight: parent.height
             color: "#3E3853"
         }
-
-
     }
 
     Rectangle {
@@ -57,7 +55,7 @@ DapUiQmlScreen {
             color: "#070023"
 
             font {
-                pointSize: 16
+                pointSize: 18
                 family: "Roboto"
                 styleName: "Normal"
                 weight: Font.Normal
@@ -65,3 +63,9 @@ DapUiQmlScreen {
         }
     }
 }
+
+/*##^##
+Designer {
+    D{i:0;autoSize:true;height:480;width:640}
+}
+##^##*/

CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActions.qml

@@ -45,3 +45,6 @@ DapUiQmlWidgetLastActionsForm {
         }
     }
 }
+
+
+

CellFrameDashboardGUI/screen/LastAction/DapUiQmlWidgetLastActionsDelegateForm.qml

@@ -9,55 +9,52 @@ Component {
         height: 50 * pt
         color: "transparent"
 
-        Rectangle {
-            id: dapData
-            width: childrenRect.width
-            height: childrenRect.height
-            Layout.alignment: Qt.AlignVCenter
-            anchors.left: dapContentDelegate.left
+        RowLayout {
+            anchors.fill: parent
+            anchors.rightMargin: 20 * pt
             anchors.leftMargin: 16 * pt
-            anchors.top: parent.top
-            anchors.topMargin: 13
 
-            Column {
-                anchors.fill: parent
+            ColumnLayout {
+                Layout.fillHeight: true
+                Layout.fillWidth: true
                 spacing: 2
 
                 Text {
+                    Layout.fillWidth: true
                     text: tokenName
-                    color: "#5F5F63"
-                    font.family: "Roboto Regular"
+                    color: "#3E3853"
+                    font.family: fontRobotoRegular.name
                     font.pixelSize: 14 * pt
+                    elide: Text.ElideRight
                 }
 
                 Text {
+                    Layout.fillWidth: true
                     text: txStatus
-                    color: "#A7A7A7"
-                    font.family: "Roboto"
+                    color: "#757184"
+                    font.family: fontRobotoRegular.name
                     font.pixelSize: 12 * pt
                 }
             }
+
+            Text {
+                Layout.fillHeight: true
+                Layout.fillWidth: true
+                horizontalAlignment: Qt.AlignRight
+                verticalAlignment: Qt.AlignVCenter
+                color: "#3E3853"
+                text: cryptocurrency;
+                font.family: fontRobotoRegular.name
+                font.pixelSize: 12 * pt
+            }
         }
 
-        Text {
-            anchors.left: dapData.right
-            anchors.top: parent.top
-            anchors.right: parent.right
-            anchors.bottom: parent.bottom
-            anchors.rightMargin: 20 * pt
 
-            horizontalAlignment: Qt.AlignRight
-            verticalAlignment: Qt.AlignVCenter
-            color: "#505559"
-            text: cryptocurrency;
-            font.family: "Roboto"
-            font.pixelSize: 14 * pt
-        }
 
         Rectangle {
             width: parent.width
-            height: 1 * pt
-            color: "#C7C9CC"
+            height: 1
+            color: "#E3E2E6"
             anchors.bottom: parent.bottom
         }
     }

CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBar.qml

@@ -8,10 +8,7 @@ Rectangle {
         color: "transparent"
 
         Row {
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.bottom: parent.bottom
-            anchors.right: statusBarAddWalletButton.left
+            anchors.fill: parent
             anchors.leftMargin: 30 * pt
             anchors.topMargin: 10 * pt
             anchors.bottomMargin: 10 * pt
@@ -60,7 +57,11 @@ Rectangle {
 
         DapUiQmlWidgetStatusBarButtonForm {
             id: statusBarAddWalletButton
-            width: 130 * pt
+            width: 120 * pt
+            height: 36 * pt
+            name: qsTr("New wallet")
+            fontHeight: 14 * pt
+            backgroundColor: "#070023"
             anchors.right: parent.right
             anchors.top: parent.top
             anchors.topMargin: 10 * pt

CellFrameDashboardGUI/screen/StatusBar/DapUiQmlWidgetStatusBarButtonForm.ui.qml

@@ -2,21 +2,34 @@ import QtQuick 2.0
 import QtQuick.Controls 2.0
 
 Button {
+    property alias name: templateText.text
+    property alias fontHeight: templateText.font.pixelSize
+    property alias backgroundColor: background.color
+
+    property int defaultHeight: 50 * pt
+    property int defaultWidth: 100 * pt
+    property string normalButton: "qrc:/res/icons/new-wallet_icon_dark.png"
+    property string hoverButton: "qrc:/res/icons/new-wallet_icon_dark_hover.png"
+
     id: button
+    width: defaultHeight
+    height: defaultWidth
+
     contentItem: Rectangle {
+        id: background
         anchors.fill: parent
-        border.color: "#B5B5B5"
-        border.width: 1 * pt
-        color: "transparent"
+        color: "#070023"
 
         Text {
+            id: templateText
             anchors.fill: parent
             verticalAlignment: Qt.AlignVCenter
             horizontalAlignment: Qt.AlignRight
-            anchors.rightMargin: 20 * pt
-            font.family: "Regular"
-            color: "#505559"
-            text: qsTr("New wallet")
+            anchors.rightMargin: 20
+            font.family: "Roboto"
+            font.weight: Font.Normal
+            color: "#FFFFFF"
+            text: qsTr("template")
         }
 
         Image {
@@ -24,7 +37,7 @@ Button {
             anchors.verticalCenter: parent.verticalCenter
             anchors.left: parent.left
             anchors.leftMargin: 10 * pt
-            source: "qrc:/res/icons/defaul_icon.png"
+            source: button.hovered ? hoverButton : normalButton
             width: 28 * pt
             height: 28 * pt
         }