Swap two printer related help messages.

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

diff --git a/src/frontends/xforms/FormParagraph.h b/src/frontends/xforms/FormParagraph.h
index ca2b970bc6f5d16ea38172c13e0b8061f9501fd2..c8458eb64a14d1db732945d41b0a82b742a473ba 100644 (file)
--- a/src/frontends/xforms/FormParagraph.h
+++ b/src/frontends/xforms/FormParagraph.h
@@ -13,105 +13,65 @@
 #ifndef FORM_PARAGRAPH_H
 #define FORM_PARAGRAPH_H
 
-#include "DialogBase.h"
-#include "support/utility.hpp"
-#include <vector>
+#include "FormBase.h"
 
 #ifdef __GNUG_
 #pragma interface
 #endif
 
-class LyXView;
-class Dialogs;
-class NoRepeatedApplyReadOnlyPolicy;
-//template <class x> class ButtonController;
-class ButtonController;
 
 struct FD_form_tabbed_paragraph;
 struct FD_form_paragraph_general;
 struct FD_form_paragraph_extra;
 
-#ifdef SIGC_CXX_NAMESPACES
-using SigC::Connection;
-#endif
-
 /** This class provides an XForms implementation of the FormParagraph Popup.
-    The table-layout-form here changes values for latex-tabulars
+ *           @author Jürgen Vigna
  */
-class FormParagraph : public DialogBase, public noncopyable {
+class FormParagraph : public FormBaseBD {
 public:
-    FormParagraph(LyXView *, Dialogs *);
-    ~FormParagraph();
-    ///
-    static  int WMHideCB(FL_FORM *, void *);
-    static void OKCB(FL_OBJECT *, long);
-    static void ApplyCB(FL_OBJECT *, long);
-    static void CancelCB(FL_OBJECT *, long);
-    static void RestoreCB(FL_OBJECT *, long);
-    static void InputCB(FL_OBJECT *, long);
-    static void VSpaceCB(FL_OBJECT *, long);
-    ///
-    enum EnumPopupStatus {
-       ///
-        POPUP_UNMODIFIED,
        ///
-        POPUP_MODIFIED,
+       FormParagraph(LyXView *, Dialogs *);
        ///
-        POPUP_READONLY
-    };
+       ~FormParagraph();
 
 private:
-    /// Create the popup if necessary, update it and display it.
-    void show();
-    /// Hide the popup.
-    void hide();
-    /// Update the popup.
-    void update();
-    ///
-    void general_update();
-    ///
-    void extra_update();
-    /// Apply from popup
-    void apply();
-    ///
-    void general_apply();
-    ///
-    void extra_apply();
-    /// Cancel from popup
-    void cancel();
-    /// Build the popup
-    void build();
-    /// Explicitly free the popup.
-    void free();
-    ///
-    bool CheckParagraphInput(FL_OBJECT * ob, long);
+       /** Redraw the form (on receipt of a Signal indicating, for example,
+           that the xform colours have been re-mapped). */
+       virtual void redraw();
+       /// Build the popup
+       virtual void build();
+       /// Apply from popup
+       virtual void apply();
+       /// Update the popup.
+       virtual void update();
+       /// Filter the inputs on callback from xforms
+       virtual bool input(FL_OBJECT * ob, long);
 
+       ///
+       virtual FL_FORM * form() const;
+       
+       ///
+       void general_update();
+       ///
+       void extra_update();
+       ///
+       void general_apply();
+       ///
+       void extra_apply();
 
-    /// Typedefinitions from the fdesign produced Header file
-    FD_form_tabbed_paragraph * build_tabbed_paragraph();
-    ///
-    FD_form_paragraph_general * build_paragraph_general();
-    ///
-    FD_form_paragraph_extra * build_paragraph_extra();
+       /// Typedefinitions from the fdesign produced Header file
+       FD_form_tabbed_paragraph * build_tabbed_paragraph();
+       ///
+       FD_form_paragraph_general * build_paragraph_general();
+       ///
+       FD_form_paragraph_extra * build_paragraph_extra();
 
-    /// Real GUI implementation.
-    FD_form_tabbed_paragraph  * dialog_;
-    ///
-    FD_form_paragraph_general * general_;
-    ///
-    FD_form_paragraph_extra   * extra_;
-    /// Which LyXView do we belong to?
-    LyXView * lv_;
-    ///
-    Dialogs * d_;
-    /// Update connection.
-    Connection u_;
-    /// Hide connection.
-    Connection h_;
-    /// has form contents changed? Used to control OK/Apply
-    EnumPopupStatus status;
-    ///
-       ButtonController/*<NoRepeatedApplyReadOnlyPolicy>*/ * bc_;
+       /// Real GUI implementation.
+       FD_form_tabbed_paragraph  * dialog_;
+       ///
+       FD_form_paragraph_general * general_;
+       ///
+       FD_form_paragraph_extra   * extra_;
 };
 
 #endif