kopia lustrzana https://github.com/jamescoxon/dl-fldigi
Upstream version 3.04AR
Stelios Bounanos
rodzic
40555942a8
commit
a5062ae24e
|
|
@ -9,7 +9,7 @@ dnl major and minor must be integers; patch may
|
|||
dnl contain other characters or be empty
|
||||
m4_define(FLDIGI_MAJOR, [3])
|
||||
m4_define(FLDIGI_MINOR, [0])
|
||||
m4_define(FLDIGI_PATCH, [4AQ])
|
||||
m4_define(FLDIGI_PATCH, [4AR])
|
||||
|
||||
AC_INIT([fldigi], FLDIGI_MAJOR.FLDIGI_MINOR[FLDIGI_PATCH], [w1hkj AT w1hkj DOT com])
|
||||
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@
|
|||
#include "include/pixmaps/minus-icon.xpm"
|
||||
#include "include/pixmaps/plus-icon.xpm"
|
||||
#include "include/pixmaps/net-icon.xpm"
|
||||
#include "include/pixmaps/right-arrow-icon.xpm"
|
||||
//#include "include/pixmaps/right-arrow-icon.xpm"
|
||||
#include "include/pixmaps/save-icon.xpm"
|
||||
#include "include/pixmaps/time-icon.xpm"
|
||||
#include "include/pixmaps/trash-icon.xpm"
|
||||
|
|
@ -1726,9 +1726,18 @@ void create_fl_digi_main() {
|
|||
|
||||
IMAGE_WIDTH = progdefaults.wfwidth;
|
||||
Hwfall = progdefaults.wfheight;
|
||||
Wwfall = DEFAULT_HNOM + 2 * BEZEL;
|
||||
WNOM = Wwfall;
|
||||
// Wwfall = DEFAULT_HNOM + 2 * BEZEL;
|
||||
HNOM = DEFAULT_HNOM;
|
||||
|
||||
WNOM = DEFAULT_HNOM;
|
||||
if (progdefaults.docked_scope)
|
||||
Wwfall = WNOM - 2 * BEZEL - Hwfall + 24;
|
||||
else
|
||||
Wwfall = WNOM - 2 * BEZEL - 2 * DEFAULT_SW;
|
||||
// if (progdefaults.docked_scope)
|
||||
// WNOM = Wwfall;
|
||||
// else
|
||||
// WNOM = Wwfall + 2 * DEFAULT_SW;
|
||||
|
||||
update_main_title();
|
||||
fl_digi_main = new Fl_Double_Window(WNOM, HNOM, main_window_title.c_str());
|
||||
|
|
@ -1761,21 +1770,19 @@ void create_fl_digi_main() {
|
|||
btnMacroTimer->hide();
|
||||
btnMacroDummy = new Fl_Button(WNOM - 50 - pad, 0, 50, Hmenu, "");
|
||||
|
||||
int qh = Hqsoframe / 2;
|
||||
int qfy = Hmenu + qh - pad;
|
||||
|
||||
#define FREQWIDTH 172 // FREQWIDTH should be a multiple of 9 + 10
|
||||
#define FREQHEIGHT 30
|
||||
#define BTNWIDTH 30
|
||||
|
||||
#define FREQDISP_WIDTH (FREQWIDTH + 4)
|
||||
#define QSO_INFO_WIDTH (WNOM - FREQDISP_WIDTH - BTNWIDTH)
|
||||
int qh = Hqsoframe / 2;
|
||||
int qfy = Hmenu + qh - pad;
|
||||
int rig_control_width = FREQWIDTH + 4;
|
||||
|
||||
Fl_Group *TopFrame = new Fl_Group(0, Hmenu, WNOM, Hqsoframe + Hnotes);
|
||||
|
||||
// leftmost frame
|
||||
RigControlFrame = new Fl_Group(0, Hmenu,
|
||||
FREQDISP_WIDTH, Hqsoframe + Hnotes);
|
||||
rig_control_width, Hqsoframe + Hnotes);
|
||||
|
||||
txtRigName = new Fl_Box(2, Hmenu, FREQWIDTH, Hqsoframe - FREQHEIGHT);
|
||||
txtRigName->align(FL_ALIGN_CENTER);
|
||||
|
|
@ -1963,18 +1970,12 @@ void create_fl_digi_main() {
|
|||
QsoInfoFrame2 = new Fl_Group(rightof(QsoButtonFrame), Y,
|
||||
WNOM - rightof(QsoButtonFrame), Hnotes);
|
||||
|
||||
// Fl_Box *boxA = new Fl_Box(rightof(QsoButtonFrame), Y, 40, Hnotes, "Name");
|
||||
// boxA->align(FL_ALIGN_INSIDE | FL_ALIGN_LEFT);
|
||||
inpName = new Fl_Input(rightof(QsoButtonFrame)+40, Y, 90, Hnotes, "Name");
|
||||
inpName->align(FL_ALIGN_LEFT);
|
||||
|
||||
// Fl_Box *boxB = new Fl_Box(rightof(inpName), Y, 25, Hnotes, "Loc");
|
||||
// boxB->align(FL_ALIGN_INSIDE | FL_ALIGN_LEFT);
|
||||
inpLoc = new Fl_Input(rightof(inpName) - 8, Y, 58, Hnotes, "Loc");
|
||||
inpLoc->align(FL_ALIGN_LEFT);
|
||||
|
||||
// Fl_Box *boxC = new Fl_Box(rightof(inpLoc), Y, 20, Hnotes, "Az");
|
||||
// boxC->align(FL_ALIGN_INSIDE | FL_ALIGN_LEFT);
|
||||
inpAZ = new Fl_Input(leftof(inpRstOut), Y, 28, Hnotes, "Az");
|
||||
inpAZ->align(FL_ALIGN_LEFT);
|
||||
|
||||
|
|
@ -2113,21 +2114,25 @@ void create_fl_digi_main() {
|
|||
if (progdefaults.docked_scope) {
|
||||
Fl_Pack *wfpack = new Fl_Pack(0, Y, WNOM, Hwfall);
|
||||
wfpack->type(1);
|
||||
wf = new waterfall(0, Y, Wwfall - Hwfall + 24, Hwfall);
|
||||
wf = new waterfall(0, Y, Wwfall, Hwfall);
|
||||
wf->end();
|
||||
Fl_Pack *ypack = new Fl_Pack(Wwfall - Hwfall + 24, Y, Hwfall - 24, Hwfall);
|
||||
Fl_Pack *ypack = new Fl_Pack(
|
||||
rightof(wf), Y,
|
||||
Hwfall - 24, Hwfall);
|
||||
|
||||
ypack->type(0);
|
||||
|
||||
wfscope = new Digiscope (Wwfall - Hwfall, Y, Hwfall - 24, Hwfall - 24);
|
||||
wfscope = new Digiscope (
|
||||
rightof(wf), Y,
|
||||
Hwfall - 24, Hwfall - 24);
|
||||
|
||||
pgrsSquelch = new Progress(
|
||||
Wwfall - Hwfall + 24, Y + Hwfall - 24,
|
||||
Hwfall - 24, 12, "");
|
||||
rightof(wf), Y + Hwfall - 24,
|
||||
Hwfall - 24, 12,
|
||||
"");
|
||||
pgrsSquelch->color(FL_BACKGROUND2_COLOR, FL_DARK_GREEN);
|
||||
sldrSquelch = new Fl_Slider(
|
||||
FL_HOR_NICE_SLIDER,
|
||||
Wwfall - Hwfall + 24, Y + Hwfall - 12,
|
||||
Hwfall - 24, 12, "");
|
||||
sldrSquelch = new Fl_Slider( FL_HOR_NICE_SLIDER,
|
||||
rightof(wf), Y + Hwfall - 12, Hwfall - 24, 12, "");
|
||||
|
||||
sldrSquelch->minimum(0);
|
||||
sldrSquelch->maximum(100);
|
||||
|
|
@ -2146,17 +2151,18 @@ void create_fl_digi_main() {
|
|||
wf = new waterfall(0, Y, Wwfall, Hwfall);
|
||||
wf->end();
|
||||
|
||||
pgrsSquelch = new Progress(
|
||||
WNOM - 2*DEFAULT_SW, Y + 4,
|
||||
DEFAULT_SW, Hwfall - 8, "");
|
||||
pgrsSquelch = new Progress(
|
||||
rightof(wf), Y + 4,
|
||||
DEFAULT_SW, Hwfall - 8,
|
||||
"");
|
||||
pgrsSquelch->color(FL_BACKGROUND2_COLOR, FL_DARK_GREEN);
|
||||
pgrsSquelch->type(Progress::VERTICAL);
|
||||
pgrsSquelch->tooltip("Detected signal level");
|
||||
|
||||
sldrSquelch = new Fl_Slider(
|
||||
FL_VERT_NICE_SLIDER,
|
||||
WNOM - DEFAULT_SW, Y + 4,
|
||||
DEFAULT_SW, Hwfall - 8, "");
|
||||
sldrSquelch = new Fl_Slider(
|
||||
rightof(pgrsSquelch), Y + 4,
|
||||
DEFAULT_SW, Hwfall - 8,
|
||||
"");
|
||||
sldrSquelch->minimum(100);
|
||||
sldrSquelch->maximum(0);
|
||||
sldrSquelch->step(1);
|
||||
|
|
|
|||
|
|
@ -1,129 +1,40 @@
|
|||
/* XPM */
|
||||
static const char *save_icon[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 16 107 2",
|
||||
" c #4E6A7D",
|
||||
". c #58787A",
|
||||
"X c #6E706B",
|
||||
"o c #6B716E",
|
||||
"O c #72756B",
|
||||
"+ c #667173",
|
||||
"@ c #627075",
|
||||
"# c #38678B",
|
||||
"$ c #3D698A",
|
||||
"% c #3B6B8F",
|
||||
"& c #3D6B8E",
|
||||
"* c #3F6C8E",
|
||||
"= c #4A6D85",
|
||||
"- c #436E88",
|
||||
"; c #4A7180",
|
||||
": c #41749A",
|
||||
"> c #44789F",
|
||||
", c #547D9B",
|
||||
"< c #6B7F88",
|
||||
"1 c #5186AF",
|
||||
"2 c #5892BD",
|
||||
"3 c #688BA0",
|
||||
"4 c #6E99B6",
|
||||
"5 c #7798B0",
|
||||
"6 c #719FBF",
|
||||
"7 c #739FC0",
|
||||
"8 c #79A7CA",
|
||||
"9 c #9F9F9F",
|
||||
"0 c #92A6AC",
|
||||
"q c #95A9AF",
|
||||
"w c #9AAEB4",
|
||||
"e c #A8A7A7",
|
||||
"r c #A8A7A8",
|
||||
"t c #A9A9A9",
|
||||
"y c #AAAAA9",
|
||||
"u c #AFAFAF",
|
||||
"i c #B4B4B4",
|
||||
"p c #B7B6B6",
|
||||
"a c #B9B9B9",
|
||||
"s c #BCBCBC",
|
||||
"d c #C5CBBF",
|
||||
"f c #8FB3CE",
|
||||
"g c #92B7D3",
|
||||
"h c #96BBD8",
|
||||
"j c #9EBFD9",
|
||||
"k c #98BFDC",
|
||||
"l c #ACBCC3",
|
||||
"z c #9BC2DF",
|
||||
"x c #ABC8DF",
|
||||
"c c #ABCBE2",
|
||||
"v c #ACCBE3",
|
||||
"b c #B1CEE6",
|
||||
"n c gray76",
|
||||
"m c #C3C3C3",
|
||||
"M c gray77",
|
||||
"N c #C5C5C5",
|
||||
"B c #CACFC4",
|
||||
"V c #C8C8C8",
|
||||
"C c gray79",
|
||||
"Z c #CACACA",
|
||||
"A c #CBCBCB",
|
||||
"S c #CDCDCD",
|
||||
"D c #CECECE",
|
||||
"F c gray81",
|
||||
"G c #CED4C8",
|
||||
"H c #C9D6DD",
|
||||
"J c #D0D0D0",
|
||||
"K c gray82",
|
||||
"L c #D2D2D2",
|
||||
"P c #D5D5D5",
|
||||
"I c gray84",
|
||||
"U c gainsboro",
|
||||
"Y c #DDDDDD",
|
||||
"T c #DDE1D6",
|
||||
"R c #DFE2DE",
|
||||
"E c #E2E6DD",
|
||||
"W c #C1D9EB",
|
||||
"Q c #C5DBEC",
|
||||
"! c #D5DFE5",
|
||||
"~ c #D0DFEF",
|
||||
"^ c gray89",
|
||||
"/ c #E4E4E4",
|
||||
"( c #E9E9EA",
|
||||
") c #EAE9EA",
|
||||
"_ c gray92",
|
||||
"` c #EBECEC",
|
||||
"' c #ECECEC",
|
||||
"] c gray93",
|
||||
"[ c #EDEEED",
|
||||
"{ c #EDEDEE",
|
||||
"} c #EDEEEE",
|
||||
"| c #EEEEEE",
|
||||
" . c gray94",
|
||||
".. c #F1F1F1",
|
||||
"X. c gray95",
|
||||
"o. c #F3F3F3",
|
||||
"O. c #F3F4F3",
|
||||
"+. c #F4F4F4",
|
||||
"@. c gray97",
|
||||
"#. c #F9F9F9",
|
||||
"$. c gray98",
|
||||
"%. c #FCFBFC",
|
||||
"&. c gray99",
|
||||
"*. c #FDFDFD",
|
||||
"=. c #FEFEFE",
|
||||
"-. c gray100",
|
||||
";. c None",
|
||||
/* pixels */
|
||||
";.;.;.# # # $ ; . ;.;.;.;.;.;.;.",
|
||||
";.;.;.b ~ Q z 3 - ;.;.;.;.;.;.;.",
|
||||
"< + @ = : > j W 1 X X X X X X ",
|
||||
"o E -.T H 4 # c g , ! -.-.-.+.X ",
|
||||
"O *.| ] R 5 # 8 f & l { } [ O.X ",
|
||||
"X %.` # # # # 8 2 # # # # ' o.X ",
|
||||
"X $.( B # k 6 6 6 7 h # q ) X.X ",
|
||||
"X #.$./ d # k 7 7 x # 0 / +...X ",
|
||||
"X #.| $./ d # v k % 0 / $.| ..X ",
|
||||
"X @.^ | $.$.G * # w $.&.| ^ .X ",
|
||||
"X =.-.-.-.-.-.-.-.+.+._ _ ^ .X ",
|
||||
"X D C C C C N C C N N N N N I X ",
|
||||
"X D N 9 u s M V J t L t L a Z X ",
|
||||
"X S m y i n M V A r K e K p Z X ",
|
||||
"X Y U U U P P F F F F F F F Z X ",
|
||||
"X X X X X X X X X X X X X X X X "
|
||||
};
|
||||
static const char * save_icon[] = {
|
||||
"16 16 21 1",
|
||||
" c None",
|
||||
". c #6E706B",
|
||||
"+ c #3D698A",
|
||||
"@ c #38678B",
|
||||
"# c #667173",
|
||||
"$ c #627075",
|
||||
"% c #4E6A7D",
|
||||
"& c #6B716E",
|
||||
"* c #FFFFFF",
|
||||
"= c #ABCBE2",
|
||||
"- c #547D9B",
|
||||
"; c #72756B",
|
||||
"> c #FDFDFD",
|
||||
", c #3D6B8E",
|
||||
"' c #ABC8DF",
|
||||
") c #CACACA",
|
||||
"! c #FAFAFA",
|
||||
"~ c #ACCBE3",
|
||||
"{ c #3B6B8F",
|
||||
"] c #3F6C8E",
|
||||
"^ c #FCFCFC",
|
||||
" . +@@@ ",
|
||||
" @@@@ ",
|
||||
".#$...@@@%......",
|
||||
"&*****@==-*****.",
|
||||
";>****@==,*****.",
|
||||
".*@@@@@==@@@@@*.",
|
||||
".**@@======@@**.",
|
||||
".***@@==='@@***.",
|
||||
".))!*@@~={@**)).",
|
||||
".))*!!@]@@!^*)).",
|
||||
".))****@@****)).",
|
||||
".))**********)).",
|
||||
".))**********)).",
|
||||
".)))))))))))))).",
|
||||
".)))))))))))))).",
|
||||
"................"};
|
||||
|
|
|
|||
|
|
@ -610,7 +610,7 @@ bool riginitOK = false;
|
|||
} else if (chkUSERIGCATis) { // start the rigCAT thread
|
||||
if (rigCAT_init(true)) {
|
||||
wf->USB(true);
|
||||
wf->setQSY(0);
|
||||
wf->setQSY(1);
|
||||
// activate_rig_menu_item(true);
|
||||
qsoFreqDisp->activate();
|
||||
riginitOK = true;
|
||||
|
|
@ -619,7 +619,7 @@ bool riginitOK = false;
|
|||
} else if (chkUSEHAMLIBis) { // start the hamlib thread
|
||||
if (hamlib_init(btnPTTis == 1 ? true : false) == false) {
|
||||
wf->USB(true);
|
||||
wf->setQSY(0);
|
||||
wf->setQSY(1);
|
||||
// activate_rig_menu_item(true);
|
||||
qsoFreqDisp->activate();
|
||||
riginitOK = true;
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue