From 1b202357d3c5a20a4a82ca40050ab62528f8d4fe Mon Sep 17 00:00:00 2001 From: drowe67 Date: Mon, 27 May 2013 20:46:49 +0000 Subject: [PATCH] after some sizer frustration with ptt dlg, rename commport to ptt git-svn-id: https://svn.code.sf.net/p/freetel/code@1285 01035d8c-6547-0410-b346-abe4f91aad63 --- fdmdv2/src/Makefile.linux | 7 ++-- fdmdv2/src/{dlg_comports.cpp => dlg_ptt.cpp} | 34 +++++++++++--------- fdmdv2/src/{dlg_comports.h => dlg_ptt.h} | 2 +- fdmdv2/src/fdmdv2_main.h | 2 +- 4 files changed, 25 insertions(+), 20 deletions(-) rename fdmdv2/src/{dlg_comports.cpp => dlg_ptt.cpp} (91%) rename fdmdv2/src/{dlg_comports.h => dlg_ptt.h} (98%) diff --git a/fdmdv2/src/Makefile.linux b/fdmdv2/src/Makefile.linux index 54c0a1a3..a7f9e381 100644 --- a/fdmdv2/src/Makefile.linux +++ b/fdmdv2/src/Makefile.linux @@ -73,8 +73,9 @@ endif HAMLIB=hamlib-1.2.15.3 ifeq ($(SYSTEM_HAMLIB),y) -HAMLIB_INC ?= $(shell pkg-config hamlib --cflags) -HAMLIB_LIB ?= $(shell pkg-config hamlib --libs) +#HAMLIB_INC ?= $(shell pkg-config hamlib --cflags) +#HAMLIB_LIB ?= $(shell pkg-config hamlib --libs) +HAMLIB_LIB = -lhamlib else HAMLIB_INC=-I$(HAMLIB)/include/hamlib # TODO: need to include all the backends too @@ -99,7 +100,7 @@ fdmdv2_plot_spectrum.o \ fdmdv2_plot_waterfall_linux.o \ fdmdv2_pa_wrapper.o \ dlg_audiooptions.o \ -dlg_comports.o \ +dlg_ptt.o \ dlg_filter.o \ dlg_options.o \ varicode.o \ diff --git a/fdmdv2/src/dlg_comports.cpp b/fdmdv2/src/dlg_ptt.cpp similarity index 91% rename from fdmdv2/src/dlg_comports.cpp rename to fdmdv2/src/dlg_ptt.cpp index 80b85f42..fab263c2 100644 --- a/fdmdv2/src/dlg_comports.cpp +++ b/fdmdv2/src/dlg_ptt.cpp @@ -1,5 +1,5 @@ //========================================================================== -// Name: dlg_comports.cpp +// Name: dlg_ptt.cpp // Purpose: Subclasses dialog GUI for PTT Config. Creates simple // wxWidgets dialog GUI to select real/virtual Comm ports. // Date: May 11 2012 @@ -19,7 +19,7 @@ // along with this program; if not, see . // //========================================================================== -#include "dlg_comports.h" +#include "dlg_ptt.h" #include "fdmdv2_main.h" #ifdef __WIN32__ @@ -43,45 +43,49 @@ ComPortsDlg::ComPortsDlg(wxWindow* parent, wxWindowID id, const wxString& title, mainSizer->Add(staticBoxSizer28, 0, wxEXPAND, 5); wxStaticBoxSizer* staticBoxSizer18 = new wxStaticBoxSizer( new wxStaticBox(this, wxID_ANY, _("Hamlib Settings")), wxVERTICAL); - mainSizer->Add(staticBoxSizer18, 1, wxEXPAND, 5); - wxGridSizer* gridSizer100 = new wxGridSizer(1, 5, 0, 0); + //wxGridSizer* gridSizer100 = new wxGridSizer(1, 5, 0, 0); + wxBoxSizer* gridSizer100 = new wxBoxSizer(wxHORIZONTAL); /* Use Hamlib for PTT checkbox. */ m_ckUseHamlibPTT = new wxCheckBox(this, wxID_ANY, _("Use Hamlib PTT"), wxDefaultPosition, wxSize(-1, -1), 0); m_ckUseHamlibPTT->SetValue(false); - gridSizer100->Add(m_ckUseHamlibPTT, 1, wxALIGN_LEFT, 2); + gridSizer100->Add(m_ckUseHamlibPTT, 0, wxALIGN_CENTER_VERTICAL, 0); /* Hamlib Rig Type combobox. */ - gridSizer100->Add(new wxStaticText(this, wxID_ANY, _("Rig Model: "), wxDefaultPosition, wxDefaultSize, 0), 1,wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 2); - m_cbRigName = new wxComboBox(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(140, -1), 0, NULL, wxCB_DROPDOWN); - /* TODO(Joel): this is a hack. At the least, need to gaurntee that m_hamLib + gridSizer100->Add(new wxStaticText(this, wxID_ANY, _("Rig Model:"), wxDefaultPosition, wxDefaultSize, 0), + 0, wxALIGN_CENTER_VERTICAL | wxLEFT, 20); + m_cbRigName = new wxComboBox(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(250, -1), 0, NULL, wxCB_DROPDOWN); + /* TODO(Joel): this is a hack. At the least, need to gurantee that m_hamLib * exists. */ wxGetApp().m_hamlib->populateComboBox(m_cbRigName); m_cbRigName->SetSelection(wxGetApp().m_intHamlibRig); - gridSizer100->Add(m_cbRigName, 1, wxALIGN_CENTER|wxALIGN_RIGHT, 2); + gridSizer100->Add(m_cbRigName, 0, wxALIGN_CENTER_VERTICAL, 0); /* Hamlib Serial Port combobox. */ - gridSizer100->Add(new wxStaticText(this, wxID_ANY, _("Serial Device: "), wxDefaultPosition, wxDefaultSize, 0), 1,wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 2); + gridSizer100->Add(new wxStaticText(this, wxID_ANY, _("Serial Device:"), wxDefaultPosition, wxDefaultSize, 0), + 0, wxALIGN_CENTER_VERTICAL | wxLEFT, 20); m_cbSerialPort = new wxComboBox(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(140, -1), 0, NULL, wxCB_DROPDOWN); - gridSizer100->Add(m_cbSerialPort, 1, wxALIGN_CENTER|wxALIGN_RIGHT, 2); + gridSizer100->Add(m_cbSerialPort, 0, wxALIGN_CENTER_VERTICAL, 0); - staticBoxSizer18->Add(gridSizer100, 1, wxALIGN_CENTER_VERTICAL|wxALL, 1); + staticBoxSizer18->Add(gridSizer100, 1); + mainSizer->Add(staticBoxSizer18, 1); wxBoxSizer* boxSizer12 = new wxBoxSizer(wxHORIZONTAL); - mainSizer->Add(boxSizer12, 0, wxLEFT|wxRIGHT|wxTOP|wxBOTTOM|wxALIGN_CENTER_HORIZONTAL, 5); m_buttonOK = new wxButton(this, wxID_OK, _("OK"), wxDefaultPosition, wxSize(-1,-1), 0); m_buttonOK->SetDefault(); - boxSizer12->Add(m_buttonOK, 0, wxLEFT|wxRIGHT|wxTOP|wxBOTTOM, 5); + m_buttonCancel = new wxButton(this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize(-1,-1), 0); boxSizer12->Add(m_buttonCancel, 0, wxLEFT|wxRIGHT|wxTOP|wxBOTTOM, 5); m_buttonApply = new wxButton(this, wxID_APPLY, _("Apply"), wxDefaultPosition, wxSize(-1,-1), 0); boxSizer12->Add(m_buttonApply, 0, wxLEFT|wxRIGHT|wxTOP|wxBOTTOM, 5); - SetSizeHints(450,300); + mainSizer->Add(boxSizer12, 0, wxLEFT|wxRIGHT|wxTOP|wxBOTTOM|wxALIGN_CENTER_HORIZONTAL, 5); + //SetSizeHints(450,300); + if ( GetSizer() ) { GetSizer()->Fit(this); diff --git a/fdmdv2/src/dlg_comports.h b/fdmdv2/src/dlg_ptt.h similarity index 98% rename from fdmdv2/src/dlg_comports.h rename to fdmdv2/src/dlg_ptt.h index 808b7a65..f9a5240b 100644 --- a/fdmdv2/src/dlg_comports.h +++ b/fdmdv2/src/dlg_ptt.h @@ -1,5 +1,5 @@ //========================================================================== -// Name: dlg_comports.h +// Name: dlg_ptt.h // Purpose: Subclasses dialog GUI for PTT Config. // // Created: May. 11, 2012 diff --git a/fdmdv2/src/fdmdv2_main.h b/fdmdv2/src/fdmdv2_main.h index 743ecfc1..fa340dc7 100644 --- a/fdmdv2/src/fdmdv2_main.h +++ b/fdmdv2/src/fdmdv2_main.h @@ -59,7 +59,7 @@ #include "golay23.h" #include "topFrame.h" -#include "dlg_comports.h" +#include "dlg_ptt.h" #include "fdmdv2_plot.h" #include "fdmdv2_plot_scalar.h" #include "fdmdv2_plot_scatter.h" -- 2.25.1