diff --git a/CellFrameDashboardGUI/CellFrameDashboardGUI.pro b/CellFrameDashboardGUI/CellFrameDashboardGUI.pro
index 50f85d114fbec73dc40c6a4cc2dc16a9d77bc7cc..2234a40bb86e2baec4bf1552cdb76e85fb431f3d 100755
--- a/CellFrameDashboardGUI/CellFrameDashboardGUI.pro
+++ b/CellFrameDashboardGUI/CellFrameDashboardGUI.pro
@@ -52,12 +52,13 @@ ICON = Resources/Icons/icon.ico
#RCC_DIR = rcc
#UI_DIR = uic
-SRC_PATH = $$PWD/Src/
+SRC_PATH = $$PWD/src/
INCLUDE_PATH = $${SRC_PATH}/include/
+QML_PATH = $$PWD/screen/
-INCLUDEPATH += $$_PRO_FILE_PWD_/../libCellFrameDashboardCommon/
- $$_PRO_FILE_PWD_/../DapRPCProtocol/
- $${INCLUDE_PATH}/
+INCLUDEPATH += $$_PRO_FILE_PWD_/../libCellFrameDashboardCommon/ \
+ $$_PRO_FILE_PWD_/../DapRPCProtocol/ \
+ $${INCLUDE_PATH}/ \
$${SRC_PATH}/
SOURCES += \
@@ -69,15 +70,8 @@ SOURCES += \
$${SRC_PATH}/DapScreenHistoryFilterModel.cpp \
$${SRC_PATH}/DapScreenHistoryModel.cpp \
$${SRC_PATH}/DapSettingsNetworkModel.cpp \
- $${SRC_PATH}/DapUiQmlWidgetChainTransactions.cpp \
$${SRC_PATH}/DapWalletFilterModel.cpp \
$${SRC_PATH}/main.cpp \
- $${SRC_PATH}/DapUiQmlWidgetChainBallance.cpp \
- $${SRC_PATH}/DapUiQmlWidgetChainBlockExplorer.cpp \
- $${SRC_PATH}/DapUiQmlWidgetChainNodeLogs.cpp \
- $${SRC_PATH}/DapUiQmlWidgetChainOperations.cpp \
- $${SRC_PATH}/DapUiQmlWidgetModel.cpp \
- $${SRC_PATH}/DapUiQmlWidget.cpp \
$${SRC_PATH}/DapScreenDialog.cpp \
$${SRC_PATH}/DapScreenDialogChangeWidget.cpp \
$${SRC_PATH}/DapServiceClient.cpp \
@@ -92,10 +86,12 @@ SOURCES += \
RESOURCES += $$PWD/qml.qrc
# Additional import path used to resolve QML modules in Qt Creator's code model
-QML_IMPORT_PATH =
+#QML_IMPORT_PATH += $$PWD/screen \
+# $$PWD/screen/Dashboard
# Additional import path used to resolve QML modules just for Qt Quick Designer
-QML_DESIGNER_IMPORT_PATH =
+#QML_DESIGNER_IMPORT_PATH += $$PWD/screen/ \
+# $$PWD/screen/Dashboard
# Default rules for deployment.
qnx: target.path = /tmp/$${TARGET}/bin
@@ -111,13 +107,6 @@ HEADERS += \
$${INCLUDE_PATH}/DapScreenHistoryFilterModel.h \
$${INCLUDE_PATH}/DapScreenHistoryModel.h \
$${INCLUDE_PATH}/DapSettingsNetworkModel.h \
- $${INCLUDE_PATH}/DapUiQmlWidgetChainBallance.h \
- $${INCLUDE_PATH}/DapUiQmlWidgetChainBlockExplorer.h \
- $${INCLUDE_PATH}/DapUiQmlWidgetChainNodeLogs.h \
- $${INCLUDE_PATH}/DapUiQmlWidgetChainOperations.h \
- $${INCLUDE_PATH}/DapUiQmlWidgetChainTransactions.h \
- $${INCLUDE_PATH}/DapUiQmlWidgetModel.h \
- $${INCLUDE_PATH}/DapUiQmlWidget.h \
$${INCLUDE_PATH}/DapScreenDialog.h \
$${INCLUDE_PATH}/DapScreenDialogChangeWidget.h \
$${INCLUDE_PATH}/DapServiceClient.h \
@@ -129,6 +118,20 @@ HEADERS += \
$${INCLUDE_PATH}/DapChainWalletsModel.h \
$${INCLUDE_PATH}/DapWalletFilterModel.h
+DISTFILES += \
+ $${QML_PATH}/DapUiQmlScreen.qml \
+ $${QML_PATH}/DapUiQmlScreenMainWindow.qml \
+ $${QML_PATH}/DapUiQmlScreenMainWindowForm.ui.qml \
+ $${QML_PATH}/main.qml \
+ $${QML_PATH}/Dashboard/DapUiQmlScreenDashboard.qml \
+ $${QML_PATH}/Console/DapUiQmlWidgetConsole.qml \
+ $${QML_PATH}/Console/DapUiQmlScreenConsoleForm.ui.qml \
+ $${QML_PATH}/Console/DapUiQmlWidgetConsoleLastActionsDelegateForm.qml \
+ $${QML_PATH}/Console/DapUiQmlWidgetConsoleLastActionsForm.qml \
+ $${QML_PATH}/LastAction/DapUiQmlWidgetRightPanel.qml \
+ $${QML_PATH}/LastAction/DapUiQmlWidgetRightPanelForm.ui.qml
+
+
include (../libdap/libdap.pri)
include (../libdap-crypto/libdap-crypto.pri)
include (../libdap-qt/libdap-qt.pri)
diff --git a/CellFrameDashboardGUI/Screen/DapUiQmlScreen.qml b/CellFrameDashboardGUI/Screen/DapUiQmlScreen.qml
index 3596945747322680dd44ebd38db5141e2241a461..618dec1b58789e2e66bbba586bb3565fd62d9e60 100644
--- a/CellFrameDashboardGUI/Screen/DapUiQmlScreen.qml
+++ b/CellFrameDashboardGUI/Screen/DapUiQmlScreen.qml
@@ -1,4 +1,5 @@
import QtQuick 2.4
+import "LastAction"
Rectangle {
property DapUiQmlWidgetRightPanel rightPanel
diff --git a/CellFrameDashboardGUI/Screen/Dashboard/DapUiQmlScreenDashboard.qml b/CellFrameDashboardGUI/Screen/Dashboard/DapUiQmlScreenDashboard.qml
index fa42a42c0f7371ab88bafc09f2cfbbb91e57f95c..e99736c6892d8e42e493e5ceff65121e33651417 100644
--- a/CellFrameDashboardGUI/Screen/Dashboard/DapUiQmlScreenDashboard.qml
+++ b/CellFrameDashboardGUI/Screen/Dashboard/DapUiQmlScreenDashboard.qml
@@ -4,7 +4,7 @@ import CellFrameDashboard 1.0
import QtQml 2.12
import QtQuick.Controls 2.5
import QtQuick.Layouts 1.12
-
+import "../"
DapUiQmlScreen {
id: dapUiQmlScreenDialog
diff --git a/CellFrameDashboardGUI/qml.qrc b/CellFrameDashboardGUI/qml.qrc
index fcfb1094b1531d5549c8794a246786804f052080..c27c9530c5c96a25c4a002424ef9bad37c6176c6 100755
--- a/CellFrameDashboardGUI/qml.qrc
+++ b/CellFrameDashboardGUI/qml.qrc
@@ -1,103 +1,41 @@
<RCC>
<qresource prefix="/">
<file>CellFrameDashboardGUI.conf</file>
- <file>Resources/Icons/icon.png</file>
- <file>Resources/Icons/icon.ico</file>
- <file>Resources/Icons/defaul_icon.png</file>
- <file>Resources/Fonts/roboto_light.ttf</file>
- <file>Resources/Fonts/roboto_medium.ttf</file>
- <file>Resources/Fonts/roboto_regular.ttf</file>
- <file>Resources/Icons/ic_scroll-down.png</file>
- <file>Resources/Icons/ic_scroll-down_hover.png</file>
- <file>Resources/Icons/ic_scroll-up.png</file>
- <file>Resources/Icons/ic_scroll-up_hover.png</file>
- <file>Resources/Icons/icon_console.png</file>
- <file>Resources/Icons/icon_console_hover.png</file>
- <file>Resources/Icons/icon_dashboard.png</file>
- <file>Resources/Icons/icon_dashboard_hover.png</file>
- <file>Resources/Icons/icon_exchange.png</file>
- <file>Resources/Icons/icon_exchange_hover.png</file>
- <file>Resources/Icons/icon_history.png</file>
- <file>Resources/Icons/icon_history_hover.png</file>
- <file>Resources/Icons/icon_logs.png</file>
- <file>Resources/Icons/icon_logs_hover.png</file>
- <file>Resources/Icons/ic_arrow_drop_down.png</file>
- <file>Resources/Icons/ic_arrow_drop_up.png</file>
- <file>DapUiQmlWidgetStatusBarComboBox.qml</file>
- <file>Resources/Icons/icon_settings.png</file>
- <file>Resources/Icons/icon_settings_hover.png</file>
- <file>DapUiQmlWidgetStatusBarComboBoxDelegate.qml</file>
- <file>Resources/Icons/back_icon.png</file>
- <file>Resources/Icons/back_icon_hover.png</file>
- <file>Resources/Icons/close_icon.png</file>
- <file>Resources/Icons/close_icon_hover.png</file>
- <file>Resources/Icons/ic_copy.png</file>
- <file>Resources/Icons/ic_copy_hover.png</file>
- <file>Resources/Icons/ic_edit.png</file>
- <file>Resources/Icons/ic_edit_hover.png</file>
- <file>Resources/Icons/new-payment_icon.png</file>
- <file>DapUiQmlWidgetRightPanel.qml</file>
- <file>DapUiQmlWidgetRightPanelForm.ui.qml</file>
- <file>DapUiQmlWidgetHistoryLastActions.qml</file>
- <file>DapUiQmlScreen.qml</file>
- <file>DapUiQmlScreenDialogAddWalletHeader.qml</file>
- <file>DapUiQmlWalletCreatedHeader.qml</file>
- <file>DapUiQmlWalletCreated.qml</file>
- <file>Screen/Console/DapUiQmlScreenConsoleForm.ui.qml</file>
- <file>Screen/Console/DapUiQmlWidgetConsole.qml</file>
- <file>Screen/Console/DapUiQmlWidgetConsoleForm.ui.qml</file>
- <file>Screen/Console/DapUiQmlWidgetConsoleLastActionsDelegateForm.qml</file>
- <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>
- <file>Screen/Exchange/DapUiQmlWidgetExchangeOrderTitleForm.ui.qml</file>
- <file>Screen/Explorer/DapUiQmlWidgetNodeNetworkExplorer.qml</file>
- <file>Screen/History/DapUiQmlScreenHistory.qml</file>
- <file>Screen/History/DapUiQmlScreenHistoryForm.ui.qml</file>
- <file>Screen/LastAction/DapUiQmlRecoveryNotesForm.ui.qml</file>
- <file>Screen/LastAction/DapUiQmlRecoveryQrForm.ui.qml</file>
- <file>Screen/LastAction/DapUiQmlScreenDialogAddWallet.qml</file>
- <file>Screen/LastAction/DapUiQmlScreenDialogAddWalletForm.ui.qml</file>
- <file>Screen/LastAction/DapUiQmlWalletCreatedForm.ui.qml</file>
- <file>Screen/LastAction/DapUiQmlWidgetChainWallet.qml</file>
- <file>Screen/LastAction/DapUiQmlWidgetChainWalletForm.ui.qml</file>
- <file>Screen/LastAction/DapUiQmlWidgetHistoryLastActions.qml</file>
- <file>Screen/LastAction/DapUiQmlWidgetLastActions.qml</file>
- <file>Screen/LastAction/DapUiQmlWidgetLastActionsButtonForm.qml</file>
- <file>Screen/LastAction/DapUiQmlWidgetLastActionsDelegateForm.qml</file>
- <file>Screen/LastAction/DapUiQmlWidgetLastActionsForm.ui.qml</file>
- <file>Screen/LastAction/DapUiQmlWidgetLastActionsHeaderForm.qml</file>
- <file>Screen/LastAction/DapUiQmlWidgetLastActionsSectionForm.qml</file>
- <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/Log/DapUiQmlWidgetChainNodeLogs.qml</file>
- <file>Screen/Log/DapUiQmlWidgetChainNodeLogsForm.ui.qml</file>
- <file>Screen/Settings/DapUiQmlScreenSettings.qml</file>
- <file>Screen/Settings/DapUiQmlScreenSettingsForm.ui.qml</file>
- <file>Screen/Settings/DapUiQmlScreenSettingsSection.qml</file>
- <file>Screen/Settings/DapUiQmlWidgetSettingsNetwork.qml</file>
- <file>Screen/Settings/DapUiQmlWidgetSettingsNetworkForm.ui.qml</file>
- <file>Screen/StatusBar/DapUiQmlWidgetStatusBar.qml</file>
- <file>Screen/StatusBar/DapUiQmlWidgetStatusBarButton.ui.qml</file>
- <file>Screen/StatusBar/DapUiQmlWidgetStatusBarComboBoxWallet.qml</file>
- <file>Screen/StatusBar/DapUiQmlWidgetStatusBarComboBoxWalletForm.ui.qml</file>
- <file>Screen/StatusBar/DapUiQmlWidgetStatusBarContentItem.qml</file>
- <file>Screen/VPN/DapUiQmlScreenVpn.qml</file>
- <file>Screen/VPN/DapUiQmlScreenVpnForm.ui.qml</file>
- <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>
- <file>Screen/DapUiQmlScreen.qml</file>
- <file>Screen/DapUiQmlScreenForm.ui.qml</file>
- <file>Screen/DapUiQmlScreenMainWindow.qml</file>
- <file>Screen/DapUiQmlScreenMainWindowForm.ui.qml</file>
- <file>Screen/main.qml</file>
+ <file>res/cellframe-logo.svg</file>
+ <file>res/Settings.json</file>
+ <file>res/fonts/roboto_light.ttf</file>
+ <file>res/fonts/roboto_medium.ttf</file>
+ <file>res/fonts/roboto_regular.ttf</file>
+ <file>res/icons/back_icon.png</file>
+ <file>res/icons/back_icon_hover.png</file>
+ <file>res/icons/close_icon.png</file>
+ <file>res/icons/close_icon_hover.png</file>
+ <file>res/icons/dashboard.icns</file>
+ <file>res/icons/defaul_icon.png</file>
+ <file>res/icons/ic_arrow_drop_down.png</file>
+ <file>res/icons/ic_arrow_drop_up.png</file>
+ <file>res/icons/ic_copy.png</file>
+ <file>res/icons/ic_copy_hover.png</file>
+ <file>res/icons/ic_edit.png</file>
+ <file>res/icons/ic_edit_hover.png</file>
+ <file>res/icons/ic_scroll-down.png</file>
+ <file>res/icons/ic_scroll-down_hover.png</file>
+ <file>res/icons/ic_scroll-up.png</file>
+ <file>res/icons/ic_scroll-up_hover.png</file>
+ <file>res/icons/icon.ico</file>
+ <file>res/icons/icon.png</file>
+ <file>res/icons/icon_console.png</file>
+ <file>res/icons/icon_console_hover.png</file>
+ <file>res/icons/icon_dashboard.png</file>
+ <file>res/icons/icon_dashboard_hover.png</file>
+ <file>res/icons/icon_exchange.png</file>
+ <file>res/icons/icon_exchange_hover.png</file>
+ <file>res/icons/icon_history.png</file>
+ <file>res/icons/icon_history_hover.png</file>
+ <file>res/icons/icon_logs.png</file>
+ <file>res/icons/icon_logs_hover.png</file>
+ <file>res/icons/icon_settings.png</file>
+ <file>res/icons/icon_settings_hover.png</file>
+ <file>res/icons/new-payment_icon.png</file>
</qresource>
</RCC>
diff --git a/CellFrameDashboardGUI/Resources/Settings.json b/CellFrameDashboardGUI/res/Settings.json
old mode 100755
new mode 100644
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Settings.json
rename to CellFrameDashboardGUI/res/Settings.json
diff --git a/CellFrameDashboardGUI/Resources/cellframe-logo.svg b/CellFrameDashboardGUI/res/cellframe-logo.svg
similarity index 100%
rename from CellFrameDashboardGUI/Resources/cellframe-logo.svg
rename to CellFrameDashboardGUI/res/cellframe-logo.svg
diff --git a/CellFrameDashboardGUI/Resources/Fonts/LICENSE.txt b/CellFrameDashboardGUI/res/fonts/LICENSE.txt
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Fonts/LICENSE.txt
rename to CellFrameDashboardGUI/res/fonts/LICENSE.txt
diff --git a/CellFrameDashboardGUI/Resources/Fonts/roboto_black.ttf b/CellFrameDashboardGUI/res/fonts/roboto_black.ttf
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Fonts/roboto_black.ttf
rename to CellFrameDashboardGUI/res/fonts/roboto_black.ttf
diff --git a/CellFrameDashboardGUI/Resources/Fonts/roboto_black_italic.ttf b/CellFrameDashboardGUI/res/fonts/roboto_black_italic.ttf
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Fonts/roboto_black_italic.ttf
rename to CellFrameDashboardGUI/res/fonts/roboto_black_italic.ttf
diff --git a/CellFrameDashboardGUI/Resources/Fonts/roboto_bold.ttf b/CellFrameDashboardGUI/res/fonts/roboto_bold.ttf
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Fonts/roboto_bold.ttf
rename to CellFrameDashboardGUI/res/fonts/roboto_bold.ttf
diff --git a/CellFrameDashboardGUI/Resources/Fonts/roboto_bold_italic.ttf b/CellFrameDashboardGUI/res/fonts/roboto_bold_italic.ttf
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Fonts/roboto_bold_italic.ttf
rename to CellFrameDashboardGUI/res/fonts/roboto_bold_italic.ttf
diff --git a/CellFrameDashboardGUI/Resources/Fonts/roboto_italic.ttf b/CellFrameDashboardGUI/res/fonts/roboto_italic.ttf
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Fonts/roboto_italic.ttf
rename to CellFrameDashboardGUI/res/fonts/roboto_italic.ttf
diff --git a/CellFrameDashboardGUI/Resources/Fonts/roboto_light.ttf b/CellFrameDashboardGUI/res/fonts/roboto_light.ttf
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Fonts/roboto_light.ttf
rename to CellFrameDashboardGUI/res/fonts/roboto_light.ttf
diff --git a/CellFrameDashboardGUI/Resources/Fonts/roboto_light_italic.ttf b/CellFrameDashboardGUI/res/fonts/roboto_light_italic.ttf
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Fonts/roboto_light_italic.ttf
rename to CellFrameDashboardGUI/res/fonts/roboto_light_italic.ttf
diff --git a/CellFrameDashboardGUI/Resources/Fonts/roboto_medium.ttf b/CellFrameDashboardGUI/res/fonts/roboto_medium.ttf
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Fonts/roboto_medium.ttf
rename to CellFrameDashboardGUI/res/fonts/roboto_medium.ttf
diff --git a/CellFrameDashboardGUI/Resources/Fonts/roboto_medium_italic.ttf b/CellFrameDashboardGUI/res/fonts/roboto_medium_italic.ttf
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Fonts/roboto_medium_italic.ttf
rename to CellFrameDashboardGUI/res/fonts/roboto_medium_italic.ttf
diff --git a/CellFrameDashboardGUI/Resources/Fonts/roboto_regular.ttf b/CellFrameDashboardGUI/res/fonts/roboto_regular.ttf
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Fonts/roboto_regular.ttf
rename to CellFrameDashboardGUI/res/fonts/roboto_regular.ttf
diff --git a/CellFrameDashboardGUI/Resources/Fonts/roboto_thin.ttf b/CellFrameDashboardGUI/res/fonts/roboto_thin.ttf
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Fonts/roboto_thin.ttf
rename to CellFrameDashboardGUI/res/fonts/roboto_thin.ttf
diff --git a/CellFrameDashboardGUI/Resources/Fonts/roboto_thin_italic.ttf b/CellFrameDashboardGUI/res/fonts/roboto_thin_italic.ttf
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Fonts/roboto_thin_italic.ttf
rename to CellFrameDashboardGUI/res/fonts/roboto_thin_italic.ttf
diff --git a/CellFrameDashboardGUI/Resources/Icons/back_icon.png b/CellFrameDashboardGUI/res/icons/back_icon.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/back_icon.png
rename to CellFrameDashboardGUI/res/icons/back_icon.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/back_icon_hover.png b/CellFrameDashboardGUI/res/icons/back_icon_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/back_icon_hover.png
rename to CellFrameDashboardGUI/res/icons/back_icon_hover.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/close_icon.png b/CellFrameDashboardGUI/res/icons/close_icon.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/close_icon.png
rename to CellFrameDashboardGUI/res/icons/close_icon.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/close_icon_hover.png b/CellFrameDashboardGUI/res/icons/close_icon_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/close_icon_hover.png
rename to CellFrameDashboardGUI/res/icons/close_icon_hover.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/dashboard.icns b/CellFrameDashboardGUI/res/icons/dashboard.icns
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/dashboard.icns
rename to CellFrameDashboardGUI/res/icons/dashboard.icns
diff --git a/CellFrameDashboardGUI/Resources/Icons/defaul_icon.png b/CellFrameDashboardGUI/res/icons/defaul_icon.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/defaul_icon.png
rename to CellFrameDashboardGUI/res/icons/defaul_icon.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/ic_arrow_drop_down.png b/CellFrameDashboardGUI/res/icons/ic_arrow_drop_down.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/ic_arrow_drop_down.png
rename to CellFrameDashboardGUI/res/icons/ic_arrow_drop_down.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/ic_arrow_drop_up.png b/CellFrameDashboardGUI/res/icons/ic_arrow_drop_up.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/ic_arrow_drop_up.png
rename to CellFrameDashboardGUI/res/icons/ic_arrow_drop_up.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/ic_copy.png b/CellFrameDashboardGUI/res/icons/ic_copy.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/ic_copy.png
rename to CellFrameDashboardGUI/res/icons/ic_copy.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/ic_copy_hover.png b/CellFrameDashboardGUI/res/icons/ic_copy_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/ic_copy_hover.png
rename to CellFrameDashboardGUI/res/icons/ic_copy_hover.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/ic_edit.png b/CellFrameDashboardGUI/res/icons/ic_edit.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/ic_edit.png
rename to CellFrameDashboardGUI/res/icons/ic_edit.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/ic_edit_hover.png b/CellFrameDashboardGUI/res/icons/ic_edit_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/ic_edit_hover.png
rename to CellFrameDashboardGUI/res/icons/ic_edit_hover.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/ic_scroll-down.png b/CellFrameDashboardGUI/res/icons/ic_scroll-down.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/ic_scroll-down.png
rename to CellFrameDashboardGUI/res/icons/ic_scroll-down.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/ic_scroll-down_hover.png b/CellFrameDashboardGUI/res/icons/ic_scroll-down_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/ic_scroll-down_hover.png
rename to CellFrameDashboardGUI/res/icons/ic_scroll-down_hover.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/ic_scroll-up.png b/CellFrameDashboardGUI/res/icons/ic_scroll-up.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/ic_scroll-up.png
rename to CellFrameDashboardGUI/res/icons/ic_scroll-up.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/ic_scroll-up_hover.png b/CellFrameDashboardGUI/res/icons/ic_scroll-up_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/ic_scroll-up_hover.png
rename to CellFrameDashboardGUI/res/icons/ic_scroll-up_hover.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon.ico b/CellFrameDashboardGUI/res/icons/icon.ico
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/icon.ico
rename to CellFrameDashboardGUI/res/icons/icon.ico
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon.png b/CellFrameDashboardGUI/res/icons/icon.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/icon.png
rename to CellFrameDashboardGUI/res/icons/icon.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_console.png b/CellFrameDashboardGUI/res/icons/icon_console.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/icon_console.png
rename to CellFrameDashboardGUI/res/icons/icon_console.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_console_hover.png b/CellFrameDashboardGUI/res/icons/icon_console_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/icon_console_hover.png
rename to CellFrameDashboardGUI/res/icons/icon_console_hover.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_dashboard.png b/CellFrameDashboardGUI/res/icons/icon_dashboard.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/icon_dashboard.png
rename to CellFrameDashboardGUI/res/icons/icon_dashboard.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_dashboard_hover.png b/CellFrameDashboardGUI/res/icons/icon_dashboard_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/icon_dashboard_hover.png
rename to CellFrameDashboardGUI/res/icons/icon_dashboard_hover.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_exchange.png b/CellFrameDashboardGUI/res/icons/icon_exchange.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/icon_exchange.png
rename to CellFrameDashboardGUI/res/icons/icon_exchange.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_exchange_hover.png b/CellFrameDashboardGUI/res/icons/icon_exchange_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/icon_exchange_hover.png
rename to CellFrameDashboardGUI/res/icons/icon_exchange_hover.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_history.png b/CellFrameDashboardGUI/res/icons/icon_history.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/icon_history.png
rename to CellFrameDashboardGUI/res/icons/icon_history.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_history_hover.png b/CellFrameDashboardGUI/res/icons/icon_history_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/icon_history_hover.png
rename to CellFrameDashboardGUI/res/icons/icon_history_hover.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_logs.png b/CellFrameDashboardGUI/res/icons/icon_logs.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/icon_logs.png
rename to CellFrameDashboardGUI/res/icons/icon_logs.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_logs_hover.png b/CellFrameDashboardGUI/res/icons/icon_logs_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/icon_logs_hover.png
rename to CellFrameDashboardGUI/res/icons/icon_logs_hover.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_settings.png b/CellFrameDashboardGUI/res/icons/icon_settings.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/icon_settings.png
rename to CellFrameDashboardGUI/res/icons/icon_settings.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/icon_settings_hover.png b/CellFrameDashboardGUI/res/icons/icon_settings_hover.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/icon_settings_hover.png
rename to CellFrameDashboardGUI/res/icons/icon_settings_hover.png
diff --git a/CellFrameDashboardGUI/Resources/Icons/new-payment_icon.png b/CellFrameDashboardGUI/res/icons/new-payment_icon.png
similarity index 100%
rename from CellFrameDashboardGUI/Resources/Icons/new-payment_icon.png
rename to CellFrameDashboardGUI/res/icons/new-payment_icon.png