Merge branch 'master' of github.com:qurrent-llc/SavvyCAN

ui/mainsettingsdialog.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>965</width>
-    <height>678</height>
+    <height>713</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -191,9 +191,23 @@
         <item>
          <widget class="QGroupBox" name="groupBox_7">
           <property name="title">
-           <string>Font Size</string>
+           <string>Font</string>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_8">
+           <item>
+            <widget class="QCheckBox" name="cbFontFixedWidth">
+             <property name="text">
+              <string>Use fixed-width font in tables</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="label_11">
+             <property name="text">
+              <string>Size</string>
+             </property>
+            </widget>
+           </item>
            <item>
             <widget class="QSpinBox" name="spinFontSize">
              <property name="minimum">

ui/signalviewerwindow.ui

@@ -18,8 +18,11 @@
     <layout class="QVBoxLayout" name="verticalLayout_2">
      <item>
       <widget class="QTableWidget" name="tableViewer">
+       <property name="sortingEnabled">
+        <bool>true</bool>
+       </property>
        <property name="columnCount">
-        <number>2</number>
+        <number>3</number>
        </property>
        <attribute name="horizontalHeaderDefaultSectionSize">
         <number>300</number>
@@ -32,6 +35,7 @@
        </attribute>
        <column/>
        <column/>
+       <column/>
       </widget>
      </item>
      <item>
@@ -45,6 +49,16 @@
    </item>
    <item>
     <layout class="QVBoxLayout" name="verticalLayout">
+     <item>
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>Node</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="cbNodes"/>
+     </item>
      <item>
       <widget class="QLabel" name="label">
        <property name="text">