From 8130cdc4c640f6ec0700b734d24f52a20b72f687 Mon Sep 17 00:00:00 2001 From: wittend99 Date: Tue, 16 Oct 2012 01:29:25 +0000 Subject: [PATCH] git-svn-id: https://svn.code.sf.net/p/freetel/code@760 01035d8c-6547-0410-b346-abe4f91aad63 --- fdmdv2/src/topFrame.cpp | 44 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/fdmdv2/src/topFrame.cpp b/fdmdv2/src/topFrame.cpp index 6c9bb5eb..76775137 100644 --- a/fdmdv2/src/topFrame.cpp +++ b/fdmdv2/src/topFrame.cpp @@ -229,17 +229,55 @@ TopFrame::TopFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxStaticBoxSizer* sbSizer5; sbSizer5 = new wxStaticBoxSizer(new wxStaticBox(this, wxID_ANY, _("Control")), wxVERTICAL); + wxBoxSizer* bSizer1511; bSizer1511 = new wxBoxSizer(wxVERTICAL); m_togBtnOnOff = new wxToggleButton(this, wxID_ANY, _("Start"), wxDefaultPosition, wxDefaultSize, 0); - m_togBtnOnOff->SetToolTip(_("Begin receiving data.")); + m_togBtnOnOff->SetToolTip(_("Begin/End receiving data.")); bSizer1511->Add(m_togBtnOnOff, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 1); sbSizer5->Add(bSizer1511, 0, wxEXPAND, 1); +//------------------------------ + + wxBoxSizer* bSizer15113; + bSizer15113 = new wxBoxSizer(wxHORIZONTAL); + + wxBoxSizer* bSizer15111; + bSizer15111 = new wxBoxSizer(wxVERTICAL); + + wxSize wxSz = wxSize(44, 30); + + m_togBtnLoopRx = new wxToggleButton(this, wxID_ANY, _("Loop\nRX"), wxDefaultPosition, wxSz, 0); + m_togBtnLoopRx->SetFont(wxFont(6, 70, 90, 90, false, wxEmptyString)); + m_togBtnLoopRx->SetToolTip(_("Loopback Receive audio data.")); + + bSizer15111->Add(m_togBtnLoopRx, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 0); + + //sbSizer5->Add(bSizer15111, 0, wxEXPAND, 1); + bSizer15113->Add(bSizer15111, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 0); + +//------------------------------ + + wxBoxSizer* bSizer15112; + bSizer15112 = new wxBoxSizer(wxVERTICAL); + + m_togBtnLoopTx = new wxToggleButton(this, wxID_ANY, _("Loop\nTX"), wxDefaultPosition, wxSz, 0); + m_togBtnLoopTx->SetFont(wxFont(6, 70, 90, 90, false, wxEmptyString)); + m_togBtnLoopTx->SetToolTip(_("Loopback Transmit audio data.")); + + bSizer15112->Add(m_togBtnLoopTx, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 0); + + + bSizer15113->Add(bSizer15112, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 0); + + sbSizer5->Add(bSizer15113, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 1); + +//------------------------------ + wxBoxSizer* bSizer151; bSizer151 = new wxBoxSizer(wxVERTICAL); @@ -342,6 +380,8 @@ TopFrame::TopFrame(wxWindow* parent, wxWindowID id, const wxString& title, const m_ckboxSQ->Connect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(TopFrame::OnCheckSQClick), NULL, this); m_togBtnOnOff->Connect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnOnOff), NULL, this); + m_togBtnLoopRx->Connect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnLoopRx), NULL, this); + m_togBtnLoopTx->Connect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnLoopTx), NULL, this); m_togBtnSplit->Connect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnSplitClick), NULL, this); m_togBtnAnalog->Connect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnAnalogClick), NULL, this); m_togBtnALC->Connect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnALCClick), NULL, this); @@ -397,6 +437,8 @@ TopFrame::~TopFrame() m_ckboxSQ->Disconnect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(TopFrame::OnCheckSQClick), NULL, this); m_togBtnOnOff->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnOnOff), NULL, this); + m_togBtnLoopRx->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnLoopRx), NULL, this); + m_togBtnLoopTx->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnLoopTx), NULL, this); m_togBtnSplit->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnSplitClick), NULL, this); m_togBtnAnalog->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnAnalogClick), NULL, this); m_togBtnALC->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnALCClick), NULL, this); -- 2.25.1