Add files via upload

This commit is contained in:
Dave 2017-05-21 22:36:42 -04:00 committed by GitHub
parent 5a21f1db8f
commit 404953d354
15 changed files with 171 additions and 93 deletions

View file

@ -76,19 +76,23 @@ void __fastcall ShowHtmlHelp(LPCSTR pContext)
hd = Application->MainForm->Handle;
}
if( !strcmpi(GetEXT(bf), "HLP") ){
::WinHelp(hd, bf, HELP_FINDER, 0);
}
else if( !strcmpi(GetEXT(bf), "CHM") ){
//1.70K look for CHM first
if( !strcmpi(GetEXT(bf), "CHM") ){
if( pContext ){
char cmd[512];
sprintf(cmd, "HH.EXE %s::/%s", bf, pContext);
::WinExec(cmd, SW_SHOWDEFAULT);
}
else {
sprintf(cmd, "HH.EXE %s::/%s", bf, pContext);
::WinExec(cmd, SW_SHOWDEFAULT);
}
else {
::ShellExecute(hd, "open", bf, NULL, NULL, SW_SHOWDEFAULT);
}
}
}
else if( !strcmpi(GetEXT(bf), "HLP") ){
::WinHelp(hd, bf, HELP_FINDER, 0);
}
else {
CWebRef WebRef;
WebRef.ShowHTML(bf);
@ -100,6 +104,7 @@ void __fastcall ShowHtmlHelp(LPCSTR pContext)
else {
ErrorMB( "'%s'が見つかりません.\r\n\r\nMMTTY English Web Site からダウンロードして下さい.", sys.m_HTMLHelp.c_str());
}
}
#if 0 // Delete by JE3HHT on 29.Sep.2010
void ShowHelp(int index)
@ -3403,7 +3408,9 @@ CWebRef::CWebRef()
void CWebRef::ShowHTML(LPCSTR url)
{
char cmd[1024];
MakeCommand(cmd, HTML.c_str(), url);
::WinExec(cmd, SW_SHOWDEFAULT);
}

View file

