From 3a00dfcd7f97aa15cbb360588d6cb46cbe7fd1d6 Mon Sep 17 00:00:00 2001 From: David Freese Date: Sun, 30 Nov 2014 15:16:40 -0600 Subject: [PATCH] HTML strings * Update to list of contibutors * Update to language selector entries * Update recongitions page in user docs * Removed percent_done from language list box --- fldigi_doxygen/user_src_docs/Recognitions.txt | 21 ++++----- src/dialogs/confdialog.cxx | 36 +++++++-------- src/dialogs/confdialog.fl | 38 ++++++++-------- src/dialogs/htmlstrings.cxx | 44 +++++++++++-------- src/include/nls.h | 1 - src/misc/configuration.cxx | 2 +- src/misc/nls.cxx | 16 +++---- 7 files changed, 83 insertions(+), 75 deletions(-) diff --git a/fldigi_doxygen/user_src_docs/Recognitions.txt b/fldigi_doxygen/user_src_docs/Recognitions.txt index 7554c049..8d62b6e8 100644 --- a/fldigi_doxygen/user_src_docs/Recognitions.txt +++ b/fldigi_doxygen/user_src_docs/Recognitions.txt @@ -23,7 +23,7 @@ The active current development team consists of:
  • Stelios Bounanos - M0GLD
  • Remi Chateauneu - F4ECW
  • Leigh Klotz - WA5ZNU
    • -
  • Stephane Fillod - F8CFE
    • +
  • Stéphane Fillod - F8CFE
  • John Douyere - VK2ETA
  • Joe Veldhuis - N8FQ
  • Chris Sylvain - KB3CS
    • @@ -35,16 +35,17 @@ The active current development team consists of: Localization files: -
    +
     
-
-
    
+   Español    Spanish   Pavel Milanes Costa CO7WT
+                        Christian W. Correa HK4QWC
+   Deutsch    German    Marc Richter        DF2MR
+   Français   French    Stéphane Fillod     F8CFE
+   Italiano   Italian   Pierfrancesco Caci  IK5PVX
+   Język      Polish    Roman Bagiński      SP4JEU
+   Nederlands Dutch     Peter van der Post  PA1POS
+
+
    Several authors have placed their digital modem code and signal processing code in the public domain and their source was either an diff --git a/src/dialogs/confdialog.cxx b/src/dialogs/confdialog.cxx index 0e4ff231..83ac380f 100644 --- a/src/dialogs/confdialog.cxx +++ b/src/dialogs/confdialog.cxx @@ -5403,7 +5403,6 @@ Fl_Double_Window* ConfigureDialog() { tabsUI->selection_color(FL_LIGHT1); { tabBrowser = new Fl_Group(0, 50, 600, 330, _("Browser")); tabBrowser->tooltip(_("User Interface - Browser")); - tabBrowser->hide(); { Fl_Group* o = new Fl_Group(30, 65, 540, 300); o->box(FL_ENGRAVED_FRAME); { Fl_Spinner2* o = cntChannels = new Fl_Spinner2(46, 75, 50, 24, _("Channels, first channel starts at waterfall lower limit")); @@ -5700,22 +5699,22 @@ Fl_Double_Window* ConfigureDialog() { { tabUserInterface = new Fl_Group(0, 50, 600, 330, _("General")); tabUserInterface->tooltip(_("User Interface - General")); tabUserInterface->hide(); - { Fl_Group* o = new Fl_Group(60, 77, 496, 76); + { Fl_Group* o = new Fl_Group(40, 77, 520, 76); o->box(FL_ENGRAVED_FRAME); - { Fl_Check_Button* o = btnShowTooltips = new Fl_Check_Button(95, 90, 120, 20, _("Show tooltips")); + { Fl_Check_Button* o = btnShowTooltips = new Fl_Check_Button(75, 90, 120, 20, _("Show tooltips")); btnShowTooltips->tooltip(_("Enable / disable tooltips")); btnShowTooltips->down_box(FL_DOWN_BOX); btnShowTooltips->value(1); btnShowTooltips->callback((Fl_Callback*)cb_btnShowTooltips); o->value(progdefaults.tooltips); } // Fl_Check_Button* btnShowTooltips - { Fl_Check_Button* o = chkMenuIcons = new Fl_Check_Button(239, 90, 150, 20, _("Show menu icons")); + { Fl_Check_Button* o = chkMenuIcons = new Fl_Check_Button(219, 90, 150, 20, _("Show menu icons")); chkMenuIcons->tooltip(_("Enable / disable icons on menus")); chkMenuIcons->down_box(FL_DOWN_BOX); chkMenuIcons->callback((Fl_Callback*)cb_chkMenuIcons); o->value(progdefaults.menuicons); } // Fl_Check_Button* chkMenuIcons - { Fl_ListBox* o = listboxScheme = new Fl_ListBox(213, 119, 80, 20, _("UI scheme")); + { Fl_ListBox* o = listboxScheme = new Fl_ListBox(193, 119, 80, 20, _("UI scheme")); listboxScheme->tooltip(_("Change application look and feel")); listboxScheme->box(FL_DOWN_BOX); listboxScheme->color(FL_BACKGROUND2_COLOR); @@ -5734,11 +5733,11 @@ Fl_Double_Window* ConfigureDialog() { o->labelsize(FL_NORMAL_SIZE); listboxScheme->end(); } // Fl_ListBox* listboxScheme - { bVisibleModes = new Fl_Button(78, 119, 110, 20, _("Visible modes")); + { bVisibleModes = new Fl_Button(58, 119, 110, 20, _("Visible modes")); bVisibleModes->tooltip(_("Select modes for menu access")); bVisibleModes->callback((Fl_Callback*)cb_bVisibleModes); } // Fl_Button* bVisibleModes - { Fl_ListBox* o = listbox_language = new Fl_ListBox(423, 119, 110, 20, _("UI language")); + { Fl_ListBox* o = listbox_language = new Fl_ListBox(375, 119, 170, 20, _("UI language")); listbox_language->tooltip(_("Changes take effect on next program startup")); listbox_language->box(FL_DOWN_BOX); listbox_language->color(FL_BACKGROUND2_COLOR); @@ -5755,57 +5754,57 @@ Fl_Double_Window* ConfigureDialog() { } // Fl_ListBox* listbox_language o->end(); } // Fl_Group* o - { Fl_Group* o = new Fl_Group(60, 154, 496, 34); + { Fl_Group* o = new Fl_Group(40, 154, 520, 34); o->box(FL_ENGRAVED_FRAME); o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); - { Fl_Check_Button* o = btn_rx_lowercase = new Fl_Check_Button(95, 161, 389, 20, _("Print CW / RTTY / THROB / CONTESTIA in lowercase")); + { Fl_Check_Button* o = btn_rx_lowercase = new Fl_Check_Button(75, 161, 389, 20, _("Print CW / RTTY / THROB / CONTESTIA in lowercase")); btn_rx_lowercase->down_box(FL_DOWN_BOX); btn_rx_lowercase->callback((Fl_Callback*)cb_btn_rx_lowercase); o->value(progdefaults.rx_lowercase); } // Fl_Check_Button* btn_rx_lowercase o->end(); } // Fl_Group* o - { Fl_Group* o = new Fl_Group(60, 189, 496, 34); + { Fl_Group* o = new Fl_Group(40, 189, 520, 34); o->box(FL_ENGRAVED_FRAME); o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); - { Fl_Check_Button* o = btn_tx_lowercase = new Fl_Check_Button(95, 197, 389, 20, _("Transmit all text in lower case")); + { Fl_Check_Button* o = btn_tx_lowercase = new Fl_Check_Button(75, 197, 389, 20, _("Transmit all text in lower case")); btn_tx_lowercase->down_box(FL_DOWN_BOX); btn_tx_lowercase->callback((Fl_Callback*)cb_btn_tx_lowercase); o->value(progdefaults.tx_lowercase); } // Fl_Check_Button* btn_tx_lowercase o->end(); } // Fl_Group* o - { Fl_Group* o = new Fl_Group(60, 224, 496, 76, _("Exit prompts")); + { Fl_Group* o = new Fl_Group(40, 224, 520, 76, _("Exit prompts")); o->box(FL_ENGRAVED_FRAME); o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); - { Fl_Check_Button* o = btn_save_config_on_exit = new Fl_Check_Button(95, 248, 233, 20, _("Prompt to save Configuration")); + { Fl_Check_Button* o = btn_save_config_on_exit = new Fl_Check_Button(75, 248, 233, 20, _("Prompt to save Configuration")); btn_save_config_on_exit->down_box(FL_DOWN_BOX); btn_save_config_on_exit->callback((Fl_Callback*)cb_btn_save_config_on_exit); o->value(progdefaults.SaveConfig); } // Fl_Check_Button* btn_save_config_on_exit - { Fl_Check_Button* o = btn2_save_macros_on_exit = new Fl_Check_Button(95, 270, 233, 20, _("Prompt to save macro file")); + { Fl_Check_Button* o = btn2_save_macros_on_exit = new Fl_Check_Button(75, 270, 233, 20, _("Prompt to save macro file")); btn2_save_macros_on_exit->tooltip(_("Write current macro set on program exit")); btn2_save_macros_on_exit->down_box(FL_DOWN_BOX); btn2_save_macros_on_exit->callback((Fl_Callback*)cb_btn2_save_macros_on_exit); o->value(progdefaults.SaveMacros); } // Fl_Check_Button* btn2_save_macros_on_exit - { Fl_Check_Button* o = btn2NagMe = new Fl_Check_Button(339, 248, 166, 20, _("Prompt to save log")); + { Fl_Check_Button* o = btn2NagMe = new Fl_Check_Button(319, 248, 166, 20, _("Prompt to save log")); btn2NagMe->tooltip(_("Bug me about saving log entries")); btn2NagMe->down_box(FL_DOWN_BOX); btn2NagMe->callback((Fl_Callback*)cb_btn2NagMe); o->value(progdefaults.NagMe); } // Fl_Check_Button* btn2NagMe - { Fl_Check_Button* o = btn2_confirm_exit = new Fl_Check_Button(339, 270, 200, 20, _("Confirm exit")); + { Fl_Check_Button* o = btn2_confirm_exit = new Fl_Check_Button(319, 270, 200, 20, _("Confirm exit")); btn2_confirm_exit->down_box(FL_DOWN_BOX); btn2_confirm_exit->callback((Fl_Callback*)cb_btn2_confirm_exit); o->value(progdefaults.confirmExit); } // Fl_Check_Button* btn2_confirm_exit o->end(); } // Fl_Group* o - { Fl_Group* o = new Fl_Group(60, 301, 496, 54, _("Check for updates")); + { Fl_Group* o = new Fl_Group(40, 301, 520, 52, _("Check for updates")); o->box(FL_ENGRAVED_FRAME); o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); - { Fl_Check_Button* o = btn_check_for_updates = new Fl_Check_Button(95, 324, 324, 20, _("Check for updates when starting program")); + { Fl_Check_Button* o = btn_check_for_updates = new Fl_Check_Button(75, 324, 324, 20, _("Check for updates when starting program")); btn_check_for_updates->down_box(FL_DOWN_BOX); btn_check_for_updates->callback((Fl_Callback*)cb_btn_check_for_updates); o->value(progdefaults.check_for_updates); @@ -5816,6 +5815,7 @@ Fl_Double_Window* ConfigureDialog() { } // Fl_Group* tabUserInterface { tabLogServer = new Fl_Group(0, 50, 600, 330, _("Log")); tabLogServer->tooltip(_("User Interface - Logging")); + tabLogServer->hide(); { Fl_Group* o = new Fl_Group(52, 315, 496, 55, _("Client/Server Logbook")); o->box(FL_ENGRAVED_FRAME); o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE)); diff --git a/src/dialogs/confdialog.fl b/src/dialogs/confdialog.fl index c7c407b1..6306c25c 100644 --- a/src/dialogs/confdialog.fl +++ b/src/dialogs/confdialog.fl @@ -410,7 +410,7 @@ progdefaults.changed = true;} } { Fl_Group tabBrowser { label Browser - tooltip {User Interface - Browser} xywh {0 50 600 330} hide + tooltip {User Interface - Browser} xywh {0 50 600 330} } { Fl_Group {} {open xywh {30 65 540 300} box ENGRAVED_FRAME @@ -739,14 +739,14 @@ progdefaults.changed = true;} tooltip {User Interface - General} xywh {0 50 600 330} hide } { Fl_Group {} {open - xywh {60 77 496 76} box ENGRAVED_FRAME + xywh {40 77 520 76} box ENGRAVED_FRAME } { Fl_Check_Button btnShowTooltips { label {Show tooltips} callback {progdefaults.tooltips = o->value(); Fl_Tooltip::enable(progdefaults.tooltips); progdefaults.changed = true;} - tooltip {Enable / disable tooltips} xywh {95 90 120 20} down_box DOWN_BOX value 1 + tooltip {Enable / disable tooltips} xywh {75 90 120 20} down_box DOWN_BOX value 1 code0 {o->value(progdefaults.tooltips);} } Fl_Check_Button chkMenuIcons { @@ -754,7 +754,7 @@ progdefaults.changed = true;} callback {progdefaults.menuicons = o->value(); icons::toggle_icon_labels(); progdefaults.changed = true;} - tooltip {Enable / disable icons on menus} xywh {239 90 150 20} down_box DOWN_BOX + tooltip {Enable / disable icons on menus} xywh {219 90 150 20} down_box DOWN_BOX code0 {o->value(progdefaults.menuicons);} } Fl_Group listboxScheme { @@ -763,7 +763,7 @@ progdefaults.changed = true;} Fl::scheme(progdefaults.ui_scheme.c_str()); progdefaults.changed = true;} open - tooltip {Change application look and feel} xywh {213 119 80 20} box DOWN_BOX color 7 align 8 + tooltip {Change application look and feel} xywh {193 119 80 20} box DOWN_BOX color 7 align 8 code0 {listboxScheme->add("base");} code1 {listboxScheme->add("gtk+");} code2 {listboxScheme->add("plastic");} @@ -777,48 +777,48 @@ progdefaults.changed = true;} mode_browser->callback(toggle_visible_modes); mode_browser->show(&progdefaults.visible_modes); progdefaults.changed = true;} - tooltip {Select modes for menu access} xywh {78 119 110 20} + tooltip {Select modes for menu access} xywh {58 119 110 20} } Fl_Group listbox_language { label {UI language} callback {progdefaults.ui_language = o->index(); progdefaults.changed = true;} open - tooltip {Changes take effect on next program startup} xywh {423 119 110 20} box DOWN_BOX color 7 labelsize 12 align 5 + tooltip {Changes take effect on next program startup} xywh {375 119 170 20} box DOWN_BOX color 7 labelsize 12 align 5 code0 {o->labelsize(FL_NORMAL_SIZE);} class Fl_ListBox } {} } Fl_Group {} { - xywh {60 154 496 34} box ENGRAVED_FRAME align 21 + xywh {40 154 520 34} box ENGRAVED_FRAME align 21 } { Fl_Check_Button btn_rx_lowercase { label {Print CW / RTTY / THROB / CONTESTIA in lowercase} callback {progdefaults.rx_lowercase = o->value(); progdefaults.changed = true;} - xywh {95 161 389 20} down_box DOWN_BOX + xywh {75 161 389 20} down_box DOWN_BOX code0 {o->value(progdefaults.rx_lowercase);} } } Fl_Group {} { - xywh {60 189 496 34} box ENGRAVED_FRAME align 21 + xywh {40 189 520 34} box ENGRAVED_FRAME align 21 } { Fl_Check_Button btn_tx_lowercase { label {Transmit all text in lower case} callback {progdefaults.tx_lowercase = o->value(); progdefaults.changed = true;} - xywh {95 197 389 20} down_box DOWN_BOX + xywh {75 197 389 20} down_box DOWN_BOX code0 {o->value(progdefaults.tx_lowercase);} } } Fl_Group {} { label {Exit prompts} - xywh {60 224 496 76} box ENGRAVED_FRAME align 21 + xywh {40 224 520 76} box ENGRAVED_FRAME align 21 } { Fl_Check_Button btn_save_config_on_exit { label {Prompt to save Configuration} callback {progdefaults.SaveConfig = o->value(); progdefaults.changed = true;} - xywh {95 248 233 20} down_box DOWN_BOX + xywh {75 248 233 20} down_box DOWN_BOX code0 {o->value(progdefaults.SaveConfig);} } Fl_Check_Button btn2_save_macros_on_exit { @@ -826,7 +826,7 @@ progdefaults.changed = true;} callback {btn_save_macros_on_exit->value(o->value()); progdefaults.SaveMacros = o->value(); progdefaults.changed = true;} - tooltip {Write current macro set on program exit} xywh {95 270 233 20} down_box DOWN_BOX + tooltip {Write current macro set on program exit} xywh {75 270 233 20} down_box DOWN_BOX code0 {o->value(progdefaults.SaveMacros);} } Fl_Check_Button btn2NagMe { @@ -834,7 +834,7 @@ progdefaults.changed = true;} callback {btnNagMe->value(o->value()); progdefaults.NagMe=o->value(); progdefaults.changed = true;} - tooltip {Bug me about saving log entries} xywh {339 248 166 20} down_box DOWN_BOX + tooltip {Bug me about saving log entries} xywh {319 248 166 20} down_box DOWN_BOX code0 {o->value(progdefaults.NagMe);} } Fl_Check_Button btn2_confirm_exit { @@ -842,26 +842,26 @@ progdefaults.changed = true;} callback {btn2_confirm_exit->value(o->value()); progdefaults.confirmExit=o->value(); progdefaults.changed = true;} - xywh {339 270 200 20} down_box DOWN_BOX + xywh {319 270 200 20} down_box DOWN_BOX code0 {o->value(progdefaults.confirmExit);} } } Fl_Group {} { label {Check for updates} open - xywh {60 301 496 54} box ENGRAVED_FRAME align 21 + xywh {40 301 520 52} box ENGRAVED_FRAME align 21 } { Fl_Check_Button btn_check_for_updates { label {Check for updates when starting program} callback {progdefaults.check_for_updates = o->value(); progdefaults.changed = true;} - xywh {95 324 324 20} down_box DOWN_BOX + xywh {75 324 324 20} down_box DOWN_BOX code0 {o->value(progdefaults.check_for_updates);} } } } Fl_Group tabLogServer { label Log open - tooltip {User Interface - Logging} xywh {0 50 600 330} + tooltip {User Interface - Logging} xywh {0 50 600 330} hide } { Fl_Group {} { label {Client/Server Logbook} open diff --git a/src/dialogs/htmlstrings.cxx b/src/dialogs/htmlstrings.cxx index cc68d6e9..d2508223 100644 --- a/src/dialogs/htmlstrings.cxx +++ b/src/dialogs/htmlstrings.cxx @@ -36,32 +36,40 @@ const char* szAbout =
    \n\

    Fldigi " PACKAGE_VERSION "

    \n\
    \n\ -Fast and Light Digital modem program\n\ +Fast and Light DIGItal modem program\n\
    \n\

    \n\ -Copyright \251 2008-2014 " FLDIGI_AUTHORS ".\n\ +Copyright \251 2008-2014\n\

    \n\ Distributed under the GNU General Public License version 3 or later.
    \n\ This is free software: you are free to change and redistribute it.
    \n\ There is NO WARRANTY, to the extent permitted by law.\n\

    Programmers:

    \n\ -     Dave Freese, W1HKJ
    \n\ -     Stelios Bounanos, M0GLD
    \n\ -     Rem\355 Chateauneu, F4ECW
    \n\ -     John Douyere, VK2ETA
    \n\ -     Stefan Fendt, DL1SMF
    \n\ -     Leigh Klotz, WA5ZNU
    \n\ -     John Phelps, KL4YFD
    \n\ -     Andrej Lajovic, S57LN\n\ -

    Localization:

    \n\ -     Dutch: Peter van der Post, PA1POS
    \n\ -     French: St\351phane Fillod, F8CFE
    \n\ -     German: Marc Richter, DF2MR
    \n\ -     Italian: Pierfrancesco Caci, IK5PVX
    \n\ -     Polish: Roman Bagiński, SP4JEU
    \n\ -     Spanish: Pavel Milanes Costa, CO7WT
    \n\ +
    \
+Dave Freese        W1HKJ\n\
+Stelios Bounanos   M0GLD\n\
+Rem\355 Chateauneu    F4ECW\n\
+John Douyere       VK2ETA\n\
+Stefan Fendt       DL1SMF\n\
+Leigh Klotz        WA5ZNU\n\
+John Phelps        KL4YFD\n\
+Andrej Lajovic     S57LN\n\
+Robert Stiles      KK5VD\n\
+
    \

    Beginners' Guide:

    \n\ -     Murray Greenman, ZL1BPU
    \n\ +
    \
+Murray Greenman      ZL1BPU
    \n\
+
    \ +

    Localization:

    \n\ +
    \
+Espa\361ol     Spanish      Pavel Milanes Costa CO7WT\n\
+                         Christian W. Correa HK4QWC\n\
+Deutsch     German       Marc Richter        DF2MR\n\
+Fran\347ais    French       St\351phane Fillod     F8CFE\n\
+Italiano    Italian      Pierfrancesco Caci  IK5PVX\n\
+Język       Polish       Roman Bagiński      SP4JEU\n\
+Nederlands  Dutch        Peter van der Post  PA1POS\n\
+
    \ \n\ \n\ "; diff --git a/src/include/nls.h b/src/include/nls.h index dd756d4d..a456f256 100644 --- a/src/include/nls.h +++ b/src/include/nls.h @@ -28,7 +28,6 @@ struct lang_def_t { const char* lang; const char* lang_region; const char* native_name; - int percent_done; }; extern struct lang_def_t ui_langs[]; diff --git a/src/misc/configuration.cxx b/src/misc/configuration.cxx index 9032258d..7e53f441 100644 --- a/src/misc/configuration.cxx +++ b/src/misc/configuration.cxx @@ -671,7 +671,7 @@ int configuration::setDefaults() ostringstream ss; for (lang_def_t* p = ui_langs; p->lang; p++) { ss.str(""); - ss << p->native_name << " (" << p->percent_done << "%)"; + ss << p->native_name; listbox_language->add(ss.str().c_str()); } listbox_language->index(get_ui_lang()); diff --git a/src/misc/nls.cxx b/src/misc/nls.cxx index 3e81f58f..0526a961 100644 --- a/src/misc/nls.cxx +++ b/src/misc/nls.cxx @@ -46,14 +46,14 @@ using namespace std; // TODO: figure out the percentage automatically; hopefully not in a horribly kludgy way struct lang_def_t ui_langs[] = { - { "en", "en_US", "English", 100 }, - { "de", "de_DE", "Deutsch", 99 }, - { "nl", "nl_NL", "Dutch", 99}, - { "es", "es_ES", "Espa\361ol", 99 }, - { "fr", "fr_FR", "Fran\347ais", 38 }, - { "it", "it_IT", "Italiano", 99 }, - { "pl", "pl_PL", "Polish", 90}, - { NULL, NULL, NULL, 0 } + { "en", "en_US", "English"}, + { "de", "de_DE", "Deutsch (German)"}, + { "nl", "nl_NL", "Nederlands (Dutch)"}, + { "es", "es_ES", "Espa\361ol (Spanish)"}, + { "fr", "fr_FR", "Fran\347ais (French)"}, + { "it", "it_IT", "Italiano (Italian)"}, + { "pl", "pl_PL", "Język (Polish)"}, + { NULL, NULL, NULL } }; static string get_win32_lang_dir(const char* homedir = NULL)