Skip to content

Commit 69e3a42

Browse files
committed
WSJTX Widget: Removed Freq and Mode label
1 parent f7031a0 commit 69e3a42

File tree

3 files changed

+22
-38
lines changed

3 files changed

+22
-38
lines changed

Changelog

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ TBC - 0.47.0
1616
- [CHANGED] - Settings - Added network loop detection for WSJTX Forward (issue #815 @aa5sh @foldynl)
1717
- [CHANGED] - Rotator - Rotator timeout is set to 5s (PR #823 @aa5sh)
1818
- [CHANGED] - Double Spin Boxes - the decimal separator is forced to be a period
19+
- [DELETED] - WSJTX Widget - Removed Freq and Mode
1920
- Fixed QSODetail - Anti-meridian bug on map (issue #786)
2021
- Fixed Statistics: Center maps on QTH longitude (issue #824)
2122
- Fixed OmniRig disconnecting when its status changed unexpectedly (issue #832)

ui/WsjtxWidget.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ void WsjtxWidget::statusReceived(WsjtxStatus newStatus)
186186
{
187187
currFreq = Hz2MHz(newStatus.dial_freq);
188188
currBand = BandPlan::freq2Band(currFreq).name;
189-
ui->freqLabel->setText(QString("%1 MHz").arg(QSTRING_FREQ(currFreq)));
190189
clearTable();
191190
}
192191

@@ -198,7 +197,6 @@ void WsjtxWidget::statusReceived(WsjtxStatus newStatus)
198197

199198
if ( this->status.mode != newStatus.mode )
200199
{
201-
ui->modeLabel->setText(newStatus.mode);
202200
wsjtxTableModel->setCurrentSpotPeriod(WsjtxUDPReceiver::modePeriodLength(newStatus.mode)); /*currently, only Status has a correct Mode in the message */
203201
clearTable();
204202
}
@@ -331,7 +329,7 @@ void WsjtxWidget::reloadSetting()
331329
dxMemberFilter = QSet<QString>(QSet<QString>::fromList(tmp));
332330
#endif
333331

334-
ui->filteredLabel->setHidden(!isFilterEnabled());
332+
ui->filteredLabel->setVisible(isFilterEnabled());
335333
}
336334

337335
void WsjtxWidget::clearTable()

ui/WsjtxWidget.ui

Lines changed: 20 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -13,47 +13,42 @@
1313
<property name="windowTitle">
1414
<string>Form</string>
1515
</property>
16-
<layout class="QGridLayout" name="gridLayout">
16+
<layout class="QVBoxLayout" name="verticalLayout">
1717
<property name="leftMargin">
1818
<number>0</number>
1919
</property>
2020
<property name="topMargin">
21-
<number>9</number>
21+
<number>0</number>
2222
</property>
2323
<property name="rightMargin">
2424
<number>0</number>
2525
</property>
2626
<property name="bottomMargin">
2727
<number>0</number>
2828
</property>
29-
<item row="0" column="0" colspan="2">
30-
<widget class="QLabel" name="freqLabel">
31-
<property name="text">
32-
<string>0.000 MHz</string>
29+
<item>
30+
<widget class="QLabel" name="filteredLabel">
31+
<property name="sizePolicy">
32+
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
33+
<horstretch>0</horstretch>
34+
<verstretch>0</verstretch>
35+
</sizepolicy>
36+
</property>
37+
<property name="styleSheet">
38+
<string notr="true">color: red</string>
3339
</property>
34-
</widget>
35-
</item>
36-
<item row="0" column="2">
37-
<widget class="QLabel" name="modeLabel">
3840
<property name="text">
39-
<string/>
41+
<string>Filtered</string>
42+
</property>
43+
<property name="alignment">
44+
<set>Qt::AlignCenter</set>
45+
</property>
46+
<property name="textInteractionFlags">
47+
<set>Qt::NoTextInteraction</set>
4048
</property>
4149
</widget>
4250
</item>
43-
<item row="0" column="4">
44-
<spacer name="horizontalSpacer">
45-
<property name="orientation">
46-
<enum>Qt::Horizontal</enum>
47-
</property>
48-
<property name="sizeHint" stdset="0">
49-
<size>
50-
<width>40</width>
51-
<height>20</height>
52-
</size>
53-
</property>
54-
</spacer>
55-
</item>
56-
<item row="1" column="0" colspan="6">
51+
<item>
5752
<widget class="QTableView" name="tableView">
5853
<property name="focusPolicy">
5954
<enum>Qt::ClickFocus</enum>
@@ -117,16 +112,6 @@
117112
</attribute>
118113
</widget>
119114
</item>
120-
<item row="0" column="3">
121-
<widget class="QLabel" name="filteredLabel">
122-
<property name="styleSheet">
123-
<string notr="true">color: red</string>
124-
</property>
125-
<property name="text">
126-
<string>Filtered</string>
127-
</property>
128-
</widget>
129-
</item>
130115
</layout>
131116
<action name="actionDisplayedColumns">
132117
<property name="text">

0 commit comments

Comments
 (0)