w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-09-02 13:17:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Small adjustment to message tab #2 layout.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3190 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Edson W. R. Pereira 2013-04-17 00:07:28 +00:00
parent c53b29f46f
commit c972e1c28b
2 changed files with 206 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mainwindow.cpp
View File

@ -1355,7 +1355,6 @@ void MainWindow::readFromStdout() //readFromStdout
#ifdef unix #ifdef unix
if(b and !m_diskData) { if(b and !m_diskData) {
qDebug() << msg;
int i1=msg.indexOf(" "); int i1=msg.indexOf(" ");
QString c2=msg.mid(i1+1); QString c2=msg.mid(i1+1);
int i2=c2.indexOf(" "); int i2=c2.indexOf(" ");
@ -1363,10 +1362,9 @@ void MainWindow::readFromStdout() //readFromStdout
c2=c2.mid(0,i2); c2=c2.mid(0,i2);
int nHz=t.mid(22,4).toInt(); int nHz=t.mid(22,4).toInt();
QString freq = QString::number((int)(1000000.0*m_dialFreq + nHz + 0.5)); QString freq = QString::number((int)(1000000.0*m_dialFreq + nHz + 0.5));
qDebug() << freq;
QString snr= QString::number(t.mid(10,3).toInt()); QString snr= QString::number(t.mid(10,3).toInt());
if(gridOK(g2)) if(gridOK(g2))
psk_Reporter->addRemoteStation(c2,g2,freq,"JT9",snr,QString::number(QDateTime::currentDateTime().toTime_t())); psk_Reporter->addRemoteStation(c2,g2,freq,"JT9",snr,QString::number(QDateTime::currentDateTime().toTime_t()));
} }
#endif #endif
} }

