Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 22:22:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Layout fixes

Browse source
This commit is contained in:
stojce 2014-03-23 13:20:24 +01:00
parent 61a59a54c4
commit 7c36c4a2b7
3 changed files with 78 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
interface/interface_en.ts
View file

@ -14,12 +14,12 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="src/Application.cpp" line="3577"/> <location filename="src/Application.cpp" line="3580"/>
<source>Open Script</source> <source>Open Script</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="src/Application.cpp" line="3578"/> <location filename="src/Application.cpp" line="3581"/>
<source>JavaScript Files (*.js)</source> <source>JavaScript Files (*.js)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -132,116 +132,116 @@
<context> <context>
<name>PreferencesDialog</name> <name>PreferencesDialog</name>
<message> <message>
<location filename="ui/preferencesDialog.ui" line="90"/> <location filename="ui/preferencesDialog.ui" line="93"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="609"/> <location filename="../build/interface/ui_preferencesDialog.h" line="619"/>
<source>Cancel</source> <source>Cancel</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="ui/preferencesDialog.ui" line="125"/> <location filename="ui/preferencesDialog.ui" line="128"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="610"/> <location filename="../build/interface/ui_preferencesDialog.h" line="620"/>
<source>Save all changes</source> <source>Save all changes</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="ui/preferencesDialog.ui" line="196"/> <location filename="ui/preferencesDialog.ui" line="199"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="611"/> <location filename="../build/interface/ui_preferencesDialog.h" line="621"/>
<source>Avatar</source> <source>Avatar</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="ui/preferencesDialog.ui" line="230"/> <location filename="ui/preferencesDialog.ui" line="233"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="612"/> <location filename="../build/interface/ui_preferencesDialog.h" line="622"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Avatar display name &lt;span style=&quot; color:#909090;&quot;&gt;(optional)&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Avatar display name &lt;span style=&quot; color:#909090;&quot;&gt;(optional)&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="ui/preferencesDialog.ui" line="266"/> <location filename="ui/preferencesDialog.ui" line="269"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="613"/> <location filename="../build/interface/ui_preferencesDialog.h" line="623"/>
<source>Not showing a name</source> <source>Not showing a name</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="ui/preferencesDialog.ui" line="294"/> <location filename="ui/preferencesDialog.ui" line="297"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="614"/> <location filename="../build/interface/ui_preferencesDialog.h" line="624"/>
<source>Head</source> <source>Head</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="ui/preferencesDialog.ui" line="395"/> <location filename="ui/preferencesDialog.ui" line="398"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="616"/> <location filename="../build/interface/ui_preferencesDialog.h" line="626"/>
<source>Body</source> <source>Body</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="ui/preferencesDialog.ui" line="506"/> <location filename="ui/preferencesDialog.ui" line="509"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="618"/> <location filename="../build/interface/ui_preferencesDialog.h" line="628"/>
<source>Advanced Tuning</source> <source>Advanced Tuning</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="ui/preferencesDialog.ui" line="534"/> <location filename="ui/preferencesDialog.ui" line="540"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="619"/> <location filename="../build/interface/ui_preferencesDialog.h" line="629"/>
<source>It&apos;s not recomended that you play with these settings unless you&apos;ve looked into exactly what they do.</source> <source>It&apos;s not recomended that you play with these settings unless you&apos;ve looked into exactly what they do.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="ui/preferencesDialog.ui" line="570"/> <location filename="ui/preferencesDialog.ui" line="576"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="620"/> <location filename="../build/interface/ui_preferencesDialog.h" line="630"/>
<source>&lt;p&gt;Avatar&lt;/p&gt;</source> <source>&lt;p&gt;Avatar&lt;/p&gt;</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="ui/preferencesDialog.ui" line="602"/> <location filename="ui/preferencesDialog.ui" line="608"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="621"/> <location filename="../build/interface/ui_preferencesDialog.h" line="631"/>
<source>Vertical field of view</source> <source>Vertical field of view</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="ui/preferencesDialog.ui" line="702"/> <location filename="ui/preferencesDialog.ui" line="711"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="622"/> <location filename="../build/interface/ui_preferencesDialog.h" line="632"/>
<source>Lean scale (applies to Faceshift users)</source> <source>Lean scale (applies to Faceshift users)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="ui/preferencesDialog.ui" line="784"/> <location filename="ui/preferencesDialog.ui" line="796"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="623"/> <location filename="../build/interface/ui_preferencesDialog.h" line="633"/>
<source>Avatar scale (default is 1.0)</source> <source>Avatar scale &lt;span style=&quot; color:#909090;&quot;&gt;(default is 1.0)&lt;/span&gt;</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="ui/preferencesDialog.ui" line="863"/> <location filename="ui/preferencesDialog.ui" line="878"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="624"/> <location filename="../build/interface/ui_preferencesDialog.h" line="634"/>
<source>Pupil dillation</source> <source>Pupil dillation</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="ui/preferencesDialog.ui" line="939"/> <location filename="ui/preferencesDialog.ui" line="957"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="625"/> <location filename="../build/interface/ui_preferencesDialog.h" line="635"/>
<source>Audio Jitter Buffer Samples (0 for automatic)</source> <source>Audio Jitter Buffer Samples (0 for automatic)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="ui/preferencesDialog.ui" line="1027"/> <location filename="ui/preferencesDialog.ui" line="1048"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="626"/> <location filename="../build/interface/ui_preferencesDialog.h" line="636"/>
<source>Faceshift eye detection</source> <source>Faceshift eye detection</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="ui/preferencesDialog.ui" line="1104"/> <location filename="ui/preferencesDialog.ui" line="1128"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="627"/> <location filename="../build/interface/ui_preferencesDialog.h" line="637"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Voxels&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Voxels&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="ui/preferencesDialog.ui" line="1136"/> <location filename="ui/preferencesDialog.ui" line="1160"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="628"/> <location filename="../build/interface/ui_preferencesDialog.h" line="638"/>
<source>Maximum voxels</source> <source>Maximum voxels</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="ui/preferencesDialog.ui" line="1212"/> <location filename="ui/preferencesDialog.ui" line="1239"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="629"/> <location filename="../build/interface/ui_preferencesDialog.h" line="639"/>
<source>Max voxels sent each second</source> <source>Max voxels sent each second</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

