diff options
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/HVAC.ui | 1005 | ||||
| -rw-r--r-- | ui/IC.ui | 1094 | ||||
| -rw-r--r-- | ui/Settings_Window.ui | 669 | ||||
| -rw-r--r-- | ui/SteeringControls.ui | 540 |
4 files changed, 1816 insertions, 1492 deletions
@@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>713</width> - <height>527</height> + <width>815</width> + <height>575</height> </rect> </property> <property name="windowTitle"> @@ -66,7 +66,7 @@ QSlider::sub-page:vertical { background-color: #131313 ; /* black */ height: 20px; - width: 18px; + width: 28px; margin: 2px; border: 1px solid #6C6C85 ; /* pastel purple */ border-radius: 8px; @@ -74,7 +74,7 @@ QSlider::sub-page:vertical { QSlider::groove:vertical { border-radius: 8px; - width: 18px; + width: 28px; margin: 2px; border: 1px solid #6C6C85 ; /* pastel purple */ background-color: #4BD7D6 ; /* light blue */ @@ -191,44 +191,6 @@ QListWidget::item:hover { </property> <layout class="QVBoxLayout" name="verticalLayout_2"> <item> - <widget class="QFrame" name="frame_2"> - <property name="minimumSize"> - <size> - <width>0</width> - <height>50</height> - </size> - </property> - <property name="frameShape"> - <enum>QFrame::StyledPanel</enum> - </property> - <property name="frameShadow"> - <enum>QFrame::Raised</enum> - </property> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <widget class="QLabel" name="label_2"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="font"> - <font> - <weight>75</weight> - <italic>true</italic> - <bold>true</bold> - </font> - </property> - <property name="text"> - <string>HVAC</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> <widget class="QScrollArea" name="scrollArea"> <property name="widgetResizable"> <bool>true</bool> @@ -238,8 +200,8 @@ QListWidget::item:hover { <rect> <x>0</x> <y>0</y> - <width>697</width> - <height>409</height> + <width>799</width> + <height>517</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_3"> @@ -248,6 +210,9 @@ QListWidget::item:hover { <property name="orientation"> <enum>Qt::Vertical</enum> </property> + <property name="sizeType"> + <enum>QSizePolicy::Fixed</enum> + </property> <property name="sizeHint" stdset="0"> <size> <width>20</width> @@ -271,12 +236,28 @@ QListWidget::item:hover { <enum>QFrame::Raised</enum> </property> <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="12"> - <widget class="QFrame" name="rightControls"> + <item row="1" column="3" colspan="2"> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Fixed</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="0" column="1" colspan="5" alignment="Qt::AlignBottom"> + <widget class="QFrame" name="frame_2"> <property name="minimumSize"> <size> <width>0</width> - <height>0</height> + <height>50</height> </size> </property> <property name="frameShape"> @@ -285,69 +266,15 @@ QListWidget::item:hover { <property name="frameShadow"> <enum>QFrame::Raised</enum> </property> - <layout class="QGridLayout" name="gridLayout_3"> - <item row="1" column="0" colspan="5"> - <spacer name="verticalSpacer_4"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Fixed</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="2" column="0" rowspan="5"> - <spacer name="horizontalSpacer_9"> - <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 row="2" column="4" rowspan="5"> - <spacer name="horizontalSpacer_8"> - <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 row="4" column="1"> - <widget class="QListWidget" name="rightTempList"> + <layout class="QVBoxLayout" name="verticalLayout_4"> + <item alignment="Qt::AlignHCenter"> + <widget class="QLabel" name="label_2"> <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> - <size> - <width>0</width> - <height>152</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>60</width> - <height>152</height> - </size> - </property> <property name="font"> <font> <weight>75</weight> @@ -355,83 +282,47 @@ QListWidget::item:hover { <bold>true</bold> </font> </property> - <property name="focusPolicy"> - <enum>Qt::StrongFocus</enum> - </property> - <property name="layoutDirection"> - <enum>Qt::LeftToRight</enum> - </property> - <property name="autoFillBackground"> - <bool>false</bool> - </property> - <property name="frameShape"> - <enum>QFrame::NoFrame</enum> - </property> - <property name="frameShadow"> - <enum>QFrame::Plain</enum> - </property> - <property name="verticalScrollBarPolicy"> - <enum>Qt::ScrollBarAlwaysOff</enum> - </property> - <property name="horizontalScrollBarPolicy"> - <enum>Qt::ScrollBarAlwaysOff</enum> - </property> - <property name="sizeAdjustPolicy"> - <enum>QAbstractScrollArea::AdjustToContentsOnFirstShow</enum> - </property> - <property name="editTriggers"> - <set>QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed</set> - </property> - <property name="showDropIndicator" stdset="0"> - <bool>false</bool> - </property> - <property name="dragDropMode"> - <enum>QAbstractItemView::DragOnly</enum> - </property> - <property name="selectionMode"> - <enum>QAbstractItemView::ContiguousSelection</enum> - </property> - <property name="textElideMode"> - <enum>Qt::ElideMiddle</enum> - </property> - <property name="verticalScrollMode"> - <enum>QAbstractItemView::ScrollPerPixel</enum> - </property> - <property name="movement"> - <enum>QListView::Snap</enum> - </property> - <property name="resizeMode"> - <enum>QListView::Adjust</enum> - </property> - <property name="layoutMode"> - <enum>QListView::SinglePass</enum> - </property> - <property name="spacing"> - <number>1</number> - </property> - <property name="viewMode"> - <enum>QListView::ListMode</enum> - </property> - <property name="selectionRectVisible"> - <bool>true</bool> - </property> - <property name="itemAlignment"> - <set>Qt::AlignCenter</set> - </property> - </widget> - </item> - <item row="6" column="3" alignment="Qt::AlignHCenter"> - <widget class="QLabel" name="label_4"> <property name="text"> - <string/> - </property> - <property name="pixmap"> - <pixmap resource="../assets/res.qrc">:/Images/Images/HMI_HVAC_Fan_Icon.svg</pixmap> + <string>HVAC</string> </property> </widget> </item> - <item row="0" column="0" colspan="5" alignment="Qt::AlignHCenter"> - <widget class="QLabel" name="label_6"> + </layout> + </widget> + </item> + <item row="1" column="6"> + <spacer name="horizontalSpacer_3"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="1" colspan="2"> + <widget class="QFrame" name="leftControls"> + <property name="minimumSize"> + <size> + <width>0</width> + <height>0</height> + </size> + </property> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> + </property> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="1" column="0" colspan="5" alignment="Qt::AlignHCenter"> + <widget class="QLabel" name="label"> <property name="font"> <font> <weight>75</weight> @@ -440,78 +331,223 @@ QListWidget::item:hover { </font> </property> <property name="text"> - <string>Right Controls</string> + <string>Left Controls</string> </property> </widget> </item> - <item row="2" column="2" rowspan="5"> - <spacer name="horizontalSpacer_5"> + <item row="0" column="0" colspan="5"> + <spacer name="verticalSpacer_7"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Vertical</enum> </property> <property name="sizeType"> <enum>QSizePolicy::Fixed</enum> </property> <property name="sizeHint" stdset="0"> <size> - <width>40</width> - <height>20</height> + <width>20</width> + <height>40</height> </size> </property> </spacer> </item> - <item row="2" column="3" rowspan="4" alignment="Qt::AlignHCenter"> - <widget class="QSlider" name="rightFanSpeed_slider"> - <property name="minimumSize"> - <size> - <width>40</width> - <height>0</height> - </size> - </property> + <item row="2" column="0" colspan="5"> + <spacer name="verticalSpacer_3"> <property name="orientation"> <enum>Qt::Vertical</enum> </property> - </widget> - </item> - <item row="6" column="1"> - <widget class="QPushButton" name="rightTempDown"> - <property name="text"> - <string/> + <property name="sizeType"> + <enum>QSizePolicy::Fixed</enum> </property> - <property name="icon"> - <iconset resource="../assets/res.qrc"> - <normaloff>:/Carbon_Icons/carbon_icons/temperature--hot.svg</normaloff>:/Carbon_Icons/carbon_icons/temperature--hot.svg</iconset> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>20</height> + </size> </property> - <property name="iconSize"> + </spacer> + </item> + <item row="3" column="0" rowspan="2"> + <spacer name="horizontalSpacer_6"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> <size> <width>40</width> - <height>40</height> + <height>20</height> </size> </property> - </widget> + </spacer> </item> - <item row="3" column="1" alignment="Qt::AlignTop"> - <widget class="QPushButton" name="rightTempUp"> - <property name="text"> - <string/> + <item row="3" column="2" rowspan="2"> + <spacer name="horizontalSpacer_4"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> </property> - <property name="icon"> - <iconset resource="../assets/res.qrc"> - <normaloff>:/Carbon_Icons/carbon_icons/temperature--frigid.svg</normaloff>:/Carbon_Icons/carbon_icons/temperature--frigid.svg</iconset> + <property name="sizeType"> + <enum>QSizePolicy::Fixed</enum> </property> - <property name="iconSize"> + <property name="sizeHint" stdset="0"> <size> <width>40</width> - <height>40</height> + <height>20</height> </size> </property> + </spacer> + </item> + <item row="3" column="3" rowspan="2"> + <widget class="QFrame" name="frame_3"> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> + </property> + <layout class="QVBoxLayout" name="verticalLayout_5"> + <item alignment="Qt::AlignHCenter|Qt::AlignBottom"> + <widget class="QPushButton" name="leftTempUp"> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset resource="../assets/res.qrc"> + <normaloff>:/Carbon_Icons/carbon_icons/temperature--frigid.svg</normaloff>:/Carbon_Icons/carbon_icons/temperature--frigid.svg</iconset> + </property> + <property name="iconSize"> + <size> + <width>40</width> + <height>40</height> + </size> + </property> + </widget> + </item> + <item alignment="Qt::AlignHCenter|Qt::AlignVCenter"> + <widget class="QListWidget" name="leftTempList"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>152</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>60</width> + <height>152</height> + </size> + </property> + <property name="font"> + <font> + <weight>75</weight> + <italic>true</italic> + <bold>true</bold> + </font> + </property> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <property name="layoutDirection"> + <enum>Qt::LeftToRight</enum> + </property> + <property name="autoFillBackground"> + <bool>false</bool> + </property> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Plain</enum> + </property> + <property name="verticalScrollBarPolicy"> + <enum>Qt::ScrollBarAlwaysOff</enum> + </property> + <property name="horizontalScrollBarPolicy"> + <enum>Qt::ScrollBarAlwaysOff</enum> + </property> + <property name="sizeAdjustPolicy"> + <enum>QAbstractScrollArea::AdjustToContentsOnFirstShow</enum> + </property> + <property name="editTriggers"> + <set>QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed</set> + </property> + <property name="showDropIndicator" stdset="0"> + <bool>false</bool> + </property> + <property name="dragDropMode"> + <enum>QAbstractItemView::DragOnly</enum> + </property> + <property name="selectionMode"> + <enum>QAbstractItemView::SingleSelection</enum> + </property> + <property name="textElideMode"> + <enum>Qt::ElideMiddle</enum> + </property> + <property name="verticalScrollMode"> + <enum>QAbstractItemView::ScrollPerPixel</enum> + </property> + <property name="movement"> + <enum>QListView::Snap</enum> + </property> + <property name="isWrapping" stdset="0"> + <bool>false</bool> + </property> + <property name="resizeMode"> + <enum>QListView::Adjust</enum> + </property> + <property name="layoutMode"> + <enum>QListView::SinglePass</enum> + </property> + <property name="spacing"> + <number>1</number> + </property> + <property name="viewMode"> + <enum>QListView::ListMode</enum> + </property> + <property name="uniformItemSizes"> + <bool>true</bool> + </property> + <property name="selectionRectVisible"> + <bool>true</bool> + </property> + <property name="itemAlignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + <item alignment="Qt::AlignHCenter|Qt::AlignTop"> + <widget class="QPushButton" name="leftTempDown"> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset resource="../assets/res.qrc"> + <normaloff>:/Carbon_Icons/carbon_icons/temperature--hot.svg</normaloff>:/Carbon_Icons/carbon_icons/temperature--hot.svg</iconset> + </property> + <property name="iconSize"> + <size> + <width>40</width> + <height>40</height> + </size> + </property> + </widget> + </item> + </layout> </widget> </item> - <item row="7" column="0" colspan="5"> - <spacer name="verticalSpacer_6"> + <item row="5" column="0" colspan="5"> + <spacer name="verticalSpacer_5"> <property name="orientation"> <enum>Qt::Vertical</enum> </property> + <property name="sizeType"> + <enum>QSizePolicy::Preferred</enum> + </property> <property name="sizeHint" stdset="0"> <size> <width>20</width> @@ -520,27 +556,101 @@ QListWidget::item:hover { </property> </spacer> </item> + <item row="3" column="4" rowspan="2"> + <spacer name="horizontalSpacer_7"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Fixed</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="3" column="1"> + <widget class="QFrame" name="frame_4"> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> + </property> + <layout class="QVBoxLayout" name="verticalLayout_6"> + <property name="spacing"> + <number>4</number> + </property> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item alignment="Qt::AlignHCenter"> + <widget class="QSlider" name="leftFanSpeed_slider"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>40</width> + <height>0</height> + </size> + </property> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="invertedAppearance"> + <bool>false</bool> + </property> + <property name="invertedControls"> + <bool>false</bool> + </property> + <property name="tickPosition"> + <enum>QSlider::NoTicks</enum> + </property> + <property name="tickInterval"> + <number>0</number> + </property> + </widget> + </item> + <item alignment="Qt::AlignHCenter|Qt::AlignVCenter"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string/> + </property> + <property name="pixmap"> + <pixmap resource="../assets/res.qrc">:/Images/Images/HMI_HVAC_Fan_Icon.svg</pixmap> + </property> + <property name="scaledContents"> + <bool>false</bool> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + </layout> + </widget> + </item> </layout> </widget> </item> - <item row="0" column="5"> - <spacer name="horizontalSpacer"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Fixed</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="0" column="13"> - <spacer name="horizontalSpacer_3"> + <item row="1" column="0"> + <spacer name="horizontalSpacer_2"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> @@ -555,8 +665,8 @@ QListWidget::item:hover { </property> </spacer> </item> - <item row="0" column="2" colspan="2"> - <widget class="QFrame" name="leftControls"> + <item row="1" column="5"> + <widget class="QFrame" name="rightControls"> <property name="minimumSize"> <size> <width>0</width> @@ -569,42 +679,14 @@ QListWidget::item:hover { <property name="frameShadow"> <enum>QFrame::Raised</enum> </property> - <layout class="QGridLayout" name="gridLayout_2"> - <item row="2" column="1" rowspan="4" alignment="Qt::AlignHCenter"> - <widget class="QSlider" name="leftFanSpeed_slider"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>40</width> - <height>0</height> - </size> - </property> + <layout class="QGridLayout" name="gridLayout_3"> + <item row="6" column="0" colspan="6"> + <spacer name="verticalSpacer_6"> <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="invertedAppearance"> - <bool>false</bool> - </property> - <property name="invertedControls"> - <bool>false</bool> - </property> - <property name="tickPosition"> - <enum>QSlider::NoTicks</enum> - </property> - <property name="tickInterval"> - <number>0</number> - </property> - </widget> - </item> - <item row="7" column="0" colspan="5"> - <spacer name="verticalSpacer_5"> - <property name="orientation"> - <enum>Qt::Vertical</enum> + <property name="sizeType"> + <enum>QSizePolicy::Preferred</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -614,44 +696,14 @@ QListWidget::item:hover { </property> </spacer> </item> - <item row="6" column="1" alignment="Qt::AlignHCenter|Qt::AlignVCenter"> - <widget class="QLabel" name="label_3"> - <property name="text"> - <string/> - </property> - <property name="pixmap"> - <pixmap resource="../assets/res.qrc">:/Images/Images/HMI_HVAC_Fan_Icon.svg</pixmap> - </property> - <property name="scaledContents"> - <bool>false</bool> - </property> - <property name="alignment"> - <set>Qt::AlignCenter</set> - </property> - </widget> - </item> - <item row="6" column="3"> - <widget class="QPushButton" name="leftTempDown"> - <property name="text"> - <string/> - </property> - <property name="icon"> - <iconset resource="../assets/res.qrc"> - <normaloff>:/Carbon_Icons/carbon_icons/temperature--hot.svg</normaloff>:/Carbon_Icons/carbon_icons/temperature--hot.svg</iconset> - </property> - <property name="iconSize"> - <size> - <width>40</width> - <height>40</height> - </size> - </property> - </widget> - </item> - <item row="2" column="4" rowspan="5"> - <spacer name="horizontalSpacer_7"> + <item row="3" column="5" rowspan="3"> + <spacer name="horizontalSpacer_8"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> + <property name="sizeType"> + <enum>QSizePolicy::Fixed</enum> + </property> <property name="sizeHint" stdset="0"> <size> <width>40</width> @@ -660,125 +712,80 @@ QListWidget::item:hover { </property> </spacer> </item> - <item row="4" column="3" alignment="Qt::AlignHCenter"> - <widget class="QListWidget" name="leftTempList"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>0</width> - <height>152</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>60</width> - <height>152</height> - </size> - </property> - <property name="font"> - <font> - <weight>75</weight> - <italic>true</italic> - <bold>true</bold> - </font> - </property> - <property name="focusPolicy"> - <enum>Qt::StrongFocus</enum> - </property> - <property name="layoutDirection"> - <enum>Qt::LeftToRight</enum> - </property> - <property name="autoFillBackground"> - <bool>false</bool> - </property> + <item row="4" column="4"> + <widget class="QFrame" name="frame_6"> <property name="frameShape"> - <enum>QFrame::NoFrame</enum> + <enum>QFrame::StyledPanel</enum> </property> <property name="frameShadow"> - <enum>QFrame::Plain</enum> - </property> - <property name="verticalScrollBarPolicy"> - <enum>Qt::ScrollBarAlwaysOff</enum> - </property> - <property name="horizontalScrollBarPolicy"> - <enum>Qt::ScrollBarAlwaysOff</enum> - </property> - <property name="sizeAdjustPolicy"> - <enum>QAbstractScrollArea::AdjustToContentsOnFirstShow</enum> - </property> - <property name="editTriggers"> - <set>QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed</set> - </property> - <property name="showDropIndicator" stdset="0"> - <bool>false</bool> - </property> - <property name="dragDropMode"> - <enum>QAbstractItemView::DragOnly</enum> - </property> - <property name="selectionMode"> - <enum>QAbstractItemView::SingleSelection</enum> - </property> - <property name="textElideMode"> - <enum>Qt::ElideMiddle</enum> - </property> - <property name="verticalScrollMode"> - <enum>QAbstractItemView::ScrollPerPixel</enum> - </property> - <property name="movement"> - <enum>QListView::Snap</enum> - </property> - <property name="isWrapping" stdset="0"> - <bool>false</bool> - </property> - <property name="resizeMode"> - <enum>QListView::Adjust</enum> - </property> - <property name="layoutMode"> - <enum>QListView::SinglePass</enum> - </property> - <property name="spacing"> - <number>1</number> - </property> - <property name="viewMode"> - <enum>QListView::ListMode</enum> - </property> - <property name="uniformItemSizes"> - <bool>true</bool> - </property> - <property name="selectionRectVisible"> - <bool>true</bool> - </property> - <property name="itemAlignment"> - <set>Qt::AlignCenter</set> - </property> + <enum>QFrame::Raised</enum> + </property> + <layout class="QVBoxLayout" name="verticalLayout_8"> + <property name="spacing"> + <number>4</number> + </property> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item alignment="Qt::AlignHCenter"> + <widget class="QSlider" name="rightFanSpeed_slider"> + <property name="minimumSize"> + <size> + <width>40</width> + <height>0</height> + </size> + </property> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + </widget> + </item> + <item alignment="Qt::AlignHCenter|Qt::AlignVCenter"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string/> + </property> + <property name="pixmap"> + <pixmap resource="../assets/res.qrc">:/Images/Images/HMI_HVAC_Fan_Icon.svg</pixmap> + </property> + </widget> + </item> + </layout> </widget> </item> - <item row="1" column="0" colspan="5"> - <spacer name="verticalSpacer_3"> + <item row="3" column="2" rowspan="3" colspan="2"> + <spacer name="horizontalSpacer_5"> <property name="orientation"> - <enum>Qt::Vertical</enum> + <enum>Qt::Horizontal</enum> </property> <property name="sizeType"> <enum>QSizePolicy::Fixed</enum> </property> <property name="sizeHint" stdset="0"> <size> - <width>20</width> + <width>40</width> <height>20</height> </size> </property> </spacer> </item> - <item row="2" column="0" rowspan="5"> - <spacer name="horizontalSpacer_6"> + <item row="3" column="0" rowspan="3"> + <spacer name="horizontalSpacer_9"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> + <property name="sizeType"> + <enum>QSizePolicy::Fixed</enum> + </property> <property name="sizeHint" stdset="0"> <size> <width>40</width> @@ -787,25 +794,24 @@ QListWidget::item:hover { </property> </spacer> </item> - <item row="3" column="3"> - <widget class="QPushButton" name="leftTempUp"> - <property name="text"> - <string/> + <item row="2" column="0" colspan="6"> + <spacer name="verticalSpacer_4"> + <property name="orientation"> + <enum>Qt::Vertical</enum> </property> - <property name="icon"> - <iconset resource="../assets/res.qrc"> - <normaloff>:/Carbon_Icons/carbon_icons/temperature--frigid.svg</normaloff>:/Carbon_Icons/carbon_icons/temperature--frigid.svg</iconset> + <property name="sizeType"> + <enum>QSizePolicy::Fixed</enum> </property> - <property name="iconSize"> + <property name="sizeHint" stdset="0"> <size> - <width>40</width> - <height>40</height> + <width>20</width> + <height>20</height> </size> </property> - </widget> + </spacer> </item> - <item row="0" column="0" colspan="5" alignment="Qt::AlignHCenter"> - <widget class="QLabel" name="label"> + <item row="1" column="0" colspan="6" alignment="Qt::AlignHCenter"> + <widget class="QLabel" name="label_6"> <property name="font"> <font> <weight>75</weight> @@ -814,45 +820,167 @@ QListWidget::item:hover { </font> </property> <property name="text"> - <string>Left Controls</string> + <string>Right Controls</string> </property> </widget> </item> - <item row="2" column="2" rowspan="5"> - <spacer name="horizontalSpacer_4"> + <item row="0" column="0" colspan="6"> + <spacer name="verticalSpacer_8"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Vertical</enum> </property> <property name="sizeType"> <enum>QSizePolicy::Fixed</enum> </property> <property name="sizeHint" stdset="0"> <size> - <width>40</width> - <height>20</height> + <width>20</width> + <height>40</height> </size> </property> </spacer> </item> + <item row="4" column="1"> + <widget class="QFrame" name="frame_5"> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> + </property> + <layout class="QVBoxLayout" name="verticalLayout_7"> + <item alignment="Qt::AlignHCenter|Qt::AlignBottom"> + <widget class="QPushButton" name="rightTempUp"> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset resource="../assets/res.qrc"> + <normaloff>:/Carbon_Icons/carbon_icons/temperature--frigid.svg</normaloff>:/Carbon_Icons/carbon_icons/temperature--frigid.svg</iconset> + </property> + <property name="iconSize"> + <size> + <width>40</width> + <height>40</height> + </size> + </property> + </widget> + </item> + <item alignment="Qt::AlignHCenter|Qt::AlignVCenter"> + <widget class="QListWidget" name="rightTempList"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>152</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>60</width> + <height>152</height> + </size> + </property> + <property name="font"> + <font> + <weight>75</weight> + <italic>true</italic> + <bold>true</bold> + </font> + </property> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <property name="layoutDirection"> + <enum>Qt::LeftToRight</enum> + </property> + <property name="autoFillBackground"> + <bool>false</bool> + </property> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Plain</enum> + </property> + <property name="verticalScrollBarPolicy"> + <enum>Qt::ScrollBarAlwaysOff</enum> + </property> + <property name="horizontalScrollBarPolicy"> + <enum>Qt::ScrollBarAlwaysOff</enum> + </property> + <property name="sizeAdjustPolicy"> + <enum>QAbstractScrollArea::AdjustToContentsOnFirstShow</enum> + </property> + <property name="editTriggers"> + <set>QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed</set> + </property> + <property name="showDropIndicator" stdset="0"> + <bool>false</bool> + </property> + <property name="dragDropMode"> + <enum>QAbstractItemView::DragOnly</enum> + </property> + <property name="selectionMode"> + <enum>QAbstractItemView::ContiguousSelection</enum> + </property> + <property name="textElideMode"> + <enum>Qt::ElideMiddle</enum> + </property> + <property name="verticalScrollMode"> + <enum>QAbstractItemView::ScrollPerPixel</enum> + </property> + <property name="movement"> + <enum>QListView::Snap</enum> + </property> + <property name="resizeMode"> + <enum>QListView::Adjust</enum> + </property> + <property name="layoutMode"> + <enum>QListView::SinglePass</enum> + </property> + <property name="spacing"> + <number>1</number> + </property> + <property name="viewMode"> + <enum>QListView::ListMode</enum> + </property> + <property name="selectionRectVisible"> + <bool>true</bool> + </property> + <property name="itemAlignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + <item alignment="Qt::AlignHCenter|Qt::AlignTop"> + <widget class="QPushButton" name="rightTempDown"> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset resource="../assets/res.qrc"> + <normaloff>:/Carbon_Icons/carbon_icons/temperature--hot.svg</normaloff>:/Carbon_Icons/carbon_icons/temperature--hot.svg</iconset> + </property> + <property name="iconSize"> + <size> + <width>40</width> + <height>40</height> + </size> + </property> + </widget> + </item> + </layout> + </widget> + </item> </layout> </widget> </item> - <item row="0" column="0"> - <spacer name="horizontalSpacer_2"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> - </item> </layout> </widget> </item> @@ -865,6 +993,9 @@ QListWidget::item:hover { <property name="orientation"> <enum>Qt::Vertical</enum> </property> + <property name="sizeType"> + <enum>QSizePolicy::Fixed</enum> + </property> <property name="sizeHint" stdset="0"> <size> <width>20</width> @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>724</width> - <height>720</height> + <width>920</width> + <height>800</height> </rect> </property> <property name="windowTitle"> @@ -42,14 +42,15 @@ QPushButton:pressed { } QSlider::groove:horizontal { + background-color: #131313 ; /* black */ border: 1px solid #6C6C85 ; /* pastel purple */ - height: 15px; + height: 28px; border-radius: 8px; } QSlider::sub-page:horizontal { background-color: #4BD7D6 ; /* light blue */ - height: 15px; + height: 28px; border-radius: 5px; } @@ -66,16 +67,16 @@ QSlider::handle:horizontal { QSlider::sub-page:vertical { background-color: #131313 ; /* black */ height: 20px; - width: 18px; - margin: 2px; + width: 28px; + margin: 4px; border: 1px solid #6C6C85 ; /* pastel purple */ border-radius: 8px; } QSlider::groove:vertical { border-radius: 8px; - width: 18px; - margin: 2px; + width: 28px; + margin: 4px; border: 1px solid #6C6C85 ; /* pastel purple */ background-color: #4BD7D6 ; /* light blue */ } @@ -152,7 +153,7 @@ QLCDNumber { <item> <widget class="QFrame" name="centralwidget"> <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -164,6 +165,32 @@ QLCDNumber { <enum>QFrame::Raised</enum> </property> <layout class="QGridLayout" name="gridLayout_3"> + <item row="0" column="0" rowspan="3"> + <spacer name="horizontalSpacer_12"> + <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 row="0" column="2" rowspan="3"> + <spacer name="horizontalSpacer_13"> + <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 row="1" column="1"> <widget class="QScrollArea" name="scrollArea"> <property name="widgetResizable"> @@ -174,42 +201,33 @@ QLCDNumber { <rect> <x>0</x> <y>0</y> - <width>664</width> - <height>652</height> + <width>684</width> + <height>782</height> </rect> </property> <layout class="QGridLayout" name="gridLayout_4"> - <item row="0" column="0"> - <spacer name="verticalSpacer_6"> + <item row="2" column="0"> + <spacer name="verticalSpacer_4"> <property name="orientation"> <enum>Qt::Vertical</enum> </property> + <property name="sizeType"> + <enum>QSizePolicy::Fixed</enum> + </property> <property name="sizeHint" stdset="0"> <size> <width>20</width> - <height>40</height> + <height>20</height> </size> </property> </spacer> </item> - <item row="1" column="0"> - <widget class="QFrame" name="frame_3"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> + <item row="0" column="0" alignment="Qt::AlignBottom"> + <widget class="QFrame" name="header_frame"> <property name="minimumSize"> <size> <width>0</width> - <height>0</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>16777215</width> - <height>150</height> + <height>50</height> </size> </property> <property name="frameShape"> @@ -218,139 +236,70 @@ QLCDNumber { <property name="frameShadow"> <enum>QFrame::Raised</enum> </property> - <layout class="QGridLayout" name="gridLayout_2"> - <item row="1" column="4"> - <widget class="QPushButton" name="rightIndicatorBtn"> - <property name="text"> - <string/> - </property> - <property name="icon"> - <iconset resource="../assets/res.qrc"> - <normaloff>:/Images/Images/right.png</normaloff>:/Images/Images/right.png</iconset> - </property> - <property name="iconSize"> - <size> - <width>60</width> - <height>60</height> - </size> - </property> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QFrame" name="frame_4"> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <item> + <widget class="QLabel" name="label"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="font"> + <font> + <family>Open Sans Extrabold</family> + <weight>75</weight> + <italic>true</italic> + <bold>true</bold> + </font> + </property> + <property name="text"> + <string>Instrument Cluster</string> + </property> + </widget> + </item> + </layout> </widget> </item> - <item row="1" column="1"> - <spacer name="horizontalSpacer_3"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Fixed</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="3"> - <spacer name="horizontalSpacer_4"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Fixed</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="0"> - <widget class="QPushButton" name="leftIndicatorBtn"> - <property name="acceptDrops"> - <bool>false</bool> - </property> - <property name="autoFillBackground"> - <bool>false</bool> + <item> + <widget class="QLabel" name="label_6"> + <property name="font"> + <font> + <weight>75</weight> + <italic>true</italic> + <bold>true</bold> + </font> </property> <property name="text"> - <string/> - </property> - <property name="icon"> - <iconset resource="../assets/res.qrc"> - <normaloff>:/Images/Images/left.png</normaloff>:/Images/Images/left.png</iconset> - </property> - <property name="iconSize"> - <size> - <width>60</width> - <height>60</height> - </size> - </property> - <property name="checkable"> - <bool>false</bool> - </property> - <property name="checked"> - <bool>false</bool> + <string>Demo Mode</string> </property> </widget> </item> - <item row="1" column="2"> - <widget class="QPushButton" name="hazardBtn"> + <item> + <widget class="QCheckBox" name="demoToggle"> <property name="text"> <string/> </property> - <property name="icon"> - <iconset resource="../assets/res.qrc"> - <normaloff>:/Images/Images/hazard.png</normaloff>:/Images/Images/hazard.png</iconset> - </property> - <property name="iconSize"> - <size> - <width>60</width> - <height>60</height> - </size> - </property> </widget> </item> </layout> </widget> </item> - <item row="2" column="0"> - <spacer name="verticalSpacer_4"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Fixed</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="3" column="0" alignment="Qt::AlignTop"> - <widget class="QFrame" name="frame_1"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> + <item row="7" column="0" alignment="Qt::AlignTop"> + <widget class="QFrame" name="gearSelector"> <property name="minimumSize"> <size> <width>0</width> - <height>200</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>16777215</width> - <height>150</height> + <height>80</height> </size> </property> <property name="frameShape"> @@ -359,200 +308,255 @@ QLCDNumber { <property name="frameShadow"> <enum>QFrame::Raised</enum> </property> - <layout class="QGridLayout" name="gridLayout"> - <item row="1" column="0"> - <spacer name="horizontalSpacer_10"> + <layout class="QHBoxLayout" name="horizontalLayout_4"> + <item> + <spacer name="horizontalSpacer"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeType"> - <enum>QSizePolicy::Fixed</enum> - </property> <property name="sizeHint" stdset="0"> <size> - <width>10</width> + <width>167</width> <height>20</height> </size> </property> </spacer> </item> - <item row="1" column="6" rowspan="2"> - <widget class="QLCDNumber" name="RPM_monitor"> - <property name="frameShape"> - <enum>QFrame::NoFrame</enum> - </property> - <property name="digitCount"> - <number>4</number> - </property> - <property name="segmentStyle"> - <enum>QLCDNumber::Flat</enum> - </property> - </widget> - </item> - <item row="1" column="8" alignment="Qt::AlignHCenter"> - <widget class="QSlider" name="fuelLevel_slider"> + <item> + <widget class="QPushButton" name="parkBtn"> <property name="minimumSize"> <size> - <width>60</width> - <height>0</height> + <width>50</width> + <height>50</height> </size> </property> <property name="font"> <font> - <kerning>true</kerning> + <family>Open Sans</family> + <pointsize>20</pointsize> + <weight>75</weight> + <italic>false</italic> + <bold>true</bold> </font> </property> - <property name="sliderPosition"> - <number>0</number> + <property name="text"> + <string>P</string> </property> - <property name="orientation"> - <enum>Qt::Vertical</enum> + <property name="iconSize"> + <size> + <width>16</width> + <height>16</height> + </size> </property> - <property name="invertedAppearance"> - <bool>false</bool> + <property name="checkable"> + <bool>true</bool> </property> - <property name="invertedControls"> + <property name="checked"> <bool>false</bool> </property> - <property name="tickPosition"> - <enum>QSlider::NoTicks</enum> - </property> </widget> </item> - <item row="1" column="1" alignment="Qt::AlignHCenter"> - <widget class="QSlider" name="coolantTemp_slider"> - <property name="minimumSize"> + <item> + <spacer name="horizontalSpacer_7"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Fixed</enum> + </property> + <property name="sizeHint" stdset="0"> <size> - <width>60</width> - <height>0</height> + <width>40</width> + <height>20</height> </size> </property> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - </widget> + </spacer> </item> - <item row="4" column="3" alignment="Qt::AlignHCenter"> - <widget class="QLabel" name="label_4"> + <item> + <widget class="QPushButton" name="reverseBtn"> + <property name="minimumSize"> + <size> + <width>50</width> + <height>50</height> + </size> + </property> <property name="font"> <font> <family>Open Sans</family> + <pointsize>20</pointsize> <weight>75</weight> - <italic>true</italic> + <italic>false</italic> <bold>true</bold> </font> </property> <property name="text"> - <string>Speed (Kmph)</string> + <string>R</string> + </property> + <property name="checkable"> + <bool>true</bool> </property> </widget> </item> - <item row="1" column="5" rowspan="4"> - <widget class="Line" name="line"> + <item> + <spacer name="horizontalSpacer_8"> <property name="orientation"> - <enum>Qt::Vertical</enum> + <enum>Qt::Horizontal</enum> </property> - </widget> + <property name="sizeType"> + <enum>QSizePolicy::Fixed</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> </item> - <item row="3" column="8" alignment="Qt::AlignHCenter|Qt::AlignVCenter"> - <widget class="QLabel" name="label_3"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <item> + <widget class="QPushButton" name="neutralBtn"> + <property name="minimumSize"> + <size> + <width>50</width> + <height>50</height> + </size> </property> <property name="font"> <font> - <pointsize>12</pointsize> + <family>Open Sans</family> + <pointsize>20</pointsize> + <weight>75</weight> + <italic>false</italic> + <bold>true</bold> </font> </property> - <property name="frameShape"> - <enum>QFrame::NoFrame</enum> - </property> <property name="text"> - <string/> - </property> - <property name="pixmap"> - <pixmap resource="../assets/res.qrc">:/Carbon_Icons/carbon_icons/rain-drop.svg</pixmap> + <string>N</string> </property> - <property name="scaledContents"> - <bool>false</bool> + <property name="checkable"> + <bool>true</bool> </property> </widget> </item> - <item row="0" column="1" colspan="8"> - <spacer name="verticalSpacer_5"> + <item> + <spacer name="horizontalSpacer_9"> <property name="orientation"> - <enum>Qt::Vertical</enum> + <enum>Qt::Horizontal</enum> </property> <property name="sizeType"> <enum>QSizePolicy::Fixed</enum> </property> <property name="sizeHint" stdset="0"> <size> - <width>20</width> - <height>10</height> + <width>40</width> + <height>20</height> </size> </property> </spacer> </item> - <item row="1" column="3" rowspan="2" colspan="2"> - <widget class="QLCDNumber" name="Speed_monitor"> + <item> + <widget class="QPushButton" name="driveBtn"> + <property name="minimumSize"> + <size> + <width>50</width> + <height>50</height> + </size> + </property> <property name="font"> <font> - <weight>50</weight> + <family>Open Sans</family> + <pointsize>20</pointsize> + <weight>75</weight> <italic>false</italic> - <bold>false</bold> + <bold>true</bold> </font> </property> - <property name="layoutDirection"> - <enum>Qt::LeftToRight</enum> - </property> - <property name="frameShape"> - <enum>QFrame::NoFrame</enum> - </property> - <property name="smallDecimalPoint"> - <bool>false</bool> - </property> - <property name="digitCount"> - <number>3</number> + <property name="text"> + <string>D</string> </property> - <property name="segmentStyle"> - <enum>QLCDNumber::Flat</enum> + <property name="checkable"> + <bool>true</bool> </property> </widget> </item> - <item row="3" column="3"> - <widget class="QSlider" name="Speed_slider"> - <property name="minimumSize"> + <item> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> <size> - <width>0</width> - <height>60</height> + <width>168</width> + <height>20</height> </size> </property> - <property name="font"> - <font> - <weight>50</weight> - <bold>false</bold> - </font> - </property> - <property name="maximum"> - <number>240</number> - </property> - <property name="orientation"> - <enum>Qt::Horizontal</enum> + </spacer> + </item> + </layout> + </widget> + </item> + <item row="4" column="0"> + <spacer name="verticalSpacer_2"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Fixed</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="0" alignment="Qt::AlignTop"> + <widget class="QFrame" name="frame_3"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>150</height> + </size> + </property> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> + </property> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="1" column="4"> + <widget class="QPushButton" name="rightIndicatorBtn"> + <property name="text"> + <string/> </property> - <property name="tickPosition"> - <enum>QSlider::NoTicks</enum> + <property name="icon"> + <iconset resource="../assets/res.qrc"> + <normaloff>:/Images/Images/right.png</normaloff>:/Images/Images/right.png</iconset> </property> - <property name="tickInterval"> - <number>0</number> + <property name="iconSize"> + <size> + <width>60</width> + <height>60</height> + </size> </property> </widget> </item> - <item row="1" column="2"> - <spacer name="horizontalSpacer_5"> + <item row="1" column="1"> + <spacer name="horizontalSpacer_3"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> @@ -567,8 +571,8 @@ QLCDNumber { </property> </spacer> </item> - <item row="1" column="7"> - <spacer name="horizontalSpacer_6"> + <item row="1" column="3"> + <spacer name="horizontalSpacer_4"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> @@ -583,65 +587,57 @@ QLCDNumber { </property> </spacer> </item> - <item row="3" column="6"> - <widget class="QSlider" name="RPM_slider"> - <property name="minimumSize"> - <size> - <width>0</width> - <height>60</height> - </size> + <item row="1" column="0"> + <widget class="QPushButton" name="leftIndicatorBtn"> + <property name="acceptDrops"> + <bool>false</bool> </property> - <property name="orientation"> - <enum>Qt::Horizontal</enum> + <property name="autoFillBackground"> + <bool>false</bool> </property> - </widget> - </item> - <item row="1" column="9"> - <spacer name="horizontalSpacer_11"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> + <property name="text"> + <string/> </property> - <property name="sizeType"> - <enum>QSizePolicy::Fixed</enum> + <property name="icon"> + <iconset resource="../assets/res.qrc"> + <normaloff>:/Images/Images/left.png</normaloff>:/Images/Images/left.png</iconset> </property> - <property name="sizeHint" stdset="0"> + <property name="iconSize"> <size> - <width>10</width> - <height>20</height> + <width>60</width> + <height>60</height> </size> </property> - </spacer> - </item> - <item row="3" column="1" alignment="Qt::AlignHCenter|Qt::AlignVCenter"> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string/> + <property name="checkable"> + <bool>false</bool> </property> - <property name="pixmap"> - <pixmap resource="../assets/res.qrc">:/Carbon_Icons/carbon_icons/temperature--water.svg</pixmap> + <property name="checked"> + <bool>false</bool> </property> </widget> </item> - <item row="4" column="6" alignment="Qt::AlignHCenter"> - <widget class="QLabel" name="label_5"> - <property name="font"> - <font> - <family>Open Sans</family> - <weight>75</weight> - <italic>true</italic> - <bold>true</bold> - </font> - </property> + <item row="1" column="2"> + <widget class="QPushButton" name="hazardBtn"> <property name="text"> - <string>Engine RPM</string> + <string/> + </property> + <property name="icon"> + <iconset resource="../assets/res.qrc"> + <normaloff>:/Images/Images/hazard.png</normaloff>:/Images/Images/hazard.png</iconset> + </property> + <property name="iconSize"> + <size> + <width>60</width> + <height>60</height> + </size> </property> </widget> </item> </layout> </widget> </item> - <item row="4" column="0"> - <spacer name="verticalSpacer_2"> + <item row="6" column="0"> + <spacer name="verticalSpacer_3"> <property name="orientation"> <enum>Qt::Vertical</enum> </property> @@ -667,6 +663,12 @@ QLCDNumber { <layout class="QVBoxLayout" name="verticalLayout_3"> <item alignment="Qt::AlignTop"> <widget class="QPushButton" name="accelerationBtn"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="minimumSize"> <size> <width>0</width> @@ -697,31 +699,27 @@ QLCDNumber { </property> </widget> </item> - <item> - <spacer name="verticalSpacer_3"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Fixed</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> - </item> </layout> </widget> </item> - <item row="6" column="0" alignment="Qt::AlignTop"> - <widget class="QFrame" name="gearSelector"> + <item row="3" column="0" alignment="Qt::AlignTop"> + <widget class="QFrame" name="frame_1"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="minimumSize"> <size> <width>0</width> - <height>80</height> + <height>200</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>150</height> </size> </property> <property name="frameShape"> @@ -730,56 +728,106 @@ QLCDNumber { <property name="frameShadow"> <enum>QFrame::Raised</enum> </property> - <layout class="QHBoxLayout" name="horizontalLayout_4"> - <item> - <spacer name="horizontalSpacer"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>167</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QPushButton" name="parkBtn"> - <property name="minimumSize"> - <size> - <width>50</width> - <height>50</height> - </size> - </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="4" column="8" alignment="Qt::AlignHCenter"> + <widget class="QLabel" name="label_5"> <property name="font"> <font> <family>Open Sans</family> - <pointsize>20</pointsize> <weight>75</weight> - <italic>false</italic> + <italic>true</italic> <bold>true</bold> </font> </property> <property name="text"> - <string>P</string> + <string>Engine RPM</string> </property> - <property name="iconSize"> - <size> - <width>16</width> - <height>16</height> - </size> + </widget> + </item> + <item row="1" column="5" rowspan="2" colspan="2"> + <widget class="QLCDNumber" name="Speed_monitor"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - <property name="checkable"> - <bool>true</bool> + <property name="font"> + <font> + <weight>50</weight> + <italic>false</italic> + <bold>false</bold> + </font> </property> - <property name="checked"> + <property name="layoutDirection"> + <enum>Qt::LeftToRight</enum> + </property> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <property name="smallDecimalPoint"> <bool>false</bool> </property> + <property name="digitCount"> + <number>3</number> + </property> + <property name="segmentStyle"> + <enum>QLCDNumber::Flat</enum> + </property> </widget> </item> - <item> - <spacer name="horizontalSpacer_7"> + <item row="1" column="1" rowspan="4" colspan="2"> + <widget class="QFrame" name="frame"> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <property name="spacing"> + <number>0</number> + </property> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>4</number> + </property> + <item> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string/> + </property> + <property name="pixmap"> + <pixmap resource="../assets/res.qrc">:/Carbon_Icons/carbon_icons/temperature--water.svg</pixmap> + </property> + </widget> + </item> + <item> + <widget class="QSlider" name="coolantTemp_slider"> + <property name="minimumSize"> + <size> + <width>60</width> + <height>0</height> + </size> + </property> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item row="1" column="0" rowspan="4"> + <spacer name="horizontalSpacer_10"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> @@ -788,39 +836,30 @@ QLCDNumber { </property> <property name="sizeHint" stdset="0"> <size> - <width>40</width> + <width>10</width> <height>20</height> </size> </property> </spacer> </item> - <item> - <widget class="QPushButton" name="reverseBtn"> - <property name="minimumSize"> - <size> - <width>50</width> - <height>50</height> - </size> - </property> - <property name="font"> - <font> - <family>Open Sans</family> - <pointsize>20</pointsize> - <weight>75</weight> - <italic>false</italic> - <bold>true</bold> - </font> + <item row="0" column="3" colspan="8"> + <spacer name="verticalSpacer_5"> + <property name="orientation"> + <enum>Qt::Vertical</enum> </property> - <property name="text"> - <string>R</string> + <property name="sizeType"> + <enum>QSizePolicy::Fixed</enum> </property> - <property name="checkable"> - <bool>true</bool> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>10</height> + </size> </property> - </widget> + </spacer> </item> - <item> - <spacer name="horizontalSpacer_8"> + <item row="1" column="12" rowspan="4"> + <spacer name="horizontalSpacer_11"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> @@ -829,39 +868,34 @@ QLCDNumber { </property> <property name="sizeHint" stdset="0"> <size> - <width>40</width> + <width>10</width> <height>20</height> </size> </property> </spacer> </item> - <item> - <widget class="QPushButton" name="neutralBtn"> + <item row="3" column="8"> + <widget class="QSlider" name="RPM_slider"> <property name="minimumSize"> <size> - <width>50</width> - <height>50</height> + <width>0</width> + <height>60</height> </size> </property> - <property name="font"> - <font> - <family>Open Sans</family> - <pointsize>20</pointsize> - <weight>75</weight> - <italic>false</italic> - <bold>true</bold> - </font> - </property> - <property name="text"> - <string>N</string> + <property name="orientation"> + <enum>Qt::Horizontal</enum> </property> - <property name="checkable"> - <bool>true</bool> + </widget> + </item> + <item row="1" column="7" rowspan="4"> + <widget class="Line" name="line"> + <property name="orientation"> + <enum>Qt::Vertical</enum> </property> </widget> </item> - <item> - <spacer name="horizontalSpacer_9"> + <item row="1" column="3" rowspan="4" colspan="2"> + <spacer name="horizontalSpacer_5"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> @@ -870,168 +904,178 @@ QLCDNumber { </property> <property name="sizeHint" stdset="0"> <size> - <width>40</width> + <width>20</width> <height>20</height> </size> </property> </spacer> </item> - <item> - <widget class="QPushButton" name="driveBtn"> - <property name="minimumSize"> - <size> - <width>50</width> - <height>50</height> - </size> + <item row="1" column="8" rowspan="2"> + <widget class="QLCDNumber" name="RPM_monitor"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="font"> + <font> + <weight>50</weight> + <bold>false</bold> + </font> + </property> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <property name="digitCount"> + <number>4</number> </property> + <property name="segmentStyle"> + <enum>QLCDNumber::Flat</enum> + </property> + </widget> + </item> + <item row="4" column="5" alignment="Qt::AlignHCenter"> + <widget class="QLabel" name="label_4"> <property name="font"> <font> <family>Open Sans</family> - <pointsize>20</pointsize> <weight>75</weight> - <italic>false</italic> + <italic>true</italic> <bold>true</bold> </font> </property> <property name="text"> - <string>D</string> + <string>Speed (Kmph)</string> </property> - <property name="checkable"> - <bool>true</bool> + </widget> + </item> + <item row="3" column="5"> + <widget class="QSlider" name="Speed_slider"> + <property name="minimumSize"> + <size> + <width>0</width> + <height>60</height> + </size> + </property> + <property name="font"> + <font> + <weight>50</weight> + <bold>false</bold> + </font> + </property> + <property name="maximum"> + <number>240</number> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="tickPosition"> + <enum>QSlider::NoTicks</enum> + </property> + <property name="tickInterval"> + <number>0</number> </property> </widget> </item> - <item> - <spacer name="horizontalSpacer_2"> + <item row="1" column="9" rowspan="4"> + <spacer name="horizontalSpacer_6"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> + <property name="sizeType"> + <enum>QSizePolicy::Fixed</enum> + </property> <property name="sizeHint" stdset="0"> <size> - <width>168</width> + <width>20</width> <height>20</height> </size> </property> </spacer> </item> + <item row="1" column="11" rowspan="4"> + <widget class="QFrame" name="frame_5"> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_5"> + <property name="spacing"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>4</number> + </property> + <item> + <widget class="QSlider" name="fuelLevel_slider"> + <property name="minimumSize"> + <size> + <width>60</width> + <height>0</height> + </size> + </property> + <property name="font"> + <font> + <kerning>true</kerning> + </font> + </property> + <property name="sliderPosition"> + <number>0</number> + </property> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="invertedAppearance"> + <bool>false</bool> + </property> + <property name="invertedControls"> + <bool>false</bool> + </property> + <property name="tickPosition"> + <enum>QSlider::NoTicks</enum> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label_3"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="font"> + <font> + <pointsize>12</pointsize> + </font> + </property> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <property name="text"> + <string/> + </property> + <property name="pixmap"> + <pixmap resource="../assets/res.qrc">:/Carbon_Icons/carbon_icons/rain-drop.svg</pixmap> + </property> + <property name="scaledContents"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> </layout> </widget> </item> - <item row="7" column="0"> - <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 row="0" column="1"> - <widget class="QFrame" name="header_frame"> - <property name="minimumSize"> - <size> - <width>0</width> - <height>50</height> - </size> - </property> - <property name="frameShape"> - <enum>QFrame::StyledPanel</enum> - </property> - <property name="frameShadow"> - <enum>QFrame::Raised</enum> - </property> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <widget class="QFrame" name="frame_4"> - <property name="frameShape"> - <enum>QFrame::StyledPanel</enum> - </property> - <property name="frameShadow"> - <enum>QFrame::Raised</enum> - </property> - <layout class="QHBoxLayout" name="horizontalLayout_3"> - <item> - <widget class="QLabel" name="label"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="font"> - <font> - <family>Open Sans Extrabold</family> - <weight>75</weight> - <italic>true</italic> - <bold>true</bold> - </font> - </property> - <property name="text"> - <string>Instrument Cluster</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QLabel" name="label_6"> - <property name="font"> - <font> - <weight>75</weight> - <italic>true</italic> - <bold>true</bold> - </font> - </property> - <property name="text"> - <string>Demo Mode</string> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="demoToggle"> - <property name="text"> - <string/> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item row="0" column="2" rowspan="2"> - <spacer name="horizontalSpacer_13"> - <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 row="0" column="0" rowspan="2"> - <spacer name="horizontalSpacer_12"> - <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> diff --git a/ui/Settings_Window.ui b/ui/Settings_Window.ui index 477fa40..e1a6b81 100644 --- a/ui/Settings_Window.ui +++ b/ui/Settings_Window.ui @@ -16,7 +16,7 @@ <property name="styleSheet"> <string notr="true">*{ border: none; - background-color: transparent; + /* background-color: transparent; */ background: none; padding: 0; margin: 0; @@ -33,6 +33,7 @@ QPushButton{ padding: 5px 10px; border: 1px solid #4BD7D6 ; /* light blue */ border-radius: 10px; + margin: 3px; } QPushButton:pressed { @@ -44,6 +45,48 @@ QPushButton:pressed { padding: 5px 10px; border: 1px solid #4BD7D6 ; /* light blue */ border-radius: 10px; + margin: 3px; +} + +QComboBox{ + background-color: transparent; + padding: 5px 10px; + border: 1px solid #4BD7D6 ; /* light blue */ + border-radius: 10px; + margin: 3px; +} + +QComboBox::drop-down { + image: url(:/Carbon_Icons/carbon_icons/chevron--down.svg); +} + +QComboBox::down-arrow { + image: url(:/Carbon_Icons/carbon_icons/chevron--down.svg); +} + +QComboBox::up-arrow { + image: url(:/Carbon_Icons/carbon_icons/chevron--up.svg); +} + +QComboBox QAbstractItemView { + color: #4BD7D6; /* light blue */ + background-color: #131313; /* black */ + border: 1px solid #4BD7D6; /* light blue */ + border-radius: 10px; /* rounded corners */ +} + +QComboBox QAbstractItemView::item { + color: #4BD7D6; /* light blue */ + background-color: #131313; /* black */ + border: 1px solid #4BD7D6; /* light blue */ + border-radius: 10px; /* rounded corners */ + padding: 5px 10px; + margin: 3px; +} + +QComboBox QAbstractItemView::item:selected { + background-color: #6C6C85 ; /* pastel purple */ + border-radius: 10px; /* rounded corners */ } QCheckBox { @@ -67,11 +110,74 @@ QCheckBox:disabled { QCheckBox:indicator:disabled { background-color: #cccccc; /* Grayed out background */ +} + +#divider_1{ + background-color: #00ffff; /* Neon blue */ + border: 1px solid; +} +#divider_2{ + background-color: #00ffff; /* Neon blue */ + border: 1px solid; }</string> </property> <widget class="QWidget" name="centralwidget"> <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0" colspan="4"> + <item row="2" column="3"> + <widget class="QLabel" name="label_2"> + <property name="font"> + <font> + <weight>75</weight> + <italic>true</italic> + <bold>true</bold> + </font> + </property> + <property name="text"> + <string>Page Settings</string> + </property> + <property name="margin"> + <number>6</number> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="QFrame" name="divider_1"> + <property name="frameShape"> + <enum>QFrame::HLine</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Sunken</enum> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QLabel" name="label_19"> + <property name="font"> + <font> + <weight>75</weight> + <italic>true</italic> + <bold>true</bold> + </font> + </property> + <property name="text"> + <string>Client Settings</string> + </property> + </widget> + </item> + <item row="1" column="5" rowspan="6"> + <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 row="0" column="0" colspan="6"> <spacer name="verticalSpacer_3"> <property name="orientation"> <enum>Qt::Vertical</enum> @@ -84,80 +190,88 @@ QCheckBox:indicator:disabled { </property> </spacer> </item> - <item row="1" column="0" rowspan="5"> - <spacer name="horizontalSpacer_2"> + <item row="6" column="1" colspan="4"> + <spacer name="verticalSpacer"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> </property> <property name="sizeHint" stdset="0"> <size> - <width>40</width> - <height>20</height> + <width>20</width> + <height>40</height> </size> </property> </spacer> </item> - <item row="3" column="1" colspan="2"> - <widget class="QFrame" name="frame_general_settings"> + <item row="1" column="1" colspan="4"> + <widget class="QFrame" name="frame_2"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="frameShape"> <enum>QFrame::StyledPanel</enum> </property> <property name="frameShadow"> <enum>QFrame::Raised</enum> </property> - <layout class="QGridLayout" name="gridLayout_2"> - <item row="1" column="5" colspan="2" alignment="Qt::AlignLeft"> - <widget class="QLabel" name="connectionLogo"> + <layout class="QGridLayout" name="gridLayout_4"> + <item row="0" column="0"> + <widget class="QPushButton" name="startClientBtn"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="text"> - <string/> + <string>Start client</string> </property> - <property name="pixmap"> - <pixmap resource="../assets/res.qrc">:/Carbon_Icons/carbon_icons/connection-signal--off.svg</pixmap> + <property name="icon"> + <iconset resource="../assets/res.qrc"> + <normaloff>:/Carbon_Icons/carbon_icons/play.svg</normaloff>:/Carbon_Icons/carbon_icons/play.svg</iconset> </property> - </widget> - </item> - <item row="2" column="0" colspan="4"> - <widget class="QLabel" name="IPAddr"> - <property name="text"> - <string>IP Address *</string> + <property name="iconSize"> + <size> + <width>30</width> + <height>30</height> + </size> </property> </widget> </item> - <item row="4" column="7" alignment="Qt::AlignHCenter"> - <widget class="QCheckBox" name="place_holder_toggle_2"> - <property name="toolTip"> - <string>Default: WS</string> - </property> + <item row="0" column="1" colspan="2" alignment="Qt::AlignRight"> + <widget class="QPushButton" name="reconnectBtn"> <property name="text"> - <string/> + <string>Reconnect</string> </property> - </widget> - </item> - <item row="4" column="0" colspan="3"> - <widget class="QLabel" name="label_11"> - <property name="toolTip"> - <string>Default: WS</string> + <property name="icon"> + <iconset resource="../assets/res.qrc"> + <normaloff>:/Carbon_Icons/carbon_icons/renew.svg</normaloff>:/Carbon_Icons/carbon_icons/renew.svg</iconset> </property> - <property name="text"> - <string>Protocol</string> + <property name="iconSize"> + <size> + <width>30</width> + <height>30</height> + </size> </property> </widget> </item> - <item row="4" column="10" alignment="Qt::AlignLeft"> - <widget class="QLabel" name="label_13"> + <item row="3" column="1" alignment="Qt::AlignRight"> + <widget class="QLabel" name="connectionLogo"> <property name="text"> - <string>grpc</string> + <string/> </property> - </widget> - </item> - <item row="1" column="0" colspan="4"> - <widget class="QLabel" name="status"> - <property name="text"> - <string>Status</string> + <property name="pixmap"> + <pixmap resource="../assets/res.qrc">:/Carbon_Icons/carbon_icons/connection-signal--off.svg</pixmap> </property> </widget> </item> - <item row="1" column="7"> + <item row="3" column="2" alignment="Qt::AlignLeft"> <widget class="QLabel" name="connectionStatus"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> @@ -170,124 +284,14 @@ QCheckBox:indicator:disabled { </property> </widget> </item> - <item row="5" column="1" rowspan="2"> - <widget class="QFrame" name="PageIcons"> - <property name="frameShape"> - <enum>QFrame::StyledPanel</enum> - </property> - <property name="frameShadow"> - <enum>QFrame::Raised</enum> - </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <property name="spacing"> - <number>0</number> - </property> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> - <number>0</number> - </property> - </layout> - </widget> - </item> - <item row="3" column="5"> - <widget class="QLabel" name="label_9"> - <property name="text"> - <string/> - </property> - <property name="pixmap"> - <pixmap resource="../assets/res.qrc">:/Carbon_Icons/carbon_icons/security-services.svg</pixmap> - </property> - </widget> - </item> - <item row="1" column="4" rowspan="4"> - <spacer name="horizontalSpacer_3"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Fixed</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="3" column="0" colspan="4"> - <widget class="QLabel" name="label"> - <property name="toolTip"> - <string>Default: Secure</string> - </property> - <property name="text"> - <string>Secure Mode</string> - </property> - </widget> - </item> - <item row="5" column="2" rowspan="2"> - <widget class="QFrame" name="PageLabels"> - <property name="frameShape"> - <enum>QFrame::StyledPanel</enum> - </property> - <property name="frameShadow"> - <enum>QFrame::Raised</enum> - </property> - <layout class="QVBoxLayout" name="verticalLayout_2"> - <property name="spacing"> - <number>0</number> - </property> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> - <number>0</number> - </property> - </layout> - </widget> - </item> - <item row="4" column="5" alignment="Qt::AlignRight"> - <widget class="QLabel" name="label_12"> - <property name="text"> - <string>ws</string> - </property> - </widget> - </item> - <item row="2" column="5" colspan="7"> - <widget class="QLineEdit" name="IPAddrInput"> - <property name="placeholderText"> - <string>Default: localhost</string> - </property> - </widget> - </item> - <item row="3" column="6" colspan="3" alignment="Qt::AlignHCenter"> - <widget class="QCheckBox" name="place_holder_toggle_1"> - <property name="toolTip"> - <string>Default: Secure</string> - </property> + <item row="3" column="0"> + <widget class="QLabel" name="status"> <property name="text"> - <string/> - </property> - <property name="checked"> - <bool>false</bool> + <string>Status</string> </property> </widget> </item> - <item row="0" column="0" colspan="11"> + <item row="4" column="0" colspan="3"> <spacer name="verticalSpacer_2"> <property name="orientation"> <enum>Qt::Vertical</enum> @@ -306,76 +310,21 @@ QCheckBox:indicator:disabled { </layout> </widget> </item> - <item row="1" column="1" colspan="2"> - <widget class="QFrame" name="frame_2"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="frameShape"> - <enum>QFrame::StyledPanel</enum> - </property> - <property name="frameShadow"> - <enum>QFrame::Raised</enum> - </property> - <layout class="QHBoxLayout" name="horizontalLayout_2"> - <item> - <widget class="QPushButton" name="startClientBtn"> - <property name="text"> - <string>Start client</string> - </property> - <property name="icon"> - <iconset resource="../assets/res.qrc"> - <normaloff>:/Carbon_Icons/carbon_icons/play.svg</normaloff>:/Carbon_Icons/carbon_icons/play.svg</iconset> - </property> - <property name="iconSize"> - <size> - <width>30</width> - <height>30</height> - </size> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="reconnectBtn"> - <property name="text"> - <string>Reconnect</string> - </property> - <property name="icon"> - <iconset resource="../assets/res.qrc"> - <normaloff>:/Carbon_Icons/carbon_icons/renew.svg</normaloff>:/Carbon_Icons/carbon_icons/renew.svg</iconset> - </property> - <property name="iconSize"> - <size> - <width>30</width> - <height>30</height> - </size> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item row="5" column="1" colspan="2"> - <spacer name="verticalSpacer"> + <item row="1" column="0" rowspan="6"> + <spacer name="horizontalSpacer_2"> <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> + <enum>Qt::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> - <width>20</width> - <height>40</height> + <width>40</width> + <height>20</height> </size> </property> </spacer> </item> - <item row="1" column="3" rowspan="5"> - <spacer name="horizontalSpacer"> + <item row="2" column="2" rowspan="4"> + <spacer name="horizontalSpacer_3"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> @@ -387,12 +336,12 @@ QCheckBox:indicator:disabled { </property> </spacer> </item> - <item row="4" column="1" colspan="2"> + <item row="4" column="3" rowspan="2" colspan="2" alignment="Qt::AlignTop"> <widget class="QFrame" name="frame_page_settings"> <property name="minimumSize"> <size> - <width>300</width> - <height>300</height> + <width>0</width> + <height>0</height> </size> </property> <property name="frameShape"> @@ -402,7 +351,21 @@ QCheckBox:indicator:disabled { <enum>QFrame::Raised</enum> </property> <layout class="QGridLayout" name="gridLayout_3"> - <item row="7" column="4"> + <item row="3" column="1" colspan="3"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>HVAC</string> + </property> + </widget> + </item> + <item row="5" column="3" alignment="Qt::AlignHCenter"> + <widget class="QCheckBox" name="place_holder_toggle_3"> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item row="4" column="4"> <widget class="QPushButton" name="pushButton_3"> <property name="text"> <string/> @@ -419,25 +382,39 @@ QCheckBox:indicator:disabled { </property> </widget> </item> - <item row="5" column="4"> - <widget class="QPushButton" name="pushButton"> + <item row="2" column="1" colspan="3"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Instrument Cluster</string> + </property> + </widget> + </item> + <item row="4" column="1" colspan="3"> + <widget class="QLabel" name="label_5"> + <property name="text"> + <string>Steering Controls</string> + </property> + </widget> + </item> + <item row="5" column="1" alignment="Qt::AlignHCenter|Qt::AlignVCenter"> + <widget class="QLabel" name="label_15"> <property name="text"> <string/> </property> - <property name="icon"> - <iconset resource="../assets/res.qrc"> - <normaloff>:/Carbon_Icons/carbon_icons/view.svg</normaloff>:/Carbon_Icons/carbon_icons/view.svg</iconset> + <property name="pixmap"> + <pixmap resource="../assets/res.qrc">:/Carbon_Icons/carbon_icons/x-axis.svg</pixmap> </property> - <property name="iconSize"> - <size> - <width>30</width> - <height>30</height> - </size> + </widget> + </item> + <item row="5" column="2" alignment="Qt::AlignRight|Qt::AlignVCenter"> + <widget class="QLabel" name="label_14"> + <property name="text"> + <string>Kuksa</string> </property> </widget> </item> - <item row="6" column="4"> - <widget class="QPushButton" name="pushButton_2"> + <item row="2" column="4"> + <widget class="QPushButton" name="pushButton"> <property name="text"> <string/> </property> @@ -453,14 +430,7 @@ QCheckBox:indicator:disabled { </property> </widget> </item> - <item row="7" column="1" colspan="3"> - <widget class="QLabel" name="label_5"> - <property name="text"> - <string>Steering Controls</string> - </property> - </widget> - </item> - <item row="6" column="0"> + <item row="3" column="0"> <widget class="QLabel" name="label_7"> <property name="sizePolicy"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> @@ -485,24 +455,34 @@ QCheckBox:indicator:disabled { </property> </widget> </item> - <item row="0" column="0" colspan="5" alignment="Qt::AlignHCenter"> - <widget class="QLabel" name="label_2"> + <item row="5" column="4" alignment="Qt::AlignLeft"> + <widget class="QLabel" name="label_10"> <property name="text"> - <string>Page Settings</string> + <string>CAN</string> </property> </widget> </item> - <item row="6" column="1" colspan="3"> - <widget class="QLabel" name="label_4"> + <item row="3" column="4"> + <widget class="QPushButton" name="pushButton_2"> <property name="text"> - <string>HVAC</string> + <string/> + </property> + <property name="icon"> + <iconset resource="../assets/res.qrc"> + <normaloff>:/Carbon_Icons/carbon_icons/view.svg</normaloff>:/Carbon_Icons/carbon_icons/view.svg</iconset> + </property> + <property name="iconSize"> + <size> + <width>30</width> + <height>30</height> + </size> </property> </widget> </item> - <item row="5" column="0"> - <widget class="QLabel" name="label_6"> + <item row="4" column="0"> + <widget class="QLabel" name="label_8"> <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Ignored"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -517,24 +497,17 @@ QCheckBox:indicator:disabled { <string/> </property> <property name="pixmap"> - <pixmap resource="../assets/res.qrc">:/Carbon_Icons/carbon_icons/meter.svg</pixmap> + <pixmap resource="../assets/res.qrc">:/Images/Images/steering-wheel.svg</pixmap> </property> <property name="scaledContents"> <bool>true</bool> </property> </widget> </item> - <item row="5" column="1" colspan="3"> - <widget class="QLabel" name="label_3"> - <property name="text"> - <string>Instrument Cluster</string> - </property> - </widget> - </item> - <item row="7" column="0"> - <widget class="QLabel" name="label_8"> + <item row="2" column="0"> + <widget class="QLabel" name="label_6"> <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <sizepolicy hsizetype="Fixed" vsizetype="Ignored"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -549,44 +522,186 @@ QCheckBox:indicator:disabled { <string/> </property> <property name="pixmap"> - <pixmap resource="../assets/res.qrc">:/Images/Images/steering-wheel.svg</pixmap> + <pixmap resource="../assets/res.qrc">:/Carbon_Icons/carbon_icons/meter.svg</pixmap> </property> <property name="scaledContents"> <bool>true</bool> </property> </widget> </item> - <item row="8" column="4" alignment="Qt::AlignLeft"> - <widget class="QLabel" name="label_10"> + </layout> + </widget> + </item> + <item row="3" column="3" colspan="2"> + <widget class="QFrame" name="divider_2"> + <property name="acceptDrops"> + <bool>false</bool> + </property> + <property name="autoFillBackground"> + <bool>false</bool> + </property> + <property name="frameShape"> + <enum>QFrame::HLine</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Sunken</enum> + </property> + </widget> + </item> + <item row="5" column="1"> + <widget class="QFrame" name="frame_general_settings"> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> + </property> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="1" column="3" colspan="6"> + <widget class="QLineEdit" name="IPAddrInput"> + <property name="placeholderText"> + <string/> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_16"> <property name="text"> - <string>CAN</string> + <string>Port</string> </property> </widget> </item> - <item row="8" column="3" alignment="Qt::AlignHCenter"> - <widget class="QCheckBox" name="place_holder_toggle_3"> + <item row="4" column="4" colspan="3" alignment="Qt::AlignHCenter"> + <widget class="QCheckBox" name="place_holder_toggle_2"> + <property name="toolTip"> + <string>Default: WS</string> + </property> <property name="text"> <string/> </property> </widget> </item> - <item row="8" column="2" alignment="Qt::AlignRight|Qt::AlignVCenter"> - <widget class="QLabel" name="label_14"> + <item row="5" column="3" colspan="6"> + <widget class="QLineEdit" name="TLS_Server_Name"/> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="label_18"> <property name="text"> - <string>Kuksa</string> + <string>Default Config</string> </property> </widget> </item> - <item row="8" column="1" alignment="Qt::AlignHCenter|Qt::AlignVCenter"> - <widget class="QLabel" name="label_15"> + <item row="1" column="0" colspan="3"> + <widget class="QLabel" name="IPAddr"> + <property name="text"> + <string>IP Address</string> + </property> + </widget> + </item> + <item row="3" column="0" colspan="3"> + <widget class="QLabel" name="label"> + <property name="toolTip"> + <string>Default: Secure</string> + </property> + <property name="text"> + <string>Secure Mode</string> + </property> + </widget> + </item> + <item row="2" column="3" colspan="6"> + <widget class="QLineEdit" name="PortInput"/> + </item> + <item row="6" column="0"> + <widget class="QLabel" name="label_21"> + <property name="text"> + <string>Auth Token</string> + </property> + </widget> + </item> + <item row="6" column="3" colspan="6"> + <widget class="QLineEdit" name="Auth_Token"/> + </item> + <item row="4" column="3" alignment="Qt::AlignHCenter"> + <widget class="QLabel" name="label_12"> + <property name="font"> + <font> + <weight>75</weight> + <italic>true</italic> + <bold>true</bold> + </font> + </property> + <property name="text"> + <string>ws</string> + </property> + </widget> + </item> + <item row="5" column="0"> + <widget class="QLabel" name="label_20"> + <property name="text"> + <string>TLS Server Name</string> + </property> + </widget> + </item> + <item row="3" column="5" colspan="4" alignment="Qt::AlignLeft"> + <widget class="QCheckBox" name="place_holder_toggle_1"> + <property name="toolTip"> + <string>Default: Secure</string> + </property> + <property name="text"> + <string/> + </property> + <property name="checked"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="4" column="0" colspan="2"> + <widget class="QLabel" name="label_11"> + <property name="toolTip"> + <string>Default: WS</string> + </property> + <property name="text"> + <string>Protocol</string> + </property> + </widget> + </item> + <item row="0" column="3" colspan="6"> + <widget class="QComboBox" name="List_Configs_ComboBox"/> + </item> + <item row="3" column="3" alignment="Qt::AlignHCenter"> + <widget class="QLabel" name="label_9"> <property name="text"> <string/> </property> <property name="pixmap"> - <pixmap resource="../assets/res.qrc">:/Carbon_Icons/carbon_icons/x-axis.svg</pixmap> + <pixmap resource="../assets/res.qrc">:/Carbon_Icons/carbon_icons/security-services.svg</pixmap> </property> </widget> </item> + <item row="4" column="7" colspan="2" alignment="Qt::AlignHCenter"> + <widget class="QLabel" name="label_13"> + <property name="font"> + <font> + <weight>75</weight> + <italic>true</italic> + <bold>true</bold> + </font> + </property> + <property name="text"> + <string>grpc</string> + </property> + </widget> + </item> + <item row="7" column="0"> + <widget class="QLabel" name="label_17"> + <property name="text"> + <string>CA.pem File</string> + </property> + </widget> + </item> + <item row="7" column="3" colspan="6"> + <widget class="QLineEdit" name="CA_File"/> + </item> </layout> </widget> </item> diff --git a/ui/SteeringControls.ui b/ui/SteeringControls.ui index c46a00d..6d4a4d2 100644 --- a/ui/SteeringControls.ui +++ b/ui/SteeringControls.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>1388</width> - <height>793</height> + <width>1034</width> + <height>600</height> </rect> </property> <property name="windowTitle"> @@ -16,13 +16,13 @@ <property name="styleSheet"> <string notr="true">*{ border: none; + border-radius: 8px; background-color: transparent; - background: none; + background: none; padding: 0; margin: 0; color: #fff; } - QPushButton { background-color: #6C6C85 ; /* pastel purple */ padding: 50px 50px; @@ -67,12 +67,216 @@ QPushButton:checked { </property> <widget class="QWidget" name="centralwidget"> <layout class="QGridLayout" name="gridLayout"> - <item row="2" column="2" rowspan="3"> + <item row="2" column="1" rowspan="4" alignment="Qt::AlignRight|Qt::AlignVCenter"> + <widget class="QFrame" name="LeftControls"> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item alignment="Qt::AlignHCenter|Qt::AlignVCenter"> + <widget class="QFrame" name="TopLeftControls"> + <property name="minimumSize"> + <size> + <width>200</width> + <height>0</height> + </size> + </property> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> + </property> + <layout class="QGridLayout" name="gridLayout_3"> + <item row="2" column="2"> + <widget class="QPushButton" name="NextTrack"> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset resource="../assets/res.qrc"> + <normaloff>:/Carbon_Icons/carbon_icons/skip--forward--filled.svg</normaloff>:/Carbon_Icons/carbon_icons/skip--forward--filled.svg</iconset> + </property> + <property name="iconSize"> + <size> + <width>45</width> + <height>45</height> + </size> + </property> + </widget> + </item> + <item row="3" column="0" colspan="3"> + <widget class="QPushButton" name="VolumeDown"> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset resource="../assets/res.qrc"> + <normaloff>:/Carbon_Icons/carbon_icons/volume--down--filled--alt.svg</normaloff>:/Carbon_Icons/carbon_icons/volume--down--filled--alt.svg</iconset> + </property> + <property name="iconSize"> + <size> + <width>45</width> + <height>45</height> + </size> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QPushButton" name="Mode"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>0</height> + </size> + </property> + <property name="font"> + <font> + <weight>75</weight> + <italic>true</italic> + <bold>true</bold> + </font> + </property> + <property name="text"> + <string>MODE</string> + </property> + <property name="iconSize"> + <size> + <width>45</width> + <height>45</height> + </size> + </property> + <property name="checkable"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QPushButton" name="PreviousTrack"> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset resource="../assets/res.qrc"> + <normaloff>:/Carbon_Icons/carbon_icons/skip--back--filled.svg</normaloff>:/Carbon_Icons/carbon_icons/skip--back--filled.svg</iconset> + </property> + <property name="iconSize"> + <size> + <width>45</width> + <height>45</height> + </size> + </property> + </widget> + </item> + <item row="1" column="0" colspan="3"> + <widget class="QPushButton" name="VolumeUp"> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset resource="../assets/res.qrc"> + <normaloff>:/Carbon_Icons/carbon_icons/volume--up--filled--alt.svg</normaloff>:/Carbon_Icons/carbon_icons/volume--up--filled--alt.svg</iconset> + </property> + <property name="iconSize"> + <size> + <width>45</width> + <height>45</height> + </size> + </property> + <property name="flat"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Fixed</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + <item alignment="Qt::AlignBottom"> + <widget class="QFrame" name="BottomLeftControls"> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> + </property> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QPushButton" name="Info"> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset resource="../assets/res.qrc"> + <normaloff>:/Carbon_Icons/carbon_icons/information.svg</normaloff>:/Carbon_Icons/carbon_icons/information.svg</iconset> + </property> + <property name="iconSize"> + <size> + <width>45</width> + <height>45</height> + </size> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="VolumeMute"> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset resource="../assets/res.qrc"> + <normaloff>:/Carbon_Icons/carbon_icons/volume--mute--filled.svg</normaloff>:/Carbon_Icons/carbon_icons/volume--mute--filled.svg</iconset> + </property> + <property name="iconSize"> + <size> + <width>45</width> + <height>45</height> + </size> + </property> + </widget> + </item> + </layout> + </widget> + </item> + </layout> + </widget> + </item> + <item row="2" column="2" rowspan="3" alignment="Qt::AlignVCenter"> <widget class="QFrame" name="frame"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="minimumSize"> <size> - <width>500</width> - <height>500</height> + <width>0</width> + <height>0</height> </size> </property> <property name="frameShape"> @@ -97,10 +301,10 @@ QPushButton:checked { <property name="spacing"> <number>0</number> </property> - <item row="1" column="0"> + <item row="1" column="0" alignment="Qt::AlignVCenter"> <widget class="QPushButton" name="Horn"> <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -114,7 +318,7 @@ QPushButton:checked { </property> <property name="iconSize"> <size> - <width>200</width> + <width>250</width> <height>250</height> </size> </property> @@ -123,20 +327,7 @@ QPushButton:checked { </layout> </widget> </item> - <item row="2" column="5" rowspan="4"> - <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> - <item row="2" column="4" rowspan="4" alignment="Qt::AlignVCenter"> + <item row="2" column="3" rowspan="4" alignment="Qt::AlignVCenter"> <widget class="QFrame" name="RightControls"> <property name="minimumSize"> <size> @@ -204,10 +395,13 @@ QPushButton:checked { </property> <property name="iconSize"> <size> - <width>50</width> - <height>50</height> + <width>45</width> + <height>45</height> </size> </property> + <property name="checkable"> + <bool>false</bool> + </property> </widget> </item> </layout> @@ -240,10 +434,13 @@ QPushButton:checked { </property> <property name="iconSize"> <size> - <width>50</width> - <height>50</height> + <width>45</width> + <height>45</height> </size> </property> + <property name="checkable"> + <bool>false</bool> + </property> </widget> </item> <item row="0" column="1" colspan="2"> @@ -264,10 +461,13 @@ QPushButton:checked { </property> <property name="iconSize"> <size> - <width>50</width> - <height>50</height> + <width>45</width> + <height>45</height> </size> </property> + <property name="checkable"> + <bool>false</bool> + </property> </widget> </item> <item row="1" column="1"> @@ -281,14 +481,20 @@ QPushButton:checked { </property> <property name="iconSize"> <size> - <width>50</width> - <height>50</height> + <width>45</width> + <height>45</height> </size> </property> </widget> </item> <item row="1" column="2"> <widget class="QPushButton" name="CruiseCancel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="font"> <font> <weight>75</weight> @@ -305,10 +511,13 @@ QPushButton:checked { </property> <property name="iconSize"> <size> - <width>50</width> - <height>50</height> + <width>45</width> + <height>45</height> </size> </property> + <property name="checkable"> + <bool>false</bool> + </property> </widget> </item> </layout> @@ -333,8 +542,8 @@ QPushButton:checked { </layout> </widget> </item> - <item row="2" column="0" rowspan="4"> - <spacer name="horizontalSpacer"> + <item row="2" column="4" rowspan="4"> + <spacer name="horizontalSpacer_2"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> @@ -346,8 +555,27 @@ QPushButton:checked { </property> </spacer> </item> - <item row="5" column="2"> + <item row="6" column="0" colspan="5"> + <spacer name="verticalSpacer_4"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + <item row="5" column="2" alignment="Qt::AlignBottom"> <widget class="QFrame" name="ExtraControls"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="frameShape"> <enum>QFrame::StyledPanel</enum> </property> @@ -355,7 +583,7 @@ QPushButton:checked { <enum>QFrame::Raised</enum> </property> <layout class="QHBoxLayout" name="horizontalLayout_2"> - <item> + <item alignment="Qt::AlignBottom"> <widget class="QPushButton" name="PhoneCall"> <property name="text"> <string/> @@ -366,13 +594,13 @@ QPushButton:checked { </property> <property name="iconSize"> <size> - <width>50</width> - <height>50</height> + <width>45</width> + <height>45</height> </size> </property> </widget> </item> - <item> + <item alignment="Qt::AlignBottom"> <widget class="QPushButton" name="PhoneHangup"> <property name="text"> <string/> @@ -383,13 +611,13 @@ QPushButton:checked { </property> <property name="iconSize"> <size> - <width>50</width> - <height>50</height> + <width>45</width> + <height>45</height> </size> </property> </widget> </item> - <item> + <item alignment="Qt::AlignBottom"> <widget class="QPushButton" name="Voice"> <property name="text"> <string/> @@ -400,13 +628,13 @@ QPushButton:checked { </property> <property name="iconSize"> <size> - <width>50</width> - <height>50</height> + <width>45</width> + <height>45</height> </size> </property> </widget> </item> - <item> + <item alignment="Qt::AlignBottom"> <widget class="QPushButton" name="LaneDeparture"> <property name="text"> <string/> @@ -417,8 +645,8 @@ QPushButton:checked { </property> <property name="iconSize"> <size> - <width>50</width> - <height>50</height> + <width>45</width> + <height>45</height> </size> </property> </widget> @@ -426,210 +654,27 @@ QPushButton:checked { </layout> </widget> </item> - <item row="1" column="1" colspan="4"> - <spacer name="verticalSpacer_3"> + <item row="2" column="0" rowspan="4"> + <spacer name="horizontalSpacer"> <property name="orientation"> - <enum>Qt::Vertical</enum> + <enum>Qt::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> - <width>20</width> - <height>40</height> + <width>40</width> + <height>20</height> </size> </property> </spacer> </item> - <item row="2" column="1" rowspan="4" alignment="Qt::AlignVCenter"> - <widget class="QFrame" name="LeftControls"> - <property name="frameShape"> - <enum>QFrame::StyledPanel</enum> - </property> - <property name="frameShadow"> - <enum>QFrame::Raised</enum> - </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QFrame" name="TopLeftControls"> - <property name="minimumSize"> - <size> - <width>200</width> - <height>0</height> - </size> - </property> - <property name="frameShape"> - <enum>QFrame::StyledPanel</enum> - </property> - <property name="frameShadow"> - <enum>QFrame::Raised</enum> - </property> - <layout class="QGridLayout" name="gridLayout_3"> - <item row="0" column="0" colspan="3"> - <widget class="QPushButton" name="VolumeUp"> - <property name="text"> - <string/> - </property> - <property name="icon"> - <iconset resource="../assets/res.qrc"> - <normaloff>:/Carbon_Icons/carbon_icons/volume--up--filled--alt.svg</normaloff>:/Carbon_Icons/carbon_icons/volume--up--filled--alt.svg</iconset> - </property> - <property name="iconSize"> - <size> - <width>50</width> - <height>50</height> - </size> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QPushButton" name="PreviousTrack"> - <property name="text"> - <string/> - </property> - <property name="icon"> - <iconset resource="../assets/res.qrc"> - <normaloff>:/Carbon_Icons/carbon_icons/skip--back--filled.svg</normaloff>:/Carbon_Icons/carbon_icons/skip--back--filled.svg</iconset> - </property> - <property name="iconSize"> - <size> - <width>50</width> - <height>50</height> - </size> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QPushButton" name="Mode"> - <property name="minimumSize"> - <size> - <width>0</width> - <height>70</height> - </size> - </property> - <property name="font"> - <font> - <weight>75</weight> - <italic>true</italic> - <bold>true</bold> - </font> - </property> - <property name="text"> - <string>MODE</string> - </property> - <property name="iconSize"> - <size> - <width>50</width> - <height>50</height> - </size> - </property> - </widget> - </item> - <item row="1" column="2"> - <widget class="QPushButton" name="NextTrack"> - <property name="text"> - <string/> - </property> - <property name="icon"> - <iconset resource="../assets/res.qrc"> - <normaloff>:/Carbon_Icons/carbon_icons/skip--forward--filled.svg</normaloff>:/Carbon_Icons/carbon_icons/skip--forward--filled.svg</iconset> - </property> - <property name="iconSize"> - <size> - <width>50</width> - <height>50</height> - </size> - </property> - </widget> - </item> - <item row="2" column="0" colspan="3"> - <widget class="QPushButton" name="VolumeDown"> - <property name="text"> - <string/> - </property> - <property name="icon"> - <iconset resource="../assets/res.qrc"> - <normaloff>:/Carbon_Icons/carbon_icons/volume--down--filled--alt.svg</normaloff>:/Carbon_Icons/carbon_icons/volume--down--filled--alt.svg</iconset> - </property> - <property name="iconSize"> - <size> - <width>50</width> - <height>50</height> - </size> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <spacer name="verticalSpacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Fixed</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - <item alignment="Qt::AlignBottom"> - <widget class="QFrame" name="BottomLeftControls"> - <property name="frameShape"> - <enum>QFrame::StyledPanel</enum> - </property> - <property name="frameShadow"> - <enum>QFrame::Raised</enum> - </property> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <widget class="QPushButton" name="Info"> - <property name="text"> - <string/> - </property> - <property name="icon"> - <iconset resource="../assets/res.qrc"> - <normaloff>:/Carbon_Icons/carbon_icons/information.svg</normaloff>:/Carbon_Icons/carbon_icons/information.svg</iconset> - </property> - <property name="iconSize"> - <size> - <width>50</width> - <height>50</height> - </size> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="VolumeMute"> - <property name="text"> - <string/> - </property> - <property name="icon"> - <iconset resource="../assets/res.qrc"> - <normaloff>:/Carbon_Icons/carbon_icons/volume--mute--filled.svg</normaloff>:/Carbon_Icons/carbon_icons/volume--mute--filled.svg</iconset> - </property> - <property name="iconSize"> - <size> - <width>50</width> - <height>50</height> - </size> - </property> - </widget> - </item> - </layout> - </widget> - </item> - </layout> - </widget> - </item> - <item row="6" column="0" colspan="6"> - <spacer name="verticalSpacer_4"> + <item row="0" column="0" colspan="5"> + <spacer name="verticalSpacer_3"> <property name="orientation"> <enum>Qt::Vertical</enum> </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> <property name="sizeHint" stdset="0"> <size> <width>20</width> @@ -638,17 +683,6 @@ QPushButton:checked { </property> </spacer> </item> - <item row="0" column="0" colspan="6"> - <widget class="QWidget" name="Header" native="true"> - <property name="minimumSize"> - <size> - <width>0</width> - <height>70</height> - </size> - </property> - <layout class="QHBoxLayout" name="horizontalLayout_4"/> - </widget> - </item> </layout> </widget> </widget> |