Bugfixes: checkboxes to radiobuttons (from J�rgen S) and remove a little

[lyx.git] / src / frontends / xforms / FormPreferences.C

diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C
index 111efd4b6f4ea9c1883df08288c5cf00a0f1a4b5..a63609fc4db56a9ed55637b393e6d9181b28be9d 100644 (file)
--- a/src/frontends/xforms/FormPreferences.C
+++ b/src/frontends/xforms/FormPreferences.C
@@ -28,6 +28,7 @@
 #include "Lsstream.h"
 #include "FormPreferences.h"
 #include "form_preferences.h"
+#include "ButtonController.tmpl"
 #include "input_validators.h"
 #include "LyXView.h"
 #include "language.h"
@@ -96,19 +97,19 @@ void FormPreferences::redraw()
 
        FL_FORM * form3 = 0;
        if (form2 == converters_tab_->form)
-               form3 = fl_get_active_folder(converters_tab_->tabfolder_outer);
+               form3 = fl_get_active_folder(converters_tab_->tabfolder_inner);
 
        else if (form2 == look_n_feel_tab_->form)
-               form3 = fl_get_active_folder(look_n_feel_tab_->tabfolder_outer);
+               form3 = fl_get_active_folder(look_n_feel_tab_->tabfolder_inner);
 
        else if (form2 == inputs_tab_->form)
-               form3 = fl_get_active_folder(inputs_tab_->tabfolder_outer);
+               form3 = fl_get_active_folder(inputs_tab_->tabfolder_inner);
 
        else if (form2 == outputs_tab_->form)
-               form3 = fl_get_active_folder(outputs_tab_->tabfolder_outer);
+               form3 = fl_get_active_folder(outputs_tab_->tabfolder_inner);
 
        else if (form2 == lang_opts_tab_->form)
-               form3 = fl_get_active_folder(lang_opts_tab_->tabfolder_outer);
+               form3 = fl_get_active_folder(lang_opts_tab_->tabfolder_inner);
 
        if (form3 && form3->visible)
                fl_redraw_form(form3);
@@ -126,7 +127,7 @@ void FormPreferences::showSpellPref()
 {
        show();
        fl_set_folder(dialog_->tabfolder_prefs, lang_opts_tab_->form);
-       fl_set_folder(lang_opts_tab_->tabfolder_outer, spelloptions_.dialog()->form);
+       fl_set_folder(lang_opts_tab_->tabfolder_inner, spelloptions_.dialog()->form);
 }
 
 
