From 7c36c4a2b73f1c8b33d440d146eef51d840b3555 Mon Sep 17 00:00:00 2001 From: stojce Date: Sun, 23 Mar 2014 13:20:24 +0100 Subject: [PATCH] Layout fixes --- interface/interface_en.ts | 82 ++++++++++++++-------------- interface/src/ui/FramelessDialog.cpp | 3 - interface/ui/preferencesDialog.ui | 44 ++++++++++++--- 3 files changed, 78 insertions(+), 51 deletions(-) diff --git a/interface/interface_en.ts b/interface/interface_en.ts index 12d9e48589..7dc5a4c41d 100644 --- a/interface/interface_en.ts +++ b/interface/interface_en.ts @@ -14,12 +14,12 @@ - + Open Script - + JavaScript Files (*.js) @@ -132,116 +132,116 @@ PreferencesDialog - - + + Cancel - - + + Save all changes - - + + Avatar - - + + <html><head/><body><p>Avatar display name <span style=" color:#909090;">(optional)</span></p></body></html> - - + + Not showing a name - - + + Head - - + + Body - - + + Advanced Tuning - - + + It's not recomended that you play with these settings unless you've looked into exactly what they do. - - + + <p>Avatar</p> - - + + Vertical field of view - - + + Lean scale (applies to Faceshift users) - - - Avatar scale (default is 1.0) + + + Avatar scale <span style=" color:#909090;">(default is 1.0)</span> - - + + Pupil dillation - - + + Audio Jitter Buffer Samples (0 for automatic) - - + + Faceshift eye detection - - + + <html><head/><body><p>Voxels</p></body></html> - - + + Maximum voxels - - + + Max voxels sent each second diff --git a/interface/src/ui/FramelessDialog.cpp b/interface/src/ui/FramelessDialog.cpp index 1f67e9f4d1..2b9dd42ed7 100644 --- a/interface/src/ui/FramelessDialog.cpp +++ b/interface/src/ui/FramelessDialog.cpp @@ -19,10 +19,7 @@ const int RESIZE_HANDLE_WIDTH = 7; FramelessDialog::FramelessDialog(QWidget *parent, Qt::WindowFlags flags) : QDialog(parent, flags | Qt::FramelessWindowHint), _isResizing(false) { - - setWindowOpacity(0.95); setAttribute(Qt::WA_DeleteOnClose); - installEventFilter(this); } diff --git a/interface/ui/preferencesDialog.ui b/interface/ui/preferencesDialog.ui index 0f33e2a0b0..7692da2943 100644 --- a/interface/ui/preferencesDialog.ui +++ b/interface/ui/preferencesDialog.ui @@ -9,8 +9,8 @@ 0 0 - 610 - 499 + 638 + 652 @@ -25,11 +25,14 @@ 0 + + 0.950000000000000 + 0 - 400 + 560 611 97 @@ -135,7 +138,7 @@ color: #0e7077 0 30 615 - 351 + 491 @@ -527,8 +530,11 @@ padding: 0; 16 + + true + - color: rgb(51, 51, 51) + color: rgb(51, 51, 51); It's not recomended that you play with these settings unless you've looked into exactly what they do. @@ -596,11 +602,14 @@ padding: 0; - color: rgb(51, 51, 51) + Vertical field of view + + 15 + fieldOfViewSpin @@ -701,6 +710,9 @@ padding: 0; Lean scale (applies to Faceshift users) + + 15 + leanScaleSpin @@ -781,7 +793,10 @@ padding: 0; color: rgb(51, 51, 51) - Avatar scale (default is 1.0) + Avatar scale <span style=" color:#909090;">(default is 1.0)</span> + + + 15 avatarScaleSpin @@ -862,6 +877,9 @@ padding: 0; Pupil dillation + + 15 + pupilDilationSlider @@ -938,6 +956,9 @@ padding: 0; Audio Jitter Buffer Samples (0 for automatic) + + 15 + audioJitterSpin @@ -1026,6 +1047,9 @@ padding: 0; Faceshift eye detection + + 15 + faceshiftEyeDeflectionSider @@ -1135,6 +1159,9 @@ padding: 0; Maximum voxels + + 15 + maxVoxelsSpin @@ -1211,6 +1238,9 @@ padding: 0; Max voxels sent each second + + 15 + maxVoxelsPPSSpin