diff options
author | Suchinton Chakravarty <suchinton.2001@gmail.com> | 2024-10-15 23:57:36 +0530 |
---|---|---|
committer | Suchinton Chakravarty <suchinton.2001@gmail.com> | 2024-10-22 16:09:43 +0530 |
commit | 6fdddee7d45206dc64eacd08700f79566ad9b4a6 (patch) | |
tree | 7d688595f69cdb7d7484f37542059d7406da28c5 /ui/Dashboard.ui | |
parent | 2e2dd79e41b27a1d50be3c118955cdbd76e65539 (diff) |
Fix Visual Bugs and Add options for Keypad input
- Fixed spin wheel input alignment for HVAC controls
- Minor tweaks to Gauge input, Added new tick marks and improved gradient
- Adding option(s) in config to handle Keypad input settings
- Reconnect QML signals to enable two way input for Speed, RPM and other QML elements
- Refactor and Add CLI option to start and stop playback.
- Make Tire Pressure Dock into floating window and align to screen center.
- Update resources to include keypad icons.
- Add new tile for Keypad inputs
Bug-AGL: SPEC-5161
Change-Id: I1ecefdfd114ecad081c138e74c1598907d91fd23
Signed-off-by: Suchinton Chakravarty <suchinton.2001@gmail.com>
Diffstat (limited to 'ui/Dashboard.ui')
-rw-r--r-- | ui/Dashboard.ui | 90 |
1 files changed, 77 insertions, 13 deletions
diff --git a/ui/Dashboard.ui b/ui/Dashboard.ui index f8c8938..e5d8cc0 100644 --- a/ui/Dashboard.ui +++ b/ui/Dashboard.ui @@ -55,7 +55,7 @@ QPushButton:pressed { <property name="bottomMargin"> <number>0</number> </property> - <item row="1" column="1"> + <item row="1" column="2"> <widget class="QPushButton" name="DB_Settings_Tile"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> @@ -92,8 +92,8 @@ QPushButton:pressed { </property> </widget> </item> - <item row="0" column="0"> - <widget class="QPushButton" name="DB_IC_Tile"> + <item row="1" column="0"> + <widget class="QPushButton" name="DB_Steering_Tile"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <horstretch>0</horstretch> @@ -112,11 +112,11 @@ QPushButton:pressed { <enum>Qt::LeftToRight</enum> </property> <property name="text"> - <string>Instrument Cluster</string> + <string>Steering Controls</string> </property> <property name="icon"> <iconset resource="../assets/res.qrc"> - <normaloff>:/Carbon_Icons/carbon_icons/meter.svg</normaloff>:/Carbon_Icons/carbon_icons/meter.svg</iconset> + <normaloff>:/Images/Images/steering-wheel.svg</normaloff>:/Images/Images/steering-wheel.svg</iconset> </property> <property name="iconSize"> <size> @@ -124,9 +124,12 @@ QPushButton:pressed { <height>45</height> </size> </property> + <property name="flat"> + <bool>false</bool> + </property> </widget> </item> - <item row="0" column="1"> + <item row="0" column="2"> <widget class="QPushButton" name="DB_HVAC_Tile"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> @@ -163,8 +166,72 @@ QPushButton:pressed { </property> </widget> </item> - <item row="1" column="0"> - <widget class="QPushButton" name="DB_Steering_Tile"> + <item row="1" column="1"> + <widget class="QFrame" name="keypadFrame"> + <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>0</number> + </property> + <item> + <widget class="QPushButton" name="DB_Keypad_Tile"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="font"> + <font> + <pointsize>16</pointsize> + <weight>75</weight> + <italic>true</italic> + <bold>true</bold> + </font> + </property> + <property name="layoutDirection"> + <enum>Qt::LeftToRight</enum> + </property> + <property name="text"> + <string>Keypad</string> + </property> + <property name="icon"> + <iconset resource="../assets/res.qrc"> + <normaloff>:/Images/Images/grid.svg</normaloff>:/Images/Images/grid.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 row="0" column="0" colspan="2"> + <widget class="QPushButton" name="DB_IC_Tile"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <horstretch>0</horstretch> @@ -183,11 +250,11 @@ QPushButton:pressed { <enum>Qt::LeftToRight</enum> </property> <property name="text"> - <string>Steering Controls</string> + <string>Instrument Cluster</string> </property> <property name="icon"> <iconset resource="../assets/res.qrc"> - <normaloff>:/Images/Images/steering-wheel.svg</normaloff>:/Images/Images/steering-wheel.svg</iconset> + <normaloff>:/Carbon_Icons/carbon_icons/meter.svg</normaloff>:/Carbon_Icons/carbon_icons/meter.svg</iconset> </property> <property name="iconSize"> <size> @@ -195,9 +262,6 @@ QPushButton:pressed { <height>45</height> </size> </property> - <property name="flat"> - <bool>false</bool> - </property> </widget> </item> </layout> |