diff options
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/Dashboard.ui | 90 | ||||
| -rw-r--r-- | ui/IC.ui | 243 | ||||
| -rw-r--r-- | ui/Keypad.ui | 274 |
3 files changed, 369 insertions, 238 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> @@ -170,12 +170,21 @@ QLCDNumber { <layout class="QGridLayout" name="gridLayout_3"> <item row="0" column="0"> <widget class="QDockWidget" name="TirePressureDock"> + <property name="minimumSize"> + <size> + <width>400</width> + <height>600</height> + </size> + </property> <property name="floating"> - <bool>false</bool> + <bool>true</bool> </property> <property name="features"> <set>QDockWidget::NoDockWidgetFeatures</set> </property> + <property name="allowedAreas"> + <set>Qt::LeftDockWidgetArea</set> + </property> <widget class="QWidget" name="dockWidgetContents"> <property name="autoFillBackground"> <bool>false</bool> @@ -236,69 +245,6 @@ QLCDNumber { <enum>QFrame::Raised</enum> </property> <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="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="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="autoFillBackground"> - <bool>false</bool> - </property> - </widget> - </item> - <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"> @@ -309,25 +255,6 @@ QLCDNumber { </property> </widget> </item> - <item row="3" column="4" alignment="Qt::AlignBottom"> - <widget class="QSlider" name="RPM_slider"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <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="2" colspan="3"> <widget class="QFrame" name="frame_3"> <property name="sizePolicy"> @@ -355,6 +282,32 @@ QLCDNumber { <enum>QFrame::Raised</enum> </property> <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="4" rowspan="2"> + <spacer name="horizontalSpacer_4"> + <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"> + <spacer name="horizontalSpacer_3"> + <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="3"> <widget class="QPushButton" name="rightIndicatorBtn"> <property name="text"> @@ -418,35 +371,91 @@ QLCDNumber { </property> </widget> </item> - <item row="0" column="1" rowspan="2"> - <spacer name="horizontalSpacer_3"> - <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="4" rowspan="2"> - <spacer name="horizontalSpacer_4"> - <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 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="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="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="autoFillBackground"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="3" column="4" alignment="Qt::AlignBottom"> + <widget class="QSlider" name="RPM_slider"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>60</height> + </size> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + </item> + <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="1" column="0" rowspan="4" colspan="2" alignment="Qt::AlignHCenter"> <widget class="QFrame" name="coolant_gauge_frame"> <property name="sizePolicy"> @@ -518,8 +527,8 @@ QLCDNumber { </property> <property name="minimumSize"> <size> - <width>0</width> - <height>0</height> + <width>200</width> + <height>200</height> </size> </property> </widget> @@ -594,8 +603,8 @@ QLCDNumber { </property> <property name="minimumSize"> <size> - <width>0</width> - <height>0</height> + <width>200</width> + <height>200</height> </size> </property> </widget> @@ -840,7 +849,7 @@ QLCDNumber { <item> <widget class="QPushButton" name="TirePressureBtn"> <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <sizepolicy hsizetype="Fixed" vsizetype="Minimum"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -848,7 +857,7 @@ QLCDNumber { <property name="minimumSize"> <size> <width>50</width> - <height>50</height> + <height>40</height> </size> </property> <property name="font"> @@ -869,8 +878,8 @@ QLCDNumber { </property> <property name="iconSize"> <size> - <width>50</width> - <height>50</height> + <width>40</width> + <height>40</height> </size> </property> <property name="checkable"> diff --git a/ui/Keypad.ui b/ui/Keypad.ui index cda5e42..056d8f8 100644 --- a/ui/Keypad.ui +++ b/ui/Keypad.ui @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> - <class>HVAC</class> - <widget class="QWidget" name="HVAC"> + <class>Keypad</class> + <widget class="QWidget" name="Keypad"> <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>420</width> - <height>690</height> + <width>958</width> + <height>578</height> </rect> </property> <property name="windowTitle"> @@ -31,13 +31,13 @@ background-color: #131313 ; /* black */ } -#centralwidget QPushButton{ +#centralwidget QToolButton{ background-color: #6C6C85 ; /* pastel purple */ padding: 5px 10px; border-radius: 10px; } -#centralwidget QPushButton:pressed { +#centralwidget QToolButton:pressed { background-color: #4BD7D6 ; /* light blue */ } @@ -187,123 +187,181 @@ QListWidget::item:hover { <enum>QFrame::NoFrame</enum> </property> <layout class="QGridLayout" name="gridLayout_4"> - <item row="1" column="0"> - <widget class="QFrame" name="frame_2"> + <item row="0" column="0"> + <widget class="QFrame" name="frame"> <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/> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QFrame" name="frame_2"> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> </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 name="frameShadow"> + <enum>QFrame::Raised</enum> </property> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QToolButton" name="Key_1"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset resource="../assets/res.qrc"> + <normaloff>:/Images/Images/flutter_demo.png</normaloff>:/Images/Images/flutter_demo.png</iconset> + </property> + <property name="iconSize"> + <size> + <width>200</width> + <height>200</height> + </size> + </property> + <property name="toolButtonStyle"> + <enum>Qt::ToolButtonTextUnderIcon</enum> + </property> + </widget> + </item> + <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> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QToolButton" name="Key_2"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset resource="../assets/res.qrc"> + <normaloff>:/Images/Images/qt_demo.png</normaloff>:/Images/Images/qt_demo.png</iconset> + </property> + <property name="iconSize"> + <size> + <width>200</width> + <height>200</height> + </size> + </property> + <property name="toolButtonStyle"> + <enum>Qt::ToolButtonTextUnderIcon</enum> + </property> + </widget> + </item> + </layout> </widget> </item> - <item row="4" column="2"> - <widget class="QPushButton" name="Key_5"> - <property name="text"> - <string/> + <item> + <widget class="QFrame" name="frame_3"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - <property name="icon"> - <iconset> - <normaloff>:/Keypad_Images/keypad_icons/f5-unpressed.png</normaloff>:/Keypad_Images/keypad_icons/f5-unpressed.png</iconset> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> </property> - <property name="iconSize"> - <size> - <width>100</width> - <height>100</height> - </size> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> </property> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QToolButton" name="Key_3"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset resource="../assets/res.qrc"> + <normaloff>:/Images/Images/Key_3.png</normaloff>:/Images/Images/Key_3.png</iconset> + </property> + <property name="iconSize"> + <size> + <width>200</width> + <height>200</height> + </size> + </property> + <property name="toolButtonStyle"> + <enum>Qt::ToolButtonTextUnderIcon</enum> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Minimum</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>10</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QToolButton" name="Key_4"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset resource="../assets/res.qrc"> + <normaloff>:/Images/Images/Key_4.png</normaloff>:/Images/Images/Key_4.png</iconset> + </property> + <property name="iconSize"> + <size> + <width>200</width> + <height>200</height> + </size> + </property> + <property name="toolButtonStyle"> + <enum>Qt::ToolButtonTextUnderIcon</enum> + </property> + </widget> + </item> + </layout> </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> |