kopia lustrzana https://github.com/jamescoxon/dl-fldigi
Clean up a little, reduce changes from vanilla fldigi
Daniel Richman
rodzic
e8124bca83
commit
999ebe105d
|
|
@ -15,6 +15,11 @@ dl-fldigi is hosted at http://github.com/jamescoxon/dl-fldigi
|
|||
The original fldigi is hosted at http://www.w1hkj.com/Fldigi.html
|
||||
See AUTHORS.dl-fldigi for a list of contributors.
|
||||
|
||||
This vesrion of dl-fldigi is based off fl-digi 3.21.13 (git commit
|
||||
3ba1e991a938fe36a15d281cc2b2be3e388020a1). You can see every modification
|
||||
made in full detail with the command below.
|
||||
git diff -M 3ba1e991a938fe36a15d281cc2b2be3e388020a1
|
||||
|
||||
- USAGE ---------------------------------------------------------------
|
||||
|
||||
Installation instructions can be found in INSTALL.dl-fldigi
|
||||
|
|
|
|||
6
po/es.po
6
po/es.po
|
|
@ -1047,7 +1047,6 @@ msgid "flmsg\t*"
|
|||
msgstr "flmsg\t*"
|
||||
|
||||
#: src/logger/speak.cxx:42
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
"Save all received text, one character at a time to the following file:\n"
|
||||
"\n"
|
||||
|
|
@ -1057,7 +1056,7 @@ msgstr ""
|
|||
"Salvar todo el texto recibido, un caractér cada vez al siguiente fichero:\n"
|
||||
"\n"
|
||||
" fldigi.files\\talk\\textout.txt (Windows)\n"
|
||||
" ~/.fldigi/talk/textout.txt (Linux, OS X, Free BSD)"
|
||||
" ~/.dl-fldigi/talk/textout.txt (Linux, OS X, Free BSD)"
|
||||
|
||||
#: src/misc/configuration.cxx:530
|
||||
msgid "Rig mode"
|
||||
|
|
@ -1072,7 +1071,6 @@ msgid "Always USB"
|
|||
msgstr "Siempre USB"
|
||||
|
||||
#: src/misc/configuration.cxx:710
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
"Reset all options to their default values?\n"
|
||||
"\n"
|
||||
|
|
@ -1084,7 +1082,7 @@ msgstr ""
|
|||
"Los efectos de esta acción no se observarán\n"
|
||||
"hasta el próximo inicio del programa\n"
|
||||
"Se eliminaran los ficheros siguientes:\n"
|
||||
"fldigi_def.xml and fldigi.prefs\n"
|
||||
"dl-fldigi_def.xml and dl-fldigi.prefs\n"
|
||||
|
||||
#: src/misc/configuration.cxx:715
|
||||
msgid "Confirm RESET"
|
||||
|
|
|
|||
16
po/fr.po
16
po/fr.po
|
|
@ -6,16 +6,16 @@
|
|||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: dl-fldigi 3.11\n"
|
||||
"Project-Id-Version: fldigi 3.11\n"
|
||||
"Report-Msgid-Bugs-To: w1hkj AT w1hkj DOT com\n"
|
||||
"POT-Creation-Date: 2011-06-11 20:15-0500\n"
|
||||
"PO-Revision-Date: 2010-03-06 13:04+0200\n"
|
||||
"Last-Translator: Stephane Fillod <fillods@users.sourceforge.net>\n"
|
||||
"Language-Team: French\n"
|
||||
"Language: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: \n"
|
||||
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
|
||||
|
||||
#: src/main.cxx:248
|
||||
|
|
@ -25,8 +25,8 @@ msgstr "%s log démarré le %s"
|
|||
|
||||
#: src/main.cxx:888
|
||||
msgid ""
|
||||
"License GPLv3+: GNU GPL version 3 or later <http://www.gnu.org/licenses/"
|
||||
"gpl-3.0.html>\n"
|
||||
"License GPLv3+: GNU GPL version 3 or later <http://www.gnu.org/licenses/gpl-"
|
||||
"3.0.html>\n"
|
||||
"This is free software: you are free to change and redistribute it.\n"
|
||||
"There is NO WARRANTY, to the extent permitted by law.\n"
|
||||
msgstr ""
|
||||
|
|
@ -948,8 +948,8 @@ msgstr ""
|
|||
msgid ""
|
||||
"Save all received text, one character at a time to the following file:\n"
|
||||
"\n"
|
||||
" dl-fldigi.files\\talk\\textout.txt (Windows)\n"
|
||||
" ~/.dl-fldigi/talk/textout.txt (Linux, OS X, Free BSD)"
|
||||
" fldigi.files\\talk\\textout.txt (Windows)\n"
|
||||
" ~/.fldigi/talk/textout.txt (Linux, OS X, Free BSD)"
|
||||
msgstr ""
|
||||
|
||||
#: src/misc/configuration.cxx:530
|
||||
|
|
@ -969,7 +969,7 @@ msgid ""
|
|||
"Reset all options to their default values?\n"
|
||||
"\n"
|
||||
"Reset options will take effect at the next start\n"
|
||||
"Files: dl-fldigi_def.xml and dl-fldigi.prefs will be deleted!\n"
|
||||
"Files: fldigi_def.xml and fldigi.prefs will be deleted!\n"
|
||||
msgstr ""
|
||||
|
||||
#: src/misc/configuration.cxx:715
|
||||
|
|
@ -4294,7 +4294,7 @@ msgid "Connect/disconnect to Talker socket server"
|
|||
msgstr ""
|
||||
|
||||
#: src/dialogs/confdialog.cxx:6331
|
||||
msgid "Auto connect when dl-fldigi opens (server must be up)"
|
||||
msgid "Auto connect when fldigi opens (server must be up)"
|
||||
msgstr ""
|
||||
|
||||
#: src/dialogs/confdialog.cxx:6338
|
||||
|
|
|
|||
17
po/it.po
17
po/it.po
|
|
@ -11,10 +11,10 @@ msgstr ""
|
|||
"PO-Revision-Date: 2011-02-18 21:57+0100\n"
|
||||
"Last-Translator: Pierfrancesco Caci <pf@tippete.net>\n"
|
||||
"Language-Team: Italian\n"
|
||||
"Language: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: \n"
|
||||
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
||||
|
||||
#: src/main.cxx:248
|
||||
|
|
@ -24,8 +24,8 @@ msgstr "%s log iniziato il %s"
|
|||
|
||||
#: src/main.cxx:888
|
||||
msgid ""
|
||||
"License GPLv3+: GNU GPL version 3 or later <http://www.gnu.org/licenses/"
|
||||
"gpl-3.0.html>\n"
|
||||
"License GPLv3+: GNU GPL version 3 or later <http://www.gnu.org/licenses/gpl-"
|
||||
"3.0.html>\n"
|
||||
"This is free software: you are free to change and redistribute it.\n"
|
||||
"There is NO WARRANTY, to the extent permitted by law.\n"
|
||||
msgstr ""
|
||||
|
|
@ -953,12 +953,11 @@ msgid "flmsg\t*"
|
|||
msgstr ""
|
||||
|
||||
#: src/logger/speak.cxx:42
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
"Save all received text, one character at a time to the following file:\n"
|
||||
"\n"
|
||||
" dl-fldigi.files\\talk\\textout.txt (Windows)\n"
|
||||
" ~/.dl-fldigi/talk/textout.txt (Linux, OS X, Free BSD)"
|
||||
" fldigi.files\\talk\\textout.txt (Windows)\n"
|
||||
" ~/.fldigi/talk/textout.txt (Linux, OS X, Free BSD)"
|
||||
msgstr ""
|
||||
"Salva tutto il tesxto ricevuto, un carattere alla volta, su questo file:\n"
|
||||
"\n"
|
||||
|
|
@ -978,12 +977,11 @@ msgid "Always USB"
|
|||
msgstr "Sempre USB"
|
||||
|
||||
#: src/misc/configuration.cxx:710
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
"Reset all options to their default values?\n"
|
||||
"\n"
|
||||
"Reset options will take effect at the next start\n"
|
||||
"Files: dl-fldigi_def.xml and dl-fldigi.prefs will be deleted!\n"
|
||||
"Files: fldigi_def.xml and fldigi.prefs will be deleted!\n"
|
||||
msgstr ""
|
||||
"Resetta tutte le opzioni ai loro valori predefiniti?\n"
|
||||
"\n"
|
||||
|
|
@ -4363,8 +4361,7 @@ msgid "Connect/disconnect to Talker socket server"
|
|||
msgstr "Connetti/disconnetti il socket del server Talker"
|
||||
|
||||
#: src/dialogs/confdialog.cxx:6331
|
||||
#, fuzzy
|
||||
msgid "Auto connect when dl-fldigi opens (server must be up)"
|
||||
msgid "Auto connect when fldigi opens (server must be up)"
|
||||
msgstr ""
|
||||
"Connetti automaticamente all'avvio di fldigi (il server deve essere attivo)"
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ LOCATOR_SRC = misc/locator.c
|
|||
BENCHMARK_SRC = include/benchmark.h misc/benchmark.cxx
|
||||
REGEX_SRC = compat/regex.h compat/regex.c
|
||||
STACK_SRC = include/stack.h misc/stack.cxx
|
||||
MINGW32_SRC = include/compat.h compat/getsysinfo.c compat/mingw.c compat/mingw.h compat/flock.c compat/flock.h
|
||||
MINGW32_SRC = include/compat.h compat/getsysinfo.c compat/mingw.c compat/mingw.h
|
||||
NLS_SRC = misc/nls.cxx include/nls.h
|
||||
|
||||
# We distribute these but do not always compile them
|
||||
|
|
|
|||
|
|
@ -1,166 +0,0 @@
|
|||
/* Emulate flock on platforms that lack it, primarily Windows and MinGW.
|
||||
|
||||
This is derived from sqlite3 sources.
|
||||
http://www.sqlite.org/cvstrac/rlog?f=sqlite/src/os_win.c
|
||||
http://www.sqlite.org/copyright.html
|
||||
|
||||
Written by Richard W.M. Jones <rjones.at.redhat.com>
|
||||
(Tweaked by Daniel Richman to use as a MINGW "patch" only)
|
||||
|
||||
Copyright (C) 2008-2010 Free Software Foundation, Inc.
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
This library 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
|
||||
Lesser 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 <http://www.gnu.org/licenses/>. */
|
||||
|
||||
#include <config.h>
|
||||
#include <sys/file.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include "flock.h"
|
||||
|
||||
#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
|
||||
|
||||
/* _get_osfhandle */
|
||||
#include <io.h>
|
||||
|
||||
/* LockFileEx */
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <windows.h>
|
||||
|
||||
#include <errno.h>
|
||||
|
||||
/* Determine the current size of a file. Because the other braindead
|
||||
* APIs we'll call need lower/upper 32 bit pairs, keep the file size
|
||||
* like that too.
|
||||
*/
|
||||
static BOOL
|
||||
file_size (HANDLE h, DWORD * lower, DWORD * upper)
|
||||
{
|
||||
*lower = GetFileSize (h, upper);
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* LOCKFILE_FAIL_IMMEDIATELY is undefined on some Windows systems. */
|
||||
#ifndef LOCKFILE_FAIL_IMMEDIATELY
|
||||
# define LOCKFILE_FAIL_IMMEDIATELY 1
|
||||
#endif
|
||||
|
||||
/* Acquire a lock. */
|
||||
static BOOL
|
||||
do_lock (HANDLE h, int non_blocking, int exclusive)
|
||||
{
|
||||
BOOL res;
|
||||
DWORD size_lower, size_upper;
|
||||
OVERLAPPED ovlp;
|
||||
int flags = 0;
|
||||
|
||||
/* We're going to lock the whole file, so get the file size. */
|
||||
res = file_size (h, &size_lower, &size_upper);
|
||||
if (!res)
|
||||
return 0;
|
||||
|
||||
/* Start offset is 0, and also zero the remaining members of this struct. */
|
||||
memset (&ovlp, 0, sizeof ovlp);
|
||||
|
||||
if (non_blocking)
|
||||
flags |= LOCKFILE_FAIL_IMMEDIATELY;
|
||||
if (exclusive)
|
||||
flags |= LOCKFILE_EXCLUSIVE_LOCK;
|
||||
|
||||
return LockFileEx (h, flags, 0, size_lower, size_upper, &ovlp);
|
||||
}
|
||||
|
||||
/* Unlock reader or exclusive lock. */
|
||||
static BOOL
|
||||
do_unlock (HANDLE h)
|
||||
{
|
||||
int res;
|
||||
DWORD size_lower, size_upper;
|
||||
|
||||
res = file_size (h, &size_lower, &size_upper);
|
||||
if (!res)
|
||||
return 0;
|
||||
|
||||
return UnlockFile (h, 0, 0, size_lower, size_upper);
|
||||
}
|
||||
|
||||
/* Now our BSD-like flock operation. */
|
||||
int
|
||||
flock (int fd, int operation)
|
||||
{
|
||||
HANDLE h = (HANDLE) _get_osfhandle (fd);
|
||||
DWORD res;
|
||||
int non_blocking;
|
||||
|
||||
if (h == INVALID_HANDLE_VALUE)
|
||||
{
|
||||
errno = EBADF;
|
||||
return -1;
|
||||
}
|
||||
|
||||
non_blocking = operation & LOCK_NB;
|
||||
operation &= ~LOCK_NB;
|
||||
|
||||
switch (operation)
|
||||
{
|
||||
case LOCK_SH:
|
||||
res = do_lock (h, non_blocking, 0);
|
||||
break;
|
||||
case LOCK_EX:
|
||||
res = do_lock (h, non_blocking, 1);
|
||||
break;
|
||||
case LOCK_UN:
|
||||
res = do_unlock (h);
|
||||
break;
|
||||
default:
|
||||
errno = EINVAL;
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Map Windows errors into Unix errnos. As usual MSDN fails to
|
||||
* document the permissible error codes.
|
||||
*/
|
||||
if (!res)
|
||||
{
|
||||
DWORD err = GetLastError ();
|
||||
switch (err)
|
||||
{
|
||||
/* This means someone else is holding a lock. */
|
||||
case ERROR_LOCK_VIOLATION:
|
||||
errno = EAGAIN;
|
||||
break;
|
||||
|
||||
/* Out of memory. */
|
||||
case ERROR_NOT_ENOUGH_MEMORY:
|
||||
errno = ENOMEM;
|
||||
break;
|
||||
|
||||
case ERROR_BAD_COMMAND:
|
||||
errno = EINVAL;
|
||||
break;
|
||||
|
||||
/* Unlikely to be other errors, but at least don't lose the
|
||||
* error code.
|
||||
*/
|
||||
default:
|
||||
fprintf(stderr, "compat_mingw_flock.c: Unknown error %i.\n", err);
|
||||
errno = EIO;
|
||||
}
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
@ -1,51 +0,0 @@
|
|||
/* Emulate flock on platforms that lack it, primarily Windows and MinGW.
|
||||
|
||||
This is derived from sqlite3 sources.
|
||||
http://www.sqlite.org/cvstrac/rlog?f=sqlite/src/os_win.c
|
||||
http://www.sqlite.org/copyright.html
|
||||
|
||||
Written by Richard W.M. Jones <rjones.at.redhat.com>
|
||||
(Tweaked by Daniel Richman to use as a MINGW "patch" only)
|
||||
|
||||
Copyright (C) 2008-2010 Free Software Foundation, Inc.
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
This library 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
|
||||
Lesser 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 <http://www.gnu.org/licenses/>. */
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
|
||||
|
||||
#ifndef LOCK_SH
|
||||
/* Operations for the 'flock' call (same as Linux kernel constants). */
|
||||
# define LOCK_SH 1 /* Shared lock. */
|
||||
# define LOCK_EX 2 /* Exclusive lock. */
|
||||
# define LOCK_UN 8 /* Unlock. */
|
||||
|
||||
/* Can be OR'd in to one of the above. */
|
||||
# define LOCK_NB 4 /* Don't block when locking. */
|
||||
#endif
|
||||
|
||||
#ifndef EWOULDBLOCK
|
||||
#define EWOULDBLOCK EAGAIN
|
||||
#endif
|
||||
|
||||
int flock (int fd, int operation);
|
||||
|
||||
#endif /* Windows */
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
|
@ -453,7 +453,7 @@ char snrmsg[80];
|
|||
void rtty::Metric()
|
||||
{
|
||||
double delta = rtty_baud/2.0;
|
||||
double np =
|
||||
double np =
|
||||
wf->powerDensity(frequency - shift * 1.5, delta) +
|
||||
wf->powerDensity(frequency + shift * 1.5, delta) + 1e-10;
|
||||
double sp =
|
||||
|
|
|
|||
|
|
@ -3241,7 +3241,7 @@ static const char szProsigns[] = "~|%|&|+|=|{|}|<|>|[|]| ";
|
|||
o->selection_color((Fl_Color)51);
|
||||
o->labelsize(18);
|
||||
o->align(FL_ALIGN_CLIP|FL_ALIGN_INSIDE);
|
||||
{ tabsConfigure = new Fl_Tabs(-4, 0, 521, 375);
|
||||
{ tabsConfigure = new Fl_Tabs(-4, 0, 521, 372);
|
||||
tabsConfigure->color((Fl_Color)FL_LIGHT1);
|
||||
tabsConfigure->selection_color((Fl_Color)FL_LIGHT1);
|
||||
{ tabOperator = new Fl_Group(0, 25, 500, 345, _("Operator"));
|
||||
|
|
@ -3308,7 +3308,7 @@ static const char szProsigns[] = "~|%|&|+|=|{|}|<|>|[|]| ";
|
|||
inpMyLocator->when(FL_WHEN_RELEASE);
|
||||
inpMyLocator->labelsize(FL_NORMAL_SIZE);
|
||||
} // Fl_Input2* inpMyLocator
|
||||
{ inpMyAntenna = new Fl_Input2(110, 166, 320, 24, _("Antenna:"));
|
||||
{ inpMyAntenna = new Fl_Input2(110, 167, 320, 24, _("Antenna:"));
|
||||
inpMyAntenna->tooltip(_("Short description of antenna"));
|
||||
inpMyAntenna->box(FL_DOWN_BOX);
|
||||
inpMyAntenna->color((Fl_Color)FL_BACKGROUND2_COLOR);
|
||||
|
|
@ -3944,10 +3944,10 @@ ab and newline are automatically included."));
|
|||
} // Fl_Tabs* tabsUI
|
||||
tabUI->end();
|
||||
} // Fl_Group* tabUI
|
||||
{ tabWaterfall = new Fl_Group(0, 25, 500, 346, _("Waterfall"));
|
||||
{ tabWaterfall = new Fl_Group(0, 25, 500, 347, _("Waterfall"));
|
||||
tabWaterfall->labelsize(12);
|
||||
tabWaterfall->hide();
|
||||
{ tabsWaterfall = new Fl_Tabs(0, 25, 500, 346);
|
||||
{ tabsWaterfall = new Fl_Tabs(0, 25, 500, 347);
|
||||
tabsWaterfall->color((Fl_Color)FL_LIGHT1);
|
||||
tabsWaterfall->selection_color((Fl_Color)FL_LIGHT1);
|
||||
{ Fl_Group* o = new Fl_Group(0, 50, 500, 320, _("Display"));
|
||||
|
|
@ -5447,13 +5447,14 @@ an merging"));
|
|||
} // Fl_Tabs* tabsModems
|
||||
tabModems->end();
|
||||
} // Fl_Group* tabModems
|
||||
{ tabRig = new Fl_Group(0, 25, 500, 346, _("Rig"));
|
||||
{ tabRig = new Fl_Group(0, 25, 500, 345, _("Rig"));
|
||||
tabRig->tooltip(_("Transceiver control"));
|
||||
tabRig->labelsize(12);
|
||||
tabRig->hide();
|
||||
{ tabsRig = new Fl_Tabs(0, 25, 500, 346);
|
||||
{ tabsRig = new Fl_Tabs(0, 25, 500, 345);
|
||||
tabsRig->selection_color((Fl_Color)FL_LIGHT1);
|
||||
{ Fl_Group* o = new Fl_Group(0, 50, 500, 320, _("Hardware PTT"));
|
||||
o->hide();
|
||||
{ grpHWPTT = new Fl_Group(5, 100, 490, 265, _("h/w ptt device-pin"));
|
||||
grpHWPTT->box(FL_ENGRAVED_FRAME);
|
||||
grpHWPTT->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE);
|
||||
|
|
@ -5516,7 +5517,6 @@ an merging"));
|
|||
} // Fl_Group* o
|
||||
{ Fl_Group* o = new Fl_Group(0, 50, 500, 320, _("RigCAT"));
|
||||
o->tooltip(_("Rig Control using xml spec file"));
|
||||
o->hide();
|
||||
{ chkUSERIGCAT = new Fl_Check_Button(195, 60, 110, 20, _("Use RigCAT"));
|
||||
chkUSERIGCAT->tooltip(_("RigCAT used for rig control"));
|
||||
chkUSERIGCAT->down_box(FL_DOWN_BOX);
|
||||
|
|
@ -5941,11 +5941,11 @@ an merging"));
|
|||
} // Fl_Tabs* tabsRig
|
||||
tabRig->end();
|
||||
} // Fl_Group* tabRig
|
||||
{ tabSoundCard = new Fl_Group(0, 25, 500, 346, _("Audio"));
|
||||
{ tabSoundCard = new Fl_Group(0, 25, 500, 345, _("Audio"));
|
||||
tabSoundCard->tooltip(_("Audio devices"));
|
||||
tabSoundCard->labelsize(12);
|
||||
tabSoundCard->hide();
|
||||
{ tabsSoundCard = new Fl_Tabs(0, 25, 500, 346);
|
||||
{ tabsSoundCard = new Fl_Tabs(0, 25, 500, 345);
|
||||
tabsSoundCard->selection_color((Fl_Color)FL_LIGHT1);
|
||||
{ tabAudio = new Fl_Group(0, 50, 500, 320, _("Devices"));
|
||||
{ AudioOSS = new Fl_Group(5, 60, 490, 45);
|
||||
|
|
@ -6368,10 +6368,10 @@ d frequency"));
|
|||
} // Fl_Group* o
|
||||
tabID->end();
|
||||
} // Fl_Group* tabID
|
||||
{ tabMisc = new Fl_Group(0, 25, 500, 346, _("Misc"));
|
||||
{ tabMisc = new Fl_Group(0, 25, 500, 345, _("Misc"));
|
||||
tabMisc->labelsize(12);
|
||||
tabMisc->hide();
|
||||
{ tabsMisc = new Fl_Tabs(0, 25, 500, 346);
|
||||
{ tabsMisc = new Fl_Tabs(0, 25, 500, 345);
|
||||
tabsMisc->selection_color((Fl_Color)FL_LIGHT1);
|
||||
{ tabCPUspeed = new Fl_Group(0, 50, 500, 320, _("CPU"));
|
||||
{ Fl_Group* o = new Fl_Group(5, 60, 490, 51);
|
||||
|
|
@ -6827,31 +6827,34 @@ d frequency"));
|
|||
btnQRZnotavailable->callback((Fl_Callback*)cb_btnQRZnotavailable);
|
||||
o->value(progdefaults.QRZ == QRZNONE);
|
||||
} // Fl_Round_Button* btnQRZnotavailable
|
||||
{ Fl_Round_Button* o = btnQRZonline = new Fl_Round_Button(25, 100, 337, 20, _("QRZ online via default Internet Browser"));
|
||||
{ Fl_Round_Button* o = btnQRZonline = new Fl_Round_Button(25, 75, 337, 20, _("QRZ online via default Internet Browser"));
|
||||
btnQRZonline->tooltip(_("Visit QRZ web site"));
|
||||
btnQRZonline->down_box(FL_DOWN_BOX);
|
||||
btnQRZonline->callback((Fl_Callback*)cb_btnQRZonline);
|
||||
o->value(progdefaults.QRZ == QRZHTML);
|
||||
} // Fl_Round_Button* btnQRZonline
|
||||
{ Fl_Round_Button* o = btnHAMCALLonline = new Fl_Round_Button(25, 125, 337, 20, _("HamCall online via default Internet Browser"));
|
||||
{ Fl_Round_Button* o = btnHAMCALLonline = new Fl_Round_Button(25, 106, 337, 20, _("HamCall online via default Internet Browser"));
|
||||
btnHAMCALLonline->tooltip(_("Visit Hamcall web site"));
|
||||
btnHAMCALLonline->down_box(FL_DOWN_BOX);
|
||||
btnHAMCALLonline->callback((Fl_Callback*)cb_btnHAMCALLonline);
|
||||
o->value(progdefaults.QRZ == HAMCALLHTML);
|
||||
} // Fl_Round_Button* btnHAMCALLonline
|
||||
{ btnCALLOOK = new Fl_Round_Button(25, 70, 375, 25, _("Callook.info lookup (US callsigns only)"));
|
||||
{ Fl_Round_Button* o = btnCALLOOK = new Fl_Round_Button(25, 137, 337, 20, _("Callook.info lookup (US callsigns only)"));
|
||||
btnCALLOOK->tooltip(_("Visit Hamcall web site"));
|
||||
btnCALLOOK->down_box(FL_DOWN_BOX);
|
||||
btnCALLOOK->callback((Fl_Callback*)cb_btnCALLOOK);
|
||||
o->value(progdefaults.QRZ == CALLOOK);
|
||||
} // Fl_Round_Button* btnCALLOOK
|
||||
o->end();
|
||||
} // Fl_Group* o
|
||||
tabQRZ->end();
|
||||
} // Fl_Group* tabQRZ
|
||||
{ tabDL = new Fl_Group(0, 25, 500, 350, _("DL Client"));
|
||||
tabDL->selection_color((Fl_Color)48);
|
||||
tabDL->labelsize(12);
|
||||
tabDL->hide();
|
||||
{ tabsDL = new Fl_Tabs(0, 25, 500, 348);
|
||||
tabsDL->selection_color((Fl_Color)55);
|
||||
tabsDL->selection_color((Fl_Color)FL_LIGHT1);
|
||||
{ tabDLEnable = new Fl_Group(0, 50, 500, 320, _("Enable"));
|
||||
{ Fl_Group* o = new Fl_Group(5, 59, 490, 76, _("habitat"));
|
||||
o->box(FL_ENGRAVED_FRAME);
|
||||
|
|
@ -7034,6 +7037,8 @@ d frequency"));
|
|||
o->align(FL_ALIGN_WRAP);
|
||||
} // Fl_Box* o
|
||||
{ Fl_Spinner* o = new Fl_Spinner(100, 225, 45, 25, _("Rate"));
|
||||
o->minimum(10);
|
||||
o->maximum(300);
|
||||
o->callback((Fl_Callback*)cb_Rate);
|
||||
o->value(progdefaults.gps_rate);
|
||||
} // Fl_Spinner* o
|
||||
|
|
|
|||
|
|
@ -111,14 +111,14 @@ static const char szProsigns[] = "~|%|&|+|=|{|}|<|>|[|]| ";} {}
|
|||
code {static const int flight_browser_columns[] = { 170, 150, 170 };} {}
|
||||
Fl_Window {} {
|
||||
label {Fldigi configuration} open
|
||||
xywh {511 412 500 400} type Double color 45 selection_color 51 labelsize 18 align 80 non_modal visible
|
||||
xywh {644 190 500 400} type Double color 45 selection_color 51 labelsize 18 align 80 non_modal visible
|
||||
} {
|
||||
Fl_Tabs tabsConfigure {open
|
||||
xywh {-4 0 521 375} color 50 selection_color 50
|
||||
xywh {-4 0 521 372} color 50 selection_color 50
|
||||
} {
|
||||
Fl_Group tabOperator {
|
||||
label Operator
|
||||
callback {progdefaults.changed = true;} selected
|
||||
callback {progdefaults.changed = true;}
|
||||
tooltip {Operator information} xywh {0 25 500 345} labelsize 12 when 1
|
||||
} {
|
||||
Fl_Group {} {
|
||||
|
|
@ -182,7 +182,7 @@ progdefaults.changed = true;}
|
|||
progdefaults.changed = true;
|
||||
dl_fldigi::changed(dl_fldigi::CH_INFO);
|
||||
btnApplyConfig->activate();}
|
||||
tooltip {Short description of antenna} xywh {110 166 320 24}
|
||||
tooltip {Short description of antenna} xywh {110 167 320 24}
|
||||
code0 {inpMyAntenna->labelsize(FL_NORMAL_SIZE);}
|
||||
class Fl_Input2
|
||||
}
|
||||
|
|
@ -216,7 +216,7 @@ btnApplyConfig->activate();}
|
|||
}
|
||||
}
|
||||
Fl_Group tabUI {
|
||||
label UI
|
||||
label UI open
|
||||
xywh {0 25 502 346} labelsize 12 hide
|
||||
} {
|
||||
Fl_Tabs tabsUI {open
|
||||
|
|
@ -935,10 +935,10 @@ connect_to_log_server();}
|
|||
}
|
||||
Fl_Group tabWaterfall {
|
||||
label Waterfall
|
||||
xywh {0 25 500 346} labelsize 12 hide
|
||||
xywh {0 25 500 347} labelsize 12 hide
|
||||
} {
|
||||
Fl_Tabs tabsWaterfall {open
|
||||
xywh {0 25 500 346} color 50 selection_color 50
|
||||
xywh {0 25 500 347} color 50 selection_color 50
|
||||
} {
|
||||
Fl_Group {} {
|
||||
label Display open
|
||||
|
|
@ -1247,7 +1247,7 @@ behaves inside the waterfall} xywh {15 196 150 22} down_box BORDER_BOX align 8
|
|||
}
|
||||
}
|
||||
Fl_Group tabModems {
|
||||
label Modems
|
||||
label Modems open
|
||||
xywh {-4 25 521 347} labelsize 12 hide
|
||||
} {
|
||||
Fl_Tabs tabsModems {open
|
||||
|
|
@ -2184,7 +2184,7 @@ o->color(fl_rgb_color(progdefaults.rttymarkRGBI.R,progdefaults.rttymarkRGBI.G,pr
|
|||
o->redraw();
|
||||
wf->redraw_marker();
|
||||
progdefaults.changed = true;
|
||||
}}
|
||||
}} selected
|
||||
tooltip {Change color} xywh {403 208 18 18} color 2 align 8
|
||||
code0 {o->color(fl_rgb_color(progdefaults.rttymarkRGBI.R,progdefaults.rttymarkRGBI.G,progdefaults.rttymarkRGBI.B));}
|
||||
}
|
||||
|
|
@ -2300,15 +2300,15 @@ progdefaults.changed = true;}
|
|||
}
|
||||
}
|
||||
Fl_Group tabRig {
|
||||
label Rig open
|
||||
tooltip {Transceiver control} xywh {0 25 500 346} labelsize 12 hide
|
||||
label Rig
|
||||
tooltip {Transceiver control} xywh {0 25 500 345} labelsize 12 hide
|
||||
} {
|
||||
Fl_Tabs tabsRig {open
|
||||
xywh {0 25 500 346} selection_color 50
|
||||
xywh {0 25 500 345} selection_color 50
|
||||
} {
|
||||
Fl_Group {} {
|
||||
label {Hardware PTT} open
|
||||
xywh {0 50 500 320}
|
||||
xywh {0 50 500 320} hide
|
||||
} {
|
||||
Fl_Group grpHWPTT {
|
||||
label {h/w ptt device-pin} open
|
||||
|
|
@ -2414,7 +2414,7 @@ progdefaults.changed = true;}
|
|||
}
|
||||
Fl_Group {} {
|
||||
label RigCAT open
|
||||
tooltip {Rig Control using xml spec file} xywh {0 50 500 320} hide
|
||||
tooltip {Rig Control using xml spec file} xywh {0 50 500 320}
|
||||
} {
|
||||
Fl_Check_Button chkUSERIGCAT {
|
||||
label {Use RigCAT}
|
||||
|
|
@ -2888,10 +2888,10 @@ progdefaults.changed = true;}
|
|||
}
|
||||
Fl_Group tabSoundCard {
|
||||
label Audio
|
||||
tooltip {Audio devices} xywh {0 25 500 346} labelsize 12 hide
|
||||
tooltip {Audio devices} xywh {0 25 500 345} labelsize 12 hide
|
||||
} {
|
||||
Fl_Tabs tabsSoundCard {open
|
||||
xywh {0 25 500 346} selection_color 50
|
||||
xywh {0 25 500 345} selection_color 50
|
||||
} {
|
||||
Fl_Group tabAudio {
|
||||
label Devices open
|
||||
|
|
@ -3154,11 +3154,11 @@ progdefaults.changed = true;}
|
|||
}
|
||||
}
|
||||
Fl_Group tabID {
|
||||
label ID open
|
||||
label ID
|
||||
xywh {0 25 500 346} labelsize 12 hide
|
||||
} {
|
||||
Fl_Group {} {
|
||||
label {Video Preamble ID}
|
||||
label {Video Preamble ID} open
|
||||
xywh {5 35 490 103} box ENGRAVED_FRAME align 21
|
||||
} {
|
||||
Fl_Check_Button btnsendid {
|
||||
|
|
@ -3342,11 +3342,11 @@ progdefaults.changed = true;}
|
|||
}
|
||||
}
|
||||
Fl_Group tabMisc {
|
||||
label Misc
|
||||
xywh {0 25 500 346} labelsize 12 hide
|
||||
label Misc open
|
||||
xywh {0 25 500 345} labelsize 12 hide
|
||||
} {
|
||||
Fl_Tabs tabsMisc {
|
||||
xywh {0 25 500 346} selection_color 50
|
||||
Fl_Tabs tabsMisc {open
|
||||
xywh {0 25 500 345} selection_color 50
|
||||
} {
|
||||
Fl_Group tabCPUspeed {
|
||||
label CPU open
|
||||
|
|
@ -3663,7 +3663,7 @@ progdefaults.changed = true;}
|
|||
}
|
||||
}
|
||||
Fl_Group tabQRZ {
|
||||
label {Callsign DB} open
|
||||
label {Callsign DB}
|
||||
tooltip {Callsign database} xywh {0 25 500 345} labelsize 12 hide
|
||||
} {
|
||||
Fl_Group {} {
|
||||
|
|
@ -3755,7 +3755,7 @@ progdefaults.changed = true;}
|
|||
callback {set_qrz_buttons(o);
|
||||
progdefaults.QRZ = QRZHTML;
|
||||
progdefaults.changed = true;}
|
||||
tooltip {Visit QRZ web site} xywh {25 100 337 20} down_box DOWN_BOX
|
||||
tooltip {Visit QRZ web site} xywh {25 75 337 20} down_box DOWN_BOX
|
||||
code0 {o->value(progdefaults.QRZ == QRZHTML);}
|
||||
}
|
||||
Fl_Round_Button btnHAMCALLonline {
|
||||
|
|
@ -3763,7 +3763,7 @@ progdefaults.changed = true;}
|
|||
callback {set_qrz_buttons(o);
|
||||
progdefaults.QRZ = HAMCALLHTML;
|
||||
progdefaults.changed = true;}
|
||||
tooltip {Visit Hamcall web site} xywh {25 125 337 20} down_box DOWN_BOX
|
||||
tooltip {Visit Hamcall web site} xywh {25 106 337 20} down_box DOWN_BOX
|
||||
code0 {o->value(progdefaults.QRZ == HAMCALLHTML);}
|
||||
}
|
||||
Fl_Round_Button btnCALLOOK {
|
||||
|
|
@ -3771,16 +3771,17 @@ progdefaults.changed = true;}
|
|||
callback {set_qrz_buttons(o);
|
||||
progdefaults.QRZ = CALLOOK;
|
||||
progdefaults.changed = true;}
|
||||
xywh {25 70 375 25} down_box DOWN_BOX
|
||||
tooltip {Visit Hamcall web site} xywh {25 137 337 20} down_box DOWN_BOX
|
||||
code0 {o->value(progdefaults.QRZ == CALLOOK);}
|
||||
}
|
||||
}
|
||||
}
|
||||
Fl_Group tabDL {
|
||||
label {DL Client} open
|
||||
xywh {0 25 500 350} labelsize 12 hide
|
||||
xywh {0 25 500 350} selection_color 48 labelsize 12 hide
|
||||
} {
|
||||
Fl_Tabs tabsDL {open
|
||||
xywh {0 25 500 348} selection_color 55
|
||||
xywh {0 25 500 348} selection_color 50
|
||||
} {
|
||||
Fl_Group tabDLEnable {
|
||||
label Enable open
|
||||
|
|
@ -4028,7 +4029,7 @@ stationary_lon->do_callback();}
|
|||
progdefaults.changed = true;
|
||||
dl_fldigi::changed(dl_fldigi::CH_GPS_SETTINGS);
|
||||
btnApplyConfig->activate();}
|
||||
xywh {100 225 45 25}
|
||||
xywh {100 225 45 25} minimum 10 maximum 300
|
||||
code0 {o->value(progdefaults.gps_rate);}
|
||||
}
|
||||
Fl_Box {} {
|
||||
|
|
|
|||
|
|
@ -338,7 +338,6 @@ Fl_Pack *hpack = (Fl_Pack *)0;
|
|||
Fl_Value_Slider2 *mvsquelch = (Fl_Value_Slider2 *)0;
|
||||
Fl_Button *btnClearMViewer = 0;
|
||||
|
||||
//jcoxon
|
||||
Fl_Group *TopFrameHAB;
|
||||
Fl_Choice *habFlight;
|
||||
Fl_Button *habOpenBrowser;
|
||||
|
|
@ -427,7 +426,7 @@ int Hwfall;
|
|||
int HNOM = DEFAULT_HNOM;
|
||||
// WNOM must be large enough to contain ALL of the horizontal widgets
|
||||
// when the main dialog is initially created.
|
||||
int WNOM = 1000;//progStatus.mainW ? progStatus.mainW : WMIN;
|
||||
int WNOM = 650;//progStatus.mainW ? progStatus.mainW : WMIN;
|
||||
int Wwfall;
|
||||
|
||||
int altMacros = 0;
|
||||
|
|
@ -924,25 +923,17 @@ void startup_modem(modem* m, int f)
|
|||
Status1->show();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (id >= MODE_HELL_FIRST && id <= MODE_HELL_LAST) {
|
||||
printf("Setup Hell\n");
|
||||
ReceiveText->hide();
|
||||
FHdisp->show();
|
||||
sldrHellBW->value(progdefaults.HELL_BW);
|
||||
}
|
||||
//jcoxon
|
||||
/*
|
||||
else if (!bWF_only) {
|
||||
ReceiveText->show();
|
||||
FHdisp->hide();
|
||||
}
|
||||
*/
|
||||
else if (!bWF_only) {
|
||||
ReceiveText->show();
|
||||
FHdisp->hide();
|
||||
}
|
||||
//
|
||||
|
||||
if (id == MODE_RTTY)
|
||||
sldrRTTYbandwidth->value(progdefaults.RTTY_BW);
|
||||
else if (id >= MODE_PSK_FIRST && id <= MODE_PSK_LAST)
|
||||
|
|
@ -1460,8 +1451,6 @@ void cb_dlfldigi_autoswitchmode(Fl_Widget *w, void *)
|
|||
dl_fldigi::flights::auto_switchmode();
|
||||
}
|
||||
|
||||
//jcoxon added 21/3/10
|
||||
|
||||
void cb_mnuConfigDLClient(Fl_Widget *, void *a) {
|
||||
Fl_Widget *open_tab = (Fl_Widget *) a;
|
||||
if (open_tab == NULL)
|
||||
|
|
@ -1490,8 +1479,6 @@ void cb_mnuVisitView(Fl_Widget*, void*)
|
|||
// TODO HABITAT-LATER cb_mnuVisitURL(0, (void*)string(progdefaults.server_location).append("view.php").c_str());
|
||||
}
|
||||
|
||||
//End
|
||||
|
||||
void cb_logfile(Fl_Widget* w, void*)
|
||||
{
|
||||
progStatus.LOGenabled = reinterpret_cast<Fl_Menu_*>(w)->mvalue()->value();
|
||||
|
|
@ -2031,9 +2018,7 @@ string new_call;
|
|||
void clearQSO()
|
||||
{
|
||||
if (bWF_only) return;
|
||||
//jcoxon
|
||||
if (bHAB) return;
|
||||
//
|
||||
Fl_Input* in[] = {
|
||||
inpCall1, inpCall2, inpCall3, inpCall4,
|
||||
inpName1, inpName2,
|
||||
|
|
@ -2102,9 +2087,7 @@ void cb_loc(Fl_Widget* w, void*)
|
|||
void cb_call(Fl_Widget* w, void*)
|
||||
{
|
||||
if (bWF_only) return;
|
||||
//jcoxon
|
||||
if (bHAB) return;
|
||||
//
|
||||
if (progdefaults.calluppercase) {
|
||||
int pos = inpCall->position();
|
||||
char* uc = new char[inpCall->size()];
|
||||
|
|
@ -2554,10 +2537,8 @@ void UI_select()
|
|||
{
|
||||
if (bWF_only)
|
||||
return;
|
||||
//jcoxon
|
||||
if (bHAB)
|
||||
return;
|
||||
//
|
||||
Fl_Menu_Item* cf = getMenuItem(CONTEST_FIELDS_MLABEL);
|
||||
|
||||
if (progStatus.NO_RIGLOG || progStatus.Rig_Contest_UI || progStatus.Rig_Log_UI) {
|
||||
|
|
@ -3487,10 +3468,8 @@ void update_main_title()
|
|||
buf.append(" - ");
|
||||
if (bWF_only)
|
||||
buf.append(_("waterfall-only mode"));
|
||||
//jcoxon
|
||||
else if (bHAB)
|
||||
buf = "dl-fldigi for High Altitude Balloon Tracking";
|
||||
//
|
||||
else
|
||||
buf.append(progdefaults.myCall.empty() ? _("NO CALLSIGN SET") : progdefaults.myCall.c_str());
|
||||
if (fl_digi_main)
|
||||
|
|
@ -5127,7 +5106,6 @@ void noop_controls() // create and then hide all controls not being used
|
|||
FHdisp = new Raster(0,0,10,100); FHdisp->hide();
|
||||
}
|
||||
TransmitText = new FTextTX(0,0,100,100); TransmitText->hide();
|
||||
|
||||
|
||||
for (int i = 0; i < NUMMACKEYS * NUMKEYROWS; i++) {
|
||||
btnMacro[i] = new Fl_Button(defwidget); btnMacro[i]->hide();
|
||||
|
|
@ -5178,7 +5156,7 @@ void noop_controls() // create and then hide all controls not being used
|
|||
outSerNo1 = new Fl_Input2(defwidget); outSerNo1->hide();
|
||||
inpSerNo1 = new Fl_Input2(defwidget); inpSerNo1->hide();
|
||||
if(!bHAB) {
|
||||
qsoFreqDisp1 = new cFreqControl(defwidget); qsoFreqDisp1->hide();
|
||||
qsoFreqDisp1 = new cFreqControl(defwidget); qsoFreqDisp1->hide();
|
||||
}
|
||||
|
||||
inpFreq2 = new Fl_Input2(defwidget); inpFreq2->hide();
|
||||
|
|
@ -5455,8 +5433,6 @@ void create_fl_digi_main_WF_only() {
|
|||
|
||||
}
|
||||
|
||||
//jcoxon
|
||||
|
||||
void create_fl_digi_main_dl_fldigi() {
|
||||
|
||||
int fnt = fl_font();
|
||||
|
|
@ -5468,7 +5444,6 @@ void create_fl_digi_main_dl_fldigi() {
|
|||
int freqwidth = (int)fl_width("999999999") + 10;
|
||||
fl_font(fnt, fsize);
|
||||
|
||||
//jcoxon
|
||||
int Htext = progStatus.mainH - Hwfall - Hmenu - Hstatus - Hmacros - Hqsoframe - 4;
|
||||
int minRxHeight = 100;
|
||||
int TopFrameHABheight = 120;
|
||||
|
|
@ -5476,56 +5451,51 @@ void create_fl_digi_main_dl_fldigi() {
|
|||
|
||||
IMAGE_WIDTH = 4000;//progdefaults.HighFreqCutoff;
|
||||
Hwfall = progdefaults.wfheight;
|
||||
Wwfall = WNOM - 2 * DEFAULT_SW - 2 * pad;
|
||||
Wwfall = WMIN_hab - 2 * DEFAULT_SW - 2 * pad;
|
||||
w_habString = Wwfall;
|
||||
//jcoxon
|
||||
// HAB_height = Hmenu + Hwfall + Hstatus + 4 * pad;
|
||||
HAB_height = Hmenu + Hwfall + minRxHeight + TopFrameHABheight + Hstatus + 4 * pad;
|
||||
|
||||
fl_digi_main = new Fl_Double_Window(WNOM, HAB_height);
|
||||
fl_digi_main = new Fl_Double_Window(WMIN_hab, HAB_height);
|
||||
|
||||
mnuFrame = new Fl_Group(0,0,WNOM, Hmenu);
|
||||
mnuFrame = new Fl_Group(0,0,WMIN_hab, Hmenu);
|
||||
|
||||
mnu = new Fl_Menu_Bar(0, 0, WNOM - 200 - pad, Hmenu);
|
||||
// do some more work on the menu
|
||||
mnu = new Fl_Menu_Bar(0, 0, WMIN_hab - 200 - pad, Hmenu);
|
||||
for (size_t i = 0; i < sizeof(alt_menu_)/sizeof(alt_menu_[0]); i++) {
|
||||
// FL_NORMAL_SIZE may have changed; update the menu items
|
||||
// FL_NORMAL_SIZE may have changed; update the menu items
|
||||
if (alt_menu_[i].text) {
|
||||
alt_menu_[i].labelsize_ = FL_NORMAL_SIZE;
|
||||
}
|
||||
// set the icon label for items with the multi label type
|
||||
// set the icon label for items with the multi label type
|
||||
if (alt_menu_[i].labeltype() == _FL_MULTI_LABEL)
|
||||
set_icon_label(&alt_menu_[i]);
|
||||
}
|
||||
mnu->menu(alt_menu_);
|
||||
|
||||
btnAutoSpot = new Fl_Light_Button(WNOM - 200 - pad, 0, 50, Hmenu, "Spot");
|
||||
btnAutoSpot = new Fl_Light_Button(WMIN_hab - 200 - pad, 0, 50, Hmenu, "Spot");
|
||||
btnAutoSpot->selection_color(FL_YELLOW);
|
||||
btnAutoSpot->callback(cbAutoSpot, 0);
|
||||
btnAutoSpot->deactivate();
|
||||
|
||||
btnRSID = new Fl_Light_Button(WNOM - 150 - pad, 0, 50, Hmenu, "RxID");
|
||||
btnRSID = new Fl_Light_Button(WMIN_hab - 150 - pad, 0, 50, Hmenu, "RxID");
|
||||
btnRSID->selection_color(FL_GREEN);
|
||||
btnRSID->tooltip("Receive RSID");
|
||||
btnRSID->callback(cbRSID, 0);
|
||||
|
||||
btnTxRSID = new Fl_Light_Button(WNOM - 100 - pad, 0, 50, Hmenu, "TxID");
|
||||
btnTxRSID = new Fl_Light_Button(WMIN_hab - 100 - pad, 0, 50, Hmenu, "TxID");
|
||||
btnTxRSID->selection_color(FL_BLUE);
|
||||
btnTxRSID->tooltip("Transmit RSID");
|
||||
btnTxRSID->callback(cbTxRSID, 0);
|
||||
|
||||
btnTune = new Fl_Light_Button(WNOM - 50 - pad, 0, 50, Hmenu, "TUNE");
|
||||
btnTune = new Fl_Light_Button(WMIN_hab - 50 - pad, 0, 50, Hmenu, "TUNE");
|
||||
btnTune->selection_color(FL_RED);
|
||||
btnTune->callback(cbTune, 0);
|
||||
|
||||
mnuFrame->resizable(mnu);
|
||||
mnuFrame->end();
|
||||
|
||||
//jcoxon
|
||||
|
||||
Y = Hmenu + pad;
|
||||
|
||||
TopFrameHAB = new Fl_Group(0, Y, WNOM, TopFrameHABheight - 1);
|
||||
TopFrameHAB = new Fl_Group(0, Y, WMIN_hab, TopFrameHABheight - 1);
|
||||
TopFrameHAB->box(FL_UP_BOX);
|
||||
|
||||
/* Row one: [flight] [browse] [payload] [mode] [autoconfigure] [autoswitch] */
|
||||
|
|
@ -5738,8 +5708,8 @@ void create_fl_digi_main_dl_fldigi() {
|
|||
|
||||
Y = Hmenu + pad + TopFrameHABheight;
|
||||
|
||||
TiledGroup = new Fl_Tile_Check(0, Y, WNOM, Htext);
|
||||
ReceiveText = new FTextRX(0, Y, WNOM, minRxHeight, "");
|
||||
TiledGroup = new Fl_Tile_Check(0, Y, WMIN_hab, Htext);
|
||||
ReceiveText = new FTextRX(0, Y, WMIN_hab, minRxHeight, "");
|
||||
ReceiveText->color(
|
||||
fl_rgb_color(
|
||||
progdefaults.RxColor.R,
|
||||
|
|
@ -5753,23 +5723,21 @@ void create_fl_digi_main_dl_fldigi() {
|
|||
ReceiveText->setFontColor(progdefaults.SKIPcolor, FTextBase::SKIP);
|
||||
ReceiveText->setFontColor(progdefaults.ALTRcolor, FTextBase::ALTR);
|
||||
|
||||
FHdisp = new Raster(0, Y, WNOM, minRxHeight);
|
||||
FHdisp = new Raster(0, Y, WMIN_hab, minRxHeight);
|
||||
FHdisp->hide();
|
||||
|
||||
|
||||
Fl_Box *minbox = new Fl_Box(0,Y + minRxHeight + 1, WNOM, minRxHeight);
|
||||
//Fl_Box *minbox = new Fl_Box(sw,Y + 66, progStatus.mainW-sw, Htext - 66 - 66);
|
||||
Fl_Box *minbox = new Fl_Box(0,Y + minRxHeight + 1, WMIN_hab, minRxHeight);
|
||||
minbox->hide();
|
||||
|
||||
TiledGroup->resizable(minbox);
|
||||
|
||||
TiledGroup->end();
|
||||
Fl_Group::current()->resizable(TiledGroup);
|
||||
//
|
||||
|
||||
Y = Hmenu + pad + TopFrameHABheight + minRxHeight;
|
||||
|
||||
Fl_Pack *wfpack = new Fl_Pack(0, Y, WNOM, Hwfall);
|
||||
Fl_Pack *wfpack = new Fl_Pack(0, Y, WMIN_hab, Hwfall);
|
||||
wfpack->type(1);
|
||||
wf = new waterfall(0, Y, Wwfall, Hwfall);
|
||||
wf->end();
|
||||
|
|
@ -5798,7 +5766,7 @@ void create_fl_digi_main_dl_fldigi() {
|
|||
|
||||
Y += (Hwfall + pad);
|
||||
|
||||
Fl_Pack *hpack = new Fl_Pack(0, Y, WNOM, Hstatus);
|
||||
Fl_Pack *hpack = new Fl_Pack(0, Y, WMIN_hab, Hstatus);
|
||||
hpack->type(1);
|
||||
MODEstatus = new Fl_Button(0, Y, Wmode+30, Hstatus, "");
|
||||
MODEstatus->box(FL_DOWN_BOX);
|
||||
|
|
@ -5820,7 +5788,7 @@ void create_fl_digi_main_dl_fldigi() {
|
|||
|
||||
StatusBar = new Fl_Box(
|
||||
rightof(Status2), Y,
|
||||
WNOM - bwSqlOnOff - bwAfcOnOff - Wwarn - rightof(Status2) - 2 * pad,// - 60,
|
||||
WMIN_hab - bwSqlOnOff - bwAfcOnOff - Wwarn - rightof(Status2) - 2 * pad,// - 60,
|
||||
Hstatus, "");
|
||||
StatusBar->box(FL_DOWN_BOX);
|
||||
StatusBar->color(FL_BACKGROUND2_COLOR);
|
||||
|
|
@ -5839,12 +5807,12 @@ void create_fl_digi_main_dl_fldigi() {
|
|||
sql_width -= 15; // leave room for resize handle
|
||||
#endif
|
||||
btnAFC = new Fl_Light_Button(
|
||||
WNOM - bwSqlOnOff - bwAfcOnOff,
|
||||
WMIN_hab - bwSqlOnOff - bwAfcOnOff,
|
||||
Y,
|
||||
bwAfcOnOff, Hstatus, "AFC");
|
||||
btnAFC->selection_color(progdefaults.AfcColor);
|
||||
btnSQL = new Fl_Light_Button(
|
||||
WNOM - bwSqlOnOff,
|
||||
WMIN_hab - bwSqlOnOff,
|
||||
Y,
|
||||
sql_width, Hstatus, "SQL");
|
||||
btnSQL->selection_color(progdefaults.Sql1Color);
|
||||
|
|
@ -5886,41 +5854,20 @@ void create_fl_digi_main_dl_fldigi() {
|
|||
make_scopeviewer();
|
||||
noop_controls();
|
||||
|
||||
/*
|
||||
progdefaults.WF_UIwfcarrier =
|
||||
progdefaults.WF_UIwfreflevel =
|
||||
progdefaults.WF_UIwfampspan =
|
||||
progdefaults.WF_UIwfmode =
|
||||
progdefaults.WF_UIx1 =
|
||||
progdefaults.WF_UIwfshift =
|
||||
progdefaults.WF_UIwfdrop = true;
|
||||
progdefaults.WF_UIrev =
|
||||
progdefaults.WF_UIwfstore =
|
||||
progdefaults.WF_UIxmtlock =
|
||||
progdefaults.WF_UIqsy = false;
|
||||
progdefaults.autoextract = true;
|
||||
wf->UI_select(true);
|
||||
*/
|
||||
wf->UI_select(progStatus.WF_UI);
|
||||
|
||||
createConfig();
|
||||
if (withnoise)
|
||||
grpNoise->show();
|
||||
altTabs();
|
||||
|
||||
}
|
||||
//
|
||||
|
||||
void create_fl_digi_main(int argc, char** argv)
|
||||
{
|
||||
if (bWF_only)
|
||||
create_fl_digi_main_WF_only();
|
||||
//jcoxon
|
||||
else if (bHAB)
|
||||
{
|
||||
create_fl_digi_main_dl_fldigi();
|
||||
}
|
||||
//
|
||||
else
|
||||
create_fl_digi_main_primary();
|
||||
|
||||
|
|
@ -5936,15 +5883,12 @@ void create_fl_digi_main(int argc, char** argv)
|
|||
|
||||
fl_digi_main->xclass(PACKAGE_NAME);
|
||||
|
||||
//jcoxon
|
||||
if (bHAB) {
|
||||
fl_digi_main->size_range(WMIN, HAB_height, 0, HAB_height);
|
||||
}
|
||||
|
||||
else {
|
||||
fl_digi_main->size_range(WMIN, bWF_only ? WF_only_height : HMIN, 0, bWF_only ? WF_only_height : 0);
|
||||
}
|
||||
//
|
||||
if (bHAB)
|
||||
fl_digi_main->size_range(WMIN_hab, HAB_height, 0, HAB_height);
|
||||
else
|
||||
fl_digi_main->size_range(
|
||||
WMIN, bWF_only ? WF_only_height : HMIN,
|
||||
0, bWF_only ? WF_only_height : 0);
|
||||
}
|
||||
|
||||
void put_freq(double frequency)
|
||||
|
|
@ -6578,9 +6522,7 @@ ret:
|
|||
void resetMixerControls()
|
||||
{
|
||||
if (bWF_only) return;
|
||||
//jcoxon
|
||||
if (bHAB) return;
|
||||
//
|
||||
if (progdefaults.EnableMixer) {
|
||||
menuMix->activate();
|
||||
btnLineIn->activate();
|
||||
|
|
|
|||
|
|
@ -251,7 +251,7 @@ dominoex::dominoex(trx_mode md)
|
|||
|
||||
tonespacing = 1.0 * samplerate * doublespaced / symlen;
|
||||
tonespacing += progdefaults.DOMINOEX_ADJ;
|
||||
|
||||
|
||||
bandwidth = NUMTONES * tonespacing;
|
||||
|
||||
hilbert = new C_FIR_filter();
|
||||
|
|
|
|||
|
|
@ -32,6 +32,5 @@
|
|||
#include <assert.h>
|
||||
|
||||
#include "compat/mingw.h"
|
||||
#include "compat/flock.h"
|
||||
|
||||
#endif // MINGW32_H
|
||||
|
|
|
|||
|
|
@ -143,7 +143,6 @@ extern Fl_Button *btnMacroTimer;
|
|||
|
||||
extern bool bWF_only;
|
||||
|
||||
/* dl_fldigi */
|
||||
extern bool bHAB;
|
||||
extern Fl_Group *TopFrameHAB;
|
||||
extern Fl_Choice *habFlight;
|
||||
|
|
@ -162,7 +161,6 @@ extern Fl_Output *habBearing;
|
|||
extern Fl_Output *habDistance;
|
||||
extern Fl_Output *habTimeSinceLastRx;
|
||||
extern Fl_Output *habString;
|
||||
/* end */
|
||||
|
||||
extern bool withnoise;
|
||||
extern int altMacros;
|
||||
|
|
@ -321,7 +319,6 @@ void sync_cw_parameters();
|
|||
|
||||
void open_recv_folder(const char *fname);
|
||||
|
||||
// dl-fldigi
|
||||
void set_menu_dl_online(bool val);
|
||||
void set_menu_dl_refresh_active(bool active);
|
||||
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@
|
|||
#define DEFAULT_HWFALL 124
|
||||
#define DEFAULT_HNOM 500
|
||||
#define WMIN 645
|
||||
#define WMIN_hab 1000
|
||||
#define HMIN 450
|
||||
//#define Wwfall (DEFAULT_HNOM + 2 * BEZEL)
|
||||
#define DEFAULT_WNOM (Wwfall + 2* DEFAULT_SW)
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ protected:
|
|||
bool s2n_valid;
|
||||
|
||||
unsigned cap;
|
||||
|
||||
|
||||
double track_freq(double freq);
|
||||
|
||||
public:
|
||||
|
|
@ -131,7 +131,7 @@ public:
|
|||
CAP_IMG = 1 << 3, CAP_BW = 1 << 4, CAP_RX = 1 << 5,
|
||||
CAP_TX = 1 << 6
|
||||
};
|
||||
|
||||
|
||||
unsigned char track_freq_lock;
|
||||
|
||||
// for CW modem use only
|
||||
|
|
|
|||
30
src/main.cxx
30
src/main.cxx
|
|
@ -116,6 +116,8 @@
|
|||
|
||||
using namespace std;
|
||||
|
||||
string appname;
|
||||
|
||||
string scDevice[2];
|
||||
|
||||
string HomeDir;
|
||||
|
|
@ -142,6 +144,7 @@ string WRAP_auto_dir;
|
|||
string ICS_dir;
|
||||
string ICS_msg_dir;
|
||||
string ICS_tmp_dir;
|
||||
|
||||
string PskMailFile;
|
||||
string ArqFilename;
|
||||
string xmlfname;
|
||||
|
|
@ -190,15 +193,11 @@ static void arg_error(const char* name, const char* arg, bool missing) noreturn_
|
|||
# define SHOW_WIZARD_BEFORE_MAIN_WINDOW 0
|
||||
#endif
|
||||
|
||||
std::string appname;
|
||||
|
||||
int main(int argc, char ** argv)
|
||||
{
|
||||
appname = argv[0];
|
||||
debug_exec(argv);
|
||||
|
||||
set_platform_ui();
|
||||
|
||||
CREATE_THREAD_ID(); // only call this once
|
||||
SET_THREAD_ID(FLMAIN_TID);
|
||||
|
||||
|
|
@ -234,7 +233,9 @@ int main(int argc, char ** argv)
|
|||
#endif
|
||||
}
|
||||
|
||||
dl_fldigi::init();
|
||||
set_platform_ui();
|
||||
|
||||
dl_fldigi::init();
|
||||
|
||||
generate_option_help();
|
||||
generate_version_text();
|
||||
|
|
@ -287,7 +288,6 @@ int main(int argc, char ** argv)
|
|||
qsl_open(string(HomeDir).append("AGMemberList.txt").c_str(), QSL_EQSL);
|
||||
|
||||
progStatus.loadLastState();
|
||||
|
||||
create_fl_digi_main(argc, argv);
|
||||
|
||||
if (!have_config || show_cpucheck) {
|
||||
|
|
@ -412,7 +412,7 @@ int main(int argc, char ** argv)
|
|||
#endif
|
||||
// connect_to_log_server();
|
||||
|
||||
dl_fldigi::ready(bHAB);
|
||||
dl_fldigi::ready(bHAB);
|
||||
|
||||
int ret = Fl::run();
|
||||
|
||||
|
|
@ -531,10 +531,10 @@ void generate_option_help(void) {
|
|||
|
||||
<< " --wfall-only\n"
|
||||
<< " Hide all controls but the waterfall\n\n"
|
||||
//jcoxon
|
||||
|
||||
<< " --hab\n"
|
||||
<< " High Altitude Balloon Setup (dl-fldigi)\n\n"
|
||||
//
|
||||
|
||||
<< " --debug-level LEVEL\n"
|
||||
<< " Set the event log verbosity\n\n"
|
||||
|
||||
|
|
@ -633,9 +633,7 @@ int parse_args(int argc, char **argv, int& idx)
|
|||
|
||||
OPT_FONT, OPT_WFALL_HEIGHT,
|
||||
OPT_WINDOW_WIDTH, OPT_WINDOW_HEIGHT, OPT_WFALL_ONLY,
|
||||
//jcoxon
|
||||
OPT_HAB,
|
||||
//
|
||||
OPT_HAB,
|
||||
#if USE_PORTAUDIO
|
||||
OPT_FRAMES_PER_BUFFER,
|
||||
#endif
|
||||
|
|
@ -682,9 +680,7 @@ int parse_args(int argc, char **argv, int& idx)
|
|||
{ "window-width", 1, 0, OPT_WINDOW_WIDTH },
|
||||
{ "window-height", 1, 0, OPT_WINDOW_HEIGHT },
|
||||
{ "wfall-only", 0, 0, OPT_WFALL_ONLY },
|
||||
//jcoxon
|
||||
{ "hab", 0, 0, OPT_HAB },
|
||||
//
|
||||
{ "wo", 0, 0, OPT_WFALL_ONLY },
|
||||
|
||||
#if USE_PORTAUDIO
|
||||
|
|
@ -850,11 +846,11 @@ int parse_args(int argc, char **argv, int& idx)
|
|||
case OPT_WFALL_ONLY:
|
||||
bWF_only = true;
|
||||
break;
|
||||
//jcoxon
|
||||
|
||||
case OPT_HAB:
|
||||
bHAB = true;
|
||||
break;
|
||||
//
|
||||
|
||||
case OPT_NOISE:
|
||||
withnoise = true;
|
||||
break;
|
||||
|
|
@ -1110,7 +1106,7 @@ static void checkdirectories(void)
|
|||
{ MacrosDir, "macros", create_new_macros },
|
||||
{ WrapDir, "wrap", 0 },
|
||||
{ TalkDir, "talk", 0 },
|
||||
{ TempDir, "temp", 0 }
|
||||
{ TempDir, "temp", 0 },
|
||||
};
|
||||
|
||||
int r;
|
||||
|
|
|
|||
|
|
@ -702,7 +702,7 @@ int configuration::setDefaults()
|
|||
mnuLang->hide();
|
||||
#endif
|
||||
|
||||
inpGPSdev->value(gps_device.c_str());
|
||||
inpGPSdev->value(gps_device.c_str());
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -871,7 +871,7 @@ static bool open_serial(const char* dev)
|
|||
|
||||
if (err == ERROR_ACCESS_DENIED)
|
||||
{
|
||||
LOG_INFO("opening port %s resulted in ERROR_ACCESS_DENIED, it exists but is currently open - allowing");
|
||||
LOG_DEBUG("opening port %s resulted in ERROR_ACCESS_DENIED, it exists but is currently open - allowing");
|
||||
ret = true;
|
||||
}
|
||||
}
|
||||
|
|
@ -991,6 +991,7 @@ out:
|
|||
inpRIGdev->add(ttyname);
|
||||
# endif
|
||||
inpXmlRigDevice->add(ttyname);
|
||||
|
||||
inpGPSdev->add(ttyname);
|
||||
}
|
||||
#else // __APPLE__
|
||||
|
|
|
|||
|
|
@ -64,7 +64,6 @@ static FTextView* text;
|
|||
|
||||
debug* debug::inst = 0;
|
||||
debug::level_e debug::level = debug::INFO_LEVEL;
|
||||
//debug::level_e debug::level = debug::DEBUG_LEVEL;
|
||||
uint32_t debug::mask = ~0u;
|
||||
|
||||
static const char* prefix[] = {
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ void handle_signal(int s)
|
|||
#ifdef __MINGW32__
|
||||
else
|
||||
{
|
||||
/* Re-establish the signal */
|
||||
/* Reset the signal */
|
||||
signal(SIGUSR2, handle_signal);
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -873,7 +873,7 @@ void WFdisp::update_waterfall() {
|
|||
}
|
||||
|
||||
void WFdisp::drawcolorWF() {
|
||||
static int waterwheel = 0;
|
||||
static int waterwheel = 0;
|
||||
FILE *fp;
|
||||
png_structp png_ptr;
|
||||
png_infop info_ptr;
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue