Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 00:33:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Overlay behaviour

Browse source
This commit is contained in:
stojce 2014-03-26 00:05:11 +01:00
parent 547f33f4d6
commit 22a8693b89
4 changed files with 144 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

129
interface/interface_en.ts
View file

@ -4,22 +4,22 @@
<context>
<name>Application</name>
<message>
<location filename="src/Application.cpp" line="1368"/>
<location filename="src/Application.cpp" line="1380"/>
<source>Export Voxels</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/Application.cpp" line="1369"/>
<location filename="src/Application.cpp" line="1381"/>
<source>Sparse Voxel Octree Files (*.svo)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/Application.cpp" line="3596"/>
<location filename="src/Application.cpp" line="3597"/>
<source>Open Script</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/Application.cpp" line="3597"/>
<location filename="src/Application.cpp" line="3598"/>
<source>JavaScript Files (*.js)</source>
<translation type="unfinished"></translation>
</message>
@ -113,22 +113,135 @@
<context>
<name>Menu</name>
<message>
<location filename="src/Menu.cpp" line="455"/>
<location filename="src/Menu.cpp" line="459"/>
<source>Open .ini config file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/Menu.cpp" line="457"/>
<location filename="src/Menu.cpp" line="469"/>
<location filename="src/Menu.cpp" line="461"/>
<location filename="src/Menu.cpp" line="473"/>
<source>Text files (*.ini)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/Menu.cpp" line="467"/>
<location filename="src/Menu.cpp" line="471"/>
<source>Save .ini config file</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>PreferencesDialog</name>
<message>
<location filename="ui/preferencesDialog.ui" line="93"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="619"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="128"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="620"/>
<source>Save all changes</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="199"/>
<location filename="ui/preferencesDialog.ui" line="576"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="621"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="630"/>
<source>Avatar</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="233"/>
<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>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="269"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="623"/>
<source>Not showing a name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="297"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="624"/>
<source>Head</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="398"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="626"/>
<source>Body</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="509"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="628"/>
<source>Advanced Tuning</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="540"/>
<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>
<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>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="711"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="632"/>
<source>Lean scale (applies to Faceshift users)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="796"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="633"/>
<source>Avatar scale &lt;span style=&quot; color:#909090;&quot;&gt;(default is 1.0)&lt;/span&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="878"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="634"/>
<source>Pupil dillation</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="957"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="635"/>
<source>Audio Jitter Buffer Samples (0 for automatic)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="1048"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="636"/>
<source>Faceshift eye detection</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="1128"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="637"/>
<source>Voxels</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="1160"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="638"/>
<source>Maximum voxels</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/preferencesDialog.ui" line="1239"/>
<location filename="../build/interface/ui_preferencesDialog.h" line="639"/>
<source>Max voxels sent each second</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QObject</name>
<message>

2
interface/src/Menu.cpp
View file

@ -714,7 +714,7 @@ void Menu::loginForCurrentDomain() {
void Menu::editPreferences() {
if (!_preferencesDialog) {
_preferencesDialog = new PreferencesDialog(Application::getInstance()->getGLWidget());
_preferencesDialog = new PreferencesDialog(Application::getInstance()->getWindow());
_preferencesDialog->show();
}
_preferencesDialog->raise();

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

@ -10,6 +10,7 @@
#include <QFile>
#include <QPushButton>
#include <QSizeGrip>
#include <QMainWindow>
#include "Application.h"
#include "FramelessDialog.h"
@ -17,20 +18,35 @@
const int RESIZE_HANDLE_WIDTH = 7;
FramelessDialog::FramelessDialog(QWidget *parent, Qt::WindowFlags flags) :
QDialog(parent, flags | Qt::FramelessWindowHint),
QDialog(parent, flags | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint),
_isResizing(false) {
setAttribute(Qt::WA_DeleteOnClose);
installEventFilter(this);
startTimer(20);
}
void FramelessDialog::timerEvent(QTimerEvent *event) {
move(parentWidget()->pos().x(), parentWidget()->pos().y() + 22);
setFixedHeight(parentWidget()->size().height());
}
void FramelessDialog::paintEvent(QPaintEvent* event) {
//move(parentWidget()->pos());
//resize(size().width(), parentWidget()->size().height());
}
void FramelessDialog::showEvent(QShowEvent* event) {
QDesktopWidget desktop;
// move to upper left
move(desktop.availableGeometry().x(), desktop.availableGeometry().y());
// move(desktop.availableGeometry().x(), desktop.availableGeometry().y());
move(parentWidget()->pos().x(), parentWidget()->pos().y() + 22);
// keep full height
resize(size().width(), desktop.availableGeometry().height());
setFixedHeight(parentWidget()->size().height());
// resize(size().width(), desktop.availableGeometry().height());
}
void FramelessDialog::setStyleSheetFile(const QString& fileName) {

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

@ -14,6 +14,7 @@
#include <QString>
#include <QPainter>
#include <QStyleOptionTitleBar>
#include <QtCore/QTimer>
class FramelessDialog : public QDialog {
Q_OBJECT
@ -28,6 +29,8 @@ protected:
virtual void mousePressEvent(QMouseEvent* mouseEvent);
virtual void mouseReleaseEvent(QMouseEvent* mouseEvent);
virtual void showEvent(QShowEvent* event);
void paintEvent(QPaintEvent* event);
void timerEvent(QTimerEvent *event);
private:
bool _isResizing;