Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 262 → Rev 263

/QMK-Groundstation/trunk/Forms/mktool.cpp
1629,7 → 1629,7
 
Conn->Close();
 
ac_ConnectTTY->setText("Seriell Verbinden");
ac_ConnectTTY->setText("Kopter Verbinden");
le_Port->setEnabled(true);
 
Ticker->stop();
1636,9 → 1636,19
}
else
{
if (Conn->Open(le_Port->text()))
int i_Type;
if (le_Port->text().contains(QString("IP:")))
{
ac_ConnectTTY->setText("Seriell Trennen");
i_Type = C_IP;
}
else
{
i_Type = C_TTY;
}
 
if (Conn->Open(i_Type, le_Port->text()))
{
ac_ConnectTTY->setText("Kopter Trennen");
le_Port->setEnabled(false);
 
Conn->send_Cmd('v', ADDRESS_ALL, TX_Data, 0, true);
/QMK-Groundstation/trunk/Forms/mktool.ui
1729,13 → 1729,7
</spacer>
</item>
</layout>
<zorder>label_8</zorder>
<zorder>label_9</zorder>
<zorder>le_TarLong</zorder>
<zorder>le_TarLat</zorder>
<zorder>pb_FlyTo</zorder>
<zorder>verticalSpacer_2</zorder>
<zorder>te_KML</zorder>
</widget>
</item>
<item row="0" column="1" >
1864,13 → 1858,23
</rect>
</property>
</widget>
<widget class="QComboBox" name="cb_device" >
<property name="geometry" >
<rect>
<x>350</x>
<y>140</y>
<width>114</width>
<height>26</height>
</rect>
</property>
<property name="editable" >
<bool>true</bool>
</property>
</widget>
</widget>
</widget>
</item>
</layout>
<zorder>line_2</zorder>
<zorder>lb_Status</zorder>
<zorder>tab_Main</zorder>
</widget>
<widget class="QMenuBar" name="menubar" >
<property name="geometry" >
1878,7 → 1882,7
<x>0</x>
<y>0</y>
<width>699</width>
<height>25</height>
<height>24</height>
</rect>
</property>
<widget class="QMenu" name="menuProgramm" >
2092,7 → 2096,7
<normalon>:/Actions/Images/Actions/Seriell-OK.png</normalon>:/Actions/Images/Actions/Seriell-NO.png</iconset>
</property>
<property name="text" >
<string>Seriell Verbinden</string>
<string>Kopter Verbinden</string>
</property>
</action>
<action name="ac_RecordCSV" >