diff options
| author |   Suchinton Chakravarty <suchinton.2001@gmail.com> | 2024-09-15 23:31:58 +0530 |
|---|---|---|
| committer | Suchinton Chakravarty <suchinton.2001@gmail.com> | 2024-09-29 23:31:52 +0530 |
| commit | 65d4619371979c8921ff155a6fe1d7de0e1d3598 (patch) | |
| tree | defb38b033c88338b609c4b9ecc0edd55cb23124 /ui | |
| parent | b0844193f37f477c9e7e509e0b4eaf221886192b (diff) | |
Add New Custom Gauges and CARLA playback refactored
- This commit adds new custom QML Gauges for Engine RPM, Speed, Fuel level and Coolant temp
- Improve Exception handling for CARLA playback
- Add the RPM and Speed Gauge elements
- Update the functions resp. for updating their values
- Fix Alignment of backgrounds, font size and progress bar
- Update Half Gauge to have progress ticks
- Add gauges to the main IC page
Bug-AGL: SPEC-5161
Change-Id: I52274afb7ea95c812c539a0b21305ad078d5dadb
Signed-off-by: Suchinton Chakravarty <suchinton.2001@gmail.com>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/IC.ui | 822 | ||||
| -rw-r--r-- | ui/Keypad.ui | 316 |
2 files changed, 651 insertions, 487 deletions
@@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>920</width> - <height>800</height> + <width>1200</width> + <height>880</height> </rect> </property> <property name="windowTitle"> @@ -166,33 +166,13 @@ QLCDNumber { </property> <layout class="QGridLayout" name="gridLayout_3"> <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> - <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="1" rowspan="2"> <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> @@ -206,84 +186,10 @@ QLCDNumber { <enum>QFrame::Raised</enum> </property> <layout class="QGridLayout" name="gridLayout_4"> - <item row="0" column="0"> - <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_6"> - <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> - <pointsize>18</pointsize> - <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> - <pointsize>18</pointsize> - <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="1" column="0"> - <widget class="QFrame" name="frame_3"> + <item row="2" column="0"> + <widget class="QFrame" name="frame_1"> <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -297,7 +203,7 @@ QLCDNumber { <property name="maximumSize"> <size> <width>16777215</width> - <height>150</height> + <height>16777215</height> </size> </property> <property name="frameShape"> @@ -306,150 +212,83 @@ 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> + <layout class="QGridLayout" name="gridLayout"> + <item row="3" column="3" alignment="Qt::AlignBottom"> + <widget class="QSlider" name="Speed_slider"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - <property name="iconSize"> + <property name="minimumSize"> <size> - <width>60</width> + <width>0</width> <height>60</height> </size> </property> - </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 name="font"> + <font> + <weight>50</weight> + <bold>false</bold> + </font> </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>20</height> - </size> + <property name="maximum"> + <number>240</number> </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 name="tickPosition"> + <enum>QSlider::NoTicks</enum> </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>20</height> - </size> + <property name="tickInterval"> + <number>0</number> </property> - </spacer> + </widget> </item> - <item row="1" column="0"> - <widget class="QPushButton" name="leftIndicatorBtn"> - <property name="acceptDrops"> - <bool>false</bool> + <item row="4" column="3" alignment="Qt::AlignHCenter|Qt::AlignTop"> + <widget class="QLabel" name="label_4"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - <property name="autoFillBackground"> - <bool>false</bool> + <property name="font"> + <font> + <family>Open Sans</family> + <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>Speed (Kmph)</string> </property> </widget> </item> - <item row="1" column="2"> - <widget class="QPushButton" name="hazardBtn"> - <property name="text"> - <string/> - </property> - <property name="icon"> - <iconset resource="../assets/res.qrc"> - <normaloff>:/Images/Images/hazard.png</normaloff>:/Images/Images/hazard.png</iconset> + <item row="2" column="3"> + <widget class="QWidget" name="Speed_Gauge_Placeholder" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - <property name="iconSize"> - <size> - <width>60</width> - <height>60</height> - </size> + <property name="autoFillBackground"> + <bool>false</bool> </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"> - <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>200</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"> - <item row="4" column="8" alignment="Qt::AlignHCenter"> + <item row="4" column="4" alignment="Qt::AlignHCenter|Qt::AlignTop"> <widget class="QLabel" name="label_5"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="font"> <font> <family>Open Sans</family> @@ -463,50 +302,191 @@ QLCDNumber { </property> </widget> </item> - <item row="1" column="5" rowspan="2" colspan="2"> - <widget class="QLCDNumber" name="Speed_monitor"> + <item row="0" column="2" colspan="4"> + <spacer name="verticalSpacer_5"> + <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>10</height> + </size> + </property> + </spacer> + </item> + <item row="2" column="4"> + <widget class="QWidget" name="RPM_Gauge_Placeholder" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> + </item> + <item row="3" column="4" alignment="Qt::AlignBottom"> + <widget class="QSlider" name="RPM_slider"> <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Expanding"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="font"> - <font> - <weight>50</weight> - <italic>false</italic> - <bold>false</bold> - </font> + <property name="minimumSize"> + <size> + <width>0</width> + <height>60</height> + </size> </property> - <property name="layoutDirection"> - <enum>Qt::LeftToRight</enum> + <property name="orientation"> + <enum>Qt::Horizontal</enum> </property> - <property name="frameShape"> - <enum>QFrame::NoFrame</enum> + </widget> + </item> + <item row="1" column="2" colspan="3"> + <widget class="QFrame" name="frame_3"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - <property name="smallDecimalPoint"> - <bool>false</bool> + <property name="minimumSize"> + <size> + <width>0</width> + <height>0</height> + </size> </property> - <property name="digitCount"> - <number>3</number> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>150</height> + </size> + </property> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> </property> - <property name="segmentStyle"> - <enum>QLCDNumber::Flat</enum> + <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> + </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> + </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> + </property> + </widget> + </item> + <item row="1" column="2"> + <widget class="QPushButton" name="hazardBtn"> + <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="1" column="1" rowspan="4" colspan="2"> - <widget class="QFrame" name="frame_2"> + <item row="1" column="0" rowspan="4" colspan="2"> + <widget class="QFrame" name="coolant_gauge_frame"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <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"> - <property name="spacing"> - <number>0</number> - </property> + <layout class="QGridLayout" name="gridLayout_5"> <property name="leftMargin"> <number>0</number> </property> @@ -519,8 +499,33 @@ QLCDNumber { <property name="bottomMargin"> <number>4</number> </property> - <item> + <item row="1" column="1"> + <widget class="QSlider" name="coolantTemp_slider"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>60</width> + <height>0</height> + </size> + </property> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + </widget> + </item> + <item row="1" column="0"> <widget class="QLabel" name="label_2"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="text"> <string/> </property> @@ -529,207 +534,51 @@ QLCDNumber { </property> </widget> </item> - <item> - <widget class="QSlider" name="coolantTemp_slider"> + <item row="0" column="0" colspan="2"> + <widget class="QWidget" name="coolant_Gauge_Placeholder" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="minimumSize"> <size> - <width>60</width> + <width>0</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> - <property name="sizeType"> - <enum>QSizePolicy::Fixed</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>10</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="0" column="3" colspan="8"> - <spacer name="verticalSpacer_5"> - <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>10</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="12" rowspan="4"> - <spacer name="horizontalSpacer_11"> - <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> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="3" column="8"> - <widget class="QSlider" name="RPM_slider"> - <property name="minimumSize"> - <size> - <width>0</width> - <height>60</height> - </size> - </property> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - </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 row="1" column="3" rowspan="4" colspan="2"> - <spacer name="horizontalSpacer_5"> - <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="8" rowspan="2"> - <widget class="QLCDNumber" name="RPM_monitor"> + <item row="1" column="6" rowspan="4" alignment="Qt::AlignRight"> + <widget class="QFrame" name="fuel_gauge_frame"> <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Expanding"> + <sizepolicy hsizetype="Expanding" 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> - <weight>75</weight> - <italic>true</italic> - <bold>true</bold> - </font> - </property> - <property name="text"> - <string>Speed (Kmph)</string> - </property> - </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 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>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> + <layout class="QGridLayout" name="gridLayout_6"> <property name="bottomMargin"> <number>4</number> </property> - <item> + <item row="1" column="0" alignment="Qt::AlignRight"> <widget class="QSlider" name="fuelLevel_slider"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="minimumSize"> <size> <width>60</width> @@ -758,10 +607,10 @@ QLCDNumber { </property> </widget> </item> - <item> + <item row="1" column="1" alignment="Qt::AlignRight"> <widget class="QLabel" name="label_3"> <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -785,95 +634,94 @@ QLCDNumber { </property> </widget> </item> + <item row="0" column="0" colspan="2"> + <widget class="QWidget" name="fuel_Gauge_Placeholder" native="true"> + <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> + </widget> + </item> </layout> </widget> </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"> + <item row="0" column="0"> + <widget class="QFrame" name="header_frame"> + <property name="minimumSize"> <size> - <width>20</width> - <height>40</height> + <width>0</width> + <height>50</height> </size> </property> - </spacer> - </item> - <item row="5" column="0"> - <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_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> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QFrame" name="frame_6"> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> </property> - <property name="minimumSize"> - <size> - <width>0</width> - <height>80</height> - </size> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> </property> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <item> + <spacer name="horizontalSpacer_6"> + <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> + <item alignment="Qt::AlignRight"> + <widget class="QLabel" name="label_6"> <property name="font"> <font> - <family>Open Sans</family> - <pointsize>16</pointsize> + <pointsize>18</pointsize> <weight>75</weight> <italic>true</italic> <bold>true</bold> </font> </property> <property name="text"> - <string>Accelerate</string> - </property> - <property name="icon"> - <iconset> - <normaloff>:/Misc_icons/Misc_icons/speed-up-fill.svg</normaloff>:/Misc_icons/Misc_icons/speed-up-fill.svg</iconset> + <string>Demo Mode</string> </property> - <property name="iconSize"> - <size> - <width>60</width> - <height>60</height> - </size> + </widget> + </item> + <item alignment="Qt::AlignRight"> + <widget class="QCheckBox" name="demoToggle"> + <property name="text"> + <string/> </property> </widget> </item> </layout> </widget> </item> - <item row="6" column="0"> - <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> - <item row="7" column="0"> + <item row="4" column="0" alignment="Qt::AlignBottom"> <widget class="QFrame" name="gearSelector"> <property name="minimumSize"> <size> diff --git a/ui/Keypad.ui b/ui/Keypad.ui new file mode 100644 index 0000000..cda5e42 --- /dev/null +++ b/ui/Keypad.ui @@ -0,0 +1,316 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>HVAC</class> + <widget class="QWidget" name="HVAC"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>420</width> + <height>690</height> + </rect> + </property> + <property name="windowTitle"> + <string>Form</string> + </property> + <property name="styleSheet"> + <string notr="true">*{ + border: none; + background-color: transparent; + background: none; + padding: 0; + margin: 0; + color: #fff; +} + +#scrollAreaWidgetContents{ + background-color: #131313 ; /* black */ +} + +#centralwidget{ + background-color: #131313 ; /* black */ +} + +#centralwidget QPushButton{ + background-color: #6C6C85 ; /* pastel purple */ + padding: 5px 10px; + border-radius: 10px; +} + +#centralwidget QPushButton:pressed { + background-color: #4BD7D6 ; /* light blue */ +} + +#centralwidget QSlider::groove:horizontal { + border: 1px solid #6C6C85 ; /* pastel purple */ + height: 15px; + border-radius: 8px; +} + +#centralwidget QSlider::sub-page:horizontal { + background-color: #4BD7D6 ; /* light blue */ + height: 15px; + border-radius: 5px; +} + +#centralwidget QSlider::handle:horizontal { + background: qlineargradient(x1:0, y1:0, x2:1, y2:1, + stop:0 #eee, stop:1 #ccc); + border: 1px solid #777; + width: 20px; + margin-top: -2px; + margin-bottom: -2px; + border-radius: 8px; +} + +QSlider::sub-page:vertical { + background-color: #131313 ; /* black */ + height: 20px; + width: 28px; + margin: 2px; + border: 1px solid #6C6C85 ; /* pastel purple */ + border-radius: 8px; +} + +QSlider::groove:vertical { + border-radius: 8px; + width: 28px; + margin: 2px; + border: 1px solid #6C6C85 ; /* pastel purple */ + background-color: #4BD7D6 ; /* light blue */ +} +QSlider::groove:vertical:hover { + background-color: rgb(55, 62, 76); +} +QSlider::handle:vertical { + background-color: #d5d5d5; + height: 15px; + width: 20px; + border-radius: 5px; +} +QSlider::handle:vertical:hover { + background-color: #6C6C85 ; /* pastel purple */ +} +QSlider::handle:vertical:pressed { + background-color: #4BD7D6 ; /* light blue */ +} + + +QScrollBar:horizontal { + min-width: 240px; + height: 13px; + } + + QScrollBar:vertical { + min-height: 240px; + width: 13px; + } + + QScrollBar::groove { + background: 2A2827; /* dark grey */ + border-radius: 5px; + } + + QScrollBar::handle { + background: #4BD7D6 ; /* light blue */ + border-radius: 5px; + } + + QScrollBar::handle:horizontal { + width: 25px; + } + + QScrollBar::handle:vertical { + height: 25px; scrollAreaWidgetContents + } + +#leftControls{ + background: #041F2B ; /* dark blue */ + border-radius: 10px; +} + +#rightControls{ + background: #041F2B ; /* dark blue */ + border-radius: 10px; +} + + +/*============================================*/ + +QListWidget { + min-height: 150px; + max-height: 150px; + background-color: #131313 ; /* black */ + border: 1px solid #6C6C85 ; /* pastel purple */ + border-radius: 8px; +} + +QListWidget::item { + height: 50px; + width: 50px; + border-radius: 8px; + text-align: center; +} + +QListWidget::item:selected { + background-color: #4BD7D6 ; /* light blue */ + border-radius: 8px; +} + +QListWidget::item:selected:!active { + border-width: 0px; +} + +QListWidget::item:selected:active { + background-color: #4BD7D6 ; /* light blue */ +} + +QListWidget::item:selected:!focus { + color: black; + border-width: 0px; +} + +QListWidget::item:focus { + background-color: #6C6C85 ; /* pastel purple */ +} + +QListWidget::item:hover { + background-color: #6C6C85 ; /* pastel purple */ +} + +</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QFrame" name="centralwidget"> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <layout class="QGridLayout" name="gridLayout_4"> + <item row="1" column="0"> + <widget class="QFrame" name="frame_2"> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="2" column="1"> + <widget class="QPushButton" name="Key_2"> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset> + <normaloff>:/Keypad_Images/keypad_icons/f2-unpressed.png</normaloff>:/Keypad_Images/keypad_icons/f2-unpressed.png</iconset> + </property> + <property name="iconSize"> + <size> + <width>100</width> + <height>100</height> + </size> + </property> + </widget> + </item> + <item row="2" column="2"> + <widget class="QPushButton" name="Key_3"> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset> + <normaloff>:/Keypad_Images/keypad_icons/f3-unpressed.png</normaloff>:/Keypad_Images/keypad_icons/f3-unpressed.png</iconset> + </property> + <property name="iconSize"> + <size> + <width>100</width> + <height>100</height> + </size> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QPushButton" name="Key_1"> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset> + <normaloff>:/Keypad_Images/keypad_icons/f1-unpressed.png</normaloff>:/Keypad_Images/keypad_icons/f1-unpressed.png</iconset> + </property> + <property name="iconSize"> + <size> + <width>100</width> + <height>100</height> + </size> + </property> + </widget> + </item> + <item row="4" column="2"> + <widget class="QPushButton" name="Key_5"> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset> + <normaloff>:/Keypad_Images/keypad_icons/f5-unpressed.png</normaloff>:/Keypad_Images/keypad_icons/f5-unpressed.png</iconset> + </property> + <property name="iconSize"> + <size> + <width>100</width> + <height>100</height> + </size> + </property> + </widget> + </item> + <item row="4" column="0"> + <widget class="QPushButton" name="Key_4"> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset> + <normaloff>:/Keypad_Images/keypad_icons/f4-unpressed.png</normaloff>:/Keypad_Images/keypad_icons/f4-unpressed.png</iconset> + </property> + <property name="iconSize"> + <size> + <width>100</width> + <height>100</height> + </size> + </property> + </widget> + </item> + <item row="4" column="1"> + <spacer name="horizontalSpacer"> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + </item> + <item row="2" column="0"> + <spacer name="verticalSpacer"> + <property name="sizeType"> + <enum>QSizePolicy::Fixed</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + </item> + </layout> + </widget> + <resources> + <include location="../assets/res.qrc"/> + </resources> + <connections/> +</ui> |