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

Macro Buttons 

* Increase width of alternate macro button(s)
  * Add 2 row scheme, one above, one below text panel
pull/1/head
David Freese 2014-10-19 09:16:20 -05:00
rodzic b123fc1023
commit 9bbef877c7
5 zmienionych plików z 159 dodań i 76 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

118
src/dialogs/confdialog.cxx
Wyświetl plik

@ -836,15 +836,6 @@ set_macroLabels();
UI_select();
}
Fl_Round_Button *btn_scheme_4=(Fl_Round_Button *)0;
static void cb_btn_scheme_4(Fl_Round_Button*, void*) {
progdefaults.mbar_scheme = 4;
progdefaults.changed = true;
set_macroLabels();
UI_select();
}
Fl_Round_Button *btn_scheme_5=(Fl_Round_Button *)0;
static void cb_btn_scheme_5(Fl_Round_Button*, void*) {
@ -854,15 +845,6 @@ set_macroLabels();
UI_select();
}
Fl_Round_Button *btn_scheme_6=(Fl_Round_Button *)0;
static void cb_btn_scheme_6(Fl_Round_Button*, void*) {
progdefaults.mbar_scheme = 6;
progdefaults.changed = true;
set_macroLabels();
UI_select();
}
Fl_Round_Button *btn_scheme_7=(Fl_Round_Button *)0;
static void cb_btn_scheme_7(Fl_Round_Button*, void*) {
@ -872,15 +854,6 @@ set_macroLabels();
UI_select();
}
Fl_Round_Button *btn_scheme_8=(Fl_Round_Button *)0;
static void cb_btn_scheme_8(Fl_Round_Button*, void*) {
progdefaults.mbar_scheme = 8;
progdefaults.changed = true;
set_macroLabels();
UI_select();
}
Fl_Round_Button *btn_scheme_9=(Fl_Round_Button *)0;
static void cb_btn_scheme_9(Fl_Round_Button*, void*) {
@ -890,6 +863,42 @@ set_macroLabels();
UI_select();
}
Fl_Round_Button *btn_scheme_11=(Fl_Round_Button *)0;
static void cb_btn_scheme_11(Fl_Round_Button*, void*) {
progdefaults.mbar_scheme = 11;
progdefaults.changed = true;
set_macroLabels();
UI_select();
}
Fl_Round_Button *btn_scheme_4=(Fl_Round_Button *)0;
static void cb_btn_scheme_4(Fl_Round_Button*, void*) {
progdefaults.mbar_scheme = 4;
progdefaults.changed = true;
set_macroLabels();
UI_select();
}
Fl_Round_Button *btn_scheme_6=(Fl_Round_Button *)0;
static void cb_btn_scheme_6(Fl_Round_Button*, void*) {
progdefaults.mbar_scheme = 6;
progdefaults.changed = true;
set_macroLabels();
UI_select();
}
Fl_Round_Button *btn_scheme_8=(Fl_Round_Button *)0;
static void cb_btn_scheme_8(Fl_Round_Button*, void*) {
progdefaults.mbar_scheme = 8;
progdefaults.changed = true;
set_macroLabels();
UI_select();
}
Fl_Round_Button *btn_scheme_10=(Fl_Round_Button *)0;
static void cb_btn_scheme_10(Fl_Round_Button*, void*) {
@ -899,6 +908,15 @@ set_macroLabels();
UI_select();
}
Fl_Round_Button *btn_scheme_12=(Fl_Round_Button *)0;
static void cb_btn_scheme_12(Fl_Round_Button*, void*) {
progdefaults.mbar_scheme = 12;
progdefaults.changed = true;
set_macroLabels();
UI_select();
}
Fl_Check_Button *btnUseLastMacro=(Fl_Check_Button *)0;
static void cb_btnUseLastMacro(Fl_Check_Button* o, void*) {
@ -5981,41 +5999,51 @@ ab and newline are automatically included."));
btn_scheme_3->down_box(FL_ROUND_DOWN_BOX);
btn_scheme_3->callback((Fl_Callback*)cb_btn_scheme_3);
} // Fl_Round_Button* btn_scheme_3
{ btn_scheme_4 = new Fl_Round_Button(228, 155, 144, 22, _("Two scheme 2"));
btn_scheme_4->type(102);
btn_scheme_4->down_box(FL_ROUND_DOWN_BOX);
btn_scheme_4->callback((Fl_Callback*)cb_btn_scheme_4);
} // Fl_Round_Button* btn_scheme_4
{ btn_scheme_5 = new Fl_Round_Button(228, 180, 144, 22, _("Two scheme 3"));
{ btn_scheme_5 = new Fl_Round_Button(228, 155, 144, 22, _("Two scheme 3"));
btn_scheme_5->type(102);
btn_scheme_5->down_box(FL_ROUND_DOWN_BOX);
btn_scheme_5->callback((Fl_Callback*)cb_btn_scheme_5);
} // Fl_Round_Button* btn_scheme_5
{ btn_scheme_6 = new Fl_Round_Button(228, 205, 144, 22, _("Two scheme 4"));
btn_scheme_6->type(102);
btn_scheme_6->down_box(FL_ROUND_DOWN_BOX);
btn_scheme_6->callback((Fl_Callback*)cb_btn_scheme_6);
} // Fl_Round_Button* btn_scheme_6
{ btn_scheme_7 = new Fl_Round_Button(396, 130, 144, 22, _("Two scheme 5"));
{ btn_scheme_7 = new Fl_Round_Button(228, 180, 144, 22, _("Two scheme 5"));
btn_scheme_7->type(102);
btn_scheme_7->down_box(FL_ROUND_DOWN_BOX);
btn_scheme_7->callback((Fl_Callback*)cb_btn_scheme_7);
} // Fl_Round_Button* btn_scheme_7
{ btn_scheme_8 = new Fl_Round_Button(396, 155, 144, 22, _("Two scheme 6"));
btn_scheme_8->type(102);
btn_scheme_8->down_box(FL_ROUND_DOWN_BOX);
btn_scheme_8->callback((Fl_Callback*)cb_btn_scheme_8);
} // Fl_Round_Button* btn_scheme_8
{ btn_scheme_9 = new Fl_Round_Button(396, 180, 144, 22, _("Two scheme 7"));
{ btn_scheme_9 = new Fl_Round_Button(228, 205, 144, 22, _("Two scheme 7"));
btn_scheme_9->type(102);
btn_scheme_9->down_box(FL_ROUND_DOWN_BOX);
btn_scheme_9->callback((Fl_Callback*)cb_btn_scheme_9);
} // Fl_Round_Button* btn_scheme_9
{ btn_scheme_11 = new Fl_Round_Button(228, 230, 144, 22, _("Two scheme 9"));
btn_scheme_11->type(102);
btn_scheme_11->down_box(FL_ROUND_DOWN_BOX);
btn_scheme_11->callback((Fl_Callback*)cb_btn_scheme_11);
} // Fl_Round_Button* btn_scheme_11
{ btn_scheme_4 = new Fl_Round_Button(396, 130, 144, 22, _("Two scheme 2"));
btn_scheme_4->type(102);
btn_scheme_4->down_box(FL_ROUND_DOWN_BOX);
btn_scheme_4->callback((Fl_Callback*)cb_btn_scheme_4);
} // Fl_Round_Button* btn_scheme_4
{ btn_scheme_6 = new Fl_Round_Button(396, 155, 144, 22, _("Two scheme 4"));
btn_scheme_6->type(102);
btn_scheme_6->down_box(FL_ROUND_DOWN_BOX);
btn_scheme_6->callback((Fl_Callback*)cb_btn_scheme_6);
} // Fl_Round_Button* btn_scheme_6
{ btn_scheme_8 = new Fl_Round_Button(396, 180, 144, 22, _("Two scheme 6"));
btn_scheme_8->type(102);
btn_scheme_8->down_box(FL_ROUND_DOWN_BOX);
btn_scheme_8->callback((Fl_Callback*)cb_btn_scheme_8);
} // Fl_Round_Button* btn_scheme_8
{ btn_scheme_10 = new Fl_Round_Button(396, 205, 144, 22, _("Two scheme 8"));
btn_scheme_10->type(102);
btn_scheme_10->down_box(FL_ROUND_DOWN_BOX);
btn_scheme_10->callback((Fl_Callback*)cb_btn_scheme_10);
} // Fl_Round_Button* btn_scheme_10
{ btn_scheme_12 = new Fl_Round_Button(396, 230, 144, 22, _("Two scheme 10"));
btn_scheme_12->type(102);
btn_scheme_12->down_box(FL_ROUND_DOWN_BOX);
btn_scheme_12->callback((Fl_Callback*)cb_btn_scheme_12);
} // Fl_Round_Button* btn_scheme_12
o->end();
} // Fl_Group* o
{ Fl_Group* o = new Fl_Group(52, 299, 496, 76);

62
src/dialogs/confdialog.fl
Wyświetl plik

@ -1073,49 +1073,57 @@ set_macroLabels();
UI_select();}
xywh {228 130 144 22} type Radio down_box ROUND_DOWN_BOX
}
Fl_Round_Button btn_scheme_4 {
label {Two scheme 2}
callback {progdefaults.mbar_scheme = 4;
progdefaults.changed = true;
set_macroLabels();
UI_select();}
xywh {228 155 144 22} type Radio down_box ROUND_DOWN_BOX
}
Fl_Round_Button btn_scheme_5 {
label {Two scheme 3}
callback {progdefaults.mbar_scheme = 5;
progdefaults.changed = true;
set_macroLabels();
UI_select();}
xywh {228 180 144 22} type Radio down_box ROUND_DOWN_BOX
}
Fl_Round_Button btn_scheme_6 {
label {Two scheme 4}
callback {progdefaults.mbar_scheme = 6;
progdefaults.changed = true;
set_macroLabels();
UI_select();}
xywh {228 205 144 22} type Radio down_box ROUND_DOWN_BOX
xywh {228 155 144 22} type Radio down_box ROUND_DOWN_BOX
}
Fl_Round_Button btn_scheme_7 {
label {Two scheme 5}
callback {progdefaults.mbar_scheme = 7;
progdefaults.changed = true;
set_macroLabels();
UI_select();}
xywh {228 180 144 22} type Radio down_box ROUND_DOWN_BOX
}
Fl_Round_Button btn_scheme_9 {
label {Two scheme 7}
callback {progdefaults.mbar_scheme = 9;
progdefaults.changed = true;
set_macroLabels();
UI_select();}
xywh {228 205 144 22} type Radio down_box ROUND_DOWN_BOX
}
Fl_Round_Button btn_scheme_11 {
label {Two scheme 9}
callback {progdefaults.mbar_scheme = 11;
progdefaults.changed = true;
set_macroLabels();
UI_select();}
xywh {228 230 144 22} type Radio down_box ROUND_DOWN_BOX
}
Fl_Round_Button btn_scheme_4 {
label {Two scheme 2}
callback {progdefaults.mbar_scheme = 4;
progdefaults.changed = true;
set_macroLabels();
UI_select();}
xywh {396 130 144 22} type Radio down_box ROUND_DOWN_BOX
}
Fl_Round_Button btn_scheme_8 {
label {Two scheme 6}
callback {progdefaults.mbar_scheme = 8;
Fl_Round_Button btn_scheme_6 {
label {Two scheme 4}
callback {progdefaults.mbar_scheme = 6;
progdefaults.changed = true;
set_macroLabels();
UI_select();}
xywh {396 155 144 22} type Radio down_box ROUND_DOWN_BOX
}
Fl_Round_Button btn_scheme_9 {
label {Two scheme 7}
callback {progdefaults.mbar_scheme = 9;
Fl_Round_Button btn_scheme_8 {
label {Two scheme 6}
callback {progdefaults.mbar_scheme = 8;
progdefaults.changed = true;
set_macroLabels();
UI_select();}
@ -1129,6 +1137,14 @@ set_macroLabels();
UI_select();}
xywh {396 205 144 22} type Radio down_box ROUND_DOWN_BOX
}
Fl_Round_Button btn_scheme_12 {
label {Two scheme 10}
callback {progdefaults.mbar_scheme = 12;
progdefaults.changed = true;
set_macroLabels();
UI_select();}
xywh {396 230 144 22} type Radio down_box ROUND_DOWN_BOX
}
}
Fl_Group {} {open
xywh {52 299 496 76} box ENGRAVED_FRAME

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

@ -3275,6 +3275,38 @@ int UI_position_macros(int x, int y1, int w, int HTh)
y1 += mh2;
hpack->position(x, y1);
break;
case 11:
resize_macroframe2(0, y1, w, mh2);
macroFrame2->show();
btnAltMacros2->activate();
y1 += mh2;
center_group->resize(0, y1, w, HTh);
wefax_group->resize(0, y1, w, HTh);
UI_select_central_frame(y1, HTh);
y1 += HTh;
resize_macroframe1(0, y1, w, mh2);
btnAltMacros1->deactivate();
y1 += mh2;
wfpack->position(x, y1);
y1 += wfpack->h();
hpack->position(x, y1);
break;
case 12:
resize_macroframe1(0, y1, w, mh2);
btnAltMacros1->deactivate();
y1 += mh2;
center_group->resize(0, y1, w, HTh);
wefax_group->resize(0, y1, w, HTh);
UI_select_central_frame(y1, HTh);
y1 += HTh;
resize_macroframe2(0, y1, w, mh2);
macroFrame2->show();
btnAltMacros2->activate();
y1 += mh2;
wfpack->position(x, y1);
y1 += wfpack->h();
hpack->position(x, y1);
break;
}
return y1;
}
@ -5287,9 +5319,10 @@ void create_fl_digi_main_primary() {
Y = Hmenu + Hqsoframe + pad;
int alt_btn_width = 2 * DEFAULT_SW;
macroFrame2 = new Fl_Group(0, Y, progStatus.mainW, Hmacros);
macroFrame2->box(FL_FLAT_BOX);
mf_group2 = new Fl_Group(0, Y, progStatus.mainW - Hmacros, Hmacros);
mf_group2 = new Fl_Group(0, Y, progStatus.mainW - alt_btn_width, Hmacros);
Wmacrobtn = (mf_group2->w()) / NUMMACKEYS;
Hmacrobtn = mf_group2->h();
wBLANK = (mf_group2->w() - NUMMACKEYS * Wmacrobtn) / 2;
@ -5309,7 +5342,9 @@ void create_fl_digi_main_primary() {
xpos += Wmacrobtn;
}
mf_group2->end();
btnAltMacros2 = new Fl_Button(progStatus.mainW - Hmacrobtn, ypos, Hmacrobtn, Hmacrobtn, "2");
btnAltMacros2 = new Fl_Button(
progStatus.mainW - alt_btn_width, ypos,
alt_btn_width, Hmacrobtn, "2");
btnAltMacros2->callback(altmacro_cb, 0);
btnAltMacros2->tooltip(_("Shift-key macro set"));
macroFrame2->resizable(mf_group2);
@ -5461,7 +5496,7 @@ void create_fl_digi_main_primary() {
macroFrame1 = new Fl_Group(0, Y, progStatus.mainW, Hmacros);
macroFrame1->box(FL_FLAT_BOX);
mf_group1 = new Fl_Group(0, Y, progStatus.mainW - Hmacros, Hmacros);
mf_group1 = new Fl_Group(0, Y, progStatus.mainW - alt_btn_width, Hmacros);
Wmacrobtn = (mf_group1->w()) / NUMMACKEYS;
Hmacrobtn = mf_group1->h();
wBLANK = (mf_group1->w() - NUMMACKEYS * Wmacrobtn) / 2;
@ -5480,7 +5515,9 @@ void create_fl_digi_main_primary() {
xpos += Wmacrobtn;
}
mf_group1->end();
btnAltMacros1 = new Fl_Button(progStatus.mainW - Hmacrobtn, ypos, Hmacrobtn, Hmacrobtn, "1");
btnAltMacros1 = new Fl_Button(
progStatus.mainW - alt_btn_width, ypos,
alt_btn_width, Hmacrobtn, "1");
btnAltMacros1->callback(altmacro_cb, 0);
btnAltMacros1->labelsize(progdefaults.MacroBtnFontsize);
btnAltMacros1->tooltip(_("Primary macro set"));

8
src/include/confdialog.h
Wyświetl plik

@ -116,13 +116,15 @@ extern Fl_Round_Button *btn_scheme_0;
extern Fl_Round_Button *btn_scheme_1;
extern Fl_Round_Button *btn_scheme_2;
extern Fl_Round_Button *btn_scheme_3;
extern Fl_Round_Button *btn_scheme_4;
extern Fl_Round_Button *btn_scheme_5;
extern Fl_Round_Button *btn_scheme_6;
extern Fl_Round_Button *btn_scheme_7;
extern Fl_Round_Button *btn_scheme_8;
extern Fl_Round_Button *btn_scheme_9;
extern Fl_Round_Button *btn_scheme_11;
extern Fl_Round_Button *btn_scheme_4;
extern Fl_Round_Button *btn_scheme_6;
extern Fl_Round_Button *btn_scheme_8;
extern Fl_Round_Button *btn_scheme_10;
extern Fl_Round_Button *btn_scheme_12;
extern Fl_Check_Button *btnUseLastMacro;
extern Fl_Check_Button *btnDisplayMacroFilename;
extern Fl_Check_Button *btn_save_macros_on_exit;

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

@ -1142,7 +1142,7 @@
false) \
ELEM_(int, mbar_scheme, "MBARSCHEME", \
"# and position of macro bars\n" \
"0..9, 1 = default", \
"0..12, 1 = default", \
1) \
ELEM_(double, txlevel, "TXATTEN", \
"TX attenuator (db) -30 .. 0", \