Show log messages in the GUI.

[sigrok-meter.git] / sigrok-meter

diff --git a/sigrok-meter b/sigrok-meter
index dc34745445d63f9efc7642726154f73d2d767b65..c991fad0e5fdf3dfddac710d0e557ead8b641a4b 100755 (executable)
--- a/sigrok-meter
+++ b/sigrok-meter
@@ -24,9 +24,9 @@ import argparse
 import sigrok.core as sr
 import sys
 import textwrap
+import signal
 
 default_drivers = [('demo:analog_channels=4', 'samplerate=4')]
-default_loglevel = 2
 
 def parse_cli():
     parser = argparse.ArgumentParser(
@@ -62,7 +62,7 @@ def parse_cli():
         help='Specify device configuration options')
     parser.add_argument('-l', '--loglevel',
         type=int,
-        default=default_loglevel,
+        default=None,
         help='Set loglevel (5 is most verbose)')
     parser.add_argument('--pyside',
         action='store_true',
@@ -87,6 +87,8 @@ def parse_cli():
     return args
 
 if __name__ == '__main__':
+    signal.signal(signal.SIGINT, signal.SIG_DFL)
+
     args = parse_cli()
 
     import qtcompat
@@ -95,14 +97,23 @@ if __name__ == '__main__':
     QtGui = qtcompat.QtGui
     import mainwindow
 
+    app = QtGui.QApplication([])
+
+    # Initialize modules that need a QApplication to exist.
+    import settings
+    settings.init()
+    import icons
+    icons.load_icons()
+
     context = sr.Context_create()
-    try:
-        loglevel = sr.LogLevel.get(args.loglevel)
-        context.log_level = loglevel
-    except:
-        sys.exit('Error: invalid log level.')
 
-    app = QtGui.QApplication([])
+    if args.loglevel != None:
+        try:
+            loglevel = sr.LogLevel.get(args.loglevel)
+            settings.logging.level.setValue(loglevel)
+        except:
+            sys.exit('Error: invalid log level.')
+
     s = mainwindow.MainWindow(context, args.drivers)
     s.show()