Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 13:28:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

layout improvements

Browse source
This commit is contained in:
stojce 2014-03-23 16:20:29 +01:00
parent 7c36c4a2b7
commit 32502d7b0d
4 changed files with 46 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
interface/interface_en.ts
View file

@ -133,115 +133,111 @@
<name>PreferencesDialog</name> <name>PreferencesDialog</name>
<message> <message>
<location filename="ui/preferencesDialog.ui" line="93"/> <location filename="ui/preferencesDialog.ui" line="93"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="619"/> <location filename="../build/interface/ui_preferencesDialog.h" line="626"/>
<source>Cancel</source> <source>Cancel</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="ui/preferencesDialog.ui" line="128"/> <location filename="ui/preferencesDialog.ui" line="128"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="620"/> <location filename="../build/interface/ui_preferencesDialog.h" line="627"/>
<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="199"/> <location filename="ui/preferencesDialog.ui" line="199"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="621"/> <location filename="ui/preferencesDialog.ui" line="583"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="628"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="637"/>
<source>Avatar</source> <source>Avatar</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="ui/preferencesDialog.ui" line="233"/> <location filename="ui/preferencesDialog.ui" line="233"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="622"/> <location filename="../build/interface/ui_preferencesDialog.h" line="629"/>
<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="269"/> <location filename="ui/preferencesDialog.ui" line="269"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="623"/> <location filename="../build/interface/ui_preferencesDialog.h" line="630"/>
<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="297"/> <location filename="ui/preferencesDialog.ui" line="297"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="624"/> <location filename="../build/interface/ui_preferencesDialog.h" line="631"/>
<source>Head</source> <source>Head</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="ui/preferencesDialog.ui" line="398"/> <location filename="ui/preferencesDialog.ui" line="398"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="626"/> <location filename="../build/interface/ui_preferencesDialog.h" line="633"/>
<source>Body</source> <source>Body</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="ui/preferencesDialog.ui" line="509"/> <location filename="ui/preferencesDialog.ui" line="509"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="628"/> <location filename="../build/interface/ui_preferencesDialog.h" line="635"/>
<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="540"/> <location filename="ui/preferencesDialog.ui" line="540"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="629"/> <location filename="../build/interface/ui_preferencesDialog.h" line="636"/>
<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="576"/> <location filename="ui/preferencesDialog.ui" line="615"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="630"/> <location filename="../build/interface/ui_preferencesDialog.h" line="638"/>
<source>&lt;p&gt;Avatar&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="608"/>
<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="711"/> <location filename="ui/preferencesDialog.ui" line="718"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="632"/> <location filename="../build/interface/ui_preferencesDialog.h" line="639"/>
<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="796"/> <location filename="ui/preferencesDialog.ui" line="803"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="633"/> <location filename="../build/interface/ui_preferencesDialog.h" line="640"/>
<source>Avatar scale &lt;span style=&quot; color:#909090;&quot;&gt;(default is 1.0)&lt;/span&gt;</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="878"/> <location filename="ui/preferencesDialog.ui" line="885"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="634"/> <location filename="../build/interface/ui_preferencesDialog.h" line="641"/>
<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="957"/> <location filename="ui/preferencesDialog.ui" line="964"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="635"/> <location filename="../build/interface/ui_preferencesDialog.h" line="642"/>
<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="1048"/> <location filename="ui/preferencesDialog.ui" line="1055"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="636"/> <location filename="../build/interface/ui_preferencesDialog.h" line="643"/>
<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="1128"/> <location filename="ui/preferencesDialog.ui" line="1135"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="637"/> <location filename="../build/interface/ui_preferencesDialog.h" line="644"/>
<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="1160"/> <location filename="ui/preferencesDialog.ui" line="1167"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="638"/> <location filename="../build/interface/ui_preferencesDialog.h" line="645"/>
<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="1239"/> <location filename="ui/preferencesDialog.ui" line="1246"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="639"/> <location filename="../build/interface/ui_preferencesDialog.h" line="646"/>
<source>Max voxels sent each second</source> <source>Max voxels sent each second</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

