Compare revisions

Konstantin · Konstantin · Konstantin · Konstantin · Konstantin · Konstantin
--- a/CellFrameDashboardGUI/DapScreenHistoryModel.cpp
+++ b/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;

--- a/CellFrameDashboardGUI/DapScreenHistoryModel.h
+++ b/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
 {

--- a/CellFrameDashboardGUI/Resources/Icons/icon_arrow_down.png
+++ b/CellFrameDashboardGUI/Resources/Icons/icon_arrow_down.png
--- a/CellFrameDashboardGUI/Resources/Icons/new-wallet_icon_dark.png
+++ b/CellFrameDashboardGUI/Resources/Icons/new-wallet_icon_dark.png
--- a/CellFrameDashboardGUI/Resources/Icons/new-wallet_icon_dark_hover.png
+++ b/CellFrameDashboardGUI/Resources/Icons/new-wallet_icon_dark_hover.png
--- a/CellFrameDashboardGUI/main.cpp
+++ b/CellFrameDashboardGUI/main.cpp
@@ -42,7 +42,7 @@ int main(int argc, char *argv[])
    app.setOrganizationDomain("demlabs.net");
    app.setApplicationName("CellFrame Dashboard");
    app.setWindowIcon(QIcon(":/res/icons/icon.ico"));
-    
+
    DapLogger dapLogger;
    /// TODO: The code is commented out at the time of developing the logging strategy in the project
 //#ifndef QT_DEBUG

--- a/CellFrameDashboardGUI/qml.qrc
+++ b/CellFrameDashboardGUI/qml.qrc
 <RCC>
    <qresource prefix="/">
        <file>CellFrameDashboardGUI.conf</file>
+        <file>res/icons/ic_arrow_drop_down_dark_blue.png</file>
+        <file>res/icons/ic_arrow_drop_up_dark_blue.png</file>
        <file>res/cellframe-logo.svg</file>
        <file>res/Settings.json</file>
        <file>res/fonts/roboto_light.ttf</file>
@@ -43,9 +45,6 @@
        <file>screen/DapUiQmlScreen.qml</file>
        <file>screen/DapUiQmlScreenMainWindow.qml</file>
        <file>screen/DapUiQmlScreenMainWindowForm.ui.qml</file>
-        <file>screen/DapUiQmlWidgetStatusBarComboBox.qml</file>
-        <file>screen/DapUiQmlWidgetStatusBarComboBoxDelegate.qml</file>
-        <file>screen/DapUiQmlWidgetStatusBarContentItem.qml</file>
        <file>screen/main.qml</file>
        <file>screen/Console/DapUiQmlScreenConsoleForm.ui.qml</file>
        <file>screen/Console/DapUiQmlWidgetConsole.qml</file>
@@ -54,7 +53,6 @@
        <file>screen/Console/DapUiQmlWidgetConsoleLastActionsForm.qml</file>
        <file>screen/Dashboard/DapUiQmlScreenDashboard.qml</file>
        <file>screen/Exchange/DapUiQmlScreenExchangeForm.ui.qml</file>
-        <file>screen/Exchange/DapUiQmlWidgetChainExchanges.ui.qml</file>
        <file>screen/Exchange/DapUiQmlWidgetExchangeOrderButtonForm.ui.qml</file>
        <file>screen/Exchange/DapUiQmlWidgetExchangeOrderContentForm.ui.qml</file>
        <file>screen/Exchange/DapUiQmlWidgetExchangeOrderForm.ui.qml</file>
@@ -80,8 +78,6 @@
        <file>screen/LastAction/DapUiQmlWidgetRightPanel.qml</file>
        <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>
@@ -92,8 +88,6 @@
        <file>screen/Settings/DapUiQmlWidgetSettingsNetworkForm.ui.qml</file>
        <file>screen/StatusBar/DapUiQmlWidgetStatusBar.qml</file>
        <file>screen/StatusBar/DapUiQmlWidgetStatusBarButtonForm.ui.qml</file>
-        <file>screen/StatusBar/DapUiQmlWidgetStatusBarComboBoxWallet.qml</file>
-        <file>screen/StatusBar/DapUiQmlWidgetStatusBarComboBoxWalletForm.ui.qml</file>
        <file>screen/VPN/DapUiQmlScreenVpn.qml</file>
        <file>screen/VPN/DapUiQmlScreenVpnForm.ui.qml</file>
        <file>screen/VPN/DapUiQmlWidgetSettingsVpn.qml</file>

--- a/CellFrameDashboardGUI/res/icons/ic_arrow_drop_down_dark_blue.png
+++ b/CellFrameDashboardGUI/res/icons/ic_arrow_drop_down_dark_blue.png
--- a/CellFrameDashboardGUI/res/icons/ic_arrow_drop_up_dark_blue.png
+++ b/CellFrameDashboardGUI/res/icons/ic_arrow_drop_up_dark_blue.png
--- a/CellFrameDashboardGUI/screen/Console/DapUiQmlScreenConsoleForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/Console/DapUiQmlScreenConsoleForm.ui.qml
-import QtQuick 2.13
-import QtQml 2.12
-import QtQuick.Controls 2.2
-import QtQuick.Layouts 1.12
+import QtQuick 2.0
+import QtQuick.Layouts 1.0
 import QtQuick.Controls 1.4
 import "../"


--- a/CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsole.qml
+++ b/CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsole.qml
-import QtQuick 2.13
-import QtQuick.Controls 2.5
-import QtQuick.Layouts 1.13
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.0

 Rectangle {
    property alias textAreaCmdHistory: txtCommand

--- a/CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsoleForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsoleForm.ui.qml
-import QtQuick 2.4
-import QtQuick.Controls 2.5
-import QtQuick.Layouts 1.13
-
 DapUiQmlWidgetConsole {
    textAreaCmdHistory.color: "#707070"
    textAreaCmdHistory.font.family: "Roboto"

--- a/CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsoleLastActionsDelegateForm.qml
+++ b/CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsoleLastActionsDelegateForm.qml
 import QtQuick 2.0
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.13
+import QtQuick.Layouts 1.0

 Component {
    ColumnLayout {

--- a/CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsoleLastActionsForm.qml
+++ b/CellFrameDashboardGUI/screen/Console/DapUiQmlWidgetConsoleLastActionsForm.qml
 import QtQuick 2.0
-import QtQuick.Controls 2.1
-import QtQuick.Layouts 1.13
+import QtQuick.Controls 2.0
 import "../LastAction"

 DapUiQmlWidgetLastActions {

--- a/CellFrameDashboardGUI/screen/DapUiQmlScreen.qml
+++ b/CellFrameDashboardGUI/screen/DapUiQmlScreen.qml
-import QtQuick 2.9
+import QtQuick 2.0
 import "LastAction"

 Rectangle {

--- a/CellFrameDashboardGUI/screen/DapUiQmlScreenMainWindow.qml
+++ b/CellFrameDashboardGUI/screen/DapUiQmlScreenMainWindow.qml
-import QtQuick 2.9
+import QtQuick 2.0
 import QtQuick.Controls 1.4

 DapUiQmlScreenMainWindowForm {

--- a/CellFrameDashboardGUI/screen/DapUiQmlScreenMainWindowForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/DapUiQmlScreenMainWindowForm.ui.qml
-import QtQuick 2.9
-import QtQuick.Controls 1.4
-import QtQuick.Controls 2.2
-import QtQuick.Controls.Styles 1.4
+import QtQuick 2.0
+import QtQuick.Controls 2.0
 import "./StatusBar"
 import "./LastAction"


--- a/CellFrameDashboardGUI/screen/DapUiQmlWidgetStatusBarComboBox.qml
+++ b/CellFrameDashboardGUI/screen/DapUiQmlWidgetStatusBarComboBox.qml
-import QtQuick 2.0
-import QtQuick.Controls 2.5
-import QtQuick.Controls.Styles 1.4
-import QtGraphicalEffects 1.0
-
-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
-    indicator: Image {
-        id: arrow
-        source: parent.popup.visible ? "qrc:/res/icons/ic_arrow_drop_up.png" : "qrc:/res/icons/ic_arrow_drop_down.png"
-        width: 24 * pt
-        height: 24 * pt
-        anchors.verticalCenter: parent.verticalCenter
-        anchors.right: parent.right
-        anchors.rightMargin: 16 * pt
-    }
-
-    background: Rectangle {
-        anchors.fill: parent
-        color: parent.popup.visible ? "#FFFFFF" : "transparent"
-        radius: 2 * pt
-    }
-
-    contentItem: Text {
-        id: headerText
-        anchors.fill: parent
-        anchors.leftMargin: 12 * pt
-        anchors.rightMargin: 48 * pt
-        anchors.topMargin: 0 * pt
-        text: parent.displayText
-        font.family: fontRobotoRegular.name
-        font.pixelSize: 14 * pt
-        color: parent.popup.visible ? "#332F49" : "#FFFFFF"
-        verticalAlignment: Text.AlignTop
-        elide: Text.ElideRight
-    }
-
-    popup: Popup {
-        y: parent.height - 1
-        width: parent.width + 1
-        implicitHeight: contentItem.implicitHeight
-        padding: 1
-
-        contentItem: ListView {
-            clip: true
-            implicitHeight: contentHeight
-            model: customComboBox.popup.visible ? customComboBox.delegateModel : null
-            currentIndex: customComboBox.highlightedIndex
-
-            ScrollIndicator.vertical: ScrollIndicator { }
-        }
-
-        background: Rectangle {
-            width: customComboBox.background.width
-
-            Rectangle {
-                id: contentCorner
-                anchors.fill: parent
-            }
-
-            DropShadow {
-                anchors.fill: parent
-                source: contentCorner
-                verticalOffset: 9 * pt
-                samples: 13 * pt
-                color: "#40000000"
-            }
-        }
-    }
-
-    DropShadow {
-        anchors.fill: parent
-        source: background
-        verticalOffset: 9 * pt
-        samples: 13 * pt
-        color: "#40000000"
-    }
-
-}
--- a/CellFrameDashboardGUI/screen/DapUiQmlWidgetStatusBarComboBoxDelegate.qml
+++ b/CellFrameDashboardGUI/screen/DapUiQmlWidgetStatusBarComboBoxDelegate.qml
-import QtQuick 2.0
-import QtQuick.Controls 2.5
-
-ItemDelegate {
-    property string delegateContentText: ""
-
-    width: parent.width
-    height: 42 * pt
-    contentItem: DapUiQmlWidgetStatusBarContentItem {
-        anchors.fill: parent
-        anchors.topMargin: 8 * pt
-        anchors.leftMargin: 12 * pt
-        anchors.rightMargin: 16 * pt
-        verticalAlignment: Qt.AlignTop
-        text: delegateContentText
-        color: hovered ? "#FFFFFF" : "#332F49"
-    }
-
-    background: Rectangle {
-        anchors.fill: parent
-        anchors.bottomMargin: 10 * pt
-        color: hovered ? "#332F49" : "#FFFFFF"
-    }
-
-    highlighted: parent.highlightedIndex === index
-
-}
--- a/CellFrameDashboardGUI/screen/DapUiQmlWidgetStatusBarContentItem.qml
+++ b/CellFrameDashboardGUI/screen/DapUiQmlWidgetStatusBarContentItem.qml
-import QtQuick 2.0
-import QtQuick.Controls 2.5
-import QtQuick.Controls.Styles 1.4
-
-Text {
-    color: "#A7A7A7"
-    font.family: fontRobotoRegular.name
-    font.pixelSize: 14 * pt
-    elide: Text.ElideRight
-    verticalAlignment: Text.AlignVCenter
-}
No results found