@ -32,7 +32,7 @@
#include <SHELLAPI.H>
//AA6YQ 1.65D->1.66G, JE3HHT 1.67
#define VERID "Ver1.70" //K6TU 1.68A -> 1.70A Hide FlexRadio Reserved and IQ Audio Devices
#define VERBETA "H" //JA7UDE 1.70A -> 1.70B G3WYW FT-991 CAT support
#define VERBETA "K" //JA7UDE 1.70A -> 1.70B G3WYW FT-991 CAT support
//AA6YQ 1.70C added COM16-32 to PTT/FSK port selector and Radio port selector, added 991 to Yaesu Group selector entry
//AA6YQ 1.70D prevent shift > 4000 Hz so CSlideFFT::Create does not divide by zero
//AA6YQ 1.70E limit PTT/FSK port selector and Radio port selector to display only 8 items
@ -44,9 +44,11 @@
// accept RXM_SOUNDSOURCE message to change soundcard source channel (mono, left, right)
//JA7UDE 1.70G translate new 1.70F error message into Japanese
//AA6YQ 1.70H correct regression in 1.70E that prevents correct frequency tracking for FT-891 and FT-991
//AA6YQ 1.70J update documentation and URLs
//AA6YQ 1.70K limit Help menu to one arrangement, increase height of VerDSP dialog, add "Setup always on top" option
#define VERTTL2 "MMTTY "VERID VERBETA
#define VERTTL VERTTL2" (C) JE3HHT 2000-2010."
#define VERTTL VERTTL2" Licensed under LGPL" //1.70J
#define SETUPTITLE "Setup MMTTY "VERID VERBETA //AA6YQ 1.66C
#define SETUPTITLEREMOTE "Setup "VERID VERBETA //AA6YQ 1.66C
@ -355,6 +357,7 @@ typedef struct {
int m_DisWindow;
int m_StayOnTop;
int m_MemWindow;
int m_SetupOnTop; //1.70K
int m_LWait;
AnsiString m_LogGridWidths;

Binary file not shown.

View file

@ -35,7 +35,14 @@
*/
//----------------------------------------------------------------------------
#include "fir.h"
//----------------------------------------------------------------------------
#include <System.Classes.hpp>
#include <Vcl.Controls.hpp>
#include <Vcl.ExtCtrls.hpp>
#include <Vcl.StdCtrls.hpp>/
#include <Vcl.StdCtrls.hpp>
#include <Vcl.ExtCtrls.hpp>/
#include <Vcl.StdCtrls.hpp>----------------------------------------------------------------------------
class TFreqDispDlg : public TForm
{
__published:

BIN
MMTTY.chm Normal file

Binary file not shown.

144
Main.cpp
View file

@ -161,7 +161,7 @@ __fastcall TMmttyWd::TMmttyWd(TComponent* Owner)
sys.m_FontCharset = ANSI_CHARSET;
Log.m_LogSet.m_TimeZone = 'Z';
sys.m_TimeStampUTC = 1;
sys.m_HTMLHelp = "KB2EOQ.htm";
sys.m_HTMLHelp = HELPNAME_A; //AA6YQ 1.70J was KB2EOQ.htm
KENT->Checked = FALSE;
sys.m_LWait = 2;
sys.m_LogLink = 0;
@ -179,6 +179,7 @@ __fastcall TMmttyWd::TMmttyWd(TComponent* Owner)
sys.m_LWait = 0;
sys.m_LogLink = 1;
}
sys.m_WinFontStyle = 0;
sys.m_BtnFontStyle = 0;
sys.m_Help = "Mmtty.txt";
@ -513,21 +514,32 @@ __fastcall TMmttyWd::TMmttyWd(TComponent* Owner)
WriteProfile(1025, "Default", TRUE); // デフォルトパラメータの記憶
ReadRegister();
WriteProfile(1026, "Return to the startup", TRUE); // デフォルトパラメータの記憶
sprintf(bf, "%s"HELPNAME_A, BgnDir);
if( (sys.m_HTMLHelp == HELPNAME_A)||(sys.m_HTMLHelp == HELPNAME_B) ){
sys.m_HTMLHelp = "";
//AA6YQ 1.70J
if( lcid != LANG_JAPANESE ){
sprintf(bf, "%s"HELPNAME_A, BgnDir);
}
if( IsFile(bf) ){
JanHelp = bf;
}
if( IsFile(bf) ){
sys.m_HTMLHelp = HELPNAME_A;
JanHelp = bf;
}
else {
sprintf(bf, "%s"HELPNAME_B, BgnDir);
if( IsFile(bf) ){
sys.m_HTMLHelp = HELPNAME_B;
JanHelp = bf;
}
}
//sprintf(bf, "%s"HELPNAME_A, BgnDir);
//if( (sys.m_HTMLHelp == HELPNAME_A)||(sys.m_HTMLHelp == HELPNAME_B) ){
// sys.m_HTMLHelp = "";
//}
//if( IsFile(bf) ){
// sys.m_HTMLHelp = HELPNAME_A;
// JanHelp = bf;
//}
//else {
// sprintf(bf, "%s"HELPNAME_B, BgnDir);
// if( IsFile(bf) ){
// sys.m_HTMLHelp = HELPNAME_B;
// JanHelp = bf;
// }
//}
#if 0
if( !strcmpi(GetEXT(sys.m_HTMLHelp.c_str()), "HLP") || !strcmpi(GetEXT(sys.m_HTMLHelp.c_str()), "CHM") ){
sprintf(bf, "%s%s", BgnDir, sys.m_HTMLHelp.c_str());
@ -954,7 +966,7 @@ void __fastcall TMmttyWd::UpdateSystemFont(void)
KExtSusp->Caption = "Suspend(&S)";
KSetHelp->Caption = "Setup Help(&S)...";
KWebHHT->Caption = "JE3HHT WebSite (Japanese)";
KWebHHT->Caption = "MM Open Source WebSite";
KWebJARTS->Caption = "JARTS WebSite";
KDispVer->Caption = "About MMTTY(&A)";
@ -1908,11 +1920,18 @@ void __fastcall TMmttyWd::ReadRegister(void)
Height = pIniFile->ReadInteger("Window", "WindowHeightN", Height);
}
}
}
sys.m_SetupOnTop = pIniFile->ReadInteger("Window", "SetupOnTop", sys.m_SetupOnTop); //1.70K
sys.m_WinFontName = pIniFile->ReadString("WindowFont", "Name", sys.m_WinFontName);
sys.m_WinFontCharset = (BYTE)pIniFile->ReadInteger("WindowFont", "Charset", sys.m_WinFontCharset);
sys.m_WinFontStyle = pIniFile->ReadInteger("WindowFont", "Style", sys.m_WinFontStyle);
//hack for forcing font to English (0) or Japanese (SHIFTJIS_CHARSET)
//sys.m_WinFontCharset = 0; //SHIFTJIS_CHARSET;
sys.m_FontAdjSize = pIniFile->ReadInteger("WindowFont", "Adjust", sys.m_FontAdjSize);
sys.m_BtnFontName = pIniFile->ReadString("ButtonFont", "Name", sys.m_BtnFontName);
sys.m_BtnFontCharset = (BYTE)pIniFile->ReadInteger("ButtonFont", "Charset", sys.m_BtnFontCharset);
@ -2295,6 +2314,9 @@ void __fastcall TMmttyWd::WriteRegister(void)
}
}
}
pIniFile->WriteInteger("Window", "SetupOnTop", sys.m_SetupOnTop); //1.70K
pIniFile->WriteInteger("Window", "Disable", sys.m_DisWindow);
pIniFile->WriteInteger("Window", "StayOnTop", sys.m_StayOnTop);
@ -5298,12 +5320,16 @@ void __fastcall TMmttyWd::KFFTClick(TObject *Sender)
//---------------------------------------------------------------------------
void __fastcall TMmttyWd::KWebHHTClick(TObject *Sender)
{
WebRef.ShowHTML("http://www33.ocn.ne.jp/~je3hht/");
//1.70J
//WebRef.ShowHTML("http://www33.ocn.ne.jp/~je3hht/");
WebRef.ShowHTML("http://mm-open.org/");
}
//---------------------------------------------------------------------------
void __fastcall TMmttyWd::KWebJARTSClick(TObject *Sender)
{
WebRef.ShowHTML("http://jarts.web.fc2.com/");
//1.70J
//WebRef.ShowHTML("http://jarts.web.fc2.com/");
WebRef.ShowHTML("http://jarts.jp/");
}
//---------------------------------------------------------------------------
void __fastcall TMmttyWd::KWebGRPClick(TObject *Sender)
@ -5313,12 +5339,16 @@ void __fastcall TMmttyWd::KWebGRPClick(TObject *Sender)
//---------------------------------------------------------------------------
void __fastcall TMmttyWd::KWebENGClick(TObject *Sender)
{
WebRef.ShowHTML("http://mmhamsoft.amateur-radio.ca/");
//1.70J
//WebRef.ShowHTML("http://mmhamsoft.amateur-radio.ca/");
WebRef.ShowHTML("http://hamsoft.ca/");
}
//---------------------------------------------------------------------------
void __fastcall TMmttyWd::KWebWSKClick(TObject *Sender)
{
WebRef.ShowHTML("http://home.b01.itscom.net/ja1wsk/");
//1.70J
//WebRef.ShowHTML("http://home.b01.itscom.net/ja1wsk/");
WebRef.ShowHTML("http://home.b01.itscom.net/ja1wsk/mmtty00.html");
}
//---------------------------------------------------------------------------
// MMTTY.Txtの表示メニュー
@ -5337,11 +5367,7 @@ void __fastcall TMmttyWd::KHlpDigClick(TObject *Sender)
ShowHelp(this, sys.m_HelpDigital.c_str());
}
//---------------------------------------------------------------------------
void __fastcall TMmttyWd::KW7TIClick(TObject *Sender)
{
ShowHelp(this, "W7TI.TXT");
}
//---------------------------------------------------------------------------
void __fastcall TMmttyWd::KRMClick(TObject *Sender)
{
ShowHelp(this, (Font->Charset != SHIFTJIS_CHARSET) ? "EUpdate.txt" : "Update.txt");
@ -7342,9 +7368,27 @@ void __fastcall TMmttyWd::KSetHelpClick(TObject *Sender)
DisPaint = TRUE;
TSetHelpBox *pBox = new TSetHelpBox(this);
//1.70K
if (sys.m_WinFontCharset == SHIFTJIS_CHARSET) {
pBox->GroupBox1->Visible=True;
pBox->GroupBox2->Visible=True;
pBox->GroupBox3->Visible=True;
pBox->GroupBox4->Visible=False;
}
else {
pBox->GroupBox1->Visible=False;
pBox->GroupBox2->Visible=False;
pBox->GroupBox3->Visible=False;
pBox->GroupBox4->Visible=True;
}
if( pBox->Execute() == TRUE ){
AddHelpMenu();
//AddHelpMenu(); //1.70K don't modify Help menu
UpdateSystemFont();
}
delete pBox;
TopWindow(this);
@ -7353,48 +7397,18 @@ void __fastcall TMmttyWd::KSetHelpClick(TObject *Sender)
//---------------------------------------------------------------------------
void __fastcall TMmttyWd::AddHelpMenu(void)
{
if( (sys.m_HTMLHelp == HELPNAME_A) || (sys.m_HTMLHelp == HELPNAME_B) ){
if( KMHelp->Items[0]->OnClick != KAndyHelp ){
KMHelp->Delete(0);
KMHelp->Delete(0);
KMHelp->Delete(0);
KMHelp->Delete(0);
KMHelp->Delete(0);
KMHelp->Delete(0);
pAndyMenu = new TMenuItem(NULL);
pAndyMenu->Caption = "MMTTY Help";
pAndyMenu->OnClick = KAndyHelp;
KMHelp->Insert(0, pAndyMenu);
}
}
else if( !sys.m_HTMLHelp.IsEmpty() ){
if( KMHelp->Items[0]->OnClick == KAndyHelp ){
KMHelp->Delete(0);
}
else {
pAndyMenu2 = new TMenuItem(NULL);
pAndyMenu2->Caption = "-";
pAndyMenu2->OnClick = NULL;
KMHelp->Insert(0, pAndyMenu2);
}
char bf[256];
//1.70K only one Help Menu configuration
if(sys.m_WinFontCharset != SHIFTJIS_CHARSET){
KMHelp->Delete(0); //Delete 3 Japanese Help menu items
KMHelp->Delete(0);
KMHelp->Delete(0);
pAndyMenu = new TMenuItem(NULL);
if( !strcmpi(GetEXT(sys.m_HTMLHelp.c_str()), "HLP") ){
sprintf(bf, "MMTTY Help (%s)", sys.m_HTMLHelp.c_str());
}
else {
sprintf(bf, "HTML Help (%s)", sys.m_HTMLHelp.c_str());
}
pAndyMenu->Caption = bf;
pAndyMenu->Caption = "MMTTY Help";
pAndyMenu->OnClick = KAndyHelp;
KMHelp->Insert(0, pAndyMenu);
}
else {
if( KMHelp->Items[0]->OnClick == KAndyHelp ){
KMHelp->Delete(0);
KMHelp->Delete(0);
}
}
}
//---------------------------------------------------------------------------
void __fastcall TMmttyWd::KAndyHelp(TObject *Sender)
@ -9909,3 +9923,5 @@ void __fastcall TMmttyWd::KExtCmdClick(TObject *Sender)
KExtSusp->Enabled = !pSound->m_susp;
}
//---------------------------------------------------------------------------

BIN
Main.dfm

Binary file not shown.

7
Main.h
View file

@ -41,8 +41,9 @@
#include "SendFile.h"
#define USEPAL 1
#define SQSCALE 1024 // SQ ‚Ì•\ަƒXƒP<C692>[ƒ‹
#define HELPNAME_A "MMTTY.CHM"
#define HELPNAME_A "MMTTY.chm"
#define HELPNAME_B "MMTTY.HLP"
//---------------------------------------------------------------------------
enum {
RXM_HANDLE=0x0000, // APP -> MMTTY
@ -334,7 +335,6 @@ __published: // IDE
TMenuItem *KFFTRF;
TMenuItem *KPaste;
TMenuItem *N16;
TMenuItem *KW7TI;
TMenuItem *KWebWSK;
TMenuItem *N17;
TMenuItem *KTNC;
@ -595,13 +595,12 @@ __published: // IDE
void __fastcall KFFTRMClick(TObject *Sender);
void __fastcall KFFTRFClick(TObject *Sender);
void __fastcall KPasteClick(TObject *Sender);
void __fastcall KW7TIClick(TObject *Sender);
void __fastcall KWebWSKClick(TObject *Sender);
void __fastcall KTNCClick(TObject *Sender);
void __fastcall KRMClick(TObject *Sender);
void __fastcall LTapClick(TObject *Sender);
void __fastcall KMacClick(TObject *Sender);
void __fastcall KENTClick(TObject *Sender);

View file

@ -347,6 +347,7 @@ void __fastcall TOptionDlg::UpdateUI(void)
GB4->Enabled = f;
SetGroupEnabled(GB4);
Source->Enabled = f;
}
//---------------------------------------------------------------------------
TSpeedButton *__fastcall TOptionDlg::GetSB(int n)
@ -613,6 +614,9 @@ int __fastcall TOptionDlg::Execute(CFSKDEM *fp, CFSKMOD *mp)
}
UpdateUI();
m_DisEvent = 0;
SetupTimer->Enabled= True; //1.70K
int r = ShowModal();
if( r == IDOK ){
m_DisEvent++;
@ -929,6 +933,8 @@ int __fastcall TOptionDlg::Execute(CFSKDEM *fp, CFSKMOD *mp)
if( sys.m_TxPort != TxPort->ItemIndex ) COMM.change = 1;
sys.m_TxPort = TxPort->ItemIndex;
sys.m_MemWindow = MemWin->Checked;
sys.m_SetupOnTop = SetupOnTop->Checked; //1.70K
}
else {
r = FALSE;
@ -1472,6 +1478,7 @@ void __fastcall TOptionDlg::DefBtnClick(TObject *Sender)
pllOutFC->Text = 200;
HamBtnClick(NULL);
}
//---------------------------------------------------------------------------
void __fastcall TOptionDlg::RadioBtnClick(TObject *Sender)
{
@ -1837,3 +1844,24 @@ void __fastcall TOptionDlg::HideFlexAudioClick(TObject *Sender)
//---------------------------------------------------------------------------
void __fastcall TOptionDlg::SetupOnTopClick(TObject *Sender)
{
sys.m_SetupOnTop = SetupOnTop->Checked; //1.70K
if( sys.m_SetupOnTop ){
FormStyle = fsStayOnTop;
}
else {
FormStyle = fsNormal;
}
}
void __fastcall TOptionDlg::SetupTimerTimer(TObject *Sender)
{
SetupTimer->Enabled=False;
SetupOnTop->Checked = sys.m_SetupOnTop; //1.70K
}
//---------------------------------------------------------------------------

Binary file not shown.

View file

@ -280,6 +280,8 @@ __published:
TCheckBox *CBAA6YQ;
TSpeedButton *SBAA6YQ;
TCheckBox *HideFlexAudio;
TCheckBox *SetupOnTop;
TTimer *SetupTimer;
void __fastcall HamBtnClick(TObject *Sender);
@ -353,6 +355,8 @@ __published:
void __fastcall SBAA6YQClick(TObject *Sender);
void __fastcall HideFlexAudioClick(TObject *Sender);
void __fastcall SetupOnTopClick(TObject *Sender);
void __fastcall SetupTimerTimer(TObject *Sender);
private:

View file

@ -69,24 +69,36 @@ int __fastcall TSetHelpBox::Execute(void)
//---------------------------------------------------------------------
void __fastcall TSetHelpBox::JABtnClick(TObject *Sender)
{
EditHTML->Text = "";
EditHTML->Text = "MMTTY.chm"; //1.70K
EditMMTTY->Text = "Mmtty.txt";
EditLog->Text = "Mmttylog.txt";
EditDigital->Text = "Digital.txt";
m_HelpFontName = "lr ƒSƒVƒbƒN";
m_HelpFontCharset = SHIFTJIS_CHARSET;
m_HelpFontSize = 10;
//1.70K hide English Help panels
GroupBox1->Visible=True;
GroupBox2->Visible=True;
GroupBox3->Visible=True;
GroupBox4->Visible=False;
}
//---------------------------------------------------------------------------
void __fastcall TSetHelpBox::EngBtnClick(TObject *Sender)
{
EditHTML->Text = "KB2EOQ.htm";
EditHTML->Text = "MMTTY.chm"; //1.70J
EditMMTTY->Text = "MmttyE.txt";
EditLog->Text = "LogE.txt";
EditDigital->Text = "DigitalE.txt";
m_HelpFontName = "Courier";//"Courier New";
m_HelpFontCharset = ANSI_CHARSET;
m_HelpFontSize = 10;
//1.70K hide Japanese Help panels
GroupBox1->Visible=False;
GroupBox2->Visible=False;
GroupBox3->Visible=False;
GroupBox4->Visible=True; //1.70K
}
//---------------------------------------------------------------------------
void __fastcall TSetHelpBox::FontBtnClick(TObject *Sender)

Binary file not shown.

View file

@ -38,30 +38,32 @@ __fastcall TVerDspDlg::TVerDspDlg(TComponent* AOwner)
// Version->Font->Charset = ((TForm *)AOwner)->Font->Charset;
LFree->Font->Name = ((TForm *)AOwner)->Font->Name;
LFree->Font->Charset = ((TForm *)AOwner)->Font->Charset;
if( Font->Charset != SHIFTJIS_CHARSET ){
//if( Font->Charset != SHIFTJIS_CHARSET ){ //1.70K always display this information in English
Caption = "Version Information";
LFree->Caption = "Free Software";
LTNX->Font->Size = LTNX->Font->Size - 1;
}
//}
Version->Caption = VERTTL;
LTNX->Caption =
"------ Programming ------\r\n"
"Stu, K6TU (Updated 1.66A -> 1.70A)\r\n"
"Stu, K6TU (Updated 1.68A -> 1.70A)\r\n"
"Paul, G3WYW (Updated 1.70A -> 1.70B)\r\n"
"Dave, AA6YQ (updated 1.65D -> 1.66G, 1.70B -> 1.70H)\r\n"
"Dave, AA6YQ (updated 1.65D -> 1.66G, 1.70B -> 1.70K)\r\n\r\n"
"------ Help, FAQ and Remote mode, etc... ------\r\n"
"Jan, KX2A Ken, VE5KC Bill, KB4IJ Andy, K3UK(KB2EOQ)\r\n"
"Bill, K5YG Phil, GU0SUP, Josef, OK2WO Oba, JA7UDE\r\n"
"Bill, W7TI Ed, K4SB Eddie, W6/G0AZT Geoff, G3NPA\r\n"
"Bob, K4CY Eike, DM3ML Antonio, EA1MV Edoardo, I5PAC\r\n"
"Joe, W4TV\r\n"
"Bill, W7TI Ed, K4SB Eddie, W6/G0AZT Geoff, G3NPA Bob, K4CY\r\n"
"Eike, DM3ML Antonio, EA1MV Edoardo, I5PAC Joe, W4TV\r\n\r\n"
"------ Japanese friends ------\r\n"
"Fumio, JA1IQV Nori, JA1WSK Oba, JA7UDE\r\n"
"Kaz, 7L1CUH Nobu, JA2BQX Hiro, JH1BIH, Isao JK1IQK\r\n"
"Kaz, 7L1CUH Nobu, JA2BQX Hiro, JH1BIH, Isao JK1IQK\r\n\r\n"
"------ Reflector and Web sites ------\r\n"
"MMTTY User's group http://groups.yahoo.com/group/MMTTY/\r\n"
"MMTTY-Web http://mmhamsoft.amateur-radio.ca/\r\n"
"JARTS-Web http://jarts.web.fc2.com/\r\n"
"MMTTY User's group http://groups.yahoo.com/group/MMTTY\r\n"
"MMTTY-Web http://hamsoft.ca\r\n"
"JARTS-Web http://jarts.jp\r\n"
"MMTTY open source http://mm-open.org/\r\n"
"\r\nAll friends of Radio Amateurs\r\n"
"And my wife Midori, JI3IVL, for her invisible help."
;

Binary file not shown.