393
mainwindow.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>711</width> <width>711</width>
<height>583</height> <height>495</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -1389,7 +1389,7 @@ p, li { white-space: pre-wrap; }
<string/> <string/>
</property> </property>
<attribute name="buttonGroup"> <attribute name="buttonGroup">
<string>buttonGroup</string> <string notr="true">buttonGroup</string>
</attribute> </attribute>
</widget> </widget>
</item> </item>
@ -1420,7 +1420,7 @@ p, li { white-space: pre-wrap; }
<bool>true</bool> <bool>true</bool>
</property> </property>
<attribute name="buttonGroup"> <attribute name="buttonGroup">
<string>buttonGroup</string> <string notr="true">buttonGroup</string>
</attribute> </attribute>
</widget> </widget>
</item> </item>
@ -1448,7 +1448,7 @@ p, li { white-space: pre-wrap; }
<string/> <string/>
</property> </property>
<attribute name="buttonGroup"> <attribute name="buttonGroup">
<string>buttonGroup</string> <string notr="true">buttonGroup</string>
</attribute> </attribute>
</widget> </widget>
</item> </item>
@ -1598,7 +1598,7 @@ p, li { white-space: pre-wrap; }
<string/> <string/>
</property> </property>
<attribute name="buttonGroup"> <attribute name="buttonGroup">
<string>buttonGroup</string> <string notr="true">buttonGroup</string>
</attribute> </attribute>
</widget> </widget>
</item> </item>
@ -1731,7 +1731,7 @@ p, li { white-space: pre-wrap; }
<string/> <string/>
</property> </property>
<attribute name="buttonGroup"> <attribute name="buttonGroup">
<string>buttonGroup</string> <string notr="true">buttonGroup</string>
</attribute> </attribute>
</widget> </widget>
</item> </item>
@ -1759,7 +1759,7 @@ p, li { white-space: pre-wrap; }
<string/> <string/>
</property> </property>
<attribute name="buttonGroup"> <attribute name="buttonGroup">
<string>buttonGroup</string> <string notr="true">buttonGroup</string>
</attribute> </attribute>
</widget> </widget>
</item> </item>
@ -1793,186 +1793,203 @@ p, li { white-space: pre-wrap; }
<attribute name="title"> <attribute name="title">
<string>2</string> <string>2</string>
</attribute> </attribute>
<widget class="QWidget" name="layoutWidget"> <layout class="QVBoxLayout" name="verticalLayout_9">
<property name="geometry"> <property name="spacing">
<rect> <number>0</number>
<x>5</x>
<y>1</y>
<width>280</width>
<height>229</height>
</rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_7"> <property name="margin">
<item> <number>0</number>
<layout class="QGridLayout" name="gridLayout_4"> </property>
<item row="1" column="0"> <item>
<widget class="QPushButton" name="pbCallCQ"> <layout class="QVBoxLayout" name="verticalLayout_7">
<property name="text"> <property name="spacing">
<string>Call CQ</string> <number>6</number>
</property> </property>
</widget> <item>
</item> <layout class="QGridLayout" name="gridLayout_4">
<item row="2" column="0"> <property name="spacing">
<widget class="QPushButton" name="pbAnswerCaller"> <number>2</number>
<property name="text"> </property>
<string>Answer Caller</string> <item row="0" column="0">
</property> <widget class="QLabel" name="label_9">
</widget> <property name="minimumSize">
</item> <size>
<item row="2" column="1"> <width>0</width>
<widget class="QPushButton" name="pbAnswerCQ"> <height>30</height>
<property name="text"> </size>
<string>Answer CQ</string> </property>
</property> <property name="maximumSize">
</widget> <size>
</item> <width>16777215</width>
<item row="3" column="0"> <height>30</height>
<widget class="QPushButton" name="pbSendRRR"> </size>
<property name="text"> </property>
<string>Send RRR</string> <property name="text">
</property> <string>Calling CQ </string>
</widget> </property>
</item> <property name="alignment">
<item row="3" column="1"> <set>Qt::AlignCenter</set>
<widget class="QPushButton" name="pbSendReport"> </property>
<property name="text"> </widget>
<string>Send Report</string> </item>
</property> <item row="2" column="1">
</widget> <widget class="QPushButton" name="pbAnswerCQ">
</item> <property name="text">
<item row="4" column="0" colspan="2"> <string>Answer CQ</string>
<widget class="QPushButton" name="pbSend73"> </property>
<property name="text"> </widget>
<string>Send 73</string> </item>
</property> <item row="4" column="0" colspan="2">
</widget> <widget class="QPushButton" name="pbSend73">
</item> <property name="text">
<item row="0" column="0"> <string>Send 73</string>
<widget class="QLabel" name="label_9"> </property>
<property name="maximumSize"> </widget>
<size> </item>
<width>16777215</width> <item row="1" column="0">
<height>30</height> <widget class="QPushButton" name="pbCallCQ">
</size> <property name="text">
</property> <string>Call CQ</string>
<property name="text"> </property>
<string>Call CQ and </widget>
answer callers</string> </item>
</property> <item row="3" column="1">
<property name="alignment"> <widget class="QPushButton" name="pbSendReport">
<set>Qt::AlignCenter</set> <property name="text">
</property> <string>Send Report</string>
</widget> </property>
</item> </widget>
<item row="0" column="1"> </item>
<widget class="QLabel" name="label_10"> <item row="3" column="0">
<property name="maximumSize"> <widget class="QPushButton" name="pbSendRRR">
<size> <property name="text">
<width>16777215</width> <string>Send RRR</string>
<height>30</height> </property>
</size> </widget>
</property> </item>
<property name="text"> <item row="2" column="0">
<string>Answering CQ</string> <widget class="QPushButton" name="pbAnswerCaller">
</property> <property name="text">
<property name="alignment"> <string>Answer Caller</string>
<set>Qt::AlignCenter</set> </property>
</property> </widget>
</widget> </item>
</item> <item row="0" column="1">
</layout> <widget class="QLabel" name="label_10">
</item> <property name="minimumSize">
<item> <size>
<layout class="QHBoxLayout" name="horizontalLayout_3"> <width>0</width>
<item> <height>30</height>
<widget class="QLineEdit" name="genMsg"> </size>
<property name="sizePolicy"> </property>
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <property name="maximumSize">
<horstretch>0</horstretch> <size>
<verstretch>0</verstretch> <width>16777215</width>
</sizepolicy> <height>30</height>
</property> </size>
<property name="minimumSize"> </property>
<size> <property name="text">
<width>150</width> <string>Answering CQ</string>
<height>0</height> </property>
</size> <property name="alignment">
</property> <set>Qt::AlignCenter</set>
<property name="readOnly"> </property>
<bool>true</bool> </widget>
</property> </item>
</widget> </layout>
</item> </item>
<item> <item>
<widget class="QRadioButton" name="rbGenMsg"> <layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="sizePolicy"> <item>
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <widget class="QLineEdit" name="genMsg">
<horstretch>0</horstretch> <property name="sizePolicy">
<verstretch>0</verstretch> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
</sizepolicy> <horstretch>0</horstretch>
</property> <verstretch>0</verstretch>
<property name="minimumSize"> </sizepolicy>
<size> </property>
<width>0</width> <property name="minimumSize">
<height>26</height> <size>
</size> <width>150</width>
</property> <height>0</height>
<property name="text"> </size>
<string>Generated msg</string> </property>
</property> <property name="readOnly">
<property name="checked"> <bool>true</bool>
<bool>true</bool> </property>
</property> </widget>
</widget> </item>
</item> <item>
</layout> <widget class="QRadioButton" name="rbGenMsg">
</item> <property name="sizePolicy">
<item> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<layout class="QHBoxLayout" name="horizontalLayout"> <horstretch>0</horstretch>
<item> <verstretch>0</verstretch>
<widget class="QLineEdit" name="freeTextMsg"> </sizepolicy>
<property name="sizePolicy"> </property>
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <property name="minimumSize">
<horstretch>0</horstretch> <size>
<verstretch>0</verstretch> <width>0</width>
</sizepolicy> <height>26</height>
</property> </size>
<property name="minimumSize"> </property>
<size> <property name="text">
<width>150</width> <string>Gen msg</string>
<height>0</height> </property>
</size> <property name="checked">
</property> <bool>true</bool>
</widget> </property>
</item> </widget>
<item> </item>
<widget class="QRadioButton" name="rbFreeText"> </layout>
<property name="sizePolicy"> </item>
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <item>
<horstretch>0</horstretch> <layout class="QHBoxLayout" name="horizontalLayout">
<verstretch>0</verstretch> <item>
</sizepolicy> <widget class="QLineEdit" name="freeTextMsg">
</property> <property name="sizePolicy">
<property name="minimumSize"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<size> <horstretch>0</horstretch>
<width>0</width> <verstretch>0</verstretch>
<height>26</height> </sizepolicy>
</size> </property>
</property> <property name="minimumSize">
<property name="text"> <size>
<string>Free text msg</string> <width>150</width>
</property> <height>0</height>
</widget> </size>
</item> </property>
</layout> </widget>
</item> </item>
</layout> <item>
</widget> <widget class="QRadioButton" name="rbFreeText">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>26</height>
</size>
</property>
<property name="text">
<string>Free msg</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</widget> </widget>
</widget> </widget>
</item> </item>
<item row="1" column="1" rowspan="5"> <item row="1" column="1" rowspan="5">
<widget class="QwtThermo" name="xThermo" native="true"> <widget class="QwtThermo" name="xThermo">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -1985,19 +2002,19 @@ answer callers</string>
<height>180</height> <height>180</height>
</size> </size>
</property> </property>
<property name="borderWidth" stdset="0"> <property name="borderWidth">
<number>1</number> <number>1</number>
</property> </property>
<property name="maxValue" stdset="0"> <property name="maxValue">
<double>60.000000000000000</double> <double>60.000000000000000</double>
</property> </property>
<property name="minValue" stdset="0"> <property name="minValue">
<double>0.000000000000000</double> <double>0.000000000000000</double>
</property> </property>
<property name="pipeWidth" stdset="0"> <property name="pipeWidth">
<number>8</number> <number>8</number>
</property> </property>
<property name="value" stdset="0"> <property name="value">
<double>0.000000000000000</double> <double>0.000000000000000</double>
</property> </property>
</widget> </widget>
@ -2014,7 +2031,7 @@ answer callers</string>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>711</width> <width>711</width>
<height>21</height> <height>25</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menuFile"> <widget class="QMenu" name="menuFile">