Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 800 → Rev 801

/QMK-Groundstation/trunk/QMK-Communicator/Classes/cSettings.cpp
55,7 → 55,11
 
for (int z = 0; z < CLIENT.TTY_MAX; z++)
{
#ifdef WIN32
CLIENT.TTY_DEVICES[z] = Setting.value("TTY_DEVICE_" + QString("%1").arg(z), QString("COM1")).toString();
#else
CLIENT.TTY_DEVICES[z] = Setting.value("TTY_DEVICE_" + QString("%1").arg(z), QString("/dev/ttyS3")).toString();
#endif
}
CLIENT.TCP_MAX = Setting.value("TCP_MAX", 1).toInt();
CLIENT.TCP_ID = Setting.value("TCP_ID", 0).toInt();
/QMK-Groundstation/trunk/QMK-Communicator/Defines.h
24,7 → 24,7
#include "../Global/Kopter.h"
 
static const QString QA_NAME = "QMK-Communicator";
static const QString QA_VERSION_NR = "1.2.0";
static const QString QA_VERSION_NR = "1.3.0";
 
#ifdef _BETA_
static const QString QA_VERSION = QA_VERSION_NR + " (BETA)";
32,7 → 32,7
static const QString QA_VERSION = QA_VERSION_NR;
#endif
 
static const QString QA_DATE = "28.03.2010";
static const QString QA_DATE = "25.08.2010";
static const QString QA_YEAR = "2008-2010";
 
static const QString QA_ABOUT =
/QMK-Groundstation/trunk/QMK-Communicator/Dialogs/dlg_Main.cpp
45,7 → 45,13
void dlg_Main::set_ARGV(char *Programm)
{
QString tmp = QString(Programm);
#ifdef WIN32
QMK_Dir = tmp.left(tmp.lastIndexOf("\\"));
#else
QMK_Dir = tmp.left(tmp.lastIndexOf("/"));
#endif
 
qDebug(QMK_Dir.toLatin1().data());
}
 
// Grafische Oberfläche initialisieren
443,7 → 449,11
 
void dlg_Main::slot_btn_cScope()
{
#ifdef WIN32
QString Programm = QMK_Dir + "\QMK-Scope.exe";
#else
QString Programm = QMK_Dir + "/QMK-Scope";
#endif
 
QStringList Argumente;
 
456,7 → 466,11
 
void dlg_Main::slot_btn_cSettings()
{
#ifdef WIN32
QString Programm = QMK_Dir + "\QMK-Settings.exe";
#else
QString Programm = QMK_Dir + "/QMK-Settings";
#endif
 
QStringList Argumente;
 
469,7 → 483,11
 
void dlg_Main::slot_btn_cMaps()
{
#ifdef WIN32
QString Programm = QMK_Dir + "\QMK-Maps.exe";
#else
QString Programm = QMK_Dir + "/QMK-Maps";
#endif
 
QStringList Argumente;
 
482,7 → 500,11
 
void dlg_Main::slot_btn_cVoice()
{
#ifdef WIN32
QString Programm = QMK_Dir + "\QMK-Voice.exe";
#else
QString Programm = QMK_Dir + "/QMK-Voice";
#endif
 
QStringList Argumente;
 
495,7 → 517,11
 
void dlg_Main::slot_btn_cLogger()
{
#ifdef WIN32
QString Programm = QMK_Dir + "\QMK-Logger.exe";
#else
QString Programm = QMK_Dir + "/QMK-Logger";
#endif
 
QStringList Argumente;
 
/QMK-Groundstation/trunk/QMK-Communicator/Dialogs/dlg_Main.ui
6,8 → 6,8
<rect>
<x>0</x>
<y>0</y>
<width>519</width>
<height>372</height>
<width>505</width>
<height>361</height>
</rect>
</property>
<property name="windowTitle">
238,10 → 238,7
<item row="0" column="0">
<widget class="QListWidget" name="lw_Clients">
<property name="font">
<font>
<family>Courier 10 Pitch</family>
<pointsize>12</pointsize>
</font>
<font/>
</property>
<property name="autoScroll">
<bool>false</bool>
440,8 → 437,8
<rect>
<x>0</x>
<y>0</y>
<width>519</width>
<height>21</height>
<width>505</width>
<height>19</height>
</rect>
</property>
<widget class="QMenu" name="menu_Program">
/QMK-Groundstation/trunk/QMK-Communicator/QMK-Communicator.pro
4,12 → 4,15
QT += network
TARGET = QMK-Communicator
TEMPLATE = app
DEFINES += _TTY_POSIX_
 
include(../Global/Class_SerialPort.pri)
 
DESTDIR = ../Binary
debug:DEFINES += _BETA_
 
debug {
DEFINES += _BETA_
}
 
OBJECTS_DIR = ../Binary/.build/QMK-Communicator
UI_DIR = ../Binary/.build/QMK-Communicator
MOC_DIR = ../Binary/.build/QMK-Communicator