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

Colors/Fonts Dialog 

*  deprecate colors/fonts dialogs
  *  add functionality to configdialog on separate UI tab
pull/1/head
David Freese 2013-05-11 09:18:27 -05:00
rodzic 8be39132ce
commit 531c40ca55
16 zmienionych plików z 11050 dodań i 10321 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
po/POTFILES.in
Wyświetl plik

@ -31,7 +31,6 @@ src/widgets/FTextView.cxx
src/widgets/flinput2.cxx
# Generated by fluid
src/dialogs/colorsfonts.cxx
src/dialogs/confdialog.cxx
src/dialogs/notifydialog.cxx
src/logbook/lgbook.cxx

2954
po/es.po
Wyświetl plik

Plik diff jest za duży Load Diff

3352
po/fldigi.pot
Wyświetl plik

Plik diff jest za duży Load Diff

3352
po/fr.po
Wyświetl plik

Plik diff jest za duży Load Diff

3415
po/it.po
Wyświetl plik

Plik diff jest za duży Load Diff

3393
po/pl.po
Wyświetl plik

Plik diff jest za duży Load Diff

4
src/Makefile.am
Wyświetl plik

@ -162,7 +162,7 @@ if WANT_FLARQ
rm -f $(DESTDIR)/$(datadir)/applications/flarq.desktop
endif
FLDIGI_FL_SRC = dialogs/confdialog.fl dialogs/colorsfonts.fl \
FLDIGI_FL_SRC = dialogs/confdialog.fl \
logbook/lgbook.fl dialogs/notifydialog.fl
FLARQ_FL_SRC = flarq-src/arqdialogs.fl
@ -251,7 +251,6 @@ fldigi_SOURCES += \
cw_rtty/rtty.cxx \
cw_rtty/view_rtty.cxx \
contestia/contestia.cxx \
dialogs/colorsfonts.cxx \
dialogs/confdialog.cxx \
dialogs/fl_digi.cxx \
dialogs/font_browser.cxx \
@ -290,7 +289,6 @@ fldigi_SOURCES += \
include/charsetdistiller.h \
include/charsetlist.h \
include/colorbox.h \
include/colorsfonts.h \
include/combo.h \
include/complex.h \
include/configuration.h \

1285
src/dialogs/colorsfonts.cxx
Wyświetl plik

Plik diff jest za duży Load Diff

1085
src/dialogs/colorsfonts.fl
Wyświetl plik

Plik diff jest za duży Load Diff

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

Plik diff jest za duży Load Diff

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

Plik diff jest za duży Load Diff

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