1
interface/src/Menu.h
View file

@ -75,6 +75,7 @@ public:
float getAudioJitterBufferSamples() const { return _audioJitterBufferSamples; } float getAudioJitterBufferSamples() const { return _audioJitterBufferSamples; }
void setAudioJitterBufferSamples(float audioJitterBufferSamples) { _audioJitterBufferSamples = audioJitterBufferSamples; } void setAudioJitterBufferSamples(float audioJitterBufferSamples) { _audioJitterBufferSamples = audioJitterBufferSamples; }
float getFieldOfView() const { return _fieldOfView; } float getFieldOfView() const { return _fieldOfView; }
void setFieldOfView(float fieldOfView) { _fieldOfView = fieldOfView; }
float getFaceshiftEyeDeflection() const { return _faceshiftEyeDeflection; } float getFaceshiftEyeDeflection() const { return _faceshiftEyeDeflection; }
void setFaceshiftEyeDeflection(float faceshiftEyeDeflection) { _faceshiftEyeDeflection = faceshiftEyeDeflection; } void setFaceshiftEyeDeflection(float faceshiftEyeDeflection) { _faceshiftEyeDeflection = faceshiftEyeDeflection; }
BandwidthDialog* getBandwidthDialog() const { return _bandwidthDialog; } BandwidthDialog* getBandwidthDialog() const { return _bandwidthDialog; }

4
interface/src/ui/PreferencesDialog.cpp
View file

@ -137,10 +137,14 @@ void PreferencesDialog::savePreferences() {
Application::getInstance()->resizeGL(Application::getInstance()->getGLWidget()->width(), Application::getInstance()->resizeGL(Application::getInstance()->getGLWidget()->width(),
Application::getInstance()->getGLWidget()->height()); Application::getInstance()->getGLWidget()->height());
Menu::getInstance()->setFieldOfView(ui.fieldOfViewSpin->value());
Menu::getInstance()->setFaceshiftEyeDeflection(ui.faceshiftEyeDeflectionSider->value() / Menu::getInstance()->setFaceshiftEyeDeflection(ui.faceshiftEyeDeflectionSider->value() /
(float)ui.faceshiftEyeDeflectionSider->maximum()); (float)ui.faceshiftEyeDeflectionSider->maximum());
Menu::getInstance()->setMaxVoxelPacketsPerSecond(ui.maxVoxelsPPSSpin->value()); Menu::getInstance()->setMaxVoxelPacketsPerSecond(ui.maxVoxelsPPSSpin->value());
Menu::getInstance()->setAudioJitterBufferSamples(ui.audioJitterSpin->value()); Menu::getInstance()->setAudioJitterBufferSamples(ui.audioJitterSpin->value());
Application::getInstance()->resizeGL(Application::getInstance()->getGLWidget()->width(),
Application::getInstance()->getGLWidget()->height());
} }

14
interface/ui/preferencesDialog.ui
View file

@ -573,7 +573,7 @@ padding: 0;</string>
<string notr="true">color: #0e7077</string> <string notr="true">color: #0e7077</string>
</property> </property>
<property name="text"> <property name="text">
<string>&lt;p&gt;Avatar&lt;/p&gt;</string> <string>Avatar</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
@ -627,8 +627,8 @@ padding: 0;</string>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>0</width>
<height>20</height> <height>0</height>
</size> </size>
</property> </property>
</spacer> </spacer>
@ -649,8 +649,8 @@ padding: 0;</string>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>70</width> <width>95</width>
<height>16777215</height> <height>36</height>
</size> </size>
</property> </property>
<property name="font"> <property name="font">
@ -1100,7 +1100,7 @@ padding: 0;</string>
</layout> </layout>
</item> </item>
<item> <item>
<widget class="QLabel" name="avatarTitleLabel_2"> <widget class="QLabel" name="voxelsTitleLabel">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -1125,7 +1125,7 @@ padding: 0;</string>
<string notr="true">color: #0e7077</string> <string notr="true">color: #0e7077</string>
</property> </property>
<property name="text"> <property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Voxels&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>Voxels</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>