try this for distinguishing inner and outer tabs

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

diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C
index 7723513d979c38ed3a7e406395d25ae660a1a66c..e03fed575347184260f7e18f234c44daa438e5df 100644 (file)
--- a/src/frontends/xforms/FormPreferences.C
+++ b/src/frontends/xforms/FormPreferences.C
@@ -342,10 +342,10 @@ void FormPreferences::feedback(FL_OBJECT * ob)
                str = spellchecker_.feedback(ob);
        }
 
-       str = formatted(str, dialog_->text_warning->w-10,
+       str = formatted(_(str), dialog_->text_warning->w-10,
                        FL_SMALL_SIZE, FL_NORMAL_STYLE);
 
-       fl_set_object_label(dialog_->text_warning, _(str.c_str()));
+       fl_set_object_label(dialog_->text_warning, str.c_str());
        fl_set_object_lsize(dialog_->text_warning, FL_SMALL_SIZE);
 }
 
@@ -806,9 +806,9 @@ void FormPreferences::Colors::LoadBrowserLyX()
                // Note that X stores the RGB values in the range 0 - 65535
                // whilst we require them in the range 0 - 255.
                RGBColor col;
-               col.r = static_cast<unsigned char>(xcol.red);
-               col.g = static_cast<unsigned char>(xcol.green);
-               col.b = static_cast<unsigned char>(xcol.blue);
+               col.r = xcol.red   / 256;
+               col.g = xcol.green / 256;
+               col.b = xcol.blue  / 256;
 
                // Create a valid X11 name of the form "#rrggbb" and change the
                // LColor X11name to this. Don't want to trigger a redraw,
@@ -1185,7 +1185,7 @@ bool FormPreferences::Converters::Input()
 string const FormPreferences::Converters::GetFrom() const
 {
        int const i = fl_get_choice(dialog_->choice_from);
-       if (i > 0)
+       if (i > 0 && i <= local_formats.size())
                return local_formats.Get(i-1).name();
        else {
                lyxerr << "FormPreferences::Converters::GetFrom: No choice!"
@@ -1198,7 +1198,7 @@ string const FormPreferences::Converters::GetFrom() const
 string const FormPreferences::Converters::GetTo() const
 {
        int const i = fl_get_choice(dialog_->choice_to);
-       if (i > 0)
+       if (i > 0 && i <= local_formats.size())
                return local_formats.Get(i-1).name();
        else {
                lyxerr << "FormPreferences::Converters::GetTo: No choice!"
@@ -1574,28 +1574,28 @@ FormPreferences::Interface::feedback(FL_OBJECT const * const ob) const
 bool FormPreferences::Interface::input(FL_OBJECT const * const ob)
 {
        if (ob == dialog_->button_bind_file_browse) {
-               string dir  = system_lyxdir + string("bind");
-               string name = _("Sys Bind");
+               string dir  = AddName(system_lyxdir, "bind");
+               string name = N_("Sys Bind");
                pair<string,string> dir1(name, dir);
 
-               dir = user_lyxdir + string("bind");
-               name = _("User Bind");
+               dir = AddName(user_lyxdir, "bind");
+               name = N_("User Bind");
                pair<string,string> dir2(name, dir);
 
                parent_.browse(dialog_->input_bind_file,
-                               _("Bind file"), "*.bind", dir1, dir2);
+                              N_("Bind file"), "*.bind", dir1, dir2);
                
        } else if (ob == dialog_->button_ui_file_browse) {
-               string dir  = system_lyxdir + string("ui");
-               string name = _("Sys UI");
+               string dir  = AddName(system_lyxdir, "ui");
+               string name = N_("Sys UI");
                pair<string,string> dir1(name, dir);
 
-               dir = user_lyxdir + string("ui");
-               name = _("User UI");
+               dir = AddName(user_lyxdir, "ui");
+               name = N_("User UI");
                pair<string,string> dir2(name, dir);
 
                parent_.browse(dialog_->input_ui_file,
-                               _("UI file"), "*.ui", dir1, dir2);
+                              N_("UI file"), "*.ui", dir1, dir2);
        }
        
        return true;
@@ -1790,21 +1790,21 @@ bool FormPreferences::Language::input(FL_OBJECT const * const ob)
        }
 
        if (ob == dialog_->button_kbmap1_browse) {
-               string const dir  = system_lyxdir + string("kbd");
+               string const dir  = AddName(system_lyxdir, "kbd");
                string const name = N_("Key maps");
                pair<string, string> dir1(name, dir);
 
                parent_.browse(dialog_->input_kbmap1,
-                               _("Keyboard map"), "*.kmap", dir1,
-                               make_pair(string(), string()));
+                              N_("Keyboard map"), "*.kmap", dir1,
+                              make_pair(string(), string()));
        } else if (ob == dialog_->button_kbmap2_browse) {
-               string const dir  = system_lyxdir + string("kbd");
+               string const dir  = AddName(system_lyxdir, "kbd");
                string const name = N_("Key maps");
                pair<string, string> dir1(name, dir);
 
                parent_.browse(dialog_->input_kbmap2,
-                               _("Keyboard map"), "*.kmap", dir1,
-                               make_pair(string(), string()));
+                              N_("Keyboard map"), "*.kmap", dir1,
+                              make_pair(string(), string()));
        }
 
        return activate;
