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

Handle .svo drop events and emit svoImportRequested

Browse source
This commit is contained in:
Ryan Huffman 2015-03-11 15:38:15 -07:00
parent 2f885bb7f2
commit c3c2a75f48
5 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/src/Application.cpp
View file

@ -882,9 +882,15 @@ bool Application::event(QEvent* event) {
if (event->type() == QEvent::FileOpen) { if (event->type() == QEvent::FileOpen) {
QFileOpenEvent* fileEvent = static_cast<QFileOpenEvent*>(event); QFileOpenEvent* fileEvent = static_cast<QFileOpenEvent*>(event);
QUrl url = fileEvent->url();
if (!fileEvent->url().isEmpty()) { if (!url.isEmpty()) {
DependencyManager::get<AddressManager>()->handleLookupString(fileEvent->url().toString()); if (url.scheme() == HIFI_URL_SCHEME) {
DependencyManager::get<AddressManager>()->handleLookupString(fileEvent->url().toString());
} else if (url.url().toLower().endsWith(SVO_EXTENSION)) {
emit svoImportRequested(url.url());
}
} }
return false; return false;

3
interface/src/Application.h
View file

@ -94,6 +94,7 @@ static const float NODE_KILLED_GREEN = 0.0f;
static const float NODE_KILLED_BLUE = 0.0f; static const float NODE_KILLED_BLUE = 0.0f;
static const QString SNAPSHOT_EXTENSION = ".jpg"; static const QString SNAPSHOT_EXTENSION = ".jpg";
static const QString SVO_EXTENSION = ".svo";
static const float BILLBOARD_FIELD_OF_VIEW = 30.0f; // degrees static const float BILLBOARD_FIELD_OF_VIEW = 30.0f; // degrees
static const float BILLBOARD_DISTANCE = 5.56f; // meters static const float BILLBOARD_DISTANCE = 5.56f; // meters
@ -315,6 +316,8 @@ signals:
void scriptLocationChanged(const QString& newPath); void scriptLocationChanged(const QString& newPath);
void svoImportRequested(const QString& url);
public slots: public slots:
void domainChanged(const QString& domainHostname); void domainChanged(const QString& domainHostname);
void updateWindowTitle(); void updateWindowTitle();

3
interface/src/GLCanvas.cpp
View file

@ -170,7 +170,8 @@ void GLCanvas::wheelEvent(QWheelEvent* event) {
void GLCanvas::dragEnterEvent(QDragEnterEvent* event) { void GLCanvas::dragEnterEvent(QDragEnterEvent* event) {
const QMimeData *mimeData = event->mimeData(); const QMimeData *mimeData = event->mimeData();
foreach (QUrl url, mimeData->urls()) { foreach (QUrl url, mimeData->urls()) {
if (url.url().toLower().endsWith(SNAPSHOT_EXTENSION)) { auto lower = url.url().toLower();
if (lower.endsWith(SNAPSHOT_EXTENSION) || lower.endsWith(SVO_EXTENSION)) {
event->acceptProposedAction(); event->acceptProposedAction();
break; break;
} }

1
interface/src/scripting/WindowScriptingInterface.cpp
View file

@ -32,6 +32,7 @@ WindowScriptingInterface::WindowScriptingInterface() :
{ {
const DomainHandler& domainHandler = DependencyManager::get<NodeList>()->getDomainHandler(); const DomainHandler& domainHandler = DependencyManager::get<NodeList>()->getDomainHandler();
connect(&domainHandler, &DomainHandler::hostnameChanged, this, &WindowScriptingInterface::domainChanged); connect(&domainHandler, &DomainHandler::hostnameChanged, this, &WindowScriptingInterface::domainChanged);
connect(Application::getInstance(), &Application::svoImportRequested, this, &WindowScriptingInterface::svoImportRequested);
} }
WebWindowClass* WindowScriptingInterface::doCreateWebWindow(const QString& title, const QString& url, int width, int height) { WebWindowClass* WindowScriptingInterface::doCreateWebWindow(const QString& title, const QString& url, int width, int height) {

1
interface/src/scripting/WindowScriptingInterface.h
View file

@ -60,6 +60,7 @@ signals:
void domainChanged(const QString& domainHostname); void domainChanged(const QString& domainHostname);
void inlineButtonClicked(const QString& name); void inlineButtonClicked(const QString& name);
void nonBlockingFormClosed(); void nonBlockingFormClosed();
void svoImportRequested(const QString& url);
private slots: private slots:
QScriptValue showAlert(const QString& message); QScriptValue showAlert(const QString& message);