* fix spelling in comments to please John.

[lyx.git] / src / frontends / qt4 / ButtonPolicy.h

diff --git a/src/frontends/qt4/ButtonPolicy.h b/src/frontends/qt4/ButtonPolicy.h
index 93f03ed0aa649d4c3a45725a029a17ed18e236cf..43f384baa8b9869a524e4123907c12b61d1eba19 100644 (file)
--- a/src/frontends/qt4/ButtonPolicy.h
+++ b/src/frontends/qt4/ButtonPolicy.h
@@ -23,7 +23,7 @@ namespace frontend {
     dialogs. Only the policy is implemented here.  Separate ButtonController
     classes are needed for each GUI implementation.
 
     dialogs. Only the policy is implemented here.  Separate ButtonController
     classes are needed for each GUI implementation.
 

-               Policy                    | ReadOnly | Apply Button | Repeated Apply
+    Policy                    | ReadOnly | Apply Button | Repeated Apply

     ========================================================================
     OkCancel                  |     N    |      N        |      -
     OkCancelReadOnly          |     Y    |      N        |      -
     ========================================================================
     OkCancel                  |     N    |      N        |      -
     OkCancelReadOnly          |     Y    |      N        |      -


@@ -31,6 +31,7 @@ namespace frontend {
     OkApplyCancelReadOnly     |     Y    |      Y        |      Y
     NoRepeatedApply           |     N    |      Y        |      N
     NoRepeatedApplyReadOnly   |     Y    |      Y        |      N
     OkApplyCancelReadOnly     |     Y    |      Y        |      Y
     NoRepeatedApply           |     N    |      Y        |      N
     NoRepeatedApplyReadOnly   |     Y    |      Y        |      N

+    OkApplyCancelAutoReadOnly |     Y    |      Y        |      Y

     Preferences               |     N    |      Y        | No (Ok-Close)
     Ignorant                  |    N/A   |     N/A       |     N/A
     ========================================================================
     Preferences               |     N    |      Y        | No (Ok-Close)
     Ignorant                  |    N/A   |     N/A       |     N/A
     ========================================================================


@@ -72,7 +73,7 @@ public:
                        This is based on the value of the bool state of the Button::CANCEL.
                        true == Cancel, false == Close
                 */
                        This is based on the value of the bool state of the Button::CANCEL.
                        true == Cancel, false == Close
                 */

-    OkCancelPolicy,
+               OkCancelPolicy,

 
 
                /** Ok and Cancel buttons for dialogs where read-only operation is blocked.
 
 
                /** Ok and Cancel buttons for dialogs where read-only operation is blocked.


@@ -121,7 +122,7 @@ public:
                OkApplyCancelReadOnlyPolicy,
 
                /** Ok, Apply and Cancel buttons for dialogs where repeated
                OkApplyCancelReadOnlyPolicy,
 
                /** Ok, Apply and Cancel buttons for dialogs where repeated

- *    Apply is allowed.
+                       Apply is allowed.

                        Note: This scheme supports the relabelling of Cancel to Close
                        and vice versa.
                        This is based on the value of the bool state of the Button::CANCEL.
                        Note: This scheme supports the relabelling of Cancel to Close
                        and vice versa.
                        This is based on the value of the bool state of the Button::CANCEL.


@@ -137,6 +138,14 @@ public:
                 */
                NoRepeatedApplyPolicy,
 
                 */
                NoRepeatedApplyPolicy,
 

+               /** Ok, Apply and Cancel buttons and an AutoApply checkbox.
+                       Note: This scheme supports the relabelling of Cancel to Close
+                       and vice versa.
+                       This is based on the value of the bool state of the Button::CANCEL.
+                       true == Cancel, false == Close
+                */
+               OkApplyCancelAutoReadOnlyPolicy,
+

                /** Defines the policy used by the Preferences dialog.
                        Four buttons: Ok (Save), Apply, Cancel/Close, Restore.
                        Note: This scheme supports the relabelling of Cancel to Close
                /** Defines the policy used by the Preferences dialog.
                        Four buttons: Ok (Save), Apply, Cancel/Close, Restore.
                        Note: This scheme supports the relabelling of Cancel to Close


@@ -176,6 +185,10 @@ public:
                ///
                APPLIED,
                ///
                ///
                APPLIED,
                ///

+               AUTOAPPLY_INITIAL,
+               ///
+               AUTOAPPLY_CHANGED,
+               ///

                RO_INITIAL,
                ///
                RO_VALID,
                RO_INITIAL,
                ///
                RO_VALID,


@@ -184,25 +197,29 @@ public:
                ///
                RO_APPLIED,
                ///
                ///
                RO_APPLIED,
                ///

+               RO_AUTOAPPLY,
+               ///

                BOGUS = 55
        };
 
        /// The various button types.
        enum Button {
                ///
                BOGUS = 55
        };
 
        /// The various button types.
        enum Button {
                ///

-               CLOSE    = 0,  // Not a real button, but effectively !CANCEL
+               CLOSE     = 0,  // Not a real button, but effectively !CANCEL
+               ///
+               OKAY      = 1,

                ///
                ///

-               OKAY     = 1,
+               APPLY     = 2,

                ///
                ///

-               APPLY    = 2,
+               CANCEL    = 4,

                ///
                ///

-               CANCEL   = 4,
+               RESTORE   = 8,

                ///
                ///

-               RESTORE  = 8
+               AUTOAPPLY = 16  // This is usually a checkbox

        };
        ///
        static const Button ALL_BUTTONS =
        };
        ///
        static const Button ALL_BUTTONS =

-               Button(OKAY | APPLY | CANCEL | RESTORE);
+               Button(OKAY | APPLY | CANCEL | RESTORE | AUTOAPPLY);

 
        /** State machine inputs.
            All the policies so far have both CANCEL and HIDE always going to
 
        /** State machine inputs.
            All the policies so far have both CANCEL and HIDE always going to


@@ -225,6 +242,8 @@ public:
                SMI_CANCEL,
                /// a restore action has happened
                SMI_RESTORE,
                SMI_CANCEL,
                /// a restore action has happened
                SMI_RESTORE,

+               /// apply auto-apply
+               SMI_AUTOAPPLY,

                /// the dialog has been hidden
                SMI_HIDE,
                /// the dialog contents are read-only
                /// the dialog has been hidden
                SMI_HIDE,
                /// the dialog contents are read-only