diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2015-08-21 01:03:47 +0300 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-08-31 09:17:20 +0000 |
| commit | 0982955739c6b98b9dbe63efb6575cbf01aee1ec (patch) | |
| tree | ed5dada3a4741a573944df26de142393cb4141d5 /examples/serialbus/can/mainwindow.ui | |
| parent | d36bf099fcec17c19f42baea8ea313926544584b (diff) | |
Refactor the UI of CAN example application
* The SettingsDialog class is added
* The menu-bar actions and icons are added
* All widgets are wrapped with layouts
* A code related to device accessing is modified
Change-Id: I45d056951163441195f61df411669d1130a41867
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'examples/serialbus/can/mainwindow.ui')
| -rw-r--r-- | examples/serialbus/can/mainwindow.ui | 474 |
1 files changed, 201 insertions, 273 deletions
diff --git a/examples/serialbus/can/mainwindow.ui b/examples/serialbus/can/mainwindow.ui index fe32841..19d8188 100644 --- a/examples/serialbus/can/mainwindow.ui +++ b/examples/serialbus/can/mainwindow.ui @@ -6,292 +6,174 @@ <rect> <x>0</x> <y>0</y> - <width>1254</width> - <height>852</height> + <width>551</width> + <height>481</height> </rect> </property> <property name="windowTitle"> <string>MainWindow</string> </property> <widget class="QWidget" name="centralWidget"> - <widget class="QLineEdit" name="lineEdit"> - <property name="geometry"> - <rect> - <x>180</x> - <y>40</y> - <width>191</width> - <height>27</height> - </rect> - </property> - </widget> - <widget class="QPushButton" name="sendButton"> - <property name="geometry"> - <rect> - <x>190</x> - <y>130</y> - <width>191</width> - <height>61</height> - </rect> - </property> - <property name="text"> - <string>send</string> - </property> - </widget> - <widget class="QListWidget" name="listWidget"> - <property name="geometry"> - <rect> - <x>20</x> - <y>250</y> - <width>391</width> - <height>541</height> - </rect> - </property> - </widget> - <widget class="QLineEdit" name="idEdit"> - <property name="geometry"> - <rect> - <x>40</x> - <y>40</y> - <width>113</width> - <height>27</height> - </rect> - </property> - </widget> - <widget class="QLabel" name="label"> - <property name="geometry"> - <rect> - <x>40</x> - <y>20</y> - <width>67</width> - <height>17</height> - </rect> - </property> - <property name="text"> - <string>Id</string> - </property> - </widget> - <widget class="QLabel" name="label_2"> - <property name="geometry"> - <rect> - <x>190</x> - <y>20</y> - <width>67</width> - <height>17</height> - </rect> - </property> - <property name="text"> - <string>Data</string> - </property> - </widget> - <widget class="QCheckBox" name="EFF"> - <property name="geometry"> - <rect> - <x>320</x> - <y>100</y> - <width>97</width> - <height>22</height> - </rect> - </property> - <property name="text"> - <string>EFF</string> - </property> - </widget> - <widget class="QListWidget" name="requestList"> - <property name="geometry"> - <rect> - <x>420</x> - <y>250</y> - <width>411</width> - <height>541</height> - </rect> - </property> - </widget> - <widget class="QListWidget" name="errorList"> - <property name="geometry"> - <rect> - <x>840</x> - <y>250</y> - <width>401</width> - <height>541</height> - </rect> - </property> - </widget> - <widget class="QLabel" name="label_4"> - <property name="geometry"> - <rect> - <x>20</x> - <y>230</y> - <width>67</width> - <height>17</height> - </rect> - </property> - <property name="text"> - <string>Messages</string> - </property> - </widget> - <widget class="QLabel" name="label_5"> - <property name="geometry"> - <rect> - <x>430</x> - <y>227</y> - <width>67</width> - <height>20</height> - </rect> - </property> - <property name="text"> - <string>Requests</string> - </property> - </widget> - <widget class="QLabel" name="label_6"> - <property name="geometry"> - <rect> - <x>860</x> - <y>230</y> - <width>67</width> - <height>17</height> - </rect> - </property> - <property name="text"> - <string>Errors</string> - </property> - </widget> - <widget class="QCheckBox" name="fdBox"> - <property name="geometry"> - <rect> - <x>190</x> - <y>100</y> - <width>161</width> - <height>22</height> - </rect> - </property> - <property name="text"> - <string>Flexible Data-Rate</string> - </property> - </widget> - <widget class="QPushButton" name="connectButton"> - <property name="geometry"> - <rect> - <x>530</x> - <y>130</y> - <width>131</width> - <height>61</height> - </rect> - </property> - <property name="text"> - <string>Connect</string> - </property> - </widget> - <widget class="QLineEdit" name="deviceEdit"> - <property name="geometry"> - <rect> - <x>530</x> - <y>40</y> - <width>231</width> - <height>27</height> - </rect> - </property> - </widget> - <widget class="QLabel" name="label_3"> - <property name="geometry"> - <rect> - <x>530</x> - <y>20</y> - <width>67</width> - <height>17</height> - </rect> - </property> - <property name="text"> - <string>Device</string> - </property> - </widget> - <widget class="QLabel" name="deviceLabel"> - <property name="geometry"> - <rect> - <x>530</x> - <y>70</y> - <width>441</width> - <height>17</height> - </rect> - </property> - <property name="text"> - <string>Connected to:</string> - </property> - </widget> - <widget class="QComboBox" name="pluginBox"> - <property name="geometry"> - <rect> - <x>960</x> - <y>40</y> - <width>241</width> - <height>27</height> - </rect> - </property> - </widget> - <widget class="QLabel" name="label_7"> - <property name="geometry"> - <rect> - <x>960</x> - <y>20</y> - <width>67</width> - <height>17</height> - </rect> - </property> - <property name="text"> - <string>Plugin</string> - </property> - </widget> - <widget class="QGroupBox" name="groupBox"> - <property name="geometry"> - <rect> - <x>40</x> - <y>80</y> - <width>141</width> - <height>111</height> - </rect> - </property> - <property name="title"> - <string>Frame Type</string> - </property> - <property name="checkable"> - <bool>false</bool> - </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QRadioButton" name="dataFrame"> - <property name="text"> - <string>Data</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - </item> - <item> - <widget class="QRadioButton" name="remoteFrame"> - <property name="text"> - <string>Remote Request</string> - </property> - </widget> - </item> - <item> - <widget class="QRadioButton" name="errorFrame"> - <property name="text"> - <string>Error</string> - </property> - </widget> - </item> - </layout> - </widget> + <layout class="QGridLayout" name="gridLayout_3"> + <item row="0" column="0"> + <widget class="QGroupBox" name="sendMessagesBox"> + <property name="title"> + <string>Send CAN message</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Id</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLineEdit" name="idEdit"/> + </item> + <item row="0" column="2" rowspan="3"> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Frame Type</string> + </property> + <property name="checkable"> + <bool>false</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QRadioButton" name="dataFrame"> + <property name="text"> + <string>Data</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QRadioButton" name="remoteFrame"> + <property name="text"> + <string>Re&mote Request</string> + </property> + </widget> + </item> + <item> + <widget class="QRadioButton" name="errorFrame"> + <property name="text"> + <string>Error</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item row="0" column="3"> + <widget class="QCheckBox" name="fdBox"> + <property name="text"> + <string>Flexible Data-Rate</string> + </property> + </widget> + </item> + <item row="1" column="3"> + <widget class="QCheckBox" name="EFF"> + <property name="text"> + <string>EFF</string> + </property> + </widget> + </item> + <item row="2" column="3"> + <widget class="QPushButton" name="sendButton"> + <property name="text"> + <string>send</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLineEdit" name="lineEdit"/> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Data</string> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + </item> + <item row="1" column="0"> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>Messages</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLabel" name="label_5"> + <property name="text"> + <string>Requests</string> + </property> + </widget> + </item> + <item row="0" column="2"> + <widget class="QLabel" name="label_6"> + <property name="text"> + <string>Errors</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QListWidget" name="listWidget"/> + </item> + <item row="1" column="1"> + <widget class="QListWidget" name="requestList"/> + </item> + <item row="1" column="2"> + <widget class="QListWidget" name="errorList"/> + </item> + </layout> + </item> + </layout> </widget> <widget class="QMenuBar" name="menuBar"> <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>1254</width> - <height>20</height> + <width>551</width> + <height>23</height> </rect> </property> + <widget class="QMenu" name="menuCalls"> + <property name="title"> + <string>&Calls</string> + </property> + <addaction name="actionConnect"/> + <addaction name="actionDisconnect"/> + <addaction name="separator"/> + <addaction name="actionQuit"/> + </widget> + <widget class="QMenu" name="menuTools"> + <property name="title"> + <string>Too&ls</string> + </property> + <addaction name="actionConfigure"/> + </widget> + <widget class="QMenu" name="menuHelp"> + <property name="title"> + <string>Help</string> + </property> + <addaction name="actionAboutQt"/> + </widget> + <addaction name="menuCalls"/> + <addaction name="menuTools"/> + <addaction name="menuHelp"/> </widget> <widget class="QToolBar" name="mainToolBar"> <attribute name="toolBarArea"> @@ -300,10 +182,56 @@ <attribute name="toolBarBreak"> <bool>false</bool> </attribute> + <addaction name="actionConnect"/> + <addaction name="actionDisconnect"/> + <addaction name="actionConfigure"/> </widget> <widget class="QStatusBar" name="statusBar"/> + <action name="actionConnect"> + <property name="icon"> + <iconset resource="can.qrc"> + <normaloff>:/images/connect.png</normaloff>:/images/connect.png</iconset> + </property> + <property name="text"> + <string>&Connect</string> + </property> + </action> + <action name="actionDisconnect"> + <property name="icon"> + <iconset resource="can.qrc"> + <normaloff>:/images/disconnect.png</normaloff>:/images/disconnect.png</iconset> + </property> + <property name="text"> + <string>&Disconnect</string> + </property> + </action> + <action name="actionQuit"> + <property name="icon"> + <iconset resource="can.qrc"> + <normaloff>:/images/application-exit.png</normaloff>:/images/application-exit.png</iconset> + </property> + <property name="text"> + <string>&Quit</string> + </property> + </action> + <action name="actionConfigure"> + <property name="icon"> + <iconset resource="can.qrc"> + <normaloff>:/images/settings.png</normaloff>:/images/settings.png</iconset> + </property> + <property name="text"> + <string>&Configure</string> + </property> + </action> + <action name="actionAboutQt"> + <property name="text"> + <string>&About Qt</string> + </property> + </action> </widget> <layoutdefault spacing="6" margin="11"/> - <resources/> + <resources> + <include location="can.qrc"/> + </resources> <connections/> </ui> |