Merge pull request metabrainz#288 from zas/debug_mode

Allow user to toggle debug mode from log dialog at runtime
cartr · Apr 15, 2014 · e48ef80 · e48ef80
2 parents 7d0ccd0 + 95d3648
commit e48ef80
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/picard/tagger.py b/picard/tagger.py
@@ -100,6 +100,7 @@ def __init__(self, args, localedir, autoupdate, debug=False):
 
         self._args = args
         self._autoupdate = autoupdate
+        self._debug = False
 
         # FIXME: Figure out what's wrong with QThreadPool.globalInstance().
         # It's a valid reference, but its start() method doesn't work.
@@ -134,8 +135,7 @@ def __init__(self, args, localedir, autoupdate, debug=False):
             signal.signal(signal.SIGTERM, self.signal)
 
         # Setup logging
-        if debug or "PICARD_DEBUG" in os.environ:
-            log.log_levels = log.log_levels | log.LOG_DEBUG
+        self.debug(debug or "PICARD_DEBUG" in os.environ)
         log.debug("Starting Picard %s from %r", picard.__version__, os.path.abspath(__file__))
         log.debug("Platform: %s %s %s", platform.platform(),
                   platform.python_implementation(), platform.python_version())
@@ -200,6 +200,17 @@ def __init__(self, args, localedir, autoupdate, debug=False):
         self.nats = None
         self.window = MainWindow()
 
+    def debug(self, debug):
+        if self._debug == debug:
+            return
+        if debug:
+            log.log_levels = log.log_levels | log.LOG_DEBUG
+            log.debug("Debug mode on")
+        else:
+            log.debug("Debug mode off")
+            log.log_levels = log.log_levels & ~log.LOG_DEBUG
+        self._debug = debug
+
     def move_files_to_album(self, files, albumid=None, album=None):
         """Move `files` to tracks on album `albumid`."""
         if album is None:

diff --git a/picard/ui/logview.py b/picard/ui/logview.py
@@ -35,8 +35,8 @@ def __init__(self, title, logger, w=740, h=340, parent=None):
         self.textCursor = QtGui.QTextCursor(self.doc)
         self.browser = QtGui.QTextBrowser(self)
         self.browser.setDocument(self.doc)
-        vbox = QtGui.QHBoxLayout(self)
-        vbox.addWidget(self.browser)
+        self.vbox = QtGui.QVBoxLayout(self)
+        self.vbox.addWidget(self.browser)
         self._display()
 
     def _setup_formats(self):
@@ -92,7 +92,13 @@ def __init__(self, parent=None):
         title = _("Log")
         logger = log.main_logger
         LogViewCommon.__init__(self, title, logger, parent=parent)
+        cb = QtGui.QCheckBox(_('Debug mode'), self)
+        cb.setChecked(QtCore.QObject.tagger._debug)
+        cb.stateChanged.connect(self.toggleDebug)
+        self.vbox.addWidget(cb)
 
+    def toggleDebug(self, state):
+        QtCore.QObject.tagger.debug(state == QtCore.Qt.Checked)
 
 class HistoryView(LogViewCommon):