From fb7615df196e6a6272f654ac4ec217af797da875 Mon Sep 17 00:00:00 2001
From: Aron Budea <aron.budea@collabora.com>
Date: Sun, 24 Oct 2021 04:54:39 +0200
Subject: [PATCH] Make Notebookbar the default

With a default config, Notebookbar is shown.
With an old config without user_interface.mode set, classic
toolbar is shown.

Signed-off-by: Aron Budea <aron.budea@collabora.com>
Change-Id: I398d97fa975a0c52391547d2e791ff17e7effde6
---
 configure.ac    | 2 +-
 loolwsd.xml.in  | 2 +-
 wsd/LOOLWSD.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 748be3e010c1..8bd6373618fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -780,7 +780,7 @@ AS_IF([test "$enable_welcome_message_button" = "yes"],
 AC_DEFINE_UNQUOTED([ENABLE_WELCOME_MESSAGE_BUTTON],["$ENABLE_WELCOME_MESSAGE_BUTTON"],[Should the Release notes message on startup should have a dismiss button instead of an x button to close by default?])
 AC_SUBST(ENABLE_WELCOME_MESSAGE_BUTTON)
 
-USER_INTERFACE_MODE='classic'
+USER_INTERFACE_MODE='notebookbar'
 AC_DEFINE_UNQUOTED([USER_INTERFACE_MODE],["$USER_INTERFACE_MODE"],[Which user interface mode should be activated])
 AC_SUBST(USER_INTERFACE_MODE)
 
diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index 3e311e4cfc67..8c9f81331233 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -170,7 +170,7 @@
     </welcome>
 
     <user_interface>
-      <mode type="string" desc="Controls the user interface style (classic|notebookbar)" default="@USER_INTERFACE_MODE@">@USER_INTERFACE_MODE@</mode>
+      <mode type="string" desc="Controls the user interface style (classic|notebookbar)" default="classic">@USER_INTERFACE_MODE@</mode>
     </user_interface>
 
     <storage desc="Backend storage">
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 1b4c2ef3a80d..99cce87652c0 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1125,7 +1125,7 @@ void LOOLWSD::innerInitialize(Application& self)
 #ifdef ENABLE_FEATURE_RESTRICTION
             { "restricted_commands", "" },
 #endif
-            { "user_interface.mode", USER_INTERFACE_MODE }
+            { "user_interface.mode", "classic" }
           };
 
     // Set default values, in case they are missing from the config file.