diff --git a/Components/ModulesPicker/modulespicker.ui b/Components/ModulesPicker/modulespicker.ui
index 70210978743880ef17ca2823fd7815d2bc94a04b..c1faf6a182a502dbaca18447f42ba180e685985e 100644
--- a/Components/ModulesPicker/modulespicker.ui
+++ b/Components/ModulesPicker/modulespicker.ui
@@ -1,263 +1,267 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>ModulesPicker</class>
- <widget class="QWidget" name="ModulesPicker">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>996</width>
- <height>689</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>Modules Picker</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout" stretch="0,1">
- <item>
- <layout class="QHBoxLayout" name="home_layout" stretch="1,0">
- <item>
- <widget class="QComboBox" name="comboBox_modulesList"/>
- </item>
- <item>
- <widget class="QPushButton" name="button_createModule">
- <property name="text">
- <string>Create</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="0" column="1">
- <layout class="QVBoxLayout" name="verticalLayout_2" stretch="1,0">
- <item>
- <widget class="QGroupBox" name="groupBox_3">
- <property name="title">
- <string>Utility</string>
- </property>
- <layout class="QVBoxLayout" name="group_utility">
+ <class>ModulesPicker</class>
+ <widget class="QWidget" name="ModulesPicker">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>996</width>
+ <height>689</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Modules Picker</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout" stretch="0,1">
+ <item>
+ <layout class="QHBoxLayout" name="home_layout" stretch="1,0">
<item>
- <widget class="QScrollArea" name="scrollArea_2">
- <property name="widgetResizable">
- <bool>true</bool>
- </property>
- <widget class="QWidget" name="scrollAreaWidgetContents_2">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>457</width>
- <height>502</height>
- </rect>
- </property>
- <layout class="QVBoxLayout" name="utility_layout">
- <item>
- <spacer name="verticalSpacer_2">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>463</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- </widget>
+ <widget class="QComboBox" name="comboBox_modulesList" />
</item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="groupBox_2">
- <property name="whatsThis">
- <string/>
- </property>
- <property name="title">
- <string>Splitter</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_4">
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_vertical">
+ <widget class="QPushButton" name="button_createModule">
<property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset resource="../../application.qrc">
- <normaloff>:/Resources/Images/Icons/vertical_splitter.png</normaloff>:/Resources/Images/Icons/vertical_splitter.png</iconset>
- </property>
- <property name="iconSize">
- <size>
- <width>25</width>
- <height>25</height>
- </size>
- </property>
- <property name="checked">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_horizontal">
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset resource="../../application.qrc">
- <normaloff>:/Resources/Images/Icons/horizontal_splitter.png</normaloff>:/Resources/Images/Icons/horizontal_splitter.png</iconset>
- </property>
- <property name="iconSize">
- <size>
- <width>25</width>
- <height>25</height>
- </size>
+ <string>Create</string>
</property>
- <property name="checked">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
+ </widget>
</item>
- </layout>
- </widget>
- </item>
- </layout>
- </item>
- <item row="0" column="0">
- <widget class="QGroupBox" name="groupBox">
- <property name="title">
- <string>Data Visualization</string>
- </property>
- <layout class="QVBoxLayout" name="ver_lay_3">
- <item>
- <widget class="QScrollArea" name="scrollArea">
- <property name="widgetResizable">
- <bool>true</bool>
- </property>
- <widget class="QWidget" name="scrollAreaWidgetContents">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>459</width>
- <height>277</height>
- </rect>
- </property>
- <layout class="QVBoxLayout" name="data_visual_layout">
- <item>
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_3">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>278</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QGroupBox" name="groupBox_4">
- <property name="title">
- <string>Data Source</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_6">
- <item>
- <widget class="QScrollArea" name="scrollArea_3">
- <property name="widgetResizable">
- <bool>true</bool>
- </property>
- <widget class="QWidget" name="scrollAreaWidgetContents_4">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>435</width>
- <height>232</height>
- </rect>
+ </layout>
+ </item>
+ <item>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="1">
+ <layout class="QVBoxLayout" name="verticalLayout_2" stretch="1,0">
+ <item>
+ <widget class="QGroupBox" name="groupBox_3">
+ <property name="title">
+ <string>Utility</string>
+ </property>
+ <layout class="QVBoxLayout" name="group_utility">
+ <item>
+ <widget class="QScrollArea" name="scrollArea_2">
+ <property name="widgetResizable">
+ <bool>true</bool>
+ </property>
+ <widget class="QWidget" name="scrollAreaWidgetContents_2">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>457</width>
+ <height>502</height>
+ </rect>
+ </property>
+ <layout class="QVBoxLayout" name="utility_layout">
+ <item>
+ <spacer name="verticalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>463</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox_2">
+ <property name="whatsThis">
+ <string />
+ </property>
+ <property name="title">
+ <string>Splitter</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_4">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_vertical">
+ <property name="text">
+ <string />
+ </property>
+ <property name="icon">
+ <iconset resource="../../application.qrc">
+ <normaloff>:/Resources/Icons/splitter_vertical.png</normaloff>
+ :/Resources/Icons/splitter_vertical.png
+ </iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>25</width>
+ <height>25</height>
+ </size>
+ </property>
+ <property name="checked">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_horizontal">
+ <property name="text">
+ <string />
+ </property>
+ <property name="icon">
+ <iconset resource="../../application.qrc">
+ <normaloff>:/Resources/Icons/splitter_horizontal.png</normaloff>
+ :/Resources/Icons/splitter_horizontal.png
+ </iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>25</width>
+ <height>25</height>
+ </size>
+ </property>
+ <property name="checked">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>Data Visualization</string>
</property>
- <layout class="QVBoxLayout" name="data_source_layout">
- <item>
- <spacer name="verticalSpacer_3">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>211</height>
- </size>
- </property>
- </spacer>
- </item>
+ <layout class="QVBoxLayout" name="ver_lay_3">
+ <item>
+ <widget class="QScrollArea" name="scrollArea">
+ <property name="widgetResizable">
+ <bool>true</bool>
+ </property>
+ <widget class="QWidget" name="scrollAreaWidgetContents">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>459</width>
+ <height>277</height>
+ </rect>
+ </property>
+ <layout class="QVBoxLayout" name="data_visual_layout">
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>278</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox_4">
+ <property name="title">
+ <string>Data Source</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_6">
+ <item>
+ <widget class="QScrollArea" name="scrollArea_3">
+ <property name="widgetResizable">
+ <bool>true</bool>
+ </property>
+ <widget class="QWidget" name="scrollAreaWidgetContents_4">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>435</width>
+ <height>232</height>
+ </rect>
+ </property>
+ <layout class="QVBoxLayout" name="data_source_layout">
+ <item>
+ <spacer name="verticalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>211</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
</layout>
- </widget>
</widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
+ </item>
+ </layout>
+ </item>
</layout>
- </item>
- </layout>
- </widget>
- <resources>
- <include location="../../application.qrc"/>
- </resources>
- <connections/>
-</ui>
+ </widget>
+ <resources>
+ <include location="../../application.qrc" />
+ </resources>
+ <connections />
+</ui>
\ No newline at end of file
diff --git a/Modules/Mavlink/mavlinkmodule.cpp b/Modules/Mavlink/mavlinkmodule.cpp
index 93d3b6b20619c7792974815cd6d3db7563bcd0a6..793949fcf94f8cecd1c147405b03cf211e26c8bd 100644
--- a/Modules/Mavlink/mavlinkmodule.cpp
+++ b/Modules/Mavlink/mavlinkmodule.cpp
@@ -6,7 +6,6 @@
#include "Components/ContextMenuSeparator/contextmenuseparator.h"
#include "Core/modulemessagesbroker.h"
#include "Modules/skywardhubstrings.h"
-#include "ui_mavlinkmodule.h"
MavlinkModule::MavlinkModule(QWidget *parent)
: DefaultModule(parent), mavlinkReader(this), serialPort(this)
diff --git a/Resources/Icons/SkywardHub.icns b/Resources/Icons/SkywardHub.icns
new file mode 100644
index 0000000000000000000000000000000000000000..f5f97612b4b99419369953957e0129b20cf19098
Binary files /dev/null and b/Resources/Icons/SkywardHub.icns differ
diff --git a/Resources/Icons/SkywardHub.ico b/Resources/Icons/SkywardHub.ico
new file mode 100644
index 0000000000000000000000000000000000000000..c747cd927219b501c800d819d593daa7bf2067bd
Binary files /dev/null and b/Resources/Icons/SkywardHub.ico differ
diff --git a/Resources/Icons/logo_colored.png b/Resources/Icons/logo_colored.png
new file mode 100644
index 0000000000000000000000000000000000000000..b25c015573f3ab47a4a63c20277e24dfb58b7fa7
Binary files /dev/null and b/Resources/Icons/logo_colored.png differ
diff --git a/Resources/Images/Icons/horizontal_splitter.png b/Resources/Icons/splitter_horizontal.png
similarity index 100%
rename from Resources/Images/Icons/horizontal_splitter.png
rename to Resources/Icons/splitter_horizontal.png
diff --git a/Resources/Images/Icons/vertical_splitter.png b/Resources/Icons/splitter_vertical.png
similarity index 100%
rename from Resources/Images/Icons/vertical_splitter.png
rename to Resources/Icons/splitter_vertical.png
diff --git a/Resources/Images/LogoWithText.png b/Resources/Images/LogoWithText.png
deleted file mode 100644
index e40ecdb822428f19755dd3987e0b92b908e39c8d..0000000000000000000000000000000000000000
Binary files a/Resources/Images/LogoWithText.png and /dev/null differ
diff --git a/SkywardHub.pro b/SkywardHub.pro
index c8faf643739bff01bb9d73dbedff5c367962438f..a88ef2daf5ed23c0d55922056c974ba0d5ec7387 100644
--- a/SkywardHub.pro
+++ b/SkywardHub.pro
@@ -8,6 +8,11 @@ CONFIG += c++11
# In order to do so, uncomment the following line.
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
+# MacOs app icon
+ICON = Resources/Icons/SkywardHub.icns
+
+# Windows app icon
+RC_ICONS = Resources/Icons/SkywardHub.ico
SOURCES += \
Components/ContextMenuSeparator/contextmenuseparator.cpp \
diff --git a/application.qrc b/application.qrc
index d656196baebdd4fe5bf81c132bf9d7b251f997be..e2b47668b4d28de4401de2c98fdc9766a94b12ce 100644
--- a/application.qrc
+++ b/application.qrc
@@ -1,8 +1,8 @@
<RCC>
<qresource prefix="/">
- <file>Resources/Images/LogoWithText.png</file>
+ <file>Resources/Icons/logo_colored.png</file>
+ <file>Resources/Icons/splitter_horizontal.png</file>
+ <file>Resources/Icons/splitter_vertical.png</file>
<file>Resources/Styles/global.qss</file>
- <file>Resources/Images/Icons/horizontal_splitter.png</file>
- <file>Resources/Images/Icons/vertical_splitter.png</file>
</qresource>
</RCC>