@ -119,7 +119,6 @@
#include "confdialog.h"
#include "configuration.h"
#include "colorsfonts.h"
#include "status.h"
#include "macros.h"
@ -998,10 +997,6 @@ void remove_windows()
delete cboHamlibRig;
delete dlgConfig;
}
if (dlgColorFont) {
dlgColorFont->hide();
delete dlgColorFont;
}
if (font_browser) {
font_browser->hide();
delete font_browser;
@ -1768,7 +1763,10 @@ void cb_mnuPlayback(Fl_Widget *w, void *d)
#endif // USE_SNDFILE
void cb_mnuConfigFonts(Fl_Menu_*, void *) {
selectColorsFonts();
progdefaults.loadDefaults();
tabsConfigure->value(tabUI);
tabsUI->value(tabColorsFonts);
dlgConfig->show();
}
void cb_mnuSaveConfig(Fl_Menu_ *, void *) {
@ -3505,7 +3503,7 @@ Fl_Menu_Item menu_[] = {
{_("&Configure"), 0, 0, 0, FL_SUBMENU, FL_NORMAL_LABEL, 0, 14, 0},
{ make_icon_label(_("Operator"), system_users_icon), 0, (Fl_Callback*)cb_mnuConfigOperator, 0, 0, _FL_MULTI_LABEL, 0, 14, 0},
{ make_icon_label(_("Colors && Fonts"), preferences_desktop_font_icon), 0, (Fl_Callback*)cb_mnuConfigFonts, 0, 0, _FL_MULTI_LABEL, 0, 14, 0},
{ make_icon_label(_("Colors && Fonts")), 0, (Fl_Callback*)cb_mnuConfigFonts, 0, 0, _FL_MULTI_LABEL, 0, 14, 0},
{ make_icon_label(_("User Interface")), 0, (Fl_Callback*)cb_mnuUI, 0, 0, _FL_MULTI_LABEL, 0, 14, 0},
{ make_icon_label(_("Waterfall"), waterfall_icon), 0, (Fl_Callback*)cb_mnuConfigWaterfall, 0, 0, _FL_MULTI_LABEL, 0, 14, 0},
{ make_icon_label(_("Waterfall controls")), 0, (Fl_Callback*)cb_mnuConfigWFcontrols, 0, FL_MENU_DIVIDER,
@ -4022,7 +4020,6 @@ void setTabColors()
tabsID->selection_color(progdefaults.TabsColor);
tabsQRZ->selection_color(progdefaults.TabsColor);
if (dlgConfig->visible()) dlgConfig->redraw();
if (dlgColorFont->visible()) dlgColorFont->redraw();
}
void showMacroSet() {

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

@ -1,89 +0,0 @@
// generated by Fast Light User Interface Designer (fluid) version 1.0302
#ifndef colorsfonts_h
#define colorsfonts_h
#include <FL/Fl.H>
#include "font_browser.h"
void selectColorsFonts();
void cbWaterfallFontBrowser(Fl_Widget*, void*);
void cbViewerFontBrowser(Fl_Widget*, void*);
void cbFreqControlFontBrowser(Fl_Widget*, void*);
#include <FL/Fl_Double_Window.H>
extern Fl_Double_Window *dlgColorFont;
#include <FL/Fl_Button.H>
extern Fl_Button *btnClrFntClose;
#include <FL/Fl_Tabs.H>
extern Fl_Tabs *tabsColors;
#include <FL/Fl_Group.H>
#include <FL/Fl_Box.H>
extern Fl_Box *FDdisplay;
extern Fl_Button *btn_freq_control_font;
extern Fl_Button *btnBackgroundColor;
extern Fl_Button *btnForegroundColor;
extern Fl_Button *btnFD_SystemColor;
#include <FL/Fl_Check_Button.H>
extern Fl_Check_Button *btnUseGroupColors;
extern Fl_Button *btnGroup1;
extern Fl_Button *btnGroup2;
extern Fl_Button *btnGroup3;
extern Fl_Button *btnFkeyTextColor;
extern Fl_Button *btnFkeyDEfaults;
#include <FL/Fl_Input.H>
extern Fl_Input *RxText;
extern Fl_Button *btnRxColor;
extern Fl_Button *btnTxColor;
extern Fl_Input *TxText;
extern Fl_Button *btnRxFont;
extern Fl_Button *btnTxFont;
extern Fl_Button *btnXMIT;
extern Fl_Button *btnCTRL;
extern Fl_Button *btnSKIP;
extern Fl_Button *btnALTR;
extern Fl_Button *btnSEL;
extern Fl_Button *btnNoTextColor;
extern Fl_Button *btnTextDefaults;
extern Fl_Button *btnTabColor;
extern Fl_Button *btnTabDefaultColor;
extern Fl_Button *btnSpotColor;
extern Fl_Button *btnRxIDColor;
extern Fl_Button *btnTxIDColor;
extern Fl_Button *btnTuneColor;
extern Fl_Button *btnLkColor;
extern Fl_Button *btnRevColor;
extern Fl_Button *btnXmtColor;
extern Fl_Button *btnAfcColor;
extern Fl_Button *btnSql1Color;
extern Fl_Button *btnSql2Color;
extern Fl_Box *spotcolor;
extern Fl_Box *rxidcolor;
extern Fl_Box *txidcolor;
extern Fl_Box *tunecolor;
extern Fl_Box *lockcolor;
extern Fl_Box *revcolor;
extern Fl_Box *xmtcolor;
extern Fl_Box *afccolor;
extern Fl_Box *sql1color;
extern Fl_Box *sql2color;
extern Fl_Button *btnLowSignal;
extern Fl_Box *lowcolor;
extern Fl_Button *btnHighSignal;
extern Fl_Box *highcolor;
extern Fl_Button *btnNormalSignal;
extern Fl_Box *normalcolor;
extern Fl_Button *btnOverSignal;
extern Fl_Box *overcolor;
#include <FL/Fl_Output.H>
extern Fl_Output *LOGGINGdisplay;
extern Fl_Button *btnLOGGING_color;
extern Fl_Button *btn_LOGGING_font;
extern Fl_Button *btnLOGGINGdefault_colors_font;
extern Fl_Output *LOGBOOKdisplay;
extern Fl_Button *btnLOGBOOK_color;
extern Fl_Button *btn_LOGBOOK_font;
extern Fl_Button *btnLOGBOOKdefault_colors_font;
#include <FL/Fl_Menu_Button.H>
#include "fl_digi.h"
extern Fl_Menu_Button *CHARSETstatus;
extern Fl_Box *CHARSETlabel;
Fl_Double_Window* make_colorsfonts();
#endif

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

@ -3,6 +3,7 @@
#ifndef confdialog_h
#define confdialog_h
#include <FL/Fl.H>
#include "font_browser.h"
#include "globals.h"
#include "modem.h"
#include "configuration.h"
@ -12,6 +13,9 @@
#include "flmisc.h"
extern Fl_Double_Window *dlgConfig;
extern Mode_Browser* mode_browser;
void cbWaterfallFontBrowser(Fl_Widget*, void*);
void cbViewerFontBrowser(Fl_Widget*, void*);
void cbFreqControlFontBrowser(Fl_Widget*, void*);
void set_qrzxml_buttons(Fl_Button* b);
void set_qrzweb_buttons(Fl_Button* b);
#include <FL/Fl_Double_Window.H>
@ -132,6 +136,74 @@ extern Fl_Check_Button *btnWF_UIqsy;
extern Fl_Check_Button *btnWF_UIxmtlock;
extern Fl_Button *btn_wf_enable_all;
extern Fl_Button *btn_wf_disable_all;
extern Fl_Group *tabColorsFonts;
extern Fl_Tabs *tabsColors;
#include <FL/Fl_Menu_Button.H>
#include "fl_digi.h"
extern Fl_Menu_Button *CHARSETstatus;
extern Fl_Input *RxText;
extern Fl_Button *btnRxColor;
extern Fl_Button *btnTxColor;
extern Fl_Input *TxText;
extern Fl_Button *btnRxFont;
extern Fl_Button *btnTxFont;
extern Fl_Button *btnXMIT;
extern Fl_Button *btnCTRL;
extern Fl_Button *btnSKIP;
extern Fl_Button *btnALTR;
extern Fl_Button *btnSEL;
extern Fl_Button *btnNoTextColor;
extern Fl_Button *btnTextDefaults;
extern Fl_Box *FDdisplay;
extern Fl_Button *btn_freq_control_font;
extern Fl_Button *btnBackgroundColor;
extern Fl_Button *btnForegroundColor;
extern Fl_Button *btnFD_SystemColor;
#include <FL/Fl_Output.H>
extern Fl_Output *LOGGINGdisplay;
extern Fl_Button *btnLOGGING_color;
extern Fl_Button *btn_LOGGING_font;
extern Fl_Button *btnLOGGINGdefault_colors_font;
extern Fl_Output *LOGBOOKdisplay;
extern Fl_Button *btnLOGBOOK_color;
extern Fl_Button *btn_LOGBOOK_font;
extern Fl_Button *btnLOGBOOKdefault_colors_font;
extern Fl_Check_Button *btnUseGroupColors;
extern Fl_Button *btnGroup1;
extern Fl_Button *btnGroup2;
extern Fl_Button *btnGroup3;
extern Fl_Button *btnFkeyTextColor;
extern Fl_Button *btnFkeyDEfaults;
extern Fl_Button *btnTabColor;
extern Fl_Button *btnTabDefaultColor;
extern Fl_Button *btnSpotColor;
extern Fl_Button *btnRxIDColor;
extern Fl_Button *btnTxIDColor;
extern Fl_Button *btnTuneColor;
extern Fl_Button *btnLkColor;
extern Fl_Button *btnRevColor;
extern Fl_Button *btnXmtColor;
extern Fl_Button *btnAfcColor;
extern Fl_Button *btnSql1Color;
extern Fl_Button *btnSql2Color;
extern Fl_Box *spotcolor;
extern Fl_Box *rxidcolor;
extern Fl_Box *txidcolor;
extern Fl_Box *tunecolor;
extern Fl_Box *lockcolor;
extern Fl_Box *revcolor;
extern Fl_Box *xmtcolor;
extern Fl_Box *afccolor;
extern Fl_Box *sql1color;
extern Fl_Box *sql2color;
extern Fl_Button *btnLowSignal;
extern Fl_Box *lowcolor;
extern Fl_Button *btnHighSignal;
extern Fl_Box *highcolor;
extern Fl_Button *btnNormalSignal;
extern Fl_Box *normalcolor;
extern Fl_Button *btnOverSignal;
extern Fl_Box *overcolor;
extern Fl_Group *tabWaterfall;
extern Fl_Tabs *tabsWaterfall;
#include "colorbox.h"
@ -277,7 +349,6 @@ extern Fl_Check_Button *valTHOR_SOFTBITS;
extern Fl_Counter2 *valTHOR_PATHS;
extern Fl_Group *tabNavtex;
extern Fl_Check_Button *btnNvtxAdifLog;
#include <FL/Fl_Output.H>
extern Fl_Output *txtNvtxCatalog;
extern Fl_Button *btnSelectNvtxCatalog;
extern Fl_Group *tabWefax;

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

@ -1217,7 +1217,7 @@
/* RX / TX / Waterfall text widgets */ \
ELEM_(std::string, charset_name, "CHARSET_NAME", \
"Default character set", \
"ASCII") \
"UTF-8") \
ELEM_(std::string, RxFontName, "RXFONTNAME", \
"RX text font name", \
"") \

4
src/main.cxx
Wyświetl plik

@ -81,7 +81,6 @@
#include "rigio.h"
#include "globals.h"
#include "confdialog.h"
#include "colorsfonts.h"
#include "configuration.h"
#include "macros.h"
#include "status.h"
@ -461,12 +460,9 @@ int main(int argc, char ** argv)
FSEL::create();
make_colorsfonts();
#if FLDIGI_FLTK_API_MAJOR == 1 && FLDIGI_FLTK_API_MINOR < 3
CHARSETlabel->hide();
CHARSETstatus->hide();
#else
CHARSETlabel->show();
CHARSETstatus->show();
#endif
populate_charset_menu();