kopia lustrzana https://github.com/jamescoxon/dl-fldigi
Display Macro-Loaded message
Modified the Load Macro message behavior to display whenever a Macro file is loaded or a new one created - dependent on the state of the associated configuration itempull/2/head
rodzic
75096a9049
commit
eeb334c04f
|
@ -2056,6 +2056,15 @@ void setTabColors()
|
|||
if (dlgColorFont->visible()) dlgColorFont->redraw();
|
||||
}
|
||||
|
||||
void showMacroSet() {
|
||||
if (progdefaults.DisplayMacroFilename) {
|
||||
string Macroset = "\n<<<===== Macro File ";
|
||||
Macroset.append(progStatus.LastMacroFile);
|
||||
Macroset.append(" Loaded =====>>>\n");
|
||||
ReceiveText->add(Macroset.c_str());
|
||||
}
|
||||
}
|
||||
|
||||
void create_fl_digi_main() {
|
||||
|
||||
int Y = 0;
|
||||
|
@ -2489,13 +2498,7 @@ void create_fl_digi_main() {
|
|||
ReceiveText->setFontColor(progdefaults.CTRLcolor, FTextBase::CTRL);
|
||||
ReceiveText->setFontColor(progdefaults.SKIPcolor, FTextBase::SKIP);
|
||||
ReceiveText->setFontColor(progdefaults.ALTRcolor, FTextBase::ALTR);
|
||||
|
||||
if (progdefaults.DisplayMacroFilename) {
|
||||
string Macroset = "<<<===== Macro File ";
|
||||
Macroset.append(progStatus.LastMacroFile);
|
||||
Macroset.append(" Loaded =====>>>\n\n");
|
||||
ReceiveText->add(Macroset.c_str());
|
||||
}
|
||||
showMacroSet();
|
||||
|
||||
TiledGroup->add_resize_check(FTextView::wheight_mult_tsize, ReceiveText);
|
||||
FHdisp = new Raster(sw, Y, WNOM-sw, minRxHeight);
|
||||
|
|
|
@ -167,6 +167,7 @@ extern void show_frequency(long long);
|
|||
extern void show_mode(const string& mode);
|
||||
extern void show_bw(const string& sWidth);
|
||||
extern void show_spot(bool v);
|
||||
extern void showMacroSet();
|
||||
|
||||
extern void put_WARNstatus(double);
|
||||
|
||||
|
|
|
@ -701,6 +701,7 @@ void MACROTEXT::openMacroFile()
|
|||
loadMacros(p);
|
||||
progStatus.LastMacroFile = fl_filename_name(p);
|
||||
}
|
||||
showMacroSet();
|
||||
}
|
||||
|
||||
void MACROTEXT::saveMacroFile()
|
||||
|
@ -723,6 +724,7 @@ void MACROTEXT::loadnewMACROS(string &s, size_t &i)
|
|||
progStatus.LastMacroFile = fl_filename_name(fname.c_str());
|
||||
}
|
||||
s.replace(i, endbracket - i + 1, "");
|
||||
showMacroSet();
|
||||
}
|
||||
|
||||
string MACROTEXT::expandMacro(int n)
|
||||
|
|
Ładowanie…
Reference in New Issue