From 8c455399048a81c1b6749c56d5e3c44825128847 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 24 Dec 2023 09:25:40 +0530
Subject: [PATCH] Do not require a restart to change the show layout buttons
 setting

---
 src/calibre/gui2/central.py               | 1 -
 src/calibre/gui2/init.py                  | 2 +-
 src/calibre/gui2/preferences/look_feel.py | 3 ++-
 src/calibre/gui2/preferences/look_feel.ui | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/calibre/gui2/central.py b/src/calibre/gui2/central.py
index dc2e9d1d11..7b9f358846 100644
--- a/src/calibre/gui2/central.py
+++ b/src/calibre/gui2/central.py
@@ -391,7 +391,6 @@ class CentralContainer(QWidget):
             return False
         gui.book_details.vertical = is_wide
         self.layout = layout
-        gui.place_layout_buttons()
         self.write_settings()
         self.relayout()
         return True
diff --git a/src/calibre/gui2/init.py b/src/calibre/gui2/init.py
index 50a78eec55..271d1b2074 100644
--- a/src/calibre/gui2/init.py
+++ b/src/calibre/gui2/init.py
@@ -498,6 +498,7 @@ class LayoutMixin:  # {{{
         for button in reversed(self.layout_buttons):
             self.status_bar.insertPermanentWidget(1, button)
         self.layout_button.setMenu(LayoutMenu(self))
+        self.layout_button.setVisible(not gprefs['show_layout_buttons'])
 
     def init_layout_mixin(self):
         self.vl_tabs = VLTabs(self)
@@ -549,7 +550,6 @@ class LayoutMixin:  # {{{
         b.setToolTip(_(
             'Show and hide various parts of the calibre main window'))
         self.status_bar.addPermanentWidget(b)
-        b.setVisible(not gprefs['show_layout_buttons'])
         self.status_bar.addPermanentWidget(self.jobs_button)
         self.setStatusBar(self.status_bar)
         self.status_bar.update_label.linkActivated.connect(self.update_link_clicked)
diff --git a/src/calibre/gui2/preferences/look_feel.py b/src/calibre/gui2/preferences/look_feel.py
index 33e2aa128a..70c4e83648 100644
--- a/src/calibre/gui2/preferences/look_feel.py
+++ b/src/calibre/gui2/preferences/look_feel.py
@@ -582,7 +582,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         r('book_list_tooltips', gprefs)
         r('dnd_merge', gprefs)
         r('wrap_toolbar_text', gprefs, restart_required=True)
-        r('show_layout_buttons', gprefs, restart_required=True)
+        r('show_layout_buttons', gprefs)
         r('row_numbers_in_book_list', gprefs)
         r('tag_browser_old_look', gprefs)
         r('tag_browser_hide_empty_categories', gprefs)
@@ -1182,6 +1182,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
 
     def refresh_gui(self, gui):
         gui.book_details.book_info.refresh_css()
+        gui.place_layout_buttons()
         m = gui.library_view.model()
         m.update_db_prefs_cache()
         m.beginResetModel(), m.endResetModel()
diff --git a/src/calibre/gui2/preferences/look_feel.ui b/src/calibre/gui2/preferences/look_feel.ui
index 5dae09c1c5..f3217b86f6 100644
--- a/src/calibre/gui2/preferences/look_feel.ui
+++ b/src/calibre/gui2/preferences/look_feel.ui
@@ -31,7 +31,7 @@
        <item row="7" column="1">
         <widget class="QCheckBox" name="opt_show_layout_buttons">
          <property name="text">
-          <string>Show &amp;layout buttons in the status bar (needs restart)</string>
+          <string>Show &amp;layout buttons in the status bar</string>
          </property>
         </widget>
        </item>