From 1e5055a86ba389cd7fb413461ad9f5231e85480e Mon Sep 17 00:00:00 2001
From: Roy-043 <info@b-k-g.nl>
Date: Mon, 18 Jul 2022 16:28:44 +0200
Subject: [PATCH] Draft: Remove unnecessary DisplayStatusbar preference

---
 .../ui/preferences-draftinterface.ui          | 12 --------
 .../Draft/draftutils/init_draft_statusbar.py  | 29 +++++--------------
 2 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/src/Mod/Draft/Resources/ui/preferences-draftinterface.ui b/src/Mod/Draft/Resources/ui/preferences-draftinterface.ui
index f10eea7957..d8f735206c 100644
--- a/src/Mod/Draft/Resources/ui/preferences-draftinterface.ui
+++ b/src/Mod/Draft/Resources/ui/preferences-draftinterface.ui
@@ -924,21 +924,9 @@
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="toolTip">
-      <string>Enable draft statusbar customization</string>
-     </property>
      <property name="title">
       <string>Draft Statusbar</string>
      </property>
-     <property name="checkable">
-      <bool>true</bool>
-     </property>
-     <property name="prefEntry" stdset="0">
-      <string notr="true">DisplayStatusbar</string>
-     </property>
-     <property name="prefPath" stdset="0">
-      <string notr="true">Mod/Draft</string>
-     </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
        <layout class="QGridLayout" name="gridLayout_4">
diff --git a/src/Mod/Draft/draftutils/init_draft_statusbar.py b/src/Mod/Draft/draftutils/init_draft_statusbar.py
index c2cc538918..c79be417b2 100644
--- a/src/Mod/Draft/draftutils/init_draft_statusbar.py
+++ b/src/Mod/Draft/draftutils/init_draft_statusbar.py
@@ -179,12 +179,7 @@ def init_draft_statusbar_scale():
     param = App.ParamGet("User parameter:BaseApp/Preferences/Mod/Draft")
 
     mw = Gui.getMainWindow()
-    if mw:
-        sb = mw.statusBar()
-        if sb is None:
-            return
-    else:
-        return
+    sb = mw.statusBar()
 
     scale_widget = QtGui.QToolBar()
     scale_widget.setObjectName("draft_status_scale_widget")
@@ -227,12 +222,7 @@ def init_draft_statusbar_snap():
     param = App.ParamGet("User parameter:BaseApp/Preferences/Mod/Draft")
 
     mw = Gui.getMainWindow()
-    if mw:
-        sb = mw.statusBar()
-        if sb is None:
-            return
-    else:
-        return
+    sb = mw.statusBar()
 
     # SNAP WIDGET - init ----------------------------------------------------
 
@@ -351,15 +341,11 @@ def show_draft_statusbar():
     shows draft statusbar if present or initializes it
     """
     params = App.ParamGet("User parameter:BaseApp/Preferences/Mod/Draft")
-    display_statusbar = params.GetBool("DisplayStatusbar", True)
-
-    if not display_statusbar:
-        return
 
     mw = Gui.getMainWindow()
-    if mw:
-        sb = mw.statusBar()
+    sb = mw.statusBar()
 
+    if params.GetBool("DisplayStatusbarScaleWidget", True):
         scale_widget = sb.findChild(QtGui.QToolBar,
                                     "draft_status_scale_widget")
         if scale_widget:
@@ -370,10 +356,11 @@ def show_draft_statusbar():
             if scale_widget:
                 sb.insertPermanentWidget(3, scale_widget)
                 scale_widget.show()
-            elif params.GetBool("DisplayStatusbarScaleWidget", True):
+            else:
                 t = QtCore.QTimer()
                 t.singleShot(500, init_draft_statusbar_scale)
 
+    if params.GetBool("DisplayStatusbarSnapWidget", True):
         snap_widget = sb.findChild(QtGui.QToolBar,"draft_snap_widget")
         if snap_widget:
             snap_widget.setOrientation(QtCore.Qt.Orientation.Horizontal)
@@ -384,7 +371,7 @@ def show_draft_statusbar():
                 sb.insertPermanentWidget(2, snap_widget)
                 snap_widget.setOrientation(QtCore.Qt.Orientation.Horizontal)
                 snap_widget.show()
-            elif params.GetBool("DisplayStatusbarSnapWidget", True):
+            else:
                 t = QtCore.QTimer()
                 t.singleShot(500, init_draft_statusbar_snap)
 
@@ -394,8 +381,6 @@ def hide_draft_statusbar():
     hides draft statusbar if present
     """
     mw = Gui.getMainWindow()
-    if not mw:
-        return
     sb = mw.statusBar()
 
     # hide scale widget