Updated main ui

This commit is contained in:
Jordan Sherer 2018-03-19 00:05:12 -04:00
parent 87cdc7f7e7
commit 5c8ff568c3
2 changed files with 109 additions and 17 deletions

View File

@ -937,8 +937,14 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
ui->cbMenus->setChecked(false); ui->cbMenus->setChecked(false);
} }
//UI Customizations
ui->mdiArea->addSubWindow(m_wideGraph.data(), Qt::Dialog | Qt::FramelessWindowHint | Qt::CustomizeWindowHint | Qt::Tool)->showMaximized(); ui->mdiArea->addSubWindow(m_wideGraph.data(), Qt::Dialog | Qt::FramelessWindowHint | Qt::CustomizeWindowHint | Qt::Tool)->showMaximized();
ui->menuDecode->setEnabled(false);
ui->menuMode->setEnabled(false);
ui->menuSave->setEnabled(false);
ui->menuTools->setEnabled(false);
ui->menuView->setEnabled(false);
// this must be the last statement of constructor // this must be the last statement of constructor
if (!m_valid) throw std::runtime_error {"Fatal initialization exception"}; if (!m_valid) throw std::runtime_error {"Fatal initialization exception"};
@ -2974,7 +2980,7 @@ void MainWindow::readFromStdout() //readFromStdout
} }
m_QSOText = decodedtext.string ().trimmed (); m_QSOText = decodedtext.string ().trimmed ();
//ui->textEditRX->insertHtml(decodedtext.messageWords().first().trimmed() + " "); ui->textEditRXAll->insertHtml(decodedtext.messageWords().first().trimmed() + "\n");
} }
if(m_mode=="FT8" and m_config.bHound()) { if(m_mode=="FT8" and m_config.bHound()) {
@ -6119,6 +6125,7 @@ void MainWindow::setXIT(int n, Frequency base)
void MainWindow::setFreq4(int rxFreq, int txFreq) void MainWindow::setFreq4(int rxFreq, int txFreq)
{ {
if (ui->RxFreqSpinBox->isEnabled ()) ui->RxFreqSpinBox->setValue(rxFreq); if (ui->RxFreqSpinBox->isEnabled ()) ui->RxFreqSpinBox->setValue(rxFreq);
ui->labDialFreqOffset->setText(QString("%1 Hz").arg(rxFreq));
if(m_mode.startsWith ("WSPR")) { if(m_mode.startsWith ("WSPR")) {
ui->WSPRfreqSpinBox->setValue(txFreq); ui->WSPRfreqSpinBox->setValue(txFreq);
} else { } else {
@ -6506,7 +6513,7 @@ void MainWindow::transmitDisplay (bool transmitting)
} }
// the following are always disallowed in transmit // the following are always disallowed in transmit
ui->menuMode->setEnabled (!transmitting); //ui->menuMode->setEnabled (!transmitting);
//ui->bandComboBox->setEnabled (!transmitting); //ui->bandComboBox->setEnabled (!transmitting);
if (!transmitting) { if (!transmitting) {
if (m_mode == "JT9+JT65") { if (m_mode == "JT9+JT65") {

View File

@ -76,7 +76,18 @@
<property name="handleWidth"> <property name="handleWidth">
<number>4</number> <number>4</number>
</property> </property>
<widget class="QTextEdit" name="textEditRX_6"> <widget class="QTextEdit" name="textEditRXAll">
<property name="styleSheet">
<string notr="true">background-color: #dfe6e9;</string>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
<property name="placeholderText">
<string/>
</property>
</widget>
<widget class="QTextEdit" name="textEditRX">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding"> <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -92,7 +103,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QTextEdit { background:rgb(255, 250, 205); }</string> <string notr="true">background-color:#ffeaa7;</string>
</property> </property>
<property name="readOnly"> <property name="readOnly">
<bool>true</bool> <bool>true</bool>
@ -101,7 +112,7 @@
<string/> <string/>
</property> </property>
</widget> </widget>
<widget class="QTextEdit" name="extFreeTextMsg_6"> <widget class="QTextEdit" name="extFreeTextMsgEdit">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding"> <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -121,7 +132,7 @@
</widget> </widget>
<widget class="QListWidget" name="listWidget"> <widget class="QListWidget" name="listWidget">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding"> <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -149,7 +160,7 @@
</widget> </widget>
</widget> </widget>
<widget class="QWidget" name="widget" native="true"> <widget class="QWidget" name="widget" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_8"> <layout class="QHBoxLayout" name="horizontalLayoutBand">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
@ -258,7 +269,7 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">background-color:rgb(0,0,0);</string> <string notr="true">color:white; background-color:rgb(0,0,0);</string>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::NoFrame</enum> <enum>QFrame::NoFrame</enum>
@ -286,7 +297,8 @@
background-color : black; background-color : black;
} }
QLabel[oob=&quot;true&quot;] { QLabel[oob=&quot;true&quot;] {
background-color: red; color : #EEEEEE;
font-style: italic;
} }
</string> </string>
</property> </property>
@ -297,10 +309,55 @@ QLabel[oob=&quot;true&quot;] {
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
<property name="margin"> <property name="margin">
<number>5</number> <number>0</number>
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QLabel" name="labDialFreqOffset">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Current frequency offset</string>
</property>
<property name="styleSheet">
<string notr="true">QLabel {
font-family: MS Shell Dlg 2;
font-size: 12pt;
font-style: italic;
color : white;
background-color : black;
}
</string>
</property>
<property name="text">
<string>1500 Hz</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="margin">
<number>0</number>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item> <item>
<widget class="QLabel" name="labUTC"> <widget class="QLabel" name="labUTC">
<property name="sizePolicy"> <property name="sizePolicy">
@ -340,6 +397,19 @@ QLabel[oob=&quot;true&quot;] {
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer name="verticalSpacer_4">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@ -352,7 +422,7 @@ QLabel[oob=&quot;true&quot;] {
</sizepolicy> </sizepolicy>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">background-color:rgb(0,0,0);</string> <string notr="true">color:white; background-color:rgb(0,0,0);</string>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::NoFrame</enum> <enum>QFrame::NoFrame</enum>
@ -556,7 +626,7 @@ background-color: #6699ff;
}</string> }</string>
</property> </property>
<property name="text"> <property name="text">
<string>BCN</string> <string>SND</string>
</property> </property>
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>
@ -1064,7 +1134,7 @@ background-color: #00ff00;
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QWidget" name="widget" native="true"> <widget class="QWidget" name="widgetHidden1" native="true">
<property name="visible"> <property name="visible">
<bool>false</bool> <bool>false</bool>
</property> </property>
@ -2957,7 +3027,7 @@ list. The list can be maintained in Settings (F2).</string>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QWidget" name="widget" native="true"> <widget class="QWidget" name="widgetHidden2" native="true">
<property name="visible"> <property name="visible">
<bool>false</bool> <bool>false</bool>
</property> </property>
@ -3231,7 +3301,7 @@ list. The list can be maintained in Settings (F2).</string>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1195</width> <width>1195</width>
<height>27</height> <height>22</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menuFile"> <widget class="QMenu" name="menuFile">
@ -3384,6 +3454,9 @@ list. The list can be maintained in Settings (F2).</string>
<property name="text"> <property name="text">
<string>Waterfall</string> <string>Waterfall</string>
</property> </property>
<property name="visible">
<bool>false</bool>
</property>
</action> </action>
<action name="actionOpen"> <action name="actionOpen">
<property name="text"> <property name="text">
@ -3424,6 +3497,9 @@ list. The list can be maintained in Settings (F2).</string>
<property name="text"> <property name="text">
<string>Fast</string> <string>Fast</string>
</property> </property>
<property name="visible">
<bool>false</bool>
</property>
</action> </action>
<action name="actionNone"> <action name="actionNone">
<property name="checkable"> <property name="checkable">
@ -3435,6 +3511,9 @@ list. The list can be maintained in Settings (F2).</string>
<property name="text"> <property name="text">
<string>None</string> <string>None</string>
</property> </property>
<property name="visible">
<bool>false</bool>
</property>
</action> </action>
<action name="actionSave_all"> <action name="actionSave_all">
<property name="checkable"> <property name="checkable">
@ -3826,6 +3905,9 @@ list. The list can be maintained in Settings (F2).</string>
<property name="text"> <property name="text">
<string>Erase reference spectrum</string> <string>Erase reference spectrum</string>
</property> </property>
<property name="visible">
<bool>false</bool>
</property>
</action> </action>
<action name="actionFrequency_calibration"> <action name="actionFrequency_calibration">
<property name="checkable"> <property name="checkable">
@ -3862,11 +3944,14 @@ list. The list can be maintained in Settings (F2).</string>
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>false</bool>
</property> </property>
<property name="text"> <property name="text">
<string>FT8</string> <string>FT8</string>
</property> </property>
<property name="visible">
<bool>false</bool>
</property>
</action> </action>
<action name="actionEnable_AP_FT8"> <action name="actionEnable_AP_FT8">
<property name="checkable"> <property name="checkable">