mirror of
				https://github.com/saitohirga/WSJT-X.git
				synced 2025-11-03 21:40:52 -05:00 
			
		
		
		
	Max Pts ==> Max Dist, and allow with non-contest messages.
This commit is contained in:
		
							parent
							
								
									e366b0a6af
								
							
						
					
					
						commit
						f3e838cdc6
					
				@ -856,7 +856,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
 | 
				
			|||||||
  }
 | 
					  }
 | 
				
			||||||
  ui->respondComboBox->addItem("CQ: None");
 | 
					  ui->respondComboBox->addItem("CQ: None");
 | 
				
			||||||
  ui->respondComboBox->addItem("CQ: First");
 | 
					  ui->respondComboBox->addItem("CQ: First");
 | 
				
			||||||
  ui->respondComboBox->addItem("CQ: Max Pts");
 | 
					  ui->respondComboBox->addItem("CQ: Max Dist");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  m_dateTimeRcvdRR73=QDateTime::currentDateTimeUtc();
 | 
					  m_dateTimeRcvdRR73=QDateTime::currentDateTimeUtc();
 | 
				
			||||||
  m_dateTimeSentTx3=QDateTime::currentDateTimeUtc();
 | 
					  m_dateTimeSentTx3=QDateTime::currentDateTimeUtc();
 | 
				
			||||||
@ -1024,9 +1024,6 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
 | 
				
			|||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  ui->pbBestSP->setVisible(m_mode=="FT4");
 | 
					  ui->pbBestSP->setVisible(m_mode=="FT4");
 | 
				
			||||||
  int n=ui->respondComboBox->currentIndex();
 | 
					 | 
				
			||||||
  if(m_config.special_op_id()!=SpecOp::ARRL_DIGI and n>1) n=0;
 | 
					 | 
				
			||||||
  ui->respondComboBox->setCurrentIndex(n);
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
// 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"};
 | 
				
			||||||
@ -1919,9 +1916,6 @@ void MainWindow::on_actionSettings_triggered()               //Setup Dialog
 | 
				
			|||||||
      MessageBox::information_message (this,
 | 
					      MessageBox::information_message (this,
 | 
				
			||||||
          "Fox-and-Hound operation is available only in FT8 mode.\nGo back and change your selection.");
 | 
					          "Fox-and-Hound operation is available only in FT8 mode.\nGo back and change your selection.");
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    int n=ui->respondComboBox->currentIndex();
 | 
					 | 
				
			||||||
    if(m_config.special_op_id()!=SpecOp::ARRL_DIGI and n>1) n=1;
 | 
					 | 
				
			||||||
    ui->respondComboBox->setCurrentIndex(n);
 | 
					 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -3708,7 +3702,7 @@ void MainWindow::readFromStdout()                             //readFromStdout
 | 
				
			|||||||
              processMessage (decodedtext);
 | 
					              processMessage (decodedtext);
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            if(ui->respondComboBox->currentText()=="CQ: Max Pts") {
 | 
					            if(ui->respondComboBox->currentText()=="CQ: Max Dist") {
 | 
				
			||||||
              QString deCall;
 | 
					              QString deCall;
 | 
				
			||||||
              QString deGrid;
 | 
					              QString deGrid;
 | 
				
			||||||
              decodedtext.deCallAndGrid(/*out*/deCall,deGrid);
 | 
					              decodedtext.deCallAndGrid(/*out*/deCall,deGrid);
 | 
				
			||||||
@ -8766,14 +8760,6 @@ void MainWindow::on_cbCQonly_toggled(bool)
 | 
				
			|||||||
  decodeBusy(true);
 | 
					  decodeBusy(true);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void MainWindow::on_respondComboBox_currentIndexChanged (int n)
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
  if(m_config.special_op_id()!=SpecOp::ARRL_DIGI and n==2) {
 | 
					 | 
				
			||||||
    ui->respondComboBox->setCurrentIndex(1);
 | 
					 | 
				
			||||||
    MessageBox::warning_message (this, tr ("\"CQ: Max Pts\" is available only\n in ARRL DIGI contest mode."));\
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
void MainWindow::on_cbAutoSeq_toggled(bool b)
 | 
					void MainWindow::on_cbAutoSeq_toggled(bool b)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
  ui->respondComboBox->setVisible((m_mode=="FT8" or m_mode=="FT4" or m_mode=="FST4"
 | 
					  ui->respondComboBox->setVisible((m_mode=="FT8" or m_mode=="FT4" or m_mode=="FST4"
 | 
				
			||||||
 | 
				
			|||||||
@ -325,7 +325,6 @@ private slots:
 | 
				
			|||||||
  void chk_FST4_freq_range();
 | 
					  void chk_FST4_freq_range();
 | 
				
			||||||
  void on_pbFoxReset_clicked();
 | 
					  void on_pbFoxReset_clicked();
 | 
				
			||||||
  void on_comboBoxHoundSort_activated (int index);
 | 
					  void on_comboBoxHoundSort_activated (int index);
 | 
				
			||||||
  void on_respondComboBox_currentIndexChanged(int index);
 | 
					 | 
				
			||||||
  void not_GA_warning_message ();
 | 
					  void not_GA_warning_message ();
 | 
				
			||||||
  void checkMSK144ContestType();
 | 
					  void checkMSK144ContestType();
 | 
				
			||||||
  void on_pbBestSP_clicked();
 | 
					  void on_pbBestSP_clicked();
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user