@@ -2228,35 +2228,35 @@ bool FormPreferences::Paths::input(FL_OBJECT const * const ob)
 
        if (ob == dialog_->button_default_path_browse) {
                parent_.browse(dialog_->input_default_path,
-                               _("Default path"), string(),
-                               make_pair(string(), string()),
-                               make_pair(string(), string()));
+                              N_("Default path"), string(),
+                              make_pair(string(), string()),
+                              make_pair(string(), string()));
        } else if (ob == dialog_->button_template_path_browse) {
                parent_.browse(dialog_->input_template_path,
-                               _("Template path"), string(),
-                               make_pair(string(), string()),
-                               make_pair(string(), string()));
+                              N_("Template path"), string(),
+                              make_pair(string(), string()),
+                              make_pair(string(), string()));
        } else if (ob == dialog_->button_temp_dir_browse) {
                parent_.browse(dialog_->input_temp_dir,
-                               _("Temp dir"), string(),
-                               make_pair(string(), string()),
-                               make_pair(string(), string()));
+                              N_("Temp dir"), string(),
+                              make_pair(string(), string()),
+                              make_pair(string(), string()));
        } else if (ob == dialog_->button_lastfiles_browse) {
                pair<string, string> dir(_("User"), user_lyxdir);
 
                parent_.browse(dialog_->input_lastfiles,
-                               _("Lastfiles"), string(), dir,
-                               make_pair(string(), string()));
+                              N_("Lastfiles"), string(), dir,
+                              make_pair(string(), string()));
        } else if (ob == dialog_->button_backup_path_browse) {
                parent_.browse(dialog_->input_backup_path,
-                               _("Backup path"), string(),
-                               make_pair(string(), string()),
-                               make_pair(string(), string()));
+                              N_("Backup path"), string(),
+                              make_pair(string(), string()),
+                              make_pair(string(), string()));
        } else if (ob == dialog_->button_serverpipe_browse) {
                parent_.browse(dialog_->input_serverpipe,
-                               _("LyX Server pipes"), string(),
-                               make_pair(string(), string()),
-                               make_pair(string(), string()));
+                              N_("LyX Server pipes"), string(),
+                              make_pair(string(), string()),
+                              make_pair(string(), string()));
        }
        
        return activate;
@@ -2369,9 +2369,9 @@ FormPreferences::Printer::feedback(FL_OBJECT const * const ob) const
        else if (ob == dialog_->input_landscape)
                str = lyxrc.getDescription(LyXRC::RC_PRINTLANDSCAPEFLAG);
        else if (ob == dialog_->input_copies)
-               str = lyxrc.getDescription(LyXRC::RC_PRINTCOLLCOPIESFLAG);
-       else if (ob == dialog_->input_collated)
                str = lyxrc.getDescription(LyXRC::RC_PRINTCOPIESFLAG);
+       else if (ob == dialog_->input_collated)
+               str = lyxrc.getDescription(LyXRC::RC_PRINTCOLLCOPIESFLAG);
        else if (ob == dialog_->input_paper_type)
                str = lyxrc.getDescription(LyXRC::RC_PRINTPAPERFLAG);
        else if (ob == dialog_->input_paper_size)
@@ -2949,9 +2949,9 @@ bool FormPreferences::SpellChecker::input(FL_OBJECT const * const ob)
 
        if (ob == dialog_->button_personal_dict) {
                parent_.browse(dialog_->input_personal_dict,
-                               _("Personal dictionary"), "*.ispell",
-                               make_pair(string(), string()),
-                               make_pair(string(), string()));
+                              N_("Personal dictionary"), "*.ispell",
+                              make_pair(string(), string()),
+                              make_pair(string(), string()));
        }
        
        return true; // All input is valid!
@@ -3005,11 +3005,11 @@ void FormPreferences::printWarning(string const & warning)
 {
        warningPosted = true;
 
-       string str = N_("WARNING!") + string(" ") + warning;
+       string str = _("WARNING!") + string(" ") + warning;
        str = formatted(str, dialog_->text_warning->w-10,
                         FL_SMALL_SIZE, FL_NORMAL_STYLE);
 
-       fl_set_object_label(dialog_->text_warning, _(str.c_str()));
+       fl_set_object_label(dialog_->text_warning, str.c_str());
        fl_set_object_lsize(dialog_->text_warning, FL_SMALL_SIZE);
 }