w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-31 05:42:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Starting to remove Messages window from q65w.

Browse Source
This commit is contained in:
Joe Taylor 2022-12-04 16:44:09 -05:00
parent 4c83311f5a
commit 8731f9e75a
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
q65w/mainwindow.cpp
View File

@ -48,7 +48,7 @@ MainWindow::MainWindow(QWidget *parent) :
m_settings_filename {m_appDir + "/map65.ini"}, m_settings_filename {m_appDir + "/map65.ini"},
m_astro_window {new Astro {m_settings_filename}}, m_astro_window {new Astro {m_settings_filename}},
m_band_map_window {new BandMap {m_settings_filename}}, m_band_map_window {new BandMap {m_settings_filename}},
m_messages_window {new Messages {m_settings_filename}}, // m_messages_window {new Messages {m_settings_filename}},
m_wide_graph_window {new WideGraph {m_settings_filename}}, m_wide_graph_window {new WideGraph {m_settings_filename}},
m_gui_timer {new QTimer {this}} m_gui_timer {new QTimer {this}}
{ {
@ -226,9 +226,9 @@ MainWindow::MainWindow(QWidget *parent) :
on_actionAstro_Data_triggered(); //Create the other windows on_actionAstro_Data_triggered(); //Create the other windows
on_actionWide_Waterfall_triggered(); on_actionWide_Waterfall_triggered();
on_actionMessages_triggered(); // on_actionMessages_triggered();
on_actionBand_Map_triggered(); on_actionBand_Map_triggered();
if (m_messages_window) m_messages_window->setColors(m_colors); // if (m_messages_window) m_messages_window->setColors(m_colors);
m_band_map_window->setColors(m_colors); m_band_map_window->setColors(m_colors);
if (m_astro_window) m_astro_window->setFontSize (m_astroFont); if (m_astro_window) m_astro_window->setFontSize (m_astroFont);
@ -301,7 +301,7 @@ MainWindow::MainWindow(QWidget *parent) :
if(ui->actionAFMHot->isChecked()) on_actionAFMHot_triggered(); if(ui->actionAFMHot->isChecked()) on_actionAFMHot_triggered();
if(ui->actionBlue->isChecked()) on_actionBlue_triggered(); if(ui->actionBlue->isChecked()) on_actionBlue_triggered();
connect (m_messages_window.get (), &Messages::click2OnCallsign, this, &MainWindow::doubleClickOnMessages); // connect (m_messages_window.get (), &Messages::click2OnCallsign, this, &MainWindow::doubleClickOnMessages);
connect (m_wide_graph_window.get (), &WideGraph::freezeDecode2, this, &MainWindow::freezeDecode); connect (m_wide_graph_window.get (), &WideGraph::freezeDecode2, this, &MainWindow::freezeDecode);
connect (m_wide_graph_window.get (), &WideGraph::f11f12, this, &MainWindow::bumpDF); connect (m_wide_graph_window.get (), &WideGraph::f11f12, this, &MainWindow::bumpDF);
@ -728,7 +728,7 @@ void MainWindow::on_actionDeviceSetup_triggered() //Setup Dialog
m_initIQplus=dlg.m_initIQplus; m_initIQplus=dlg.m_initIQplus;
m_bIQxt=dlg.m_bIQxt; m_bIQxt=dlg.m_bIQxt;
m_colors=dlg.m_colors; m_colors=dlg.m_colors;
m_messages_window->setColors(m_colors); // m_messages_window->setColors(m_colors);
m_band_map_window->setColors(m_colors); m_band_map_window->setColors(m_colors);
m_cal570=dlg.m_cal570; m_cal570=dlg.m_cal570;
m_TxOffset=dlg.m_TxOffset; m_TxOffset=dlg.m_TxOffset;
@ -976,7 +976,7 @@ void MainWindow::closeEvent (QCloseEvent * e)
mem_m65.detach(); mem_m65.detach();
if (m_astro_window) m_astro_window->close (); if (m_astro_window) m_astro_window->close ();
if (m_band_map_window) m_band_map_window->close (); if (m_band_map_window) m_band_map_window->close ();
if (m_messages_window) m_messages_window->close (); // if (m_messages_window) m_messages_window->close ();
if (m_wide_graph_window) m_wide_graph_window->close (); if (m_wide_graph_window) m_wide_graph_window->close ();
QMainWindow::closeEvent (e); QMainWindow::closeEvent (e);
} }
@ -1045,7 +1045,7 @@ void MainWindow::on_actionBand_Map_triggered() //Display BandMap
void MainWindow::on_actionMessages_triggered() //Display Messages void MainWindow::on_actionMessages_triggered() //Display Messages
{ {
m_messages_window->show(); // m_messages_window->show();
} }
void MainWindow::on_actionOpen_triggered() //Open File void MainWindow::on_actionOpen_triggered() //Open File
@ -1167,7 +1167,7 @@ void MainWindow::on_actionDelete_all_tf2_files_in_SaveDir_triggered()
void MainWindow::on_actionErase_Band_Map_and_Messages_triggered() void MainWindow::on_actionErase_Band_Map_and_Messages_triggered()
{ {
m_band_map_window->setText(""); m_band_map_window->setText("");
m_messages_window->setText("",""); // m_messages_window->setText("","");
m_map65RxLog |= 4; m_map65RxLog |= 4;
} }
@ -1415,7 +1415,7 @@ void MainWindow::readFromStdout() //readFromStdout
if((t.indexOf("<EarlyFinished>") >= 0) or (t.indexOf("<DecodeFinished>") >= 0)) { if((t.indexOf("<EarlyFinished>") >= 0) or (t.indexOf("<DecodeFinished>") >= 0)) {
if(m_widebandDecode) { if(m_widebandDecode) {
m_messages_window->setText(m_messagesText,m_bandmapText); // m_messages_window->setText(m_messagesText,m_bandmapText);
m_band_map_window->setText(m_bandmapText); m_band_map_window->setText(m_bandmapText);
m_widebandDecode=false; m_widebandDecode=false;
} }
@ -1443,9 +1443,9 @@ void MainWindow::readFromStdout() //readFromStdout
if(n>=30 or t.indexOf("Best-fit")>=0) ui->decodedTextBrowser->append(t.mid(1,n-m-4).trimmed()); if(n>=30 or t.indexOf("Best-fit")>=0) ui->decodedTextBrowser->append(t.mid(1,n-m-4).trimmed());
n=ui->decodedTextBrowser->verticalScrollBar()->maximum(); n=ui->decodedTextBrowser->verticalScrollBar()->maximum();
ui->decodedTextBrowser->verticalScrollBar()->setValue(n); ui->decodedTextBrowser->verticalScrollBar()->setValue(n);
m_messagesText=""; // m_messagesText="";
m_bandmapText=""; m_bandmapText="";
m_messagesText += t.mid(1); // m_messagesText += t.mid(1);
m_widebandDecode=true; m_widebandDecode=true;
} }
@ -1474,7 +1474,7 @@ void MainWindow::on_EraseButton_clicked()
qint64 ms=QDateTime::currentMSecsSinceEpoch(); qint64 ms=QDateTime::currentMSecsSinceEpoch();
ui->decodedTextBrowser->clear(); ui->decodedTextBrowser->clear();
if((ms-m_msErase)<500) { if((ms-m_msErase)<500) {
on_actionErase_Band_Map_and_Messages_triggered(); // on_actionErase_Band_Map_and_Messages_triggered();
} }
m_msErase=ms; m_msErase=ms;
} }