patch from Angus and from Levon

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1247 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 5c4a4a15db8dff1931bf6ccacd27ad1d2e487ab2..4a62427e5b223728abb87eccc4bdf1023c81b2c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2000-11-29  John Levon  <moz@compsoc.man.ac.uk>
+
+       * src/frontends/xforms/FormPrint.C: set to valid()
+       when we update from the passed parameters.
+
+2000-11-29  Angus Leeming <a.leeming@ic.ac.uk>
+
+       * src/LColor.C (getFromGUIName): internationalise the comparison.
+
+       * src/lyx_gui_misc.h (LyXBell): turn off that BLOODY bell until it's a
+       FormPreferences choice.
+
+       * src/frontends/xforms/FormPreferences.C: some additional Color safety.
+       Should be redundant.
+
 2000-11-29  John Levon  <moz@compsoc.man.ac.uk>
 
        * src/lyx_rc.C: more detail for the printer program config

diff --git a/src/LColor.C b/src/LColor.C
index a7c7c89f94c1a0ecf9fee6e92e06660480bf4da1..d6a8006c754c5ea4617241651222aee74fe0420b 100644 (file)
--- a/src/LColor.C
+++ b/src/LColor.C
@@ -194,7 +194,7 @@ LColor::color LColor::getFromGUIName(string const & guiname) const
        InfoTab::const_iterator ici = infotab.begin();
        InfoTab::const_iterator end = infotab.end();
        for (; ici != end; ++ici) {
-               if (!compare_no_case((*ici).second.guiname, guiname))
+               if (!compare_no_case(_((*ici).second.guiname), guiname))
                        return (*ici).first;
        }
        return LColor::inherit;

diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C
index 57c2cfc3ee8ed3d7687efecbf32cffadd82d00d0..d78183805b8e552225e849e72404d12f493f0cc4 100644 (file)
--- a/src/frontends/xforms/FormPreferences.C
+++ b/src/frontends/xforms/FormPreferences.C
@@ -462,7 +462,7 @@ void FormPreferences::Colors::apply()
        for (vector<NamedColor>::const_iterator cit = lyxColorDB.begin();
             cit != lyxColorDB.end(); ++cit) {
                LColor::color lc = lcolor.getFromGUIName((*cit).getname());
-               if (lc == LColor::ignore) continue;
+               if (lc == LColor::inherit) continue;
 
                // Ascertain the X11 name
                RGBColor const & col = (*cit).color();
@@ -894,6 +894,18 @@ bool FormPreferences::Colors::LoadBrowserX11(string const & filename)
        for (int i=0; i<LColor::ignore; ++i) {
                LColor::color lc = static_cast<LColor::color>(i);
 
+               if (lc == LColor::none
+                   || lc == LColor::black
+                   || lc == LColor::white
+                   || lc == LColor::red
+                   || lc == LColor::green
+                   || lc == LColor::blue
+                   || lc == LColor::cyan
+                   || lc == LColor::magenta
+                   || lc == LColor::yellow
+                   || lc == LColor::inherit
+                   || lc == LColor::ignore) continue;
+
                string name = lowercase(lcolor.getX11Name(lc));
                Display * display = fl_get_display();;
                Colormap const colormap = fl_state[fl_get_vclass()].colormap;

diff --git a/src/frontends/xforms/FormPrint.C b/src/frontends/xforms/FormPrint.C
index 4d9d9cad314456ce933bf18ff2f62cdc7974e240..29f5126949444b9f429e09079be3a23149f47757 100644 (file)
--- a/src/frontends/xforms/FormPrint.C
+++ b/src/frontends/xforms/FormPrint.C
@@ -194,6 +194,7 @@ void FormPrint::update()
 
                fl_set_input(dialog_->input_count,
                             tostr(pp.count_copies).c_str());
+               bc_.valid();
        }
 }
 

diff --git a/src/lyx_gui_misc.h b/src/lyx_gui_misc.h
index f1e7e03fdf2bc1663a753fbe9d0abe7deb35da80..e12fff1b61af4ae4c72ae0b8978f68e26e8aef04 100644 (file)
--- a/src/lyx_gui_misc.h
+++ b/src/lyx_gui_misc.h
@@ -82,7 +82,7 @@ float getScreenDPI();
 inline
 void LyXBell() {
        // if (audio()) ON/OFF switch yet to be implemented
-       fl_ringbell(20);
+       //fl_ringbell(20);
 }
 
 #endif