X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fglobalsettings.cpp;h=19ce0cd79104cce58878f1ee194fd4ac452f1736;hp=4b7936565625157ac4cfb420efe85c856bba46e8;hb=HEAD;hpb=c6b4e925a8c5d855a70ab2815e8bc1c371d5801a
diff --git a/pv/globalsettings.cpp b/pv/globalsettings.cpp
index 4b793656..ecca21d5 100644
--- a/pv/globalsettings.cpp
+++ b/pv/globalsettings.cpp
@@ -17,7 +17,9 @@
* along with this program; if not, see .
*/
-#include "globalsettings.hpp"
+#include
+#include
+#include
#include
#include
@@ -29,9 +31,13 @@
#include
#include
+#include "globalsettings.hpp"
+#include "application.hpp"
+
using std::map;
using std::pair;
using std::string;
+using std::stringstream;
using std::vector;
namespace pv {
@@ -42,14 +48,17 @@ const vector< pair > 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";
+const QString GlobalSettings::Key_General_StartAllSessions = "General_StartAllSessions";
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_ColoredBG = "View_ColoredBG";
const QString GlobalSettings::Key_View_StickyScrolling = "View_StickyScrolling";
+const QString GlobalSettings::Key_View_AllowVerticalDragging = "View_AllowVerticalDragging";
const QString GlobalSettings::Key_View_ShowSamplingPoints = "View_ShowSamplingPoints";
const QString GlobalSettings::Key_View_FillSignalHighAreas = "View_FillSignalHighAreas";
const QString GlobalSettings::Key_View_FillSignalHighAreaColor = "View_FillSignalHighAreaColor";
@@ -58,8 +67,12 @@ const QString GlobalSettings::Key_View_ConversionThresholdDispMode = "View_Conve
const QString GlobalSettings::Key_View_DefaultDivHeight = "View_DefaultDivHeight";
const QString GlobalSettings::Key_View_DefaultLogicHeight = "View_DefaultLogicHeight";
const QString GlobalSettings::Key_View_ShowHoverMarker = "View_ShowHoverMarker";
+const QString GlobalSettings::Key_View_KeepRulerItemSelected = "View_KeepRulerItemSelected";
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";
@@ -90,6 +103,15 @@ 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 // clazy:exclude=detaching-temporary
+ language = language.split("-").first();
+
+ setValue(Key_General_Language, language);
+ apply_language();
+ }
+
// Use no theme by default
if (!contains(Key_General_Theme))
setValue(Key_General_Theme, 0);
@@ -104,6 +126,10 @@ void GlobalSettings::set_defaults_where_needed()
if (!contains(Key_View_ZoomToFitAfterAcq))
setValue(Key_View_ZoomToFitAfterAcq, true);
+ // Allow vertical dragging by default
+ if (!contains(Key_View_AllowVerticalDragging))
+ setValue(Key_View_AllowVerticalDragging, true);
+
// Enable colored trace backgrounds by default
if (!contains(Key_View_ColoredBG))
setValue(Key_View_ColoredBG, true);
@@ -127,11 +153,22 @@ void GlobalSettings::set_defaults_where_needed()
if (!contains(Key_View_ShowHoverMarker))
setValue(Key_View_ShowHoverMarker, true);
+ if (!contains(Key_View_KeepRulerItemSelected))
+ setValue(Key_View_KeepRulerItemSelected, false);
+
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))
@@ -229,6 +266,12 @@ void GlobalSettings::apply_theme()
QPixmapCache::clear();
}
+void GlobalSettings::apply_language()
+{
+ Application* a = qobject_cast(QApplication::instance());
+ a->switch_language(value(Key_General_Language).toString());
+}
+
void GlobalSettings::add_change_handler(GlobalSettingsInterface *cb)
{
callbacks_.push_back(cb);
@@ -291,7 +334,11 @@ void GlobalSettings::store_gvariant(QSettings &settings, GVariant *v)
g_variant_get_size(v));
settings.setValue("value", var_data);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ settings.setValue("type", (const char *)var_type_str);
+#else
settings.setValue("type", var_type_str);
+#endif
g_free(var_type_str);
}
@@ -303,8 +350,11 @@ GVariant* GlobalSettings::restore_gvariant(QSettings &settings)
QByteArray data = settings.value("value").toByteArray();
- gpointer var_data = g_memdup((gconstpointer)data.constData(),
- (guint)data.size());
+#if GLIB_CHECK_VERSION(2, 67, 3) // See https://discourse.gnome.org/t/port-your-module-from-g-memdup-to-g-memdup2-now/5538
+ gpointer var_data = g_memdup2((gconstpointer)data.constData(), (gsize)data.size());
+#else
+ gpointer var_data = g_memdup((gconstpointer)data.constData(), (guint)data.size());
+#endif
GVariant *value = g_variant_new_from_data(var_type, var_data,
data.size(), false, g_free, var_data);
@@ -329,8 +379,11 @@ Glib::VariantBase GlobalSettings::restore_variantbase(QSettings &settings)
QByteArray data = settings.value("value").toByteArray();
- gpointer var_data = g_memdup((gconstpointer)data.constData(),
- (guint)data.size());
+#if GLIB_CHECK_VERSION(2, 67, 3) // See https://discourse.gnome.org/t/port-your-module-from-g-memdup-to-g-memdup2-now/5538
+ gpointer var_data = g_memdup2((gconstpointer)data.constData(), (gsize)data.size());
+#else
+ gpointer var_data = g_memdup((gconstpointer)data.constData(), (guint)data.size());
+#endif
GVariant *value = g_variant_new_from_data(var_type, var_data,
data.size(), false, g_free, var_data);
@@ -343,4 +396,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