3
interface/src/ui/FramelessDialog.cpp
View file

@ -19,10 +19,7 @@ const int RESIZE_HANDLE_WIDTH = 7;
FramelessDialog::FramelessDialog(QWidget *parent, Qt::WindowFlags flags) : FramelessDialog::FramelessDialog(QWidget *parent, Qt::WindowFlags flags) :
QDialog(parent, flags | Qt::FramelessWindowHint), QDialog(parent, flags | Qt::FramelessWindowHint),
_isResizing(false) { _isResizing(false) {
setWindowOpacity(0.95);
setAttribute(Qt::WA_DeleteOnClose); setAttribute(Qt::WA_DeleteOnClose);
installEventFilter(this); installEventFilter(this);
} }

44
interface/ui/preferencesDialog.ui
View file

@ -9,8 +9,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>610</width> <width>638</width>
<height>499</height> <height>652</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -25,11 +25,14 @@
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="windowOpacity">
<double>0.950000000000000</double>
</property>
<widget class="QWidget" name="buttonsPanel" native="true"> <widget class="QWidget" name="buttonsPanel" native="true">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>400</y> <y>560</y>
<width>611</width> <width>611</width>
<height>97</height> <height>97</height>
</rect> </rect>
@ -135,7 +138,7 @@ color: #0e7077</string>
<x>0</x> <x>0</x>
<y>30</y> <y>30</y>
<width>615</width> <width>615</width>
<height>351</height> <height>491</height>
</rect> </rect>
</property> </property>
<property name="frameShape"> <property name="frameShape">
@ -527,8 +530,11 @@ padding: 0;</string>
<pointsize>16</pointsize> <pointsize>16</pointsize>
</font> </font>
</property> </property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">color: rgb(51, 51, 51)</string> <string notr="true">color: rgb(51, 51, 51);</string>
</property> </property>
<property name="text"> <property name="text">
<string>It's not recomended that you play with these settings unless you've looked into exactly what they do.</string> <string>It's not recomended that you play with these settings unless you've looked into exactly what they do.</string>
@ -596,11 +602,14 @@ padding: 0;</string>
</font> </font>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">color: rgb(51, 51, 51)</string> <string notr="true"/>
</property> </property>
<property name="text"> <property name="text">
<string>Vertical field of view</string> <string>Vertical field of view</string>
</property> </property>
<property name="indent">
<number>15</number>
</property>
<property name="buddy"> <property name="buddy">
<cstring>fieldOfViewSpin</cstring> <cstring>fieldOfViewSpin</cstring>
</property> </property>
@ -701,6 +710,9 @@ padding: 0;</string>
<property name="text"> <property name="text">
<string>Lean scale (applies to Faceshift users)</string> <string>Lean scale (applies to Faceshift users)</string>
</property> </property>
<property name="indent">
<number>15</number>
</property>
<property name="buddy"> <property name="buddy">
<cstring>leanScaleSpin</cstring> <cstring>leanScaleSpin</cstring>
</property> </property>
@ -781,7 +793,10 @@ padding: 0;</string>
<string notr="true">color: rgb(51, 51, 51)</string> <string notr="true">color: rgb(51, 51, 51)</string>
</property> </property>
<property name="text"> <property name="text">
<string>Avatar scale (default is 1.0)</string> <string>Avatar scale &lt;span style=&quot; color:#909090;&quot;&gt;(default is 1.0)&lt;/span&gt;</string>
</property>
<property name="indent">
<number>15</number>
</property> </property>
<property name="buddy"> <property name="buddy">
<cstring>avatarScaleSpin</cstring> <cstring>avatarScaleSpin</cstring>
@ -862,6 +877,9 @@ padding: 0;</string>
<property name="text"> <property name="text">
<string>Pupil dillation</string> <string>Pupil dillation</string>
</property> </property>
<property name="indent">
<number>15</number>
</property>
<property name="buddy"> <property name="buddy">
<cstring>pupilDilationSlider</cstring> <cstring>pupilDilationSlider</cstring>
</property> </property>
@ -938,6 +956,9 @@ padding: 0;</string>
<property name="text"> <property name="text">
<string>Audio Jitter Buffer Samples (0 for automatic)</string> <string>Audio Jitter Buffer Samples (0 for automatic)</string>
</property> </property>
<property name="indent">
<number>15</number>
</property>
<property name="buddy"> <property name="buddy">
<cstring>audioJitterSpin</cstring> <cstring>audioJitterSpin</cstring>
</property> </property>
@ -1026,6 +1047,9 @@ padding: 0;</string>
<property name="text"> <property name="text">
<string>Faceshift eye detection</string> <string>Faceshift eye detection</string>
</property> </property>
<property name="indent">
<number>15</number>
</property>
<property name="buddy"> <property name="buddy">
<cstring>faceshiftEyeDeflectionSider</cstring> <cstring>faceshiftEyeDeflectionSider</cstring>
</property> </property>
@ -1135,6 +1159,9 @@ padding: 0;</string>
<property name="text"> <property name="text">
<string>Maximum voxels</string> <string>Maximum voxels</string>
</property> </property>
<property name="indent">
<number>15</number>
</property>
<property name="buddy"> <property name="buddy">
<cstring>maxVoxelsSpin</cstring> <cstring>maxVoxelsSpin</cstring>
</property> </property>
@ -1211,6 +1238,9 @@ padding: 0;</string>
<property name="text"> <property name="text">
<string>Max voxels sent each second</string> <string>Max voxels sent each second</string>
</property> </property>
<property name="indent">
<number>15</number>
</property>
<property name="buddy"> <property name="buddy">
<cstring>maxVoxelsPPSSpin</cstring> <cstring>maxVoxelsPPSSpin</cstring>
</property> </property>