From 2b99f299c8fd9c1d3151e4d4f7e0b3f3de465758 Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Tue, 6 Jun 2017 17:54:52 -0400 Subject: [PATCH] testing --- interface/resources/qml/hifi/tester.sh | 5 +++++ interface/src/Application.cpp | 6 +++--- interface/src/InterfaceLogging.cpp | 2 +- interface/src/Menu.cpp | 2 +- libraries/networking/src/NetworkLogging.cpp | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 interface/resources/qml/hifi/tester.sh diff --git a/interface/resources/qml/hifi/tester.sh b/interface/resources/qml/hifi/tester.sh new file mode 100644 index 0000000000..8b55fd204e --- /dev/null +++ b/interface/resources/qml/hifi/tester.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +while sleep 5; do + cp ~/hifi/interface/resources/qml/hifi/Audio.qml ~/hifi/build/interface/Release/resources/qml/hifi/Audio.qml +done diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 3bd97a48a4..0a05d85da3 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2723,9 +2723,9 @@ void Application::keyPressEvent(QKeyEvent* event) { case Qt::Key_X: if (isShifted && isMeta) { auto offscreenUi = DependencyManager::get(); - offscreenUi->togglePinned(); - //offscreenUi->getRootContext()->engine()->clearComponentCache(); - //OffscreenUi::information("Debugging", "Component cache cleared"); + //offscreenUi->togglePinned(); + offscreenUi->getRootContext()->engine()->clearComponentCache(); + OffscreenUi::information("Debugging", "Component cache cleared"); // placeholder for dialogs being converted to QML. } break; diff --git a/interface/src/InterfaceLogging.cpp b/interface/src/InterfaceLogging.cpp index 49fb0bd640..74297cd0c4 100644 --- a/interface/src/InterfaceLogging.cpp +++ b/interface/src/InterfaceLogging.cpp @@ -11,6 +11,6 @@ #include "InterfaceLogging.h" -Q_LOGGING_CATEGORY(interfaceapp, "hifi.interface") +Q_LOGGING_CATEGORY(interfaceapp, "hifi.interface", QtFatalMsg) Q_LOGGING_CATEGORY(interfaceapp_timing, "hifi.interface.timing") Q_LOGGING_CATEGORY(interfaceapp_deadlock, "hifi.interface.deadlock") diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 9bf4c934ba..05b16bf872 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -287,7 +287,7 @@ Menu::Menu() { QString("../../hifi/tablet/TabletGeneralPreferences.qml"), "GeneralPreferencesDialog"); }); - action = addActionToQMenuAndActionHash(settingsMenu, "Audio..."); + action = addActionToQMenuAndActionHash(settingsMenu, "Audio...", Qt::CTRL | Qt::Key_Z); connect(action, &QAction::triggered, [] { static const QUrl widgetUrl("hifi/dialogs/Audio.qml"); static const QUrl tabletUrl("../../hifi/Audio.qml"); diff --git a/libraries/networking/src/NetworkLogging.cpp b/libraries/networking/src/NetworkLogging.cpp index 834398694d..b0b7146633 100644 --- a/libraries/networking/src/NetworkLogging.cpp +++ b/libraries/networking/src/NetworkLogging.cpp @@ -11,7 +11,7 @@ #include "NetworkLogging.h" -Q_LOGGING_CATEGORY(networking, "hifi.networking") +Q_LOGGING_CATEGORY(networking, "hifi.networking", QtFatalMsg) Q_LOGGING_CATEGORY(resourceLog, "hifi.networking.resource") Q_LOGGING_CATEGORY(asset_client, "hifi.networking.asset_client") Q_LOGGING_CATEGORY(messages_client, "hifi.networking.messages_client")