Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-05 21:12:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge b8198f20c3 into b38237cb8d

Browse source
This commit is contained in:
HifiExperiments 2025-04-05 00:10:52 -07:00 committed by GitHub
commit 5a787f64b4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 37 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
interface/src/Application.cpp
View file

@ -1741,17 +1741,19 @@ void Application::idle() {
#endif
#ifdef Q_OS_WIN
// If tracing is enabled then monitor the CPU in a separate thread
static std::once_flag once;
std::call_once(once, [&] {
if (trace_app().isDebugEnabled()) {
QThread* cpuMonitorThread = new QThread(qApp);
cpuMonitorThread->setObjectName("cpuMonitorThread");
QObject::connect(cpuMonitorThread, &QThread::started, [this] { setupCpuMonitorThread(); });
QObject::connect(qApp, &QCoreApplication::aboutToQuit, cpuMonitorThread, &QThread::quit);
cpuMonitorThread->start();
}
});
{
// If tracing is enabled then monitor the CPU in a separate thread
static std::once_flag once;
std::call_once(once, [&] {
if (trace_app().isDebugEnabled()) {
QThread* cpuMonitorThread = new QThread(qApp);
cpuMonitorThread->setObjectName("cpuMonitorThread");
QObject::connect(cpuMonitorThread, &QThread::started, [this] { setupCpuMonitorThread(); });
QObject::connect(qApp, &QCoreApplication::aboutToQuit, cpuMonitorThread, &QThread::quit);
cpuMonitorThread->start();
}
});
}
#endif
auto displayPlugin = getActiveDisplayPlugin();
@ -1880,6 +1882,16 @@ void Application::idle() {
_overlayConductor.update(secondsSinceLastUpdate);
_gameLoopCounter.increment();
{
static std::once_flag once;
std::call_once(once, [] {
const QString& bookmarksError = DependencyManager::get<AvatarBookmarks>()->getBookmarkError();
if (!bookmarksError.isEmpty()) {
OffscreenUi::asyncWarning("Avatar Bookmarks Error", "JSON parse error: " + bookmarksError, QMessageBox::Ok, QMessageBox::Ok);
}
});
}
}
void Application::update(float deltaTime) {

15
interface/src/Bookmarks.cpp
View file

@ -4,6 +4,7 @@
//
// Created by David Rowe on 13 Jan 2015.
// Copyright 2015 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@ -24,10 +25,6 @@
#include "Menu.h"
#include "InterfaceLogging.h"
Bookmarks::Bookmarks() :
_isMenuSorted(false)
{
}
void Bookmarks::deleteBookmark() {
QStringList bookmarkList;
QList<QAction*> menuItems = _bookmarksMenu->actions();
@ -154,8 +151,14 @@ void Bookmarks::readFromFile() {
}
QByteArray data = loadFile.readAll();
QJsonDocument json(QJsonDocument::fromJson(data));
_bookmarks = json.object().toVariantMap();
QJsonParseError error;
QJsonDocument json = QJsonDocument::fromJson(data, &error);
if (json.isNull()) {
_bookmarkError = error.errorString();
} else {
_bookmarks = json.object().toVariantMap();
}
}
void Bookmarks::persistToFile() {

6
interface/src/Bookmarks.h
View file

@ -4,6 +4,7 @@
//
// Created by David Rowe on 13 Jan 2015.
// Copyright 2015 High Fidelity, Inc.
// Copyright 2024 Overte e.V.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@ -25,12 +26,14 @@ class Bookmarks: public QObject {
Q_OBJECT
public:
Bookmarks();
Bookmarks() : _isMenuSorted(false) {}
virtual void setupMenus(Menu* menubar, MenuWrapper* menu) = 0;
void insert(const QString& name, const QVariant& address); // Overwrites any existing entry with same name.
QString addressForBookmark(const QString& name) const;
const QString& getBookmarkError() const { return _bookmarkError; }
protected:
void deleteBookmark(const QString& bookmarkName);
@ -45,6 +48,7 @@ protected:
void remove(const QString& name);
QVariantMap _bookmarks; // { name: url, ... }
QString _bookmarkError;
QPointer<MenuWrapper> _bookmarksMenu;
QPointer<QAction> _deleteBookmarksAction;
QString _bookmarksFilename;