t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initial commit where connection window is active and it is possible to

Browse Source 
connect to GVRET but this time through the connection window and the
menu option "Connect".
This commit is contained in:
Collin Kidder
2015-10-18 15:34:40 -04:00
parent 49f2525320
commit 4dc8c5b434
8 changed files with 129 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mainwindow.ui
+19 -97
View File
@@ -46,102 +46,6 @@
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<item alignment="Qt::AlignHCenter">
<widget class="QLabel" name="label_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Serial Port</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="cbSerialPorts"/>
</item>
<item>
<widget class="QPushButton" name="btnConnect">
<property name="text">
<string>Connect To GVRET</string>
</property>
</widget>
</item>
<item alignment="Qt::AlignHCenter">
<widget class="QLabel" name="label_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>CANBus Speeds:</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
</property>
<item>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QLabel" name="label_5">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>First Bus:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="cbSpeed1"/>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
<number>7</number>
</property>
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
</property>
<item>
<widget class="QLabel" name="label_4">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Second Bus:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="cbSpeed2"/>
</item>
</layout>
</item>
</layout>
</item>
<item>
<widget class="QPushButton" name="btnBaudSet">
<property name="text">
<string>Set CANBUS Speeds</string>
</property>
</widget>
</item>
<item alignment="Qt::AlignHCenter">
<widget class="QLabel" name="label">
<property name="sizePolicy">
@@ -293,7 +197,7 @@
<x>0</x>
<y>0</y>
<width>800</width>
<height>21</height>
<height>27</height>
</rect>
</property>
<widget class="QMenu" name="menu_RE_Tools">
@@ -336,9 +240,17 @@
<addaction name="separator"/>
<addaction name="actionExit_Application"/>
</widget>
<widget class="QMenu" name="menuConnection">
<property name="title">
<string>Connection</string>
</property>
<addaction name="actionSetup"/>
<addaction name="actionConnect"/>
</widget>
<addaction name="menuFile"/>
<addaction name="menu_RE_Tools"/>
<addaction name="menuSend_Frames"/>
<addaction name="menuConnection"/>
</widget>
<widget class="QStatusBar" name="statusBar"/>
<action name="action_Playback">
@@ -446,6 +358,16 @@
<string>Firmware Uploader</string>
</property>
</action>
<action name="actionSetup">
<property name="text">
<string>Setup</string>
</property>
</action>
<action name="actionConnect">
<property name="text">
<string>Connect</string>
</property>
</action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<resources/>