Merge branch 'master' of github.com:collin80/SavvyCAN

This commit is contained in:
Collin Kidder
2022-10-04 19:59:46 -04:00
30 changed files with 676 additions and 138 deletions
+49 -2
View File
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>965</width>
<height>678</height>
<height>713</height>
</rect>
</property>
<property name="windowTitle">
@@ -80,6 +80,39 @@
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_6">
<property name="topMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_10">
<property name="text">
<string>Maximum Frames to Capture</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinMaximumFrames">
<property name="minimum">
<number>100000</number>
</property>
<property name="maximum">
<number>1000000000</number>
</property>
<property name="singleStep">
<number>100000</number>
</property>
<property name="value">
<number>10000000</number>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QGroupBox" name="groupBox_6">
<property name="title">
@@ -158,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">
+7
View File
@@ -227,6 +227,13 @@
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cbPersistentFilters">
<property name="text">
<string>Keep Filters When Clearing</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cbAutoScroll">
<property name="text">
+43 -1
View File
@@ -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">
@@ -85,6 +99,34 @@
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="btnSave">
<property name="text">
<string>Save View</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnLoad">
<property name="text">
<string>Load View</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnAppend">
<property name="text">
<string>Append to View</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnClear">
<property name="text">
<string>Clear View</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>