X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fglobalsettings.cpp;h=ca649befad8f318dab49f90e2ef73ad766756625;hb=e23d7aa0d9980c3c269cbddb4cfbb32350d7425c;hp=1c23e04c39a85929ed17de14d4e23878caeaca58;hpb=0466001be51e779b23aaebec1cc9361305c07be9;p=pulseview.git

diff --git a/pv/globalsettings.cpp b/pv/globalsettings.cpp
index 1c23e04c..ca649bef 100644
--- a/pv/globalsettings.cpp
+++ b/pv/globalsettings.cpp
@@ -17,8 +17,9 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "globalsettings.hpp"
-#include "application.hpp"
+#include <boost/archive/text_iarchive.hpp>
+#include <boost/archive/text_oarchive.hpp>
+#include <boost/serialization/serialization.hpp>
 
 #include <QApplication>
 #include <QColor>
@@ -30,9 +31,13 @@
 #include <QStyle>
 #include <QtGlobal>
 
+#include "globalsettings.hpp"
+#include "application.hpp"
+
 using std::map;
 using std::pair;
 using std::string;
+using std::stringstream;
 using std::vector;
 
 namespace pv {
@@ -62,6 +67,9 @@ const QString GlobalSettings::Key_View_DefaultLogicHeight = "View_DefaultLogicHe
 const QString GlobalSettings::Key_View_ShowHoverMarker = "View_ShowHoverMarker";
 const QString GlobalSettings::Key_View_SnapDistance = "View_SnapDistance";
 const QString GlobalSettings::Key_View_CursorFillColor = "View_CursorFillColor";
+const QString GlobalSettings::Key_View_CursorShowFrequency = "View_CursorShowFrequency";
+const QString GlobalSettings::Key_View_CursorShowInterval = "View_CursorShowInterval";
+const QString GlobalSettings::Key_View_CursorShowSamples = "View_CursorShowSamples";
 const QString GlobalSettings::Key_Dec_InitialStateConfigurable = "Dec_InitialStateConfigurable";
 const QString GlobalSettings::Key_Dec_ExportFormat = "Dec_ExportFormat";
 const QString GlobalSettings::Key_Dec_AlwaysShowAllRows = "Dec_AlwaysShowAllRows";
@@ -94,10 +102,11 @@ void GlobalSettings::set_defaults_where_needed()
 {
 	if (!contains(Key_General_Language)) {
 		// Determine and set default UI language
-		QString language = QLocale().uiLanguages().first();  // May return e.g. en-Latn-US
+		QString language = QLocale().uiLanguages().first();  // May return e.g. en-Latn-US  // clazy:exclude=detaching-temporary
 		language = language.split("-").first();
 
 		setValue(Key_General_Language, language);
+		apply_language();
 	}
 
 	// Use no theme by default
@@ -140,6 +149,12 @@ void GlobalSettings::set_defaults_where_needed()
 	if (!contains(Key_View_SnapDistance))
 		setValue(Key_View_SnapDistance, 15);
 
+	if (!contains(Key_View_CursorShowInterval))
+		setValue(Key_View_CursorShowInterval, true);
+
+	if (!contains(Key_View_CursorShowFrequency))
+		setValue(Key_View_CursorShowFrequency, true);
+
 	// %c was used for the row name in the past so we need to transition such users
 	if (!contains(Key_Dec_ExportFormat) ||
 		value(Key_Dec_ExportFormat).toString() == "%s %d: %c: %1")
@@ -361,4 +376,28 @@ Glib::VariantBase GlobalSettings::restore_variantbase(QSettings &settings)
 	return ret_val;
 }
 
+void GlobalSettings::store_timestamp(QSettings &settings, const char *name, const pv::util::Timestamp &ts)
+{
+	stringstream ss;
+	boost::archive::text_oarchive oa(ss);
+	oa << boost::serialization::make_nvp(name, ts);
+	settings.setValue(name, QString::fromStdString(ss.str()));
+}
+
+pv::util::Timestamp GlobalSettings::restore_timestamp(QSettings &settings, const char *name)
+{
+	util::Timestamp result;
+	stringstream ss;
+	ss << settings.value(name).toString().toStdString();
+
+	try {
+		boost::archive::text_iarchive ia(ss);
+		ia >> boost::serialization::make_nvp(name, result);
+	} catch (boost::archive::archive_exception&) {
+		qDebug() << "Could not restore setting" << name;
+	}
+
+	return result;
+}
+
 } // namespace pv