mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-11-22 04:11:16 -05:00
Fix two potential crash spots in packjt77. Add "Reset Defaults" to Colors tab.
This commit is contained in:
Joe Taylor
parent
7df048d10a
commit
800e29d4db
@ -448,6 +448,7 @@ private:
|
||||
Q_SLOT void on_pbNewCallBand_clicked();
|
||||
Q_SLOT void on_pbNewGrid_clicked();
|
||||
Q_SLOT void on_pbNewGridBand_clicked();
|
||||
Q_SLOT void on_pbResetDefaults_clicked();
|
||||
Q_SLOT void on_cbFox_clicked (bool);
|
||||
Q_SLOT void on_cbHound_clicked (bool);
|
||||
Q_SLOT void on_cbx2ToneSpacing_clicked(bool);
|
||||
@ -2177,6 +2178,31 @@ void Configuration::impl::on_pbNewGridBand_clicked()
|
||||
ui_->labNewGridBand->setStyleSheet(QString("background: %1").arg(next_color_NewGridBand_.name()));
|
||||
}
|
||||
}
|
||||
|
||||
void Configuration::impl::on_pbResetDefaults_clicked()
|
||||
{
|
||||
next_color_CQ_ = color_CQ_ = "#66ff66";
|
||||
next_color_MyCall_ = color_MyCall_ = "#ff6666";
|
||||
next_color_TxMsg_ = color_TxMsg_ = "#ffff00";
|
||||
next_color_DXCC_ = color_DXCC_ = "#ff00ff";
|
||||
next_color_DXCCband_ = color_DXCCband_ = "#ffaaff";
|
||||
next_color_NewCall_ = color_NewCall_ = "#00ffff";
|
||||
next_color_NewCallBand_ = color_NewCallBand_ = "#99ffff";
|
||||
next_color_NewGrid_ = color_NewGrid_ = "#ff80ff";
|
||||
next_color_NewGridBand_ = color_NewGridBand_ = "#ffcc99";
|
||||
|
||||
ui_->labCQ->setStyleSheet(QString("background: %1").arg(next_color_CQ_.name()));
|
||||
ui_->labMyCall->setStyleSheet(QString("background: %1").arg(next_color_MyCall_.name()));
|
||||
ui_->labTx->setStyleSheet(QString("background: %1").arg(next_color_TxMsg_.name()));
|
||||
ui_->labDXCC->setStyleSheet(QString("background: %1").arg(next_color_DXCC_.name()));
|
||||
ui_->labDXCCband->setStyleSheet(QString("background: %1").arg(next_color_DXCCband_.name()));
|
||||
ui_->labNewCall->setStyleSheet(QString("background: %1").arg(next_color_NewCall_.name()));
|
||||
ui_->labNewCallBand->setStyleSheet(QString("background: %1").arg(next_color_NewCallBand_.name()));
|
||||
ui_->labNewGrid->setStyleSheet(QString("background: %1").arg(next_color_NewGrid_.name()));
|
||||
ui_->labNewGridBand->setStyleSheet(QString("background: %1").arg(next_color_NewGridBand_.name()));
|
||||
|
||||
}
|
||||
|
||||
void Configuration::impl::on_decoded_text_font_push_button_clicked ()
|
||||
{
|
||||
next_decoded_text_font_ = QFontDialog::getFont (0, decoded_text_font_ , this
|
||||
|
||||
119
Configuration.ui
119
Configuration.ui
@ -2176,6 +2176,59 @@ Right click for insert and delete options.</string>
|
||||
<layout class="QGridLayout" name="gridLayout_5" rowstretch="1,1,2" columnstretch="1,1,2">
|
||||
<item row="1" column="1">
|
||||
<layout class="QGridLayout" name="gridLayout_13">
|
||||
<item row="6" column="1">
|
||||
<widget class="QLabel" name="labNewCallBand">
|
||||
<property name="styleSheet">
|
||||
<string notr="true">QLabel{background-color: #99ffff}</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string notr="true">K1ABC</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="7" column="1">
|
||||
<widget class="QLabel" name="labNewGrid">
|
||||
<property name="styleSheet">
|
||||
<string notr="true">QLabel{background-color: #ff8000}</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string notr="true">K1ABC</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="1">
|
||||
<widget class="QLabel" name="labDXCCband">
|
||||
<property name="styleSheet">
|
||||
<string notr="true">QLabel{background-color: #ffaaff}
|
||||
</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string notr="true">K1ABC</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="8" column="1">
|
||||
<widget class="QLabel" name="labNewGridBand">
|
||||
<property name="styleSheet">
|
||||
<string notr="true">QLabel{background-color: #ffcc99}</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string notr="true">K1ABC</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="0">
|
||||
<widget class="QPushButton" name="pbNewDXCCband">
|
||||
<property name="text">
|
||||
@ -2197,6 +2250,13 @@ Right click for insert and delete options.</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="8" column="0">
|
||||
<widget class="QPushButton" name="pbNewGridBand">
|
||||
<property name="text">
|
||||
<string>New Grid on Band</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="0">
|
||||
<widget class="QPushButton" name="pbCQmsg">
|
||||
<property name="minimumSize">
|
||||
@ -2357,63 +2417,10 @@ Right click for insert and delete options.</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="8" column="0">
|
||||
<widget class="QPushButton" name="pbNewGridBand">
|
||||
<item row="9" column="0">
|
||||
<widget class="QPushButton" name="pbResetDefaults">
|
||||
<property name="text">
|
||||
<string>New Grid on Band</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="1">
|
||||
<widget class="QLabel" name="labDXCCband">
|
||||
<property name="styleSheet">
|
||||
<string notr="true">QLabel{background-color: #ffaaff}
|
||||
</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string notr="true">K1ABC</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="1">
|
||||
<widget class="QLabel" name="labNewCallBand">
|
||||
<property name="styleSheet">
|
||||
<string notr="true">QLabel{background-color: #99ffff}</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string notr="true">K1ABC</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="7" column="1">
|
||||
<widget class="QLabel" name="labNewGrid">
|
||||
<property name="styleSheet">
|
||||
<string notr="true">QLabel{background-color: #ff8000}</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string notr="true">K1ABC</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="8" column="1">
|
||||
<widget class="QLabel" name="labNewGridBand">
|
||||
<property name="styleSheet">
|
||||
<string notr="true">QLabel{background-color: #ffcc99}</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string notr="true">K1ABC</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
<string>Reset Defaults</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
@ -866,7 +866,8 @@ subroutine pack77_1(nwords,w,i3,n3,c77)
|
||||
trim(w(nwords)).ne.'RR73' .and. trim(w(nwords)).ne.'73') return
|
||||
if(c1.eq.'+' .or. c1.eq.'-') then
|
||||
ir=0
|
||||
read(w(nwords),*) irpt
|
||||
write(81,*) nwords,w(1:nwords); flush(81)
|
||||
read(w(nwords),*,err=900) irpt
|
||||
irpt=irpt+35
|
||||
else if(c2.eq.'R+' .or. c2.eq.'R-') then
|
||||
ir=1
|
||||
@ -922,8 +923,9 @@ subroutine pack77_1(nwords,w,i3,n3,c77)
|
||||
endif
|
||||
write(c77,1000) n28a,ipa,n28b,ipb,ir,igrid4,i3
|
||||
1000 format(2(b28.28,b1),b1,b15.15,b3.3)
|
||||
|
||||
return
|
||||
|
||||
900 return
|
||||
end subroutine pack77_1
|
||||
|
||||
|
||||
@ -983,7 +985,7 @@ subroutine pack77_3(nwords,w,i3,n3,c77)
|
||||
call pack28(w(2+itu),n28b)
|
||||
ir=0
|
||||
if(w(3+itu)(1:2).eq.'R ') ir=1
|
||||
read(w(3+itu+ir),*) irpt
|
||||
read(w(3+itu+ir),*,err=900) irpt
|
||||
irpt=(irpt-509)/10 - 2
|
||||
if(irpt.lt.0) irpt=0
|
||||
if(irpt.gt.7) irpt=7
|
||||
|
||||
Loading…
Reference in New Issue
Block a user