From a69c6f8e29347cad604ddf1ffa279410765f9d4d Mon Sep 17 00:00:00 2001 From: Mohammed Nafees Date: Thu, 19 Jun 2014 23:58:31 +0530 Subject: [PATCH 01/19] Change pt to px to solve the Windows font size issue --- interface/src/ui/ScriptsTableWidget.cpp | 2 +- interface/ui/runningScriptsWidget.ui | 26 ++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/interface/src/ui/ScriptsTableWidget.cpp b/interface/src/ui/ScriptsTableWidget.cpp index 95acca052c..7b4f9e6b1f 100644 --- a/interface/src/ui/ScriptsTableWidget.cpp +++ b/interface/src/ui/ScriptsTableWidget.cpp @@ -23,7 +23,7 @@ ScriptsTableWidget::ScriptsTableWidget(QWidget* parent) : setShowGrid(false); setSelectionMode(QAbstractItemView::NoSelection); setEditTriggers(QAbstractItemView::NoEditTriggers); - setStyleSheet("QTableWidget { background: transparent; color: #333333; } QToolTip { color: #000000; background: #f9f6e4; padding: 2px; }"); + setStyleSheet("QTableWidget { border: none; background: transparent; color: #333333; } QToolTip { color: #000000; background: #f9f6e4; padding: 2px; }"); setToolTipDuration(200); setWordWrap(true); setGeometry(0, 0, parent->width(), parent->height()); diff --git a/interface/ui/runningScriptsWidget.ui b/interface/ui/runningScriptsWidget.ui index 6cb23f4c89..d8d95cabc6 100644 --- a/interface/ui/runningScriptsWidget.ui +++ b/interface/ui/runningScriptsWidget.ui @@ -25,18 +25,18 @@ QWidget { 37 - 29 + 20 251 - 20 + 31 color: #0e7077; -font-size: 20pt; +font-size: 20px; background: transparent; - <html><head/><body><p><span style=" font-size:18pt;">Running Scripts</span></p></body></html> + <html><head/><body><p><span style=" font-size:18px;">Running Scripts</span></p></body></html> 0 @@ -56,7 +56,7 @@ background: transparent; color: #0e7077; -font: bold 14pt; +font: bold 14px; background: transparent; @@ -82,7 +82,7 @@ background: transparent; background: #0e7077; color: #fff; border-radius: 4px; -font: bold 14pt; +font: bold 14px; padding-top: 3px; @@ -105,7 +105,7 @@ padding-top: 3px; background: #0e7077; color: #fff; border-radius: 4px; -font: bold 14pt; +font: bold 14px; padding-top: 3px; @@ -123,7 +123,7 @@ padding-top: 3px; color: #0e7077; -font: bold 14pt; +font: bold 14px; <html><head/><body><p><span style=" font-weight:600;">Recently loaded</span></p></body></html> @@ -140,7 +140,7 @@ font: bold 14pt; color: #95a5a6; -font-size: 14pt; +font-size: 14px; (click a script to load and run it) @@ -184,7 +184,7 @@ font-size: 14pt; - font: 14pt; + font: 14px; There are no scripts currently running. @@ -204,7 +204,7 @@ font-size: 14pt; background: transparent; -font-size: 14pt; +font-size: 14px; @@ -218,7 +218,7 @@ font-size: 14pt; background: transparent; -font-size: 14pt; +font-size: 14px; @@ -237,7 +237,7 @@ font-size: 14pt; background: #0e7077; color: #fff; border-radius: 4px; -font: bold 14pt; +font: bold 14px; padding-top: 3px; From ad41f2da9a631e4e2f362dfba4dc74916b86a89e Mon Sep 17 00:00:00 2001 From: Mohammed Nafees Date: Sat, 21 Jun 2014 16:27:13 +0530 Subject: [PATCH 02/19] Make changes to other UI forms as well --- interface/ui/preferencesDialog.ui | 2 +- interface/ui/shareSnapshot.ui | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/ui/preferencesDialog.ui b/interface/ui/preferencesDialog.ui index f00d7c4788..df33d09939 100644 --- a/interface/ui/preferencesDialog.ui +++ b/interface/ui/preferencesDialog.ui @@ -660,7 +660,7 @@ color: #0e7077 background: #0e7077; color: #fff; border-radius: 4px; -font: bold 14pt; +font: bold 14px; padding: 10px;margin-top:10px diff --git a/interface/ui/shareSnapshot.ui b/interface/ui/shareSnapshot.ui index df7fc4939f..19e0772f13 100644 --- a/interface/ui/shareSnapshot.ui +++ b/interface/ui/shareSnapshot.ui @@ -277,7 +277,7 @@ padding-left:20px; <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Helvetica'; font-size:14pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Helvetica'; font-size:14px; font-weight:400; font-style:normal;"> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> From 7271f850413d56be65bbac7478181c82c3241a00 Mon Sep 17 00:00:00 2001 From: Mohammed Nafees Date: Wed, 25 Jun 2014 01:49:17 +0530 Subject: [PATCH 03/19] Change font size values from pt to px in Chat Window. --- interface/src/ui/ChatWindow.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/ui/ChatWindow.cpp b/interface/src/ui/ChatWindow.cpp index fde77334f4..d42c40ac76 100644 --- a/interface/src/ui/ChatWindow.cpp +++ b/interface/src/ui/ChatWindow.cpp @@ -178,7 +178,7 @@ void ChatWindow::addTimeStamp() { QLabel* timeLabel = new QLabel(timeString); timeLabel->setStyleSheet("color: #333333;" "background-color: white;" - "font-size: 14pt;" + "font-size: 14px;" "padding: 4px;"); timeLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); timeLabel->setAlignment(Qt::AlignLeft); @@ -284,7 +284,7 @@ void ChatWindow::participantsChanged() { "padding-bottom: 2px;" "padding-left: 2px;" "border: 1px solid palette(shadow);" - "font-size: 14pt;" + "font-size: 14px;" "font-weight: bold"); userLabel->setProperty("user", participantName); userLabel->setCursor(Qt::PointingHandCursor); @@ -320,7 +320,7 @@ void ChatWindow::messageReceived(const QXmppMessage& message) { "padding-right: 20px;" "margin: 0px;" "color: #333333;" - "font-size: 14pt;" + "font-size: 14px;" "background-color: rgba(0, 0, 0, 0%);" "border: 0; }" "QMenu{ border: 2px outset gray; }"); From 5f4baaffa500a65f6c68e15f291f50839803ced8 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 24 Jun 2014 16:25:41 -0700 Subject: [PATCH 04/19] revert credit balance rounding --- interface/src/Application.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index d7e3b7453d..75c3f442ca 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3189,7 +3189,7 @@ void Application::updateWindowTitle(){ float creditBalance = accountManager.getAccountInfo().getBalance() / SATOSHIS_PER_CREDIT; QString creditBalanceString; - creditBalanceString.sprintf("%.8f", floor(creditBalance + 0.5)); + creditBalanceString.sprintf("%.8f", creditBalance); title += " - ₵" + creditBalanceString; } From 3da18ec1c0289d64fd52a0e6cb0358391d201435 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 24 Jun 2014 17:23:09 -0700 Subject: [PATCH 05/19] try to disable model tests --- tests/octree/src/ModelTests.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/octree/src/ModelTests.cpp b/tests/octree/src/ModelTests.cpp index 92b0b87cd8..63653dac69 100644 --- a/tests/octree/src/ModelTests.cpp +++ b/tests/octree/src/ModelTests.cpp @@ -14,6 +14,7 @@ #include +#if 0 #include #include #include @@ -21,11 +22,12 @@ #include #include #include +#endif #include "ModelTests.h" - void ModelTests::modelTreeTests(bool verbose) { +#if 0 int testsTaken = 0; int testsPassed = 0; int testsFailed = 0; @@ -256,6 +258,7 @@ void ModelTests::modelTreeTests(bool verbose) { if (verbose) { qDebug() << "******************************************************************************************"; } +#endif } From bc5f563f5c55423920ca9204237750363a4ca05a Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 24 Jun 2014 17:25:45 -0700 Subject: [PATCH 06/19] and change ring buffer size --- libraries/audio/src/AudioRingBuffer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/audio/src/AudioRingBuffer.h b/libraries/audio/src/AudioRingBuffer.h index 33fb0d238a..1ddcadeceb 100644 --- a/libraries/audio/src/AudioRingBuffer.h +++ b/libraries/audio/src/AudioRingBuffer.h @@ -31,7 +31,7 @@ const int NETWORK_BUFFER_LENGTH_SAMPLES_PER_CHANNEL = NETWORK_BUFFER_LENGTH_BYTE const unsigned int BUFFER_SEND_INTERVAL_USECS = floorf((NETWORK_BUFFER_LENGTH_SAMPLES_PER_CHANNEL / (float) SAMPLE_RATE) * 1000 * 1000); -const short RING_BUFFER_LENGTH_FRAMES = 100; +const short RING_BUFFER_LENGTH_FRAMES = 10; const int MAX_SAMPLE_VALUE = std::numeric_limits::max(); const int MIN_SAMPLE_VALUE = std::numeric_limits::min(); From 773e1b052279dec71344254b0ce7e91dcf945789 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 24 Jun 2014 18:02:35 -0700 Subject: [PATCH 07/19] try to get tests to build --- tests/octree/CMakeLists.txt | 8 ++++---- tests/octree/src/ModelTests.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/octree/CMakeLists.txt b/tests/octree/CMakeLists.txt index 1697064ff4..33c3bcd4a3 100644 --- a/tests/octree/CMakeLists.txt +++ b/tests/octree/CMakeLists.txt @@ -30,12 +30,12 @@ include_glm(${TARGET_NAME} ${ROOT_DIR}) # link in the shared libraries include(${MACRO_DIR}/LinkHifiLibrary.cmake) -link_hifi_library(animation ${TARGET_NAME} ${ROOT_DIR}) -link_hifi_library(audio ${TARGET_NAME} ${ROOT_DIR}) -link_hifi_library(fbx ${TARGET_NAME} ${ROOT_DIR}) -link_hifi_library(networking ${TARGET_NAME} ${ROOT_DIR}) link_hifi_library(models ${TARGET_NAME} ${ROOT_DIR}) link_hifi_library(octree ${TARGET_NAME} ${ROOT_DIR}) +link_hifi_library(audio ${TARGET_NAME} ${ROOT_DIR}) +link_hifi_library(networking ${TARGET_NAME} ${ROOT_DIR}) +link_hifi_library(animation ${TARGET_NAME} ${ROOT_DIR}) +link_hifi_library(fbx ${TARGET_NAME} ${ROOT_DIR}) link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR}) IF (WIN32) diff --git a/tests/octree/src/ModelTests.cpp b/tests/octree/src/ModelTests.cpp index 63653dac69..48be5e22c3 100644 --- a/tests/octree/src/ModelTests.cpp +++ b/tests/octree/src/ModelTests.cpp @@ -14,7 +14,7 @@ #include -#if 0 +#if 1 #include #include #include @@ -27,7 +27,7 @@ #include "ModelTests.h" void ModelTests::modelTreeTests(bool verbose) { -#if 0 +#if 1 int testsTaken = 0; int testsPassed = 0; int testsFailed = 0; From 40a842d25180c0664c8fec8d6c3ea865e7748e48 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 24 Jun 2014 18:15:00 -0700 Subject: [PATCH 08/19] windows build issue --- libraries/models/src/ModelItem.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/models/src/ModelItem.h b/libraries/models/src/ModelItem.h index 9a558f2ef4..2440596278 100644 --- a/libraries/models/src/ModelItem.h +++ b/libraries/models/src/ModelItem.h @@ -12,9 +12,11 @@ #ifndef hifi_ModelItem_h #define hifi_ModelItem_h -#include +#include #include +#include + #include #include From fdb0cf9386a4ce69e03617f5e688e5158603d7d6 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 24 Jun 2014 18:53:20 -0700 Subject: [PATCH 09/19] change order of headers --- tests/octree/src/ModelTests.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/octree/src/ModelTests.cpp b/tests/octree/src/ModelTests.cpp index 48be5e22c3..e12865f807 100644 --- a/tests/octree/src/ModelTests.cpp +++ b/tests/octree/src/ModelTests.cpp @@ -15,10 +15,10 @@ #include #if 1 +#include #include #include #include -#include #include #include #include From 3ad07f4b911fc74dfe8957e81d17b6aa8a8093ac Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 24 Jun 2014 19:08:16 -0700 Subject: [PATCH 10/19] argggg --- libraries/models/src/ModelItem.h | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/models/src/ModelItem.h b/libraries/models/src/ModelItem.h index 2440596278..44f4285051 100644 --- a/libraries/models/src/ModelItem.h +++ b/libraries/models/src/ModelItem.h @@ -13,6 +13,7 @@ #define hifi_ModelItem_h #include +#include // for ssize_t #include #include From 7d759fc00cc1ca0b8f9756d267ac94f8cec4086f Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 24 Jun 2014 19:11:32 -0700 Subject: [PATCH 11/19] argggg --- libraries/models/src/ModelItem.h | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/models/src/ModelItem.h b/libraries/models/src/ModelItem.h index 44f4285051..617eae9ef5 100644 --- a/libraries/models/src/ModelItem.h +++ b/libraries/models/src/ModelItem.h @@ -25,6 +25,7 @@ #include #include #include +#include class ModelItem; class ModelEditPacketSender; From e5349024e6097dd1bac574e6322338e2e4fe053a Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 24 Jun 2014 19:15:48 -0700 Subject: [PATCH 12/19] argggg ssize_t --- libraries/models/src/ModelItem.h | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/models/src/ModelItem.h b/libraries/models/src/ModelItem.h index 617eae9ef5..eba8ca7ddf 100644 --- a/libraries/models/src/ModelItem.h +++ b/libraries/models/src/ModelItem.h @@ -12,6 +12,7 @@ #ifndef hifi_ModelItem_h #define hifi_ModelItem_h +#include // ??? #include #include // for ssize_t #include From 71afc3f4d4721c668edd2eb06772ec48b97d8658 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 24 Jun 2014 19:26:24 -0700 Subject: [PATCH 13/19] argggg ssize_t --- libraries/models/src/ModelItem.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libraries/models/src/ModelItem.h b/libraries/models/src/ModelItem.h index eba8ca7ddf..218a9685b8 100644 --- a/libraries/models/src/ModelItem.h +++ b/libraries/models/src/ModelItem.h @@ -28,6 +28,13 @@ #include #include + +//#include +//#include +#include +#include +#include "ModelEditPacketSender.h" + class ModelItem; class ModelEditPacketSender; class ModelItemProperties; From 5486cd401911bf7347fa2b4d916efee95d8789af Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 24 Jun 2014 19:29:26 -0700 Subject: [PATCH 14/19] argggg ssize_t --- libraries/models/src/ModelItem.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/models/src/ModelItem.h b/libraries/models/src/ModelItem.h index 218a9685b8..5c2db93112 100644 --- a/libraries/models/src/ModelItem.h +++ b/libraries/models/src/ModelItem.h @@ -33,7 +33,7 @@ //#include #include #include -#include "ModelEditPacketSender.h" +//#include "ModelEditPacketSender.h" class ModelItem; class ModelEditPacketSender; From d967c100c429cba96e8d436dc4333f1121c94845 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 24 Jun 2014 19:57:52 -0700 Subject: [PATCH 15/19] argggg ssize_t from types.h --- libraries/models/src/ModelItem.h | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/models/src/ModelItem.h b/libraries/models/src/ModelItem.h index 5c2db93112..16442e8d9d 100644 --- a/libraries/models/src/ModelItem.h +++ b/libraries/models/src/ModelItem.h @@ -16,6 +16,7 @@ #include #include // for ssize_t #include +#include #include From 1eb5b3dda189bdf1abe862b9c2e11d0b465866a3 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 24 Jun 2014 19:58:59 -0700 Subject: [PATCH 16/19] argggg ssize_t from stdlib.h --- libraries/models/src/ModelItem.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/models/src/ModelItem.h b/libraries/models/src/ModelItem.h index 16442e8d9d..db830eabf4 100644 --- a/libraries/models/src/ModelItem.h +++ b/libraries/models/src/ModelItem.h @@ -16,7 +16,7 @@ #include #include // for ssize_t #include -#include +#include #include From 1001ea5f87750b77f963923d817ff9769231692a Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 24 Jun 2014 20:07:47 -0700 Subject: [PATCH 17/19] fixed some windows warnings --- tests/physics/src/ShapeColliderTests.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/physics/src/ShapeColliderTests.cpp b/tests/physics/src/ShapeColliderTests.cpp index 4d3c90b905..bde29ea588 100644 --- a/tests/physics/src/ShapeColliderTests.cpp +++ b/tests/physics/src/ShapeColliderTests.cpp @@ -1183,7 +1183,7 @@ void ShapeColliderTests::rayMissesCapsule() { void ShapeColliderTests::rayHitsPlane() { // make a simple plane - float planeDistanceFromOrigin = 3.579; + float planeDistanceFromOrigin = 3.579f; glm::vec3 planePosition(0.0f, planeDistanceFromOrigin, 0.0f); PlaneShape plane; plane.setTranslation(planePosition); @@ -1228,7 +1228,7 @@ void ShapeColliderTests::rayHitsPlane() { void ShapeColliderTests::rayMissesPlane() { // make a simple plane - float planeDistanceFromOrigin = 3.579; + float planeDistanceFromOrigin = 3.579f; glm::vec3 planePosition(0.0f, planeDistanceFromOrigin, 0.0f); PlaneShape plane; plane.setTranslation(planePosition); From fd3916e6626fcbe11830f33add58ef46e269e164 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 24 Jun 2014 20:10:06 -0700 Subject: [PATCH 18/19] another hack attempt to fix unit tests on windows --- libraries/models/src/ModelItem.h | 11 ----------- tests/octree/src/ModelTests.cpp | 11 +++++++---- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/libraries/models/src/ModelItem.h b/libraries/models/src/ModelItem.h index db830eabf4..cd191846d5 100644 --- a/libraries/models/src/ModelItem.h +++ b/libraries/models/src/ModelItem.h @@ -12,11 +12,7 @@ #ifndef hifi_ModelItem_h #define hifi_ModelItem_h -#include // ??? -#include -#include // for ssize_t #include -#include #include @@ -27,15 +23,8 @@ #include #include #include -#include -//#include -//#include -#include -#include -//#include "ModelEditPacketSender.h" - class ModelItem; class ModelEditPacketSender; class ModelItemProperties; diff --git a/tests/octree/src/ModelTests.cpp b/tests/octree/src/ModelTests.cpp index e12865f807..b2c0923ef4 100644 --- a/tests/octree/src/ModelTests.cpp +++ b/tests/octree/src/ModelTests.cpp @@ -14,7 +14,13 @@ #include -#if 1 +#ifdef WIN32 +#ifndef ssize_t +#define ssize_t int +#endif +#endif + + #include #include #include @@ -22,12 +28,10 @@ #include #include #include -#endif #include "ModelTests.h" void ModelTests::modelTreeTests(bool verbose) { -#if 1 int testsTaken = 0; int testsPassed = 0; int testsFailed = 0; @@ -258,7 +262,6 @@ void ModelTests::modelTreeTests(bool verbose) { if (verbose) { qDebug() << "******************************************************************************************"; } -#endif } From a7f2d150a49b17fec6f93bd9fa61f778db267a69 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 24 Jun 2014 20:15:34 -0700 Subject: [PATCH 19/19] what's this cmake defines ssize_t??? --- tests/octree/CMakeLists.txt | 5 +++++ tests/octree/src/ModelTests.cpp | 7 ------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/tests/octree/CMakeLists.txt b/tests/octree/CMakeLists.txt index 33c3bcd4a3..9c5e031d74 100644 --- a/tests/octree/CMakeLists.txt +++ b/tests/octree/CMakeLists.txt @@ -39,6 +39,11 @@ link_hifi_library(fbx ${TARGET_NAME} ${ROOT_DIR}) link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR}) IF (WIN32) + # add a definition for ssize_t so that windows doesn't bail + add_definitions(-Dssize_t=long) + #target_link_libraries(${TARGET_NAME} Winmm Ws2_32) + target_link_libraries(${TARGET_NAME} wsock32.lib) ENDIF(WIN32) + diff --git a/tests/octree/src/ModelTests.cpp b/tests/octree/src/ModelTests.cpp index b2c0923ef4..2cca4b43f6 100644 --- a/tests/octree/src/ModelTests.cpp +++ b/tests/octree/src/ModelTests.cpp @@ -14,13 +14,6 @@ #include -#ifdef WIN32 -#ifndef ssize_t -#define ssize_t int -#endif -#endif - - #include #include #include