diff --git a/src/Mod/Path/Gui/Resources/preferences/PathJob.ui b/src/Mod/Path/Gui/Resources/preferences/PathJob.ui index 15c9cfcb30..a97cc76815 100644 --- a/src/Mod/Path/Gui/Resources/preferences/PathJob.ui +++ b/src/Mod/Path/Gui/Resources/preferences/PathJob.ui @@ -142,8 +142,8 @@ 0 0 - 366 - 330 + 424 + 537 @@ -348,8 +348,8 @@ 0 0 - 319 - 528 + 424 + 537 @@ -653,16 +653,6 @@ - - - - <html><head/><body><p>Causes the toollibrary manager to remember last directory. This ONLY affects legacy tools. </p><p>This control is deprecated and will be removed in a future version</p></body></html> - - - Remember last library (legacy) - - - diff --git a/src/Mod/Path/PathScripts/PathPreferences.py b/src/Mod/Path/PathScripts/PathPreferences.py index ff07fc1cbb..caf86212cd 100644 --- a/src/Mod/Path/PathScripts/PathPreferences.py +++ b/src/Mod/Path/PathScripts/PathPreferences.py @@ -51,7 +51,7 @@ LastFileToolShape = "LastFileToolShape" UseLegacyTools = "UseLegacyTools" UseAbsoluteToolPaths = "UseAbsoluteToolPaths" -OpenLastLibrary = "OpenLastLibrary" +# OpenLastLibrary = "OpenLastLibrary" # Linear tolerance to use when generating Paths, eg when tessellating geometry GeometryTolerance = "GeometryTolerance" @@ -166,15 +166,15 @@ def toolsStoreAbsolutePaths(): return preferences().GetBool(UseAbsoluteToolPaths, False) -def toolsOpenLastLibrary(): - return preferences().GetBool(OpenLastLibrary, False) +# def toolsOpenLastLibrary(): +# return preferences().GetBool(OpenLastLibrary, False) -def setToolsSettings(legacy, relative, lastlibrary): +def setToolsSettings(legacy, relative): pref = preferences() pref.SetBool(UseLegacyTools, legacy) pref.SetBool(UseAbsoluteToolPaths, relative) - pref.SetBool(OpenLastLibrary, lastlibrary) + # pref.SetBool(OpenLastLibrary, lastlibrary) def defaultJobTemplate(): diff --git a/src/Mod/Path/PathScripts/PathPreferencesPathJob.py b/src/Mod/Path/PathScripts/PathPreferencesPathJob.py index e684415288..eba1549363 100644 --- a/src/Mod/Path/PathScripts/PathPreferencesPathJob.py +++ b/src/Mod/Path/PathScripts/PathPreferencesPathJob.py @@ -108,8 +108,7 @@ class JobPreferencesPage: def saveToolsSettings(self): PathPreferences.setToolsSettings(self.form.toolsUseLegacy.isChecked(), - self.form.toolsAbsolutePaths.isChecked(), - self.form.toolsOpenLastLibrary.isChecked()) + self.form.toolsAbsolutePaths.isChecked()) def selectComboEntry(self, widget, text): index = widget.findText(text, QtCore.Qt.MatchFixedString) diff --git a/src/Mod/Path/PathScripts/PathToolBitLibraryCmd.py b/src/Mod/Path/PathScripts/PathToolBitLibraryCmd.py index 6c3d82b834..f47bedf520 100644 --- a/src/Mod/Path/PathScripts/PathToolBitLibraryCmd.py +++ b/src/Mod/Path/PathScripts/PathToolBitLibraryCmd.py @@ -47,13 +47,7 @@ class CommandToolBitSelectorOpen: def Activated(self): import PathScripts.PathToolBitLibraryGui as PathToolBitLibraryGui dock = PathToolBitLibraryGui.ToolBitSelector() - - lastlib = PathPreferences.lastPathToolLibrary() - - if PathPreferences.toolsOpenLastLibrary(): - dock.open(lastlib) - else: - dock.open() + dock.open() class CommandToolBitLibraryOpen: @@ -76,13 +70,7 @@ class CommandToolBitLibraryOpen: def Activated(self): import PathScripts.PathToolBitLibraryGui as PathToolBitLibraryGui library = PathToolBitLibraryGui.ToolBitLibrary() - - lastlib = PathPreferences.lastPathToolLibrary() - - if PathPreferences.toolsOpenLastLibrary(): - library.open(lastlib) - else: - library.open() + library.open() # class CommandToolBitLibraryLoad: # '''