X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fglobalsettings.cpp;h=614b983c40a45418fb6b986c367fd2fad2227ee9;hb=9a220973c4e4eaccdab85a5dc90d2ee893f8d247;hp=19ce0cd79104cce58878f1ee194fd4ac452f1736;hpb=8962d7b3b640b5f07f26a4b4ebee839c4880b69d;p=pulseview.git

diff --git a/pv/globalsettings.cpp b/pv/globalsettings.cpp
index 19ce0cd7..614b983c 100644
--- a/pv/globalsettings.cpp
+++ b/pv/globalsettings.cpp
@@ -18,6 +18,7 @@
  */
 
 #include "globalsettings.hpp"
+#include "application.hpp"
 
 #include <QApplication>
 #include <QColor>
@@ -42,6 +43,7 @@ const vector< pair<QString, QString> > Themes {
 	{"DarkStyle", ":/themes/darkstyle/darkstyle.qss"}
 };
 
+const QString GlobalSettings::Key_General_Language = "General_Language";
 const QString GlobalSettings::Key_General_Theme = "General_Theme";
 const QString GlobalSettings::Key_General_Style = "General_Style";
 const QString GlobalSettings::Key_General_SaveWithSetup = "General_SaveWithSetup";
@@ -60,20 +62,24 @@ 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";
 const QString GlobalSettings::Key_Log_BufferSize = "Log_BufferSize";
 const QString GlobalSettings::Key_Log_NotifyOfStacktrace = "Log_NotifyOfStacktrace";
 
 vector<GlobalSettingsInterface*> GlobalSettings::callbacks_;
 bool GlobalSettings::tracking_ = false;
+bool GlobalSettings::is_dark_theme_ = false;
 map<QString, QVariant> GlobalSettings::tracked_changes_;
 QString GlobalSettings::default_style_;
 QPalette GlobalSettings::default_palette_;
 
 GlobalSettings::GlobalSettings() :
-	QSettings(),
-	is_dark_theme_(false)
+	QSettings()
 {
 	beginGroup("Settings");
 }
@@ -89,6 +95,14 @@ void GlobalSettings::save_internal_defaults()
 
 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
+		language = language.split("-").first();
+
+		setValue(Key_General_Language, language);
+	}
+
 	// Use no theme by default
 	if (!contains(Key_General_Theme))
 		setValue(Key_General_Theme, 0);
@@ -129,8 +143,16 @@ void GlobalSettings::set_defaults_where_needed()
 	if (!contains(Key_View_SnapDistance))
 		setValue(Key_View_SnapDistance, 15);
 
-	if (!contains(Key_Dec_ExportFormat))
-		setValue(Key_Dec_ExportFormat, "%s %d: %c: %1");
+	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")
+		setValue(Key_Dec_ExportFormat, "%s %d: %r: %1");
 
 	// Default to 500 lines of backlog
 	if (!contains(Key_Log_BufferSize))
@@ -228,6 +250,12 @@ void GlobalSettings::apply_theme()
 	QPixmapCache::clear();
 }
 
+void GlobalSettings::apply_language()
+{
+	Application* a = qobject_cast<Application*>(QApplication::instance());
+	a->switch_language(value(Key_General_Language).toString());
+}
+
 void GlobalSettings::add_change_handler(GlobalSettingsInterface *cb)
 {
 	callbacks_.push_back(cb);