Skip to content

Commit

Permalink
Make Notebookbar the default
Browse files Browse the repository at this point in the history
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
  • Loading branch information
thebearon committed Oct 27, 2021
1 parent 5b65812 commit 0901e87
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion configure.ac
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion loolwsd.xml.in
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion wsd/LOOLWSD.cpp
Expand Up @@ -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.
Expand Down

0 comments on commit 0901e87

Please sign in to comment.