Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 04:57:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

New layout

Browse source
This commit is contained in:
stojce 2014-03-14 01:51:22 +01:00
parent 939c17d0be
commit a29025a739
2 changed files with 135 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

133
interface/interface_en.ts
View file

@ -4,22 +4,22 @@
<context>
<name>Application</name>
<message>
<location filename="src/Application.cpp" line="1354"/>
<location filename="src/Application.cpp" line="1355"/>
<source>Export Voxels</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/Application.cpp" line="1355"/>
<location filename="src/Application.cpp" line="1356"/>
<source>Sparse Voxel Octree Files (*.svo)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/Application.cpp" line="3554"/>
<location filename="src/Application.cpp" line="3559"/>
<source>Open Script</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/Application.cpp" line="3555"/>
<location filename="src/Application.cpp" line="3560"/>
<source>JavaScript Files (*.js)</source>
<translation type="unfinished"></translation>
</message>
@ -113,22 +113,139 @@
<context>
<name>Menu</name>
<message>
<location filename="src/Menu.cpp" line="422"/>
<location filename="src/Menu.cpp" line="424"/>
<source>Open .ini config file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/Menu.cpp" line="424"/>
<location filename="src/Menu.cpp" line="436"/>
<location filename="src/Menu.cpp" line="426"/>
<location filename="src/Menu.cpp" line="438"/>
<source>Text files (*.ini)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/Menu.cpp" line="434"/>
<location filename="src/Menu.cpp" line="436"/>
<source>Save .ini config file</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>PreferencesDialog</name>
<message>
<location filename="ui/preferencesDialog.ui" line="34"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="406"/>
<source>Avatar</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="53"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="407"/>
<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>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="81"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="408"/>
<source>Not showing a name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="91"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="409"/>
<source>Head</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="114"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="410"/>
<source>Body</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="135"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="411"/>
<source>Advanced Tuning</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="142"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="412"/>
<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>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="165"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="413"/>
<source>&lt;p&gt;Avatar&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="174"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="414"/>
<source>Lean scale (applies to Faceshift users)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="204"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="415"/>
<source>Vertical field of view</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="241"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="416"/>
<source>Avatar scale (default is 1.0)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="271"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="417"/>
<source>Pupil dillation</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="308"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="418"/>
<source>Audio Jitter Buffer Samples (0 for automatic)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="345"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="419"/>
<source>Faceshift eye detection</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="393"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="420"/>
<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>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="402"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="421"/>
<source>Maximum voxels</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="439"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="422"/>
<source>Max voxels sent each second</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="514"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="423"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="525"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="424"/>
<source>Save all changes</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QObject</name>
<message>

12
interface/src/Menu.cpp
View file

@ -76,7 +76,7 @@ Menu::Menu() :
_lastAdjust(usecTimestampNow()),
_fpsAverage(FIVE_SECONDS_OF_FRAMES),
_loginAction(NULL),
_preferencesDialog()
_preferencesDialog(NULL)
{
Application *appInstance = Application::getInstance();
@ -678,6 +678,14 @@ void Menu::loginForCurrentDomain() {
}
void Menu::editPreferences() {
if (! _preferencesDialog) {
_preferencesDialog = new PreferencesDialog(Application::getInstance()->getGLWidget());
_preferencesDialog->show();
}
_preferencesDialog->raise();
/*
Application* applicationInstance = Application::getInstance();
QDialog dialog(applicationInstance->getWindow());
@ -812,7 +820,7 @@ void Menu::editPreferences() {
_faceshiftEyeDeflection = faceshiftEyeDeflection->value() / (float)faceshiftEyeDeflection->maximum();
}
QMetaObject::invokeMethod(applicationInstance->getAudio(), "reset", Qt::QueuedConnection);
*/
sendFakeEnterEvent();
}