X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fglobalsettings.cpp;h=c9a757c9ebb238b3b8a7d1ff4cc4d6487fb56fa6;hb=ffc00fdd5946593ad2a587078fd4ee9ba0a507ec;hp=6b13df16e397fc44ab6dd2473b92bba1f316c58f;hpb=d3feec232211b3acec6a323ca3b8008ed8b2faa0;p=pulseview.git

diff --git a/pv/globalsettings.cpp b/pv/globalsettings.cpp
index 6b13df1..c9a757c 100644
--- a/pv/globalsettings.cpp
+++ b/pv/globalsettings.cpp
@@ -19,7 +19,9 @@
 
 #include "globalsettings.hpp"
 
+#include <QApplication>
 #include <QByteArray>
+#include <QFontMetrics>
 #include <QString>
 
 using std::function;
@@ -30,10 +32,14 @@ namespace pv {
 
 const QString GlobalSettings::Key_View_ZoomToFitDuringAcq = "View_ZoomToFitDuringAcq";
 const QString GlobalSettings::Key_View_ZoomToFitAfterAcq = "View_ZoomToFitAfterAcq";
+const QString GlobalSettings::Key_View_TriggerIsZeroTime = "View_TriggerIsZeroTime";
 const QString GlobalSettings::Key_View_ColouredBG = "View_ColouredBG";
 const QString GlobalSettings::Key_View_StickyScrolling = "View_StickyScrolling";
 const QString GlobalSettings::Key_View_ShowSamplingPoints = "View_ShowSamplingPoints";
 const QString GlobalSettings::Key_View_ShowAnalogMinorGrid = "View_ShowAnalogMinorGrid";
+const QString GlobalSettings::Key_View_ConversionThresholdDispMode = "View_ConversionThresholdDispMode";
+const QString GlobalSettings::Key_View_DefaultDivHeight = "View_DefaultDivHeight";
+const QString GlobalSettings::Key_View_DefaultLogicHeight = "View_DefaultLogicHeight";
 const QString GlobalSettings::Key_Dec_InitialStateConfigurable = "Dec_InitialStateConfigurable";
 
 multimap< QString, function<void(QVariant)> > GlobalSettings::callbacks_;
@@ -59,6 +65,14 @@ void GlobalSettings::set_defaults_where_needed()
 	// Enable showing sampling points by default
 	if (!contains(Key_View_ShowSamplingPoints))
 		setValue(Key_View_ShowSamplingPoints, true);
+
+	if (!contains(Key_View_DefaultDivHeight))
+		setValue(Key_View_DefaultDivHeight,
+		3 * QFontMetrics(QApplication::font()).height());
+
+	if (!contains(Key_View_DefaultLogicHeight))
+		setValue(Key_View_DefaultLogicHeight,
+		2 * QFontMetrics(QApplication::font()).height());
 }
 
 void GlobalSettings::register_change_handler(const QString key,