mirror
/
dl-fldigi
kopia lustrzana https://github.com/jamescoxon/dl-fldigi
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Upstream version 2.10o

pull/2/head
Stelios Bounanos 2008-03-01 15:48:40 +00:00
rodzic 2b68f1100a
commit 63c4ec3551
6 zmienionych plików z 88 dodań i 51 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
configure.ac
Wyświetl plik

@ -9,7 +9,7 @@ dnl major and minor must be integers; patch may
dnl contain other characters or be empty
m4_define(FLDIGI_MAJOR, [2])
m4_define(FLDIGI_MINOR, [10])
m4_define(FLDIGI_PATCH, [N])
m4_define(FLDIGI_PATCH, [o])
AC_INIT([fldigi], FLDIGI_MAJOR.FLDIGI_MINOR[FLDIGI_PATCH], [w1hkj AT w1hkj DOT com])

47
src/dialogs/fl_digi.cxx
Wyświetl plik

@ -469,29 +469,32 @@ void macro_cb(Fl_Widget *w, void *v)
void colorize_macro(int i)
{
if (i < 4){
btnMacro[i]->color(fl_rgb_color(
progdefaults.btnGroup1.R,
progdefaults.btnGroup1.G,
progdefaults.btnGroup1.B));
} else if (i < 8) {
btnMacro[i]->color(fl_rgb_color(
progdefaults.btnGroup2.R,
progdefaults.btnGroup2.G,
progdefaults.btnGroup2.B));
btnMacro[i]->labelcolor(FL_WHITE);
if (progdefaults.useGroupColors == true) {
if (i < 4){
btnMacro[i]->color(fl_rgb_color(
progdefaults.btnGroup1.R,
progdefaults.btnGroup1.G,
progdefaults.btnGroup1.B));
} else if (i < 8) {
btnMacro[i]->color(fl_rgb_color(
progdefaults.btnGroup2.R,
progdefaults.btnGroup2.G,
progdefaults.btnGroup2.B));
} else {
btnMacro[i]->color(fl_rgb_color(
progdefaults.btnGroup3.R,
progdefaults.btnGroup3.G,
progdefaults.btnGroup3.B));
}
btnMacro[i]->labelcolor(
fl_rgb_color(
progdefaults.btnFkeyTextColor.R,
progdefaults.btnFkeyTextColor.G,
progdefaults.btnFkeyTextColor.B ));
} else {
btnMacro[i]->color(fl_rgb_color(
progdefaults.btnGroup3.R,
progdefaults.btnGroup3.G,
progdefaults.btnGroup3.B));
btnMacro[i]->labelcolor(FL_WHITE);
btnMacro[i]->color(FL_BACKGROUND2_COLOR);
btnMacro[i]->labelcolor(FL_FOREGROUND_COLOR);
}
btnMacro[i]->labelcolor(
fl_rgb_color(
progdefaults.btnFkeyTextColor.R,
progdefaults.btnFkeyTextColor.G,
progdefaults.btnFkeyTextColor.B ));
}
void colorize_macros()
@ -996,7 +999,7 @@ Fl_Menu_Item menu_[] = {
{"Configure", 0, 0, 0, FL_SUBMENU, FL_NORMAL_LABEL, 0, 14, 0},
{"Defaults", 0, 0, 0, FL_SUBMENU, FL_NORMAL_LABEL, 0, 14, 0},
{"Fonts-Colors", 0, (Fl_Callback*)cb_mnuConfigFonts, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
{"Colors-Fonts", 0, (Fl_Callback*)cb_mnuConfigFonts, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
{"Operator", 0, (Fl_Callback*)cb_mnuConfigOperator, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
{"Waterfall", 0, (Fl_Callback*)cb_mnuConfigWaterfall, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},
{"Video", 0, (Fl_Callback*)cb_mnuConfigVideo, 0, 0, FL_NORMAL_LABEL, 0, 14, 0},

2
src/include/colorsfonts.h
Wyświetl plik

@ -44,7 +44,7 @@ extern void cbTxFontBrowser(Font_Browser*, void* v);
extern void cb_ColorFontOK();
extern void make_colorsfonts();
extern Fl_Check_Button *btnUseColoredFkeys;
extern Fl_Check_Button *btnUseGroupColors;
extern Fl_Button *btnGroup1;
extern Fl_Button *btnGroup2;
extern Fl_Button *btnGroup3;

1
src/include/configuration.h
Wyświetl plik

@ -168,6 +168,7 @@ struct configuration {
RGBint cfgpal[9];
// Button key color palette
bool useGroupColors;
RGBint btnGroup1;
RGBint btnGroup2;
RGBint btnGroup3;

80
src/misc/colorsfonts.cxx
Wyświetl plik

@ -25,7 +25,7 @@
#include "colorsfonts.h"
Fl_Double_Window *dlgColorFont = (Fl_Double_Window *)0;
Fl_Check_Button *btnUseColoredFkeys=(Fl_Check_Button *)0;
Fl_Check_Button *btnUseGroupColors=(Fl_Check_Button *)0;
Fl_Button *btnGroup1=(Fl_Button *)0;
Fl_Button *btnGroup2=(Fl_Button *)0;
Fl_Button *btnGroup3=(Fl_Button *)0;
@ -38,6 +38,7 @@ Fl_Button *btnRxFont=(Fl_Button *)0;
Fl_Button *btnTxColor=(Fl_Button *)0;
Fl_Button *btnTxFont=(Fl_Button *)0;
Fl_Button *btnTextDefaults=(Fl_Button *)0;
Fl_Button *btnNoTextColor=(Fl_Button *)0;
Fl_Button *btnClrFntOK=(Fl_Button *)0;
void selectColorsFonts()
@ -52,10 +53,11 @@ void cb_ColorFontOK()
dlgColorFont->hide();
}
static void cb_btnUseColoredFkeys(Fl_Check_Button* o, void*)
static void cb_btnUseGroupColors(Fl_Check_Button* o, void*)
{
// progdefaults.UseColoredFkeys = o->value();
// progdefaults.changed = true;
progdefaults.useGroupColors = o->value();
colorize_macros();
progdefaults.changed = true;
}
static void cb_btnGroup1(Fl_Button* o, void*)
@ -294,6 +296,26 @@ static void cb_btnTxFont(Fl_Button*, void*)
b->show();
}
static void cb_btnNoTextColor(Fl_Button*, void*)
{
uchar r, g, b;
Fl_Color clr;
r = 255; g = 255; b = 255;
clr = fl_rgb_color(r,g,b);
RxText->color(clr);
RxText->redraw();
ReceiveText->color(clr);
ReceiveText->redraw();
TxText->color(clr);
TxText->redraw();
TransmitText->color(clr);
TransmitText->redraw();
progdefaults.changed = true;
}
static void cb_btnTextDefaults(Fl_Button*, void*)
{
uchar r, g, b;
@ -330,12 +352,12 @@ void make_colorsfonts()
o->box(FL_ENGRAVED_FRAME);
o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE);
btnUseColoredFkeys = new Fl_Check_Button(10, 30, 70, 15, "use colored buttons");
btnUseColoredFkeys->down_box(FL_DOWN_BOX);
btnUseColoredFkeys->callback((Fl_Callback*)cb_btnUseColoredFkeys);
// btnUseColoredFkeys->value(progdefaults.UseColoredFkeys);
btnUseGroupColors = new Fl_Check_Button(10, 30, 70, 15, "use colored buttons");
btnUseGroupColors->down_box(FL_DOWN_BOX);
btnUseGroupColors->callback((Fl_Callback*)cb_btnUseGroupColors);
btnUseGroupColors->value(progdefaults.useGroupColors);
btnGroup1 = new Fl_Button(95, 55, 70, 20, "Text");
btnGroup1 = new Fl_Button(90, 55, 75, 20, "Group 1");
btnGroup1->callback((Fl_Callback*)cb_btnGroup1);
btnGroup1->color(
fl_rgb_color(
@ -346,10 +368,11 @@ void make_colorsfonts()
fl_rgb_color(
progdefaults.btnFkeyTextColor.R,
progdefaults.btnFkeyTextColor.G,
progdefaults.btnFkeyTextColor.B));
progdefaults.btnFkeyTextColor.B));
btnGroup1->tooltip("Background color for Fkey group");
new Fl_Box(15, 56, 75, 20, "Bkgnd");
new Fl_Box(15, 56, 75, 20, "Group 1");
btnGroup2 = new Fl_Button(95, 84, 70, 20, "Text");
btnGroup2 = new Fl_Button(90, 84, 75, 20, "Group 2");
btnGroup2->callback((Fl_Callback*)cb_btnGroup2);
btnGroup2->color(
fl_rgb_color(
@ -360,10 +383,11 @@ void make_colorsfonts()
fl_rgb_color(
progdefaults.btnFkeyTextColor.R,
progdefaults.btnFkeyTextColor.G,
progdefaults.btnFkeyTextColor.B));
progdefaults.btnFkeyTextColor.B));
btnGroup2->tooltip("Background color for Fkey group");
new Fl_Box(15, 85, 75, 20, "Bkgnd");
new Fl_Box(15, 85, 75, 20, "Group 2");
btnGroup3 = new Fl_Button(95, 114, 70, 20, "Text");
btnGroup3 = new Fl_Button(90, 114, 75, 20, "Group 3");
btnGroup3->callback((Fl_Callback*)cb_btnGroup3);
btnGroup3->color(
fl_rgb_color(
@ -374,19 +398,20 @@ void make_colorsfonts()
fl_rgb_color(
progdefaults.btnFkeyTextColor.R,
progdefaults.btnFkeyTextColor.G,
progdefaults.btnFkeyTextColor.B));
progdefaults.btnFkeyTextColor.B));
btnGroup3->tooltip("Background color for Fkey group");
new Fl_Box(15, 115, 75, 20, "Bkgnd");
new Fl_Box(15, 115, 75, 20, "Group 3");
btnFkeyTextColor = new Fl_Button(95, 145, 70, 20);
btnFkeyTextColor = new Fl_Button(90, 145, 75, 20);
btnFkeyTextColor->callback((Fl_Callback*)cb_btnFkeyTextColor);
btnFkeyTextColor->color(
fl_rgb_color(
progdefaults.btnFkeyTextColor.R,
progdefaults.btnFkeyTextColor.G,
progdefaults.btnFkeyTextColor.B));
new Fl_Box(15, 145, 75, 20, "Label Txt");
new Fl_Box(15, 145, 75, 20, "Text Color");
btnFkeyDefaults = new Fl_Button(95, 175, 70, 20, "Defaults");
btnFkeyDefaults = new Fl_Button(90, 175, 75, 20, "Defaults");
btnFkeyDefaults->callback((Fl_Callback*)cb_btnFkeyDefaults);
o->end();
@ -411,19 +436,22 @@ void make_colorsfonts()
progdefaults.TxColor.G,
progdefaults.TxColor.B));
btnRxColor = new Fl_Button(205, 75, 70, 20, "Rx Color");
btnRxColor = new Fl_Button(200, 75, 70, 20, "Rx Bkgnd");
btnRxColor->callback((Fl_Callback*)cb_btnRxColor);
btnRxFont = new Fl_Button(291, 75, 72, 20, "Rx Font");
btnRxFont = new Fl_Button(285, 75, 70, 20, "Rx Font");
btnRxFont->callback((Fl_Callback*)cb_btnRxFont);
btnTxColor = new Fl_Button(210, 145, 70, 20, "Tx Color");
btnTxColor = new Fl_Button(200, 145, 70, 20, "Tx Bkgnd");
btnTxColor->callback((Fl_Callback*)cb_btnTxColor);
btnTxFont = new Fl_Button(291, 145, 72, 20, "Tx Font");
btnTxFont = new Fl_Button(285, 145, 70, 20, "Tx Font");
btnTxFont->callback((Fl_Callback*)cb_btnTxFont);
btnTextDefaults = new Fl_Button(295, 175, 70, 20, "Defaults");
btnNoTextColor = new Fl_Button(200, 175, 70, 20, "No Color");
btnNoTextColor->callback((Fl_Callback*)cb_btnNoTextColor);
btnTextDefaults = new Fl_Button(285, 175, 70, 20, "Defaults");
btnTextDefaults->callback((Fl_Callback*)cb_btnTextDefaults);
o->end();

