From 21a8a2949f8fe32f14266b47b306ac3a31cca5f2 Mon Sep 17 00:00:00 2001 From: hobbes1069 Date: Mon, 16 Jun 2014 22:37:31 +0000 Subject: [PATCH] Remove superfluous dlg_about.{h,cpp} from source and build system. Bump version due to recent changes. git-svn-id: https://svn.code.sf.net/p/freetel/code@1658 01035d8c-6547-0410-b346-abe4f91aad63 --- fdmdv2-dev/ChangeLog | 184 +++++++++++++++++++++++++++ fdmdv2-dev/src/CMakeLists.txt | 2 - fdmdv2-dev/src/dlg_about.cpp | 225 ---------------------------------- fdmdv2-dev/src/dlg_about.h | 72 ----------- fdmdv2-dev/src/fdmdv2_main.h | 1 - fdmdv2-dev/src/version.h | 6 +- 6 files changed, 187 insertions(+), 303 deletions(-) delete mode 100644 fdmdv2-dev/src/dlg_about.cpp delete mode 100644 fdmdv2-dev/src/dlg_about.h diff --git a/fdmdv2-dev/ChangeLog b/fdmdv2-dev/ChangeLog index 6cc9eb6c..5983a949 100644 --- a/fdmdv2-dev/ChangeLog +++ b/fdmdv2-dev/ChangeLog @@ -1,4 +1,188 @@ ------------------------------------------------------------------------ +r1655 | hobbes1069 | 2014-06-16 09:36:03 -0500 (Mon, 16 Jun 2014) | 1 line + +Clone fdmdv2 into fdmdv2-dev for a development sandbox. +------------------------------------------------------------------------ +r1654 | hobbes1069 | 2014-06-16 09:27:02 -0500 (Mon, 16 Jun 2014) | 1 line + +Add better portaudio detection with version. Stop linking with portaudiocpp as we don't seem to use it. +------------------------------------------------------------------------ +r1648 | drowe67 | 2014-06-12 21:27:08 -0500 (Thu, 12 Jun 2014) | 1 line + +added anti system call spam tmer, and finally have checkboxes tooltips working +------------------------------------------------------------------------ +r1647 | drowe67 | 2014-06-11 23:33:08 -0500 (Wed, 11 Jun 2014) | 1 line + +worked out sh -c cmd line how to use wxExecute which is much faster +------------------------------------------------------------------------ +r1646 | drowe67 | 2014-06-11 22:35:45 -0500 (Wed, 11 Jun 2014) | 1 line + +made ok-cancel-apply order consistent across dialogs, converted short varicode to use 2 bits/frame +------------------------------------------------------------------------ +r1645 | drowe67 | 2014-06-11 18:36:48 -0500 (Wed, 11 Jun 2014) | 1 line + +added UDP control port that can process a few commands, made options dialog non model, mostly working but a few corner cases to cover +------------------------------------------------------------------------ +r1644 | drowe67 | 2014-06-10 04:52:34 -0500 (Tue, 10 Jun 2014) | 1 line + +nasty fix to mysterious window shrinking issue +------------------------------------------------------------------------ +r1643 | drowe67 | 2014-06-10 02:40:23 -0500 (Tue, 10 Jun 2014) | 1 line + +first pass at matching multiple regexp +------------------------------------------------------------------------ +r1642 | drowe67 | 2014-06-09 05:45:59 -0500 (Mon, 09 Jun 2014) | 1 line + +event processing starting to come together, issuing system commands and logging events +------------------------------------------------------------------------ +r1641 | drowe67 | 2014-06-05 16:22:42 -0500 (Thu, 05 Jun 2014) | 1 line + +added feature to optionally play 1 kHz tone in left channel to trigger vox +------------------------------------------------------------------------ +r1640 | drowe67 | 2014-06-05 05:50:43 -0500 (Thu, 05 Jun 2014) | 1 line + +added checksum and checksums stats display for txt messages, haven't tested on poor channels yet, works OK in analog loopback +------------------------------------------------------------------------ +r1638 | drowe67 | 2014-06-05 01:52:22 -0500 (Thu, 05 Jun 2014) | 1 line + +fixed transposition and change to fdmdv_freq_shift(), thanks Bruce +------------------------------------------------------------------------ +r1636 | drowe67 | 2014-06-04 22:57:44 -0500 (Wed, 04 Jun 2014) | 1 line + +more compact varicode option working +------------------------------------------------------------------------ +r1633 | drowe67 | 2014-06-04 06:05:20 -0500 (Wed, 04 Jun 2014) | 1 line + +integrating choice of short and long varicode, short code still has some problems +------------------------------------------------------------------------ +r1629 | hobbes1069 | 2014-06-03 11:51:43 -0500 (Tue, 03 Jun 2014) | 1 line + +Update references of codec2-dev to codec2. +------------------------------------------------------------------------ +r1626 | hobbes1069 | 2014-06-03 08:09:51 -0500 (Tue, 03 Jun 2014) | 1 line + +Add comp.h to public headers. +------------------------------------------------------------------------ +r1624 | drowe67 | 2014-06-02 17:15:31 -0500 (Mon, 02 Jun 2014) | 1 line + +clip bug, thanks Bruce +------------------------------------------------------------------------ +r1622 | drowe67 | 2014-06-01 00:55:23 -0500 (Sun, 01 Jun 2014) | 1 line + +refactored varicode impl and api, freedv links with it ok, need to hook up option for new code 2 variant +------------------------------------------------------------------------ +r1621 | drowe67 | 2014-05-31 23:19:47 -0500 (Sat, 31 May 2014) | 1 line + +added support for alternate varicode librray from fdmdv1, smaller char set, but uses about 20% of the bits +------------------------------------------------------------------------ +r1620 | drowe67 | 2014-05-30 21:00:05 -0500 (Fri, 30 May 2014) | 1 line + +first draft of event processing GUI, still plenty of work to do to wire it up +------------------------------------------------------------------------ +r1615 | drowe67 | 2014-05-30 01:05:58 -0500 (Fri, 30 May 2014) | 1 line + +added web integration dialog and persistant storgage for web integration. +------------------------------------------------------------------------ +r1607 | drowe67 | 2014-05-28 18:57:27 -0500 (Wed, 28 May 2014) | 1 line + +corrected to/left swap bug, and added code so that window size is not saved if iconised. Thanks Steve & Bob +------------------------------------------------------------------------ +r1597 | drowe67 | 2014-05-26 17:26:19 -0500 (Mon, 26 May 2014) | 1 line + +Stephen's patch reversed for now, so we csn tst Win32 registery/resize issues separately +------------------------------------------------------------------------ +r1596 | drowe67 | 2014-05-26 16:21:17 -0500 (Mon, 26 May 2014) | 1 line + +Stephen's indep sound card selection logic and setting min size +------------------------------------------------------------------------ +r1595 | drowe67 | 2014-05-26 16:20:40 -0500 (Mon, 26 May 2014) | 1 line + +Stephen's indep sound card selection logic and setting min size +------------------------------------------------------------------------ +r1594 | hobbes1069 | 2014-05-24 21:41:14 -0500 (Sat, 24 May 2014) | 1 line + +Bump patch level for update. +------------------------------------------------------------------------ +r1593 | drowe67 | 2014-05-24 20:11:41 -0500 (Sat, 24 May 2014) | 1 line + +first pass at Win32 registry bug +------------------------------------------------------------------------ +r1592 | deuce | 2014-05-06 13:28:53 -0500 (Tue, 06 May 2014) | 4 lines + +Initialize the COM port defaults before opening to avoid a very short +RTS/DTR transient on open. + + +------------------------------------------------------------------------ +r1591 | deuce | 2014-05-05 23:20:22 -0500 (Mon, 05 May 2014) | 4 lines + +Performs more complete COM port initialization on Win32 to "clear out" settings in the control panel. +Should fix the issue reported by WB8ILI if he's using Windows. + + +------------------------------------------------------------------------ +r1589 | hobbes1069 | 2014-05-04 13:06:05 -0500 (Sun, 04 May 2014) | 1 line + +Fix missing png library for windows installer and bump version to 0.96.6. +------------------------------------------------------------------------ +r1494 | hobbes1069 | 2014-04-13 07:52:28 -0500 (Sun, 13 Apr 2014) | 1 line + +Commit patch for native serial PTT. +------------------------------------------------------------------------ +r1480 | drowe67 | 2014-03-25 00:21:58 -0500 (Tue, 25 Mar 2014) | 1 line + +modified play testing for mono devices, compiles OK but can't test as I don't have any mono play devices +------------------------------------------------------------------------ +r1478 | drowe67 | 2014-03-25 00:08:10 -0500 (Tue, 25 Mar 2014) | 1 line + +modified rec testing for mono devices +------------------------------------------------------------------------ +r1400 | drowe67 | 2014-02-11 14:21:37 -0600 (Tue, 11 Feb 2014) | 1 line + +patch to stop tools-filter function crashing, thanks Kamal +------------------------------------------------------------------------ +r1345 | hobbes1069 | 2013-12-16 14:41:56 -0600 (Mon, 16 Dec 2013) | 1 line + +Add better error message when an in-source build is attempted. Add workaround for bootstrap build of wxWidgets due to cmake bug. Update minimum wxWidgets version to 3.0.0. +------------------------------------------------------------------------ +r1332 | bruceperens | 2013-12-10 22:08:16 -0600 (Tue, 10 Dec 2013) | 3 lines + +Add scripts that install the necessary runtime or development packages on +Debian, and perhaps also on Ubuntu and Mint. + +------------------------------------------------------------------------ +r1331 | hobbes1069 | 2013-12-06 14:43:02 -0600 (Fri, 06 Dec 2013) | 1 line + +Make in-source build error message more human readable. +------------------------------------------------------------------------ +r1330 | hobbes1069 | 2013-10-08 14:32:59 -0500 (Tue, 08 Oct 2013) | 1 line + +Update libctb static build. +------------------------------------------------------------------------ +r1329 | hobbes1069 | 2013-10-07 16:15:25 -0500 (Mon, 07 Oct 2013) | 1 line + +Update codec2 svn checkout URL in BuildCodec2.cmake +------------------------------------------------------------------------ +r1328 | drowe67 | 2013-08-12 21:22:40 -0500 (Mon, 12 Aug 2013) | 1 line + +minor changes to defaults, re-enabled support for changing callsign when running, cleaner open/close of hamlib +------------------------------------------------------------------------ +r1327 | drowe67 | 2013-08-07 01:02:32 -0500 (Wed, 07 Aug 2013) | 1 line + +populating both serial port lists for Win32 +------------------------------------------------------------------------ +r1326 | drowe67 | 2013-08-07 00:44:18 -0500 (Wed, 07 Aug 2013) | 1 line + +change space bar capture logic to allow call signs strings with spaces, works on Linux OK +------------------------------------------------------------------------ +r1325 | drowe67 | 2013-07-29 00:06:40 -0500 (Mon, 29 Jul 2013) | 1 line + +Comm ports listing on Win32 +------------------------------------------------------------------------ +r1320 | hobbes1069 | 2013-06-17 15:35:59 -0500 (Mon, 17 Jun 2013) | 1 line + +Create prelimary librfmodem and copy golay23 sources there. Dump svn log into ChangeLog as something is better than nothing. +------------------------------------------------------------------------ r1317 | hobbes1069 | 2013-06-13 10:40:39 -0500 (Thu, 13 Jun 2013) | 1 line Update wxWidgets bootstrap process to be more simple and other tweaks to USE_STATIC_... options. diff --git a/fdmdv2-dev/src/CMakeLists.txt b/fdmdv2-dev/src/CMakeLists.txt index 080bebf2..8291bab9 100644 --- a/fdmdv2-dev/src/CMakeLists.txt +++ b/fdmdv2-dev/src/CMakeLists.txt @@ -1,5 +1,4 @@ set(FREEDV_SOURCES - dlg_about.cpp dlg_audiooptions.cpp dlg_filter.cpp dlg_options.cpp @@ -16,7 +15,6 @@ set(FREEDV_SOURCES sox_biquad.c varicode.c comp.h - dlg_about.h dlg_audiooptions.h dlg_filter.h dlg_options.h diff --git a/fdmdv2-dev/src/dlg_about.cpp b/fdmdv2-dev/src/dlg_about.cpp deleted file mode 100644 index 56808217..00000000 --- a/fdmdv2-dev/src/dlg_about.cpp +++ /dev/null @@ -1,225 +0,0 @@ -//========================================================================== -// Name: dlg_about.cpp -// Purpose: Creates simple about dialog. -// Date: Dec 06 2012 -// Authors: David Rowe, David Witten -// -// License: -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 2.1, -// as published by the Free Software Foundation. This program is -// distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public -// License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, see . -// -//========================================================================== -#include -#include -#include "dlg_about.h" -//#include "contributers.h" - -AboutDlg::AboutDlg( wxWindow* parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - long style) : wxDialog(parent, id, title, pos, size, style) -{ - this->SetSizeHints(wxDefaultSize, wxDefaultSize); - - wxBoxSizer* mainSizer; - mainSizer = new wxBoxSizer(wxVERTICAL); - - m_notebook1 = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0); - m_panel1 = new wxPanel(m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); - wxBoxSizer* bSizer3; - bSizer3 = new wxBoxSizer(wxVERTICAL); - -// m_bitmap = new wxStaticBitmap(m_panel1, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0); -// bSizer3->Add(m_bitmap, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5); - - m_panel1->SetSizer(bSizer3); - m_panel1->Layout(); - bSizer3->Fit(m_panel1); - m_notebook1->AddPage(m_panel1, _("About"), true); - m_panel4 = new wxPanel(m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); - wxBoxSizer* bSizer4; - bSizer4 = new wxBoxSizer(wxVERTICAL); - - m_htmlWin3 = new wxHtmlWindow(m_panel4, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO); - bSizer4->Add(m_htmlWin3, 1, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5); - - m_panel4->SetSizer(bSizer4); - m_panel4->Layout(); - bSizer4->Fit(m_panel4); - m_notebook1->AddPage(m_panel4, _("Credits"), false); - m_panel3 = new wxPanel(m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); - wxBoxSizer* bSizer5; - bSizer5 = new wxBoxSizer(wxVERTICAL); - - m_textCtrlLicense = new wxTextCtrl(m_panel3, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY|wxTE_RICH2); - bSizer5->Add(m_textCtrlLicense, 1, wxEXPAND, 5); - - m_panel3->SetSizer(bSizer5); - m_panel3->Layout(); - bSizer5->Fit(m_panel3); - m_notebook1->AddPage(m_panel3, _("License"), false); - - mainSizer->Add(m_notebook1, 1, wxEXPAND | wxALL, 5); - - wxStaticBoxSizer* sbSizer1; - sbSizer1 = new wxStaticBoxSizer(new wxStaticBox(this, wxID_ANY, wxEmptyString), wxVERTICAL); - - wxFlexGridSizer* fgSizer1; - fgSizer1 = new wxFlexGridSizer(0, 2, 0, 0); - fgSizer1->SetFlexibleDirection(wxBOTH); - fgSizer1->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_SPECIFIED); - - m_staticTextHomePage = new wxStaticText(this, wxID_ANY, _("Home Page:"), wxDefaultPosition, wxDefaultSize, 0); - m_staticTextHomePage->Wrap(-1); - m_staticTextHomePage->SetFont(wxFont(wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString)); - - fgSizer1->Add(m_staticTextHomePage, 1, wxALL|wxEXPAND, 5); - - m_hyperlink1 = new wxHyperlinkCtrl(this, wxID_ANY, _("http://freedv.org"), wxT("http://freedv.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE); - fgSizer1->Add(m_hyperlink1, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5); - - m_staticText2 = new wxStaticText(this, wxID_ANY, _("freedv Forum:"), wxDefaultPosition, wxDefaultSize, 0); - m_staticText2->Wrap(-1); - m_staticText2->SetFont(wxFont(wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString)); - - fgSizer1->Add(m_staticText2, 0, wxALL, 5); - - m_hyperlink2 = new wxHyperlinkCtrl(this, wxID_ANY, _("Google Group"), wxT("https://groups.google.com/forum/?fromgroups=#!forum/digitalvoice"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE); - fgSizer1->Add(m_hyperlink2, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5); - - m_staticText3 = new wxStaticText(this, wxID_ANY, _("Version:"), wxDefaultPosition, wxDefaultSize, 0); - m_staticText3->Wrap(-1); - m_staticText3->SetFont(wxFont(wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString)); - - fgSizer1->Add(m_staticText3, 0, wxALL, 5); - - m_staticTextInformation = new wxStaticText(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0); - m_staticTextInformation->Wrap(-1); - fgSizer1->Add(m_staticTextInformation, 0, wxALL, 5); - -// m_bitmapPayPal = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0); -// fgSizer1->Add(m_bitmapPayPal, 0, wxALL, 5); - - m_hyperlink3 = new wxHyperlinkCtrl(this, wxID_ANY, _("Donate via PayPal"), wxT("https://sourceforge.net/donate/index.php?group_id=202033"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE); - fgSizer1->Add(m_hyperlink3, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5); - - sbSizer1->Add(fgSizer1, 1, wxEXPAND, 5); - - mainSizer->Add(sbSizer1, 0, wxEXPAND|wxALL, 5); - - wxBoxSizer* buttonSizer; - buttonSizer = new wxBoxSizer(wxHORIZONTAL); - - m_buttonOk = new wxButton(this, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0); - m_buttonOk->SetDefault(); - buttonSizer->Add(m_buttonOk, 0, wxALL, 5); - - mainSizer->Add(buttonSizer, 0, wxALIGN_CENTER_HORIZONTAL, 5); - - this->SetSizer(mainSizer); - this->Layout(); - mainSizer->Fit(this); - this->Centre(wxBOTH); - wxString svnLatestRev("Can't determine latest SVN revision."); - - // Try to determine current SVN revision from the Internet - wxURL url(wxT("http://svn.code.sf.net/p/freetel/code/fdmdv2/")); - - if(url.GetError() == wxURL_NOERR) - { - wxString htmldata; - wxInputStream *in = url.GetInputStream(); - - if(in && in->IsOk()) - { - //printf("In OK\n"); - wxStringOutputStream html_stream(&htmldata); - in->Read(html_stream); - //wxLogDebug(htmldata); - - wxString s("

