diff options
author | suchinton2001 <suchinton.2001@gmail.com> | 2023-09-20 23:18:36 +0530 |
---|---|---|
committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2023-09-27 12:29:27 +0000 |
commit | c65710aac670e9546c261b13294571f310ca9439 (patch) | |
tree | e8939f703ff3dc19aff73495234bad64922621d6 /ui/SteeringControls.ui | |
parent | 746451c1587a2830b47904b5abb9f0b6c1b10641 (diff) |
Update UI files
V1:
- Widen Scroll bars in IC and HVAC Page
- Update UI to use carbon icon resources
- Add new Dashboard page
- Add bottom navigation bar to main window UI
- Remove deprecated navigation page files
Bug-AGL: SPEC-4905
Signed-off-by: suchinton2001 <suchinton.2001@gmail.com>
Change-Id: Ia307d326c4bc9af9969e1d6b2a2cb4948a7ee286
Diffstat (limited to 'ui/SteeringControls.ui')
-rw-r--r-- | ui/SteeringControls.ui | 143 |
1 files changed, 77 insertions, 66 deletions
diff --git a/ui/SteeringControls.ui b/ui/SteeringControls.ui index af8ce7b..c46a00d 100644 --- a/ui/SteeringControls.ui +++ b/ui/SteeringControls.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>1388</width> - <height>711</height> + <height>793</height> </rect> </property> <property name="windowTitle"> @@ -67,7 +67,7 @@ QPushButton:checked { </property> <widget class="QWidget" name="centralwidget"> <layout class="QGridLayout" name="gridLayout"> - <item row="1" column="2" rowspan="3"> + <item row="2" column="2" rowspan="3"> <widget class="QFrame" name="frame"> <property name="minimumSize"> <size> @@ -98,7 +98,7 @@ QPushButton:checked { <number>0</number> </property> <item row="1" column="0"> - <widget class="QPushButton" name="HornBtn"> + <widget class="QPushButton" name="Horn"> <property name="sizePolicy"> <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> <horstretch>0</horstretch> @@ -123,7 +123,20 @@ QPushButton:checked { </layout> </widget> </item> - <item row="1" column="4" rowspan="4" alignment="Qt::AlignVCenter"> + <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"> <widget class="QFrame" name="RightControls"> <property name="minimumSize"> <size> @@ -148,7 +161,7 @@ QPushButton:checked { </property> <layout class="QGridLayout" name="gridLayout_6"> <item row="0" column="0"> - <widget class="QPushButton" name="CruiseLimitBtn"> + <widget class="QPushButton" name="CruiseLimit"> <property name="minimumSize"> <size> <width>0</width> @@ -171,7 +184,7 @@ QPushButton:checked { </widget> </item> <item row="0" column="1"> - <widget class="QPushButton" name="CruiseDistanceBtn"> + <widget class="QPushButton" name="CruiseDistance"> <property name="font"> <font> <weight>75</weight> @@ -210,7 +223,7 @@ QPushButton:checked { </property> <layout class="QGridLayout" name="gridLayout_5"> <item row="2" column="1" colspan="2"> - <widget class="QPushButton" name="CruiseSetBtn"> + <widget class="QPushButton" name="CruiseSet"> <property name="font"> <font> <weight>75</weight> @@ -223,7 +236,7 @@ QPushButton:checked { </property> <property name="icon"> <iconset resource="../assets/res.qrc"> - <normaloff>:/icons/feather/minus.svg</normaloff>:/icons/feather/minus.svg</iconset> + <normaloff>:/Carbon_Icons/carbon_icons/subtract--alt.svg</normaloff>:/Carbon_Icons/carbon_icons/subtract--alt.svg</iconset> </property> <property name="iconSize"> <size> @@ -234,7 +247,7 @@ QPushButton:checked { </widget> </item> <item row="0" column="1" colspan="2"> - <widget class="QPushButton" name="CruiseResumeBtn"> + <widget class="QPushButton" name="CruiseResume"> <property name="font"> <font> <weight>75</weight> @@ -247,7 +260,7 @@ QPushButton:checked { </property> <property name="icon"> <iconset resource="../assets/res.qrc"> - <normaloff>:/icons/feather/plus.svg</normaloff>:/icons/feather/plus.svg</iconset> + <normaloff>:/Carbon_Icons/carbon_icons/add--alt.svg</normaloff>:/Carbon_Icons/carbon_icons/add--alt.svg</iconset> </property> <property name="iconSize"> <size> @@ -258,13 +271,13 @@ QPushButton:checked { </widget> </item> <item row="1" column="1"> - <widget class="QPushButton" name="CruiseEnableBtn"> + <widget class="QPushButton" name="CruiseEnable"> <property name="text"> <string/> </property> <property name="icon"> <iconset resource="../assets/res.qrc"> - <normaloff>:/Images/Images/cruise.png</normaloff>:/Images/Images/cruise.png</iconset> + <normaloff>:/Images/Images/AGL_Icons_CruiseControl_white.svg</normaloff>:/Images/Images/AGL_Icons_CruiseControl_white.svg</iconset> </property> <property name="iconSize"> <size> @@ -275,7 +288,7 @@ QPushButton:checked { </widget> </item> <item row="1" column="2"> - <widget class="QPushButton" name="CruiseCancelBtn"> + <widget class="QPushButton" name="CruiseCancel"> <property name="font"> <font> <weight>75</weight> @@ -288,7 +301,7 @@ QPushButton:checked { </property> <property name="icon"> <iconset resource="../assets/res.qrc"> - <normaloff>:/icons/feather/x-square.svg</normaloff>:/icons/feather/x-square.svg</iconset> + <normaloff>:/Carbon_Icons/carbon_icons/misuse--outline.svg</normaloff>:/Carbon_Icons/carbon_icons/misuse--outline.svg</iconset> </property> <property name="iconSize"> <size> @@ -320,7 +333,7 @@ QPushButton:checked { </layout> </widget> </item> - <item row="1" column="0" rowspan="4"> + <item row="2" column="0" rowspan="4"> <spacer name="horizontalSpacer"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -333,33 +346,7 @@ QPushButton:checked { </property> </spacer> </item> - <item row="5" column="0" colspan="6"> - <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="1" 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="4" column="2"> + <item row="5" column="2"> <widget class="QFrame" name="ExtraControls"> <property name="frameShape"> <enum>QFrame::StyledPanel</enum> @@ -369,13 +356,13 @@ QPushButton:checked { </property> <layout class="QHBoxLayout" name="horizontalLayout_2"> <item> - <widget class="QPushButton" name="PhoneCallBtn"> + <widget class="QPushButton" name="PhoneCall"> <property name="text"> <string/> </property> <property name="icon"> <iconset resource="../assets/res.qrc"> - <normaloff>:/icons/feather/phone-call.svg</normaloff>:/icons/feather/phone-call.svg</iconset> + <normaloff>:/Carbon_Icons/carbon_icons/phone--filled.svg</normaloff>:/Carbon_Icons/carbon_icons/phone--filled.svg</iconset> </property> <property name="iconSize"> <size> @@ -386,13 +373,13 @@ QPushButton:checked { </widget> </item> <item> - <widget class="QPushButton" name="PhoneHangupBtn"> + <widget class="QPushButton" name="PhoneHangup"> <property name="text"> <string/> </property> <property name="icon"> <iconset resource="../assets/res.qrc"> - <normaloff>:/icons/feather/phone-missed.svg</normaloff>:/icons/feather/phone-missed.svg</iconset> + <normaloff>:/Carbon_Icons/carbon_icons/phone--off--filled.svg</normaloff>:/Carbon_Icons/carbon_icons/phone--off--filled.svg</iconset> </property> <property name="iconSize"> <size> @@ -403,13 +390,13 @@ QPushButton:checked { </widget> </item> <item> - <widget class="QPushButton" name="VoiceBtn"> + <widget class="QPushButton" name="Voice"> <property name="text"> <string/> </property> <property name="icon"> <iconset resource="../assets/res.qrc"> - <normaloff>:/Images/Images/voice.svg</normaloff>:/Images/Images/voice.svg</iconset> + <normaloff>:/Carbon_Icons/carbon_icons/voice.svg</normaloff>:/Carbon_Icons/carbon_icons/voice.svg</iconset> </property> <property name="iconSize"> <size> @@ -420,13 +407,13 @@ QPushButton:checked { </widget> </item> <item> - <widget class="QPushButton" name="LaneDepartureBtn"> + <widget class="QPushButton" name="LaneDeparture"> <property name="text"> <string/> </property> <property name="icon"> <iconset resource="../assets/res.qrc"> - <normaloff>:/Images/Images/lane.png</normaloff>:/Images/Images/lane.png</iconset> + <normaloff>:/Images/Images/AGL_Icons_LaneDeparture_white.svg</normaloff>:/Images/Images/AGL_Icons_LaneDeparture_white.svg</iconset> </property> <property name="iconSize"> <size> @@ -439,7 +426,20 @@ QPushButton:checked { </layout> </widget> </item> - <item row="1" column="1" rowspan="4" alignment="Qt::AlignVCenter"> + <item row="1" column="1" colspan="4"> + <spacer name="verticalSpacer_3"> + <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="2" column="1" rowspan="4" alignment="Qt::AlignVCenter"> <widget class="QFrame" name="LeftControls"> <property name="frameShape"> <enum>QFrame::StyledPanel</enum> @@ -464,13 +464,13 @@ QPushButton:checked { </property> <layout class="QGridLayout" name="gridLayout_3"> <item row="0" column="0" colspan="3"> - <widget class="QPushButton" name="VolUpBtn"> + <widget class="QPushButton" name="VolumeUp"> <property name="text"> <string/> </property> <property name="icon"> <iconset resource="../assets/res.qrc"> - <normaloff>:/icons/feather/volume-2.svg</normaloff>:/icons/feather/volume-2.svg</iconset> + <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> @@ -481,13 +481,13 @@ QPushButton:checked { </widget> </item> <item row="1" column="0"> - <widget class="QPushButton" name="PrevTrackBtn"> + <widget class="QPushButton" name="PreviousTrack"> <property name="text"> <string/> </property> <property name="icon"> <iconset resource="../assets/res.qrc"> - <normaloff>:/icons/feather/skip-back.svg</normaloff>:/icons/feather/skip-back.svg</iconset> + <normaloff>:/Carbon_Icons/carbon_icons/skip--back--filled.svg</normaloff>:/Carbon_Icons/carbon_icons/skip--back--filled.svg</iconset> </property> <property name="iconSize"> <size> @@ -498,7 +498,7 @@ QPushButton:checked { </widget> </item> <item row="1" column="1"> - <widget class="QPushButton" name="ModeBtn"> + <widget class="QPushButton" name="Mode"> <property name="minimumSize"> <size> <width>0</width> @@ -524,13 +524,13 @@ QPushButton:checked { </widget> </item> <item row="1" column="2"> - <widget class="QPushButton" name="NextTrackBtn"> + <widget class="QPushButton" name="NextTrack"> <property name="text"> <string/> </property> <property name="icon"> <iconset resource="../assets/res.qrc"> - <normaloff>:/icons/feather/skip-forward.svg</normaloff>:/icons/feather/skip-forward.svg</iconset> + <normaloff>:/Carbon_Icons/carbon_icons/skip--forward--filled.svg</normaloff>:/Carbon_Icons/carbon_icons/skip--forward--filled.svg</iconset> </property> <property name="iconSize"> <size> @@ -541,13 +541,13 @@ QPushButton:checked { </widget> </item> <item row="2" column="0" colspan="3"> - <widget class="QPushButton" name="VolDownBtn"> + <widget class="QPushButton" name="VolumeDown"> <property name="text"> <string/> </property> <property name="icon"> <iconset resource="../assets/res.qrc"> - <normaloff>:/icons/feather/volume-1.svg</normaloff>:/icons/feather/volume-1.svg</iconset> + <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> @@ -586,13 +586,13 @@ QPushButton:checked { </property> <layout class="QHBoxLayout" name="horizontalLayout"> <item> - <widget class="QPushButton" name="InfoBtn"> + <widget class="QPushButton" name="Info"> <property name="text"> <string/> </property> <property name="icon"> <iconset resource="../assets/res.qrc"> - <normaloff>:/icons/feather/info.svg</normaloff>:/icons/feather/info.svg</iconset> + <normaloff>:/Carbon_Icons/carbon_icons/information.svg</normaloff>:/Carbon_Icons/carbon_icons/information.svg</iconset> </property> <property name="iconSize"> <size> @@ -603,13 +603,13 @@ QPushButton:checked { </widget> </item> <item> - <widget class="QPushButton" name="VolMuteBtn"> + <widget class="QPushButton" name="VolumeMute"> <property name="text"> <string/> </property> <property name="icon"> <iconset resource="../assets/res.qrc"> - <normaloff>:/icons/feather/volume-x.svg</normaloff>:/icons/feather/volume-x.svg</iconset> + <normaloff>:/Carbon_Icons/carbon_icons/volume--mute--filled.svg</normaloff>:/Carbon_Icons/carbon_icons/volume--mute--filled.svg</iconset> </property> <property name="iconSize"> <size> @@ -625,8 +625,8 @@ QPushButton:checked { </layout> </widget> </item> - <item row="0" column="1" colspan="4"> - <spacer name="verticalSpacer_3"> + <item row="6" column="0" colspan="6"> + <spacer name="verticalSpacer_4"> <property name="orientation"> <enum>Qt::Vertical</enum> </property> @@ -638,6 +638,17 @@ 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> |