7
src/misc/configuration.cxx
Wyświetl plik

@ -172,6 +172,7 @@ configuration progdefaults = {
{223,226,105},{254,254, 4},{255, 58, 0} },
// Button key color palette
true, // bool useGroupColors;
{ 80, 144, 144}, // RGBint btnGroup1;
{ 144, 80, 80}, // RGBint btnGroup2;
{ 80, 80, 144}, // RGBint btnGroup3;
@ -260,7 +261,7 @@ enum TAG { \
PALETTE5, PALETTE6, PALETTE7, PALETTE8,
VIEWERMARQUEE, VIEWERSHOWFREQ, VIEWERSTART,
VIEWERCHANNELS, VIEWERSQUELCH, VIEWERTIMEOUT, WFAVERAGING,
FKEYGROUP1, FKEYGROUP2, FKEYGROUP3,
USEGROUPCOLORS, FKEYGROUP1, FKEYGROUP2, FKEYGROUP3,
FKEYTEXTCOLOR,
RXFONTNBR, RXFONTSIZE, TXFONTNBR, TXFONTSIZE,
RXFONTCOLOR, TXFONTCOLOR
@ -459,6 +460,7 @@ void configuration::writeDefaultsXML()
writeXMLint(f, "VIEWERTIMEOUT", VIEWERtimeout);
writeXMLbool(f,"WFAVERAGEING", WFaveraging);
writeXMLbool(f,"USEGROUPCOLORS", useGroupColors);
writeXMLrgb(f, "FKEYGROUP1", btnGroup1.R, btnGroup1.G, btnGroup1.B);
writeXMLrgb(f, "FKEYGROUP2", btnGroup2.R, btnGroup2.G, btnGroup2.B);
writeXMLrgb(f, "FKEYGROUP3", btnGroup3.R, btnGroup3.G, btnGroup3.B);
@ -914,6 +916,8 @@ bool configuration::readDefaultsXML()
case WFAVERAGING :
WFaveraging = atoi(xml->getNodeData());
break;
case USEGROUPCOLORS :
useGroupColors = atoi(xml->getNodeData());
case FKEYGROUP1 :
sscanf( xml->getNodeData(), "%d %d %d",
&btnGroup1.R, &btnGroup1.G, &btnGroup1.B);
@ -1092,6 +1096,7 @@ bool configuration::readDefaultsXML()
else if (!strcmp("VIEWERSQUELCH", nodeName)) tag = VIEWERSQUELCH;
else if (!strcmp("VIEWERTIMEOUT", nodeName)) tag = VIEWERTIMEOUT;
else if (!strcmp("WFAVERAGING", nodeName)) tag = WFAVERAGING;
else if (!strcmp("USEGROUPCOLORS", nodeName)) tag = USEGROUPCOLORS;
else if (!strcmp("FKEYGROUP1", nodeName)) tag = FKEYGROUP1;
else if (!strcmp("FKEYGROUP2", nodeName)) tag = FKEYGROUP2;
else if (!strcmp("FKEYGROUP3", nodeName)) tag = FKEYGROUP3;