Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • cellframe/cellframe-dashboard
1 result
Show changes
Commits on Source (35)
Showing
with 18 additions and 154 deletions
......@@ -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;
......
......@@ -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/Resources/Icons/icon_arrow_down.png

400 B

......@@ -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
......
<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>
......
CellFrameDashboardGUI/res/icons/ic_arrow_drop_down_dark_blue.png

398 B

CellFrameDashboardGUI/res/icons/ic_arrow_drop_up_dark_blue.png

372 B

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 "../"
......
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
......
import QtQuick 2.4
import QtQuick.Controls 2.5
import QtQuick.Layouts 1.13
DapUiQmlWidgetConsole {
textAreaCmdHistory.color: "#707070"
textAreaCmdHistory.font.family: "Roboto"
......
import QtQuick 2.0
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.13
import QtQuick.Layouts 1.0
Component {
ColumnLayout {
......
import QtQuick 2.0
import QtQuick.Controls 2.1
import QtQuick.Layouts 1.13
import QtQuick.Controls 2.0
import "../LastAction"
DapUiQmlWidgetLastActions {
......
import QtQuick 2.9
import QtQuick 2.0
import "LastAction"
Rectangle {
......
import QtQuick 2.9
import QtQuick 2.0
import QtQuick.Controls 1.4
DapUiQmlScreenMainWindowForm {
......
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"
......
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"
}
}
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
}
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
}