p/freetel/code - Revision "); - int startIndex = htmldata.find(s) + s.Length(); - int endIndex = htmldata.find(wxT(": /fdmdv2

")); - svnLatestRev = wxT("Latest svn revision: ") + htmldata.SubString(startIndex, endIndex-1); - //printf("startIndex: %d endIndex: %d\n", startIndex, endIndex); - } - delete in; - } - - wxString msg; - msg.Printf( wxT("FreeDV %s\n\n") - wxT("Open Source Narrow Band Digital Voice over Radio\n\n") - wxT("For Help and Support visit: http://freedv.org\n\n") - wxT("GNU Public License V2.1\n\n") - wxT("Copyright (c) David Witten KD0EAG and David Rowe VK5DGR\n\n") - wxT("svn revision: %s\n") + svnLatestRev, FREEDV_VERSION, SVN_REVISION); - -// wxMessageBox(msg, wxT("About"), wxOK | wxICON_INFORMATION, this); -} - -AboutDlg::~AboutDlg() -{ -} -/* -AboutDlg::AboutDlg(wxWindow* parent, const wxString &mainTitle) : AboutDlgBase(parent) -{ - wxFileName splashscreen(ManagerST::Get()->GetStarupDirectory() + - wxFileName::GetPathSeparator() + - wxT("images") + - wxFileName::GetPathSeparator() + - wxT("splashscreen.png")); - - m_bmp.LoadFile(splashscreen.GetFullPath(), wxBITMAP_TYPE_PNG); - m_bitmap->SetBitmap(m_bmp); - GetSizer()->Fit(this); - - BitmapLoader bmpLoader; - m_bitmapPayPal->SetBitmap(bmpLoader.LoadBitmap(wxT("about/32/paypal"))); - - // set the page content - m_htmlWin3->SetPage(wxString::FromUTF8(about_hex)); - m_buttonOk->SetFocus(); - - wxFileName license(ManagerST::Get()->GetInstallDir() + wxFileName::GetPathSeparator() + wxT("LICENSE")); - wxString licenseFullname = license.GetFullPath(); - if(license.FileExists()) - { - wxFFile fp(licenseFullname); - if(fp.IsOpened()) - { - wxString content; - fp.ReadAll(&content, wxConvUTF8); - fp.Close(); - - m_textCtrlLicense->SetEditable(true); - wxFont font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); - font.SetFamily(wxFONTFAMILY_TELETYPE); - m_textCtrlLicense->SetFont(font); - - m_textCtrlLicense->ChangeValue(content); - m_textCtrlLicense->SetEditable(false); - } - } - CentreOnScreen(); -} - -AboutDlg::~AboutDlg() -{ -} -*/ - -void AboutDlg::ExchangeData(int inout) -{ -// return m_staticTextInformation->GetLabelText(); -} diff --git a/fdmdv2-dev/src/dlg_about.h b/fdmdv2-dev/src/dlg_about.h deleted file mode 100644 index ffdc12cc..00000000 --- a/fdmdv2-dev/src/dlg_about.h +++ /dev/null @@ -1,72 +0,0 @@ -//========================================================================== -// Name: dlg_about.h -// Purpose: Provides an 'about' dialog. -// Created: Dec 06, 2012 -// Authors: David Rowe, David Witten -// -// License: -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 2.1, -// as published by the Free Software Foundation. This program is -// distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public -// License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, see . -// -//========================================================================== -#ifndef __AboutDlg__ -#define __AboutDlg__ - -#include "fdmdv2_main.h" -#include "wx/bitmap.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/** Implementing AboutDlg */ -class AboutDlg : public wxDialog -{ - protected: - wxNotebook* m_notebook1; - wxPanel* m_panel1; - wxStaticBitmap* m_bitmap; - wxPanel* m_panel4; - wxHtmlWindow* m_htmlWin3; - wxPanel* m_panel3; - wxTextCtrl* m_textCtrlLicense; - wxStaticText* m_staticTextHomePage; - wxHyperlinkCtrl* m_hyperlink1; - wxStaticText* m_staticText2; - wxHyperlinkCtrl* m_hyperlink2; - wxStaticText* m_staticText3; - wxStaticText* m_staticTextInformation; - wxStaticBitmap* m_bitmapPayPal; - wxHyperlinkCtrl* m_hyperlink3; - wxButton* m_buttonOk; - wxBitmap m_bmp; - - public: - /** Constructor */ - AboutDlg( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("About freeDV"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); - virtual ~AboutDlg(); - void ExchangeData(int inout); -}; - -#endif // __AboutDlg__ diff --git a/fdmdv2-dev/src/fdmdv2_main.h b/fdmdv2-dev/src/fdmdv2_main.h index 8c11fb85..e85df488 100644 --- a/fdmdv2-dev/src/fdmdv2_main.h +++ b/fdmdv2-dev/src/fdmdv2_main.h @@ -79,7 +79,6 @@ #include "portaudio.h" #include "dlg_audiooptions.h" #include "dlg_filter.h" -#include "dlg_about.h" #include "dlg_options.h" #include "varicode.h" #include "sox_biquad.h" diff --git a/fdmdv2-dev/src/version.h b/fdmdv2-dev/src/version.h index ed46d3e4..fa80cbe7 100644 --- a/fdmdv2-dev/src/version.h +++ b/fdmdv2-dev/src/version.h @@ -2,10 +2,10 @@ #define FREEDV_VER_DOT_H 1 #define FREEDV_VERSION_MAJOR 0 -#define FREEDV_VERSION_MINOR 96 -#define FREEDV_VERSION_PATCH 8 +#define FREEDV_VERSION_MINOR 97 +#define FREEDV_VERSION_PATCH 0 #define FREEDV_VERSION_SUFFIX "Beta" -#define FREEDV_VERSION "0.96.8 Beta" +#define FREEDV_VERSION "0.97.0 Beta" #endif //FREEDV_VER_DOT_H -- 2.25.1