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

Macro Bar positions 

* Added 4 more position selections to the # and relative
    positioning of the macro button bars.
pull/2/head
David Freese 2011-01-20 09:42:40 -06:00
rodzic 17c2f13a46
commit 857cd2f34c
10 zmienionych plików z 6938 dodań i 6315 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
src/Makefile.am
Wyświetl plik

@ -646,5 +646,9 @@ EXTRA_DIST = \
$(srcdir)/dialogs/scheme-1.jpg \
$(srcdir)/dialogs/scheme-2.jpg \
$(srcdir)/dialogs/scheme-3.jpg \
$(srcdir)/dialogs/scheme-4.jpg \
$(srcdir)/dialogs/scheme-5.jpg \
$(srcdir)/dialogs/scheme-6.jpg \
$(srcdir)/dialogs/scheme-7.jpg \
$(FLDIGI_FL_SRC) \
$(FLARQ_FL_SRC)

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

Plik diff jest za duży Load Diff

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

@ -488,37 +488,69 @@ progdefaults.changed = true;}
label {Select \# and position of macro bars} open
xywh {2 54 496 279} box ENGRAVED_FRAME align 18
} {
Fl_Button btn_one_bar {
label {1 bar}
Fl_Button btn_oneA {
callback {progdefaults.mbar2_pos = 0;
progdefaults.mbar1_pos = true;
progdefaults.changed = true;
set_macroLabels();
UI_select();}
image {scheme-0.jpg} xywh {40 60 80 250}
image {scheme-0.jpg} xywh {15 65 50 240}
}
Fl_Button btn_twoA {
label {2-A}
callback {progdefaults.mbar2_pos = 1;
progdefaults.mbar1_pos = true;
progdefaults.changed = true;
set_macroLabels();
UI_select();}
image {scheme-1.jpg} xywh {153 60 80 250}
image {scheme-1.jpg} xywh {74 65 50 240}
}
Fl_Button btn_twoB {
label {2-B}
callback {progdefaults.mbar2_pos = 2;
progdefaults.mbar1_pos = true;
progdefaults.changed = true;
set_macroLabels();
UI_select();}
image {scheme-2.jpg} xywh {266 60 80 250}
image {scheme-2.jpg} xywh {133 65 50 240}
}
Fl_Button btn_twoC {
label {2-C}
callback {progdefaults.mbar2_pos = 3;
progdefaults.mbar1_pos = true;
progdefaults.changed = true;
set_macroLabels();
UI_select();}
image {scheme-3.jpg} xywh {380 60 80 250}
image {scheme-3.jpg} xywh {193 65 50 240}
}
Fl_Button btn_oneB {
callback {progdefaults.mbar2_pos = 0;
progdefaults.mbar1_pos = false;
progdefaults.changed = true;
set_macroLabels();
UI_select();}
image {scheme-4.jpg} xywh {252 65 50 240}
}
Fl_Button btn_twoD {
callback {progdefaults.mbar2_pos = 1;
progdefaults.mbar1_pos = false;
progdefaults.changed = true;
set_macroLabels();
UI_select();}
image {scheme-5.jpg} xywh {312 65 50 240}
}
Fl_Button btn_twoE {
callback {progdefaults.mbar2_pos = 2;
progdefaults.mbar1_pos = false;
progdefaults.changed = true;
set_macroLabels();
UI_select();}
image {scheme-6.jpg} xywh {371 65 50 240}
}
Fl_Button btn_twoF {
callback {progdefaults.mbar2_pos = 3;
progdefaults.mbar1_pos = false;
progdefaults.changed = true;
set_macroLabels();
UI_select();}
image {scheme-7.jpg} xywh {431 65 50 240}
}
}
}

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

@ -328,7 +328,7 @@ int x_qsoframe = Wbtn;
int Hmenu = 22;
int Hqsoframe = pad + 3 * (Hentry + pad);
int Hstatus = 22;
int Hmacros = 20;
int Hmacros = 22;
int w_inpFreq = 80;
int w_inpTime = 40;
int w_inpCall = 120;
@ -2422,10 +2422,16 @@ void UI_select()
MixerFrame->resize(0, y1, 0, HTh);
text_panel->resize(MixerFrame->x() + MixerFrame->w(), y1, w - MixerFrame->w(), HTh);
y1 += HTh;
macroFrame1->position(x, y1);
y1 += Hmacros;
if (progdefaults.mbar1_pos) {
macroFrame1->position(x, y1);
y1 += Hmacros;
}
wfpack->position(x, y1);
y1 += wfpack->h();
if (!progdefaults.mbar1_pos) {
macroFrame1->position(x, y1);
y1 += Hmacros;
}
hpack->position(x, y1);
break;
case 2:
@ -2441,10 +2447,16 @@ void UI_select()
macroFrame2->show();
btnAltMacros1->deactivate();
y1 += Hmacros;
macroFrame1->position(x, y1);
y1 += Hmacros;
if (progdefaults.mbar1_pos) {
macroFrame1->position(x, y1);
y1 += Hmacros;
}
wfpack->position(x, y1);
y1 += wfpack->h();
if (!progdefaults.mbar1_pos) {
macroFrame1->position(x, y1);
y1 += Hmacros;
}
hpack->position(x, y1);
break;
case 3:
@ -2455,16 +2467,22 @@ void UI_select()
MixerFrame->resize(0, y1, 0, HTh);
text_panel->resize(MixerFrame->x() + MixerFrame->w(), y1, w - MixerFrame->w(), HTh);
y1 += HTh;
macroFrame1->position(x, y1);
y1 += Hmacros;
if (progdefaults.mbar1_pos) {
macroFrame1->position(x, y1);
y1 += Hmacros;
}
wfpack->position(x, y1);
y1 += wfpack->h();
macroFrame2->size(w, Hmacros);
macroFrame2->position(x, y1);
macroFrame2->show();
y1 += Hmacros;
if (!progdefaults.mbar1_pos) {
macroFrame1->position(x, y1);
y1 += Hmacros;
}
hpack->position(x, y1);
btnAltMacros1->deactivate();
y1 += hpack->h();
break;
case 0:
default:
@ -2477,10 +2495,16 @@ void UI_select()
MixerFrame->resize(0, y1, 0, HTh);
text_panel->resize(MixerFrame->x() + MixerFrame->w(), y1, w - MixerFrame->w(), HTh);
y1 += HTh;
macroFrame1->position(x, y1);
y1 += Hmacros;
if (progdefaults.mbar1_pos) {
macroFrame1->position(x, y1);
y1 += Hmacros;
}
wfpack->position(x, y1);
y1 += wfpack->h();
if (!progdefaults.mbar1_pos) {
macroFrame1->position(x, y1);
y1 += Hmacros;
}
hpack->position(x, y1);
break;
}
@ -2511,10 +2535,16 @@ void UI_select()
MixerFrame->resize(0, y1, 0, HTh);
text_panel->resize(MixerFrame->x() + MixerFrame->w(), y1, w - MixerFrame->w(), HTh);
y1 += HTh;
macroFrame1->position(x, y1);
y1 += Hmacros;
if (progdefaults.mbar1_pos) {
macroFrame1->position(x, y1);
y1 += Hmacros;
}
wfpack->position(x, y1);
y1 += wfpack->h();
if (!progdefaults.mbar1_pos) {
macroFrame1->position(x, y1);
y1 += Hmacros;
}
hpack->position(x, y1);
break;
case 2:
@ -2530,10 +2560,16 @@ void UI_select()
macroFrame2->show();
btnAltMacros1->deactivate();
y1 += Hmacros;
macroFrame1->position(x, y1);
y1 += Hmacros;
if (progdefaults.mbar1_pos) {
macroFrame1->position(x, y1);
y1 += Hmacros;
}
wfpack->position(x, y1);
y1 += wfpack->h();
if (!progdefaults.mbar1_pos) {
macroFrame1->position(x, y1);
y1 += Hmacros;
}
hpack->position(x, y1);
break;
case 3:
@ -2544,14 +2580,20 @@ void UI_select()
MixerFrame->resize(0, y1, 0, HTh);
text_panel->resize(MixerFrame->x() + MixerFrame->w(), y1, w - MixerFrame->w(), HTh);
y1 += HTh;
macroFrame1->position(x, y1);
y1 += Hmacros;
if (progdefaults.mbar1_pos) {
macroFrame1->position(x, y1);
y1 += Hmacros;
}
wfpack->position(x, y1);
y1 += wfpack->h();
macroFrame2->size(w, Hmacros);
macroFrame2->position(x, y1);
macroFrame2->show();
y1 += Hmacros;
if (!progdefaults.mbar1_pos) {
macroFrame1->position(x, y1);
y1 += Hmacros;
}
hpack->position(x, y1);
btnAltMacros1->deactivate();
break;
@ -2566,10 +2608,16 @@ void UI_select()
MixerFrame->resize(0, y1, 0, HTh);
text_panel->resize(MixerFrame->x() + MixerFrame->w(), y1, w - MixerFrame->w(), HTh);
y1 += HTh;
macroFrame1->position(x, y1);
y1 += Hmacros;
if (progdefaults.mbar1_pos) {
macroFrame1->position(x, y1);
y1 += Hmacros;
}
wfpack->position(x, y1);
y1 += wfpack->h();
if (!progdefaults.mbar1_pos) {
macroFrame1->position(x, y1);
y1 += Hmacros;
}
hpack->position(x, y1);
break;
}
@ -2610,10 +2658,16 @@ void UI_select()
MixerFrame->resize(0, y1, 0, HTh);
text_panel->resize(MixerFrame->x() + MixerFrame->w(), y1, w - MixerFrame->w(), HTh);
y1 += HTh;
macroFrame1->position(x, y1);
y1 += Hmacros;
if (progdefaults.mbar1_pos) {
macroFrame1->position(x, y1);
y1 += Hmacros;
}
wfpack->position(x, y1);
y1 += wfpack->h();
if (!progdefaults.mbar1_pos) {
macroFrame1->position(x, y1);
y1 += macroFrame1->h();
}
hpack->position(x, y1);
break;
case 2:
@ -2629,10 +2683,16 @@ void UI_select()
macroFrame2->show();
btnAltMacros1->deactivate();
y1 += Hmacros;
macroFrame1->position(x, y1);
y1 += Hmacros;
if (progdefaults.mbar1_pos) {
macroFrame1->position(x, y1);
y1 += Hmacros;
}
wfpack->position(x, y1);
y1 += wfpack->h();
if (!progdefaults.mbar1_pos) {
macroFrame1->position(x, y1);
y1 += Hmacros;
}
hpack->position(x, y1);
break;
case 3:
@ -2643,14 +2703,20 @@ void UI_select()
MixerFrame->resize(0, y1, 0, HTh);
text_panel->resize(MixerFrame->x() + MixerFrame->w(), y1, w - MixerFrame->w(), HTh);
y1 += HTh;
macroFrame1->position(x, y1);
y1 += Hmacros;
if (progdefaults.mbar1_pos) {
macroFrame1->position(x, y1);
y1 += Hmacros;
}
wfpack->position(x, y1);
y1 += wfpack->h();
macroFrame2->size(w, Hmacros);
macroFrame2->position(x, y1);
macroFrame2->show();
y1 += Hmacros;
if (!progdefaults.mbar1_pos) {
macroFrame1->position(x, y1);
y1 += Hmacros;
}
hpack->position(x, y1);
btnAltMacros1->deactivate();
break;
@ -2665,10 +2731,16 @@ void UI_select()
MixerFrame->resize(0, y1, 0, HTh);
text_panel->resize(MixerFrame->x() + MixerFrame->w(), y1, w - MixerFrame->w(), HTh);
y1 += HTh;
macroFrame1->position(x, y1);
y1 += Hmacros;
if (progdefaults.mbar1_pos) {
macroFrame1->position(x, y1);
y1 += Hmacros;
}
wfpack->position(x, y1);
y1 += wfpack->h();
if (!progdefaults.mbar1_pos) {
macroFrame1->position(x, y1);
y1 += Hmacros;
}
hpack->position(x, y1);
break;
}
@ -4139,9 +4211,9 @@ void create_fl_digi_main_primary() {
macroFrame2 = new Fl_Group(0, Y, progStatus.mainW, Hmacros);
macroFrame2->box(FL_FLAT_BOX);
Fl_Group *btngroup2 = new Fl_Group(0, Y, progStatus.mainW - Hmacros, Hmacros);
Fl_Group *btngroup2 = new Fl_Group(0, Y + 1, progStatus.mainW - Hmacros, Hmacros - 1);
Wmacrobtn = (btngroup2->w()) / NUMMACKEYS;
Hmacrobtn = (btngroup2->h());
Hmacrobtn = btngroup2->h() - 1;
wblank = (btngroup2->w() - NUMMACKEYS * Wmacrobtn) / 2;
xpos = 0;
ypos = btngroup2->y();
@ -4297,9 +4369,9 @@ void create_fl_digi_main_primary() {
macroFrame1 = new Fl_Group(0, Y, progStatus.mainW, Hmacros);
macroFrame1->box(FL_FLAT_BOX);
Fl_Group *btngroup1 = new Fl_Group(0, Y, progStatus.mainW - Hmacros, Hmacros);
Fl_Group *btngroup1 = new Fl_Group(0, Y+1, progStatus.mainW - Hmacros, Hmacros-1);
Wmacrobtn = (btngroup1->w()) / NUMMACKEYS;
Hmacrobtn = (btngroup1->h());
Hmacrobtn = btngroup1->h() - 1;
wblank = (btngroup1->w() - NUMMACKEYS * Wmacrobtn) / 2;
xpos = 0;
ypos = btngroup1->y();

BIN
src/dialogs/scheme-0.jpg
Wyświetl plik

Plik binarny nie jest wyświetlany.
Side by Side Swipe Nakładka

Przed

Szerokość:  |  Wysokość:  |  Rozmiar: 2.8 KiB

Po

Szerokość:  |  Wysokość:  |  Rozmiar: 2.6 KiB

BIN
src/dialogs/scheme-1.jpg
Wyświetl plik

Plik binarny nie jest wyświetlany.
Side by Side Swipe Nakładka

Przed

Szerokość:  |  Wysokość:  |  Rozmiar: 3.0 KiB

Po

Szerokość:  |  Wysokość:  |  Rozmiar: 2.6 KiB

BIN
src/dialogs/scheme-2.jpg
Wyświetl plik

Plik binarny nie jest wyświetlany.
Side by Side Swipe Nakładka

Przed

Szerokość:  |  Wysokość:  |  Rozmiar: 2.6 KiB

Po

Szerokość:  |  Wysokość:  |  Rozmiar: 3.0 KiB

BIN
src/dialogs/scheme-3.jpg
Wyświetl plik

Plik binarny nie jest wyświetlany.
Side by Side Swipe Nakładka

Przed

Szerokość:  |  Wysokość:  |  Rozmiar: 3.0 KiB

Po

Szerokość:  |  Wysokość:  |  Rozmiar: 2.8 KiB

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

@ -61,10 +61,14 @@ extern Fl_Button *bwsrSliderColor;
extern Fl_Button *bwsrSldrSelColor;
extern Fl_Group *tabMBars;
extern Fl_Check_Button *btnMacroMouseWheel;
extern Fl_Button *btn_one_bar;
extern Fl_Button *btn_oneA;
extern Fl_Button *btn_twoA;
extern Fl_Button *btn_twoB;
extern Fl_Button *btn_twoC;
extern Fl_Button *btn_oneB;
extern Fl_Button *btn_twoD;
extern Fl_Button *btn_twoE;
extern Fl_Button *btn_twoF;
extern Fl_Group *tabContest;
#include <FL/Fl_Box.H>
extern Fl_Box *lblSend;

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

@ -913,6 +913,9 @@
ELEM_(bool, macro_wheel, "MACROWHEEL", \
"Enable mouse wheel rotation to control visible macro set", \
false) \
ELEM_(bool, mbar1_pos, "MBAR1POS", \
"Principal macro bar position, true=above wf, false=below", \
true) \
ELEM_(int, mbar2_pos, "MBAR2POS", \
"Position second macro button above data stream panesl", \
0) \