Merge with sync OUT-561
authorThomas
Thu, 20 Jun 2019 16:20:56 +0200
branchOUT-561
changeset 2673a7f1c342d0ba
parent 2670 bc75dcdd225a
parent 2672 3b6bf9cee1e0
Merge with sync
AdapterCallbacks.cs
     1.1 --- a/AdapterCallbacks.cs	Tue Jun 18 08:21:19 2019 +0200
     1.2 +++ b/AdapterCallbacks.cs	Thu Jun 20 16:20:56 2019 +0200
     1.3 @@ -66,6 +66,9 @@
     1.4                  case SyncHandshakeSignal.SyncNotifyInitAddOtherDevice:
     1.5                  case SyncHandshakeSignal.SyncNotifyInitFormGroup:
     1.6                      {
     1.7 +                        // Stop sync queue
     1.8 +                        ThisAddIn.SyncQueue?.Stop();
     1.9 +
    1.10                          // Syncronize engine with settings just in case (should already be synced)
    1.11                          Globals.ThisAddIn.SyncWithSettings(true);
    1.12  
     2.1 --- a/UI/RibbonCustomizations.cs	Tue Jun 18 08:21:19 2019 +0200
     2.2 +++ b/UI/RibbonCustomizations.cs	Thu Jun 20 16:20:56 2019 +0200
     2.3 @@ -1194,8 +1194,11 @@
     2.4          /// </summary>
     2.5          public bool ToggleButtonForceProtection_GetVisible(Office.IRibbonControl control)
     2.6          {
     2.7 +            // Disabled for the moment
     2.8 +            return false;
     2.9 +
    2.10              // Visible if not in Reader mode
    2.11 -            return (Globals.RELEASE_MODE != Globals.ReleaseMode.Reader);
    2.12 +            //return (Globals.RELEASE_MODE != Globals.ReleaseMode.Reader);
    2.13          }
    2.14  
    2.15          ///////////////////////////////////////////////////////////