Ui updates

- Simplify Options and Preferences layouts
- Add Prompt on Linked File Change option (you will get visual clues
    even if this is turned off)
- Better handling of deleted / renamed linked files
- Handful of other small fixes

Author: macevhicz

preditor/gui/drag_tab_bar.py

@@ -394,7 +394,10 @@ def tab_menu(self, pos, popup=True):
                     act = menu.addAction('Explore File')
                     act.triggered.connect(partial(self.explore_file, workbox))
 
-                    act = menu.addAction('Re-link File')
+                    act = menu.addAction('Save As')
+                    act.triggered.connect(partial(self.save_and_link_file, workbox))
+
+                    act = menu.addAction('Relink File')
                     act.triggered.connect(partial(self.link_file, workbox))
 
                     act = menu.addAction('Unlink File')
@@ -421,10 +424,9 @@ def link_file(self, workbox):
             workbox (WorkboxMixin): The workbox contained in the clicked tab
         """
         filename = workbox.__filename__()
-        workbox.__set_file_monitoring_enabled__(False)
-        workbox.__set_filename__("")
         filename, _other = QFileDialog.getOpenFileName(directory=filename)
         if filename and Path(filename).is_file():
+            workbox.__set_file_monitoring_enabled__(False)
 
             # First, save any unsaved text
             workbox.__save_prefs__()

preditor/gui/group_tab_widget/grouped_tab_widget.py

@@ -109,7 +109,7 @@ def addTab(self, *args, **kwargs):  # noqa: N802
         self.update_closable_tabs()
         return ret
 
-    def close_tab(self, index):
+    def close_tab(self, index, ask=True):
         if self.count() == 1:
             msg = "You have to leave at least one tab open."
             QMessageBox.critical(
@@ -124,12 +124,16 @@ def close_tab(self, index):
             "/dev/null fund for wayward code?"
         )
 
-        ret = QMessageBox.question(
-            self,
-            'Donate to the cause?',
-            msg,
-            QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.Cancel,
-        )
+        if ask:
+            ret = QMessageBox.question(
+                self,
+                'Donate to the cause?',
+                msg,
+                QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.Cancel,
+            )
+        else:
+            ret = QMessageBox.StandardButton.Yes
+
         if ret == QMessageBox.StandardButton.Yes:
             editor = self.widget(index)
             editor.__set_file_monitoring_enabled__(False)

preditor/gui/loggerwindow.py

@@ -409,6 +409,22 @@ def setAutoSaveEnabled(self, state):
         """
         self.uiAutoSaveSettingsCHK.setChecked(state)
 
+    def promptOnLinkedChange(self):
+        """Whether or not Prompt On Linked Change option is set
+
+        Returns:
+            bool: Whether or not Prompt On Linked Change option is set
+        """
+        return self.uiPromptOnLinkedChangeCHK.isChecked()
+
+    def setPromptOnLinkedChange(self, state):
+        """Set Prompt On Linked Change option option to state
+
+        Args:
+            state (bool): State to set Prompt On Linked Change option
+        """
+        self.uiPromptOnLinkedChangeCHK.setChecked(state)
+
     def loadPlugins(self):
         """Load any plugins that modify the LoggerWindow."""
         self.plugins = {}
@@ -1212,7 +1228,9 @@ def linkedFileChanged(self, filename):
                     continue
                 if Path(editor.__filename__()) == Path(filename):
                     editor.__set_file_monitoring_enabled__(False)
+
                     choice = editor.__maybe_reload_file__()
+                    # Save a backup of any unsaved changes
                     if choice:
                         editor.__save_prefs__(saveLinkedFile=False, force=True)
 
@@ -1239,6 +1257,9 @@ def closeEvent(self, event):
     def closeLoggerByAction(self):
         if self.uiConfirmBeforeCloseCHK.isChecked():
             msg = "Are you sure you want to close PrEditor?"
+
+            state_str = "enabled" if self.autoSaveEnabled() else "disabled"
+            msg += f"\n\nAuto Save is {state_str}"
             ret = QMessageBox.question(
                 self,
                 'Confirm close',
@@ -1321,6 +1342,7 @@ def recordPrefs(self, manual=False, disableFileMonitoring=False):
                 'guiFont': self.font().toString(),
                 'consoleFont': self.console().font().toString(),
                 'autoSaveSettings': self.autoSaveEnabled(),
+                'promptOnLinkedChange': self.promptOnLinkedChange(),
                 'autoPrompt': self.uiAutoPromptCHK.isChecked(),
                 'errorHyperlinks': self.uiErrorHyperlinksCHK.isChecked(),
                 'uiStatusLbl_limit': self.uiStatusLBL.limit(),
@@ -1343,6 +1365,7 @@ def recordPrefs(self, manual=False, disableFileMonitoring=False):
                 'max_recent_workboxes': self.uiMaxNumRecentWorkboxesSPIN.value(),
                 'closedWorkboxData': self.getClosedWorkboxData(),
                 'confirmBeforeClose': self.uiConfirmBeforeCloseCHK.isChecked(),
+                'displayExtraTooltipInfo': self.uiExtraTooltipInfoCHK.isChecked(),
             }
         )
 
@@ -1574,6 +1597,7 @@ def restorePrefs(self, skip_geom=False):
         self.uiSpellCheckEnabledCHK.setChecked(pref.get('spellCheckEnabled', False))
         self.uiSpellCheckEnabledCHK.setDisabled(False)
         self.setAutoSaveEnabled(pref.get('autoSaveSettings', True))
+        self.setPromptOnLinkedChange(pref.get('promptOnLinkedChange', True))
         self.uiAutoPromptCHK.setChecked(pref.get('autoPrompt', False))
         self.uiErrorHyperlinksCHK.setChecked(pref.get('errorHyperlinks', True))
         self.uiStatusLBL.setLimit(pref.get('uiStatusLbl_limit', 5))
@@ -1646,7 +1670,9 @@ def restorePrefs(self, skip_geom=False):
 
         self.dont_ask_again = pref.get('dont_ask_again', [])
 
-        self.uiExtraTooltipInfoCHK.setChecked(pref.get("uiExtraTooltipInfoCHK", False))
+        self.uiExtraTooltipInfoCHK.setChecked(
+            pref.get("displayExtraTooltipInfo", False)
+        )
 
         # Allow any plugins to restore their own preferences
         for name, plugin in self.plugins.items():