try this for distinguishing inner and outer tabs

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

diff --git a/src/frontends/xforms/FormPreferences.h b/src/frontends/xforms/FormPreferences.h
index 4558ff5d2994ba3713f2175d3053c41d8c2894f4..928f826f0e426ba9e1dacba0b88fd8459ce0df73 100644 (file)
--- a/src/frontends/xforms/FormPreferences.h
+++ b/src/frontends/xforms/FormPreferences.h
@@ -60,6 +60,10 @@ public:
                              FL_Coord, FL_Coord, int, void *);
 
 private:
+       /// Connect signals etc. Set form's max size.
+       virtual void connect();
+       /// Disconnect signals. Also perform any necessary housekeeping.
+       virtual void disconnect();
        /** Redraw the form (on receipt of a Signal indicating, for example,
            that the xform colours have been re-mapped). */
        virtual void redraw();
@@ -134,7 +138,7 @@ private:
        /// Outputs tabfolder
        FD_form_outer_tab * outputs_tab_;
        /// Spellchecker, language stuff, etc
-       FD_form_outer_tab * usage_tab_;
+       FD_form_outer_tab * lang_opts_tab_;
 
        /** Flag whether a warning has been posted to the text window.
            If so, don't redraw the window when the mouse leaves an object. */
@@ -145,6 +149,12 @@ private:
 
        class Colors {
        public:
+               ///
+               enum GuiColors {
+                       GUI_COLOR_CHOICE = FL_FREE_COL1,
+                       GUI_COLOR_HUE_DIAL = FL_FREE_COL2,
+                       GUI_COLOR_CURSOR = FL_FREE_COL3
+               };
                ///
                Colors( FormPreferences & p ) : parent_(p), dialog_(0) {}
                ///
@@ -158,7 +168,7 @@ private:
                ///
                string const feedback(FL_OBJECT const * const) const;
                ///
-               bool input(FL_OBJECT const * const);
+               void input(FL_OBJECT const * const);
                ///
                void update() { LoadBrowserLyX(); }
                
@@ -169,35 +179,24 @@ private:
                ///
                void AdjustVal( int, int, double ) const;
                ///
-               bool InputBrowserLyX() const;
-               ///
-               bool InputBrowserX11() const;
+               void InputBrowserLyX() const;
                ///
                void InputHSV();
                ///
-               void LoadBrowserLyX();
+               void InputRGB();
                ///
-               bool LoadBrowserX11(string const &);
-               ///
-               bool LoadDatabase();
-               ///
-               bool Modify() const;
+               void LoadBrowserLyX();
                ///
-               int SearchEntry(RGBColor const &) const;
+               void Modify();
                ///
-               void Sort();
+               void SwitchColorSpace() const;
                ///
-               void SortType();
+               string const X11hexname(RGBColor const &) const;
 
                ///
                FormPreferences & parent_;
                ///
                FD_form_colors * dialog_;
-               /// The usual location of the X11 name database.
-               static string const colorFile;
-               /** A vector of RGB colors and associated name.
-                   Each RGB color is unique. */
-               static std::vector<NamedColor> colorDB;
 
                /// A vector of LyX LColor GUI name and associated RGB color.
                std::vector<NamedColor> lyxColorDB;