@@ -148,10 +149,10 @@ void FormPreferences::hide()
 {
        // We need to hide the active tabfolder otherwise we get a
        // BadDrawable error from X window and LyX crashes without saving.
-       FL_FORM * outer_form = fl_get_active_folder(dialog_->tabfolder_prefs);
-       if (outer_form
-           && outer_form->visible) {
-               fl_hide_form(outer_form);
+       FL_FORM * inner_form = fl_get_active_folder(dialog_->tabfolder_prefs);
+       if (inner_form
+           && inner_form->visible) {
+               fl_hide_form(inner_form);
        }
        FormBaseDeprecated::hide();
 }
@@ -168,11 +169,11 @@ void FormPreferences::build()
        bc().setRestore(dialog_->button_restore);
 
        // build the tab folders
-       converters_tab_.reset(build_outer_tab());
-       look_n_feel_tab_.reset(build_outer_tab());
-       inputs_tab_.reset(build_outer_tab());
-       outputs_tab_.reset(build_outer_tab());
-       lang_opts_tab_.reset(build_outer_tab());
+       converters_tab_.reset(build_inner_tab());
+       look_n_feel_tab_.reset(build_inner_tab());
+       inputs_tab_.reset(build_inner_tab());
+       outputs_tab_.reset(build_inner_tab());
+       lang_opts_tab_.reset(build_inner_tab());
 
        // build actual tabfolder contents
        // these will become nested tabfolders
@@ -197,7 +198,7 @@ void FormPreferences::build()
                           _("Lang Opts"),
                           lang_opts_tab_->form);
        fl_addto_tabfolder(dialog_->tabfolder_prefs,
-                          _("Converters"),
+                          _("Conversion"),
                           converters_tab_->form);
        fl_addto_tabfolder(dialog_->tabfolder_prefs,
                           _("Inputs"),
@@ -208,49 +209,49 @@ void FormPreferences::build()
 
        // now build the nested tabfolders
        // Starting with look and feel
-       fl_addto_tabfolder(look_n_feel_tab_->tabfolder_outer,
+       fl_addto_tabfolder(look_n_feel_tab_->tabfolder_inner,
                           _("Screen Fonts"),
                           screen_fonts_.dialog()->form);
-       fl_addto_tabfolder(look_n_feel_tab_->tabfolder_outer,
+       fl_addto_tabfolder(look_n_feel_tab_->tabfolder_inner,
                           _("Interface"),
                           interface_.dialog()->form);
-       fl_addto_tabfolder(look_n_feel_tab_->tabfolder_outer,
+       fl_addto_tabfolder(look_n_feel_tab_->tabfolder_inner,
                           _("Colors"),
                           colors_.dialog()->form);
-       fl_addto_tabfolder(look_n_feel_tab_->tabfolder_outer,
+       fl_addto_tabfolder(look_n_feel_tab_->tabfolder_inner,
                           _("Misc"),
                           lnf_misc_.dialog()->form);
 
        // then build converters
-       fl_addto_tabfolder(converters_tab_->tabfolder_outer,
+       fl_addto_tabfolder(converters_tab_->tabfolder_inner,
                           _("Formats"),
                           formats_.dialog()->form);
-       fl_addto_tabfolder(converters_tab_->tabfolder_outer,
+       fl_addto_tabfolder(converters_tab_->tabfolder_inner,
                           _("Converters"),
                           converters_.dialog()->form);
 
        // then build inputs
-       // Paths should probably go in a few outer_tab called Files
-       fl_addto_tabfolder(inputs_tab_->tabfolder_outer,
+       // Paths should probably go in a few inner_tab called Files
+       fl_addto_tabfolder(inputs_tab_->tabfolder_inner,
                           _("Paths"),
                           paths_.dialog()->form);
-       fl_addto_tabfolder(inputs_tab_->tabfolder_outer,
+       fl_addto_tabfolder(inputs_tab_->tabfolder_inner,
                           _("Misc"),
                           inputs_misc_.dialog()->form);
 
        // then building outputs
-       fl_addto_tabfolder(outputs_tab_->tabfolder_outer,
+       fl_addto_tabfolder(outputs_tab_->tabfolder_inner,
                           _("Printer"),
                           printer_.dialog()->form);
-       fl_addto_tabfolder(outputs_tab_->tabfolder_outer,
+       fl_addto_tabfolder(outputs_tab_->tabfolder_inner,
                           _("Misc"),
                           outputs_misc_.dialog()->form);
 
        // then building usage
-       fl_addto_tabfolder(lang_opts_tab_->tabfolder_outer,
+       fl_addto_tabfolder(lang_opts_tab_->tabfolder_inner,
                           _("Spell checker"),
                           spelloptions_.dialog()->form);
-       fl_addto_tabfolder(lang_opts_tab_->tabfolder_outer,
+       fl_addto_tabfolder(lang_opts_tab_->tabfolder_inner,
                           _("Language"),
                           language_.dialog()->form);
 }
@@ -1528,11 +1529,11 @@ bool FormPreferences::Interface::input(FL_OBJECT const * const ob)
 {
        if (ob == dialog_->button_bind_file_browse) {
                string dir  = AddName(system_lyxdir, "bind");
-               string name = N_("Sys Bind");
+               string name = N_("Sys Bind|#S#s");
                pair<string,string> dir1(name, dir);
 
                dir = AddName(user_lyxdir, "bind");
-               name = N_("User Bind");
+               name = N_("User Bind|#U#u");
                pair<string,string> dir2(name, dir);
 
                parent_.browse(dialog_->input_bind_file,
@@ -1540,11 +1541,11 @@ bool FormPreferences::Interface::input(FL_OBJECT const * const ob)
                
        } else if (ob == dialog_->button_ui_file_browse) {
                string dir  = AddName(system_lyxdir, "ui");
-               string name = N_("Sys UI");
+               string name = N_("Sys UI|#S#s");
                pair<string,string> dir1(name, dir);
 
                dir = AddName(user_lyxdir, "ui");
-               name = N_("User UI");
+               name = N_("User UI|#U#u");
                pair<string,string> dir2(name, dir);
 
                parent_.browse(dialog_->input_ui_file,
@@ -1642,7 +1643,7 @@ void FormPreferences::Language::build()
        fl_deactivate_object(dialog_->choice_default_lang);
        combo_default_lang.reset(new Combox(FL_COMBOX_DROPLIST));
        combo_default_lang->add(obj->x, obj->y, obj->w, obj->h, 400,
-                               parent_.lang_opts_tab_->tabfolder_outer,
+                               parent_.lang_opts_tab_->tabfolder_inner,
                                parent_.dialog_->tabfolder_prefs);
        combo_default_lang->shortcut("#L",1);
        combo_default_lang->setcallback(ComboCB, &parent_);
@@ -1736,20 +1737,18 @@ bool FormPreferences::Language::input(FL_OBJECT const * const ob)
 
        if (ob == dialog_->button_kbmap1_browse) {
                string const dir  = AddName(system_lyxdir, "kbd");
-               string const name = N_("Key maps");
+               string const name = N_("Key maps|#K#k");
                pair<string, string> dir1(name, dir);
 
                parent_.browse(dialog_->input_kbmap1,
-                              N_("Keyboard map"), "*.kmap", dir1,
-                              make_pair(string(), string()));
+                              N_("Keyboard map"), "*.kmap", dir1);
        } else if (ob == dialog_->button_kbmap2_browse) {
                string const dir  = AddName(system_lyxdir, "kbd");
-               string const name = N_("Key maps");
+               string const name = N_("Key maps|#K#k");
                pair<string, string> dir1(name, dir);
 
                parent_.browse(dialog_->input_kbmap2,
-                              N_("Keyboard map"), "*.kmap", dir1,
-                              make_pair(string(), string()));
+                              N_("Keyboard map"), "*.kmap", dir1);
        }
 
        return activate;
@@ -2219,35 +2218,24 @@ bool FormPreferences::Paths::input(FL_OBJECT const * const ob)
 
        if (ob == dialog_->button_default_path_browse) {
                parent_.browse(dialog_->input_default_path,
-                              N_("Default path"), string(),
-                              make_pair(string(), string()),
-                              make_pair(string(), string()));
+                              N_("Default path"), string());
        } else if (ob == dialog_->button_template_path_browse) {
                parent_.browse(dialog_->input_template_path,
-                              N_("Template path"), string(),
-                              make_pair(string(), string()),
-                              make_pair(string(), string()));
+                              N_("Template path"), string());
        } else if (ob == dialog_->button_temp_dir_browse) {
                parent_.browse(dialog_->input_temp_dir,
-                              N_("Temp dir"), string(),
-                              make_pair(string(), string()),
-                              make_pair(string(), string()));
+                              N_("Temp dir"), string());
        } else if (ob == dialog_->button_lastfiles_browse) {
-               pair<string, string> dir(_("User"), user_lyxdir);
+               pair<string, string> dir(_("User|#U#u"), user_lyxdir);
 
                parent_.browse(dialog_->input_lastfiles,
-                              N_("Lastfiles"), string(), dir,
-                              make_pair(string(), string()));
+                              N_("Lastfiles"), string(), dir);
        } else if (ob == dialog_->button_backup_path_browse) {
                parent_.browse(dialog_->input_backup_path,
-                              N_("Backup path"), string(),
-                              make_pair(string(), string()),
-                              make_pair(string(), string()));
+                              N_("Backup path"), string());
        } else if (ob == dialog_->button_serverpipe_browse) {
                parent_.browse(dialog_->input_serverpipe,
-                              N_("LyX Server pipes"), string(),
-                              make_pair(string(), string()),
-                              make_pair(string(), string()));
+                              N_("LyX Server pipes"), string());
        }
        
        return activate;
@@ -2946,9 +2934,7 @@ bool FormPreferences::SpellOptions::input(FL_OBJECT const * const ob)
 
        if (ob == dialog_->button_personal_dict) {
                parent_.browse(dialog_->input_personal_dict,
-                              N_("Personal dictionary"), "*.ispell",
-                              make_pair(string(), string()),
-                              make_pair(string(), string()));
+                              N_("Personal dictionary"), "*.ispell");
        }
        
        return true; // All input is valid!