From dd5a19874012c5c420aefa22217fcbb40ef36bfc Mon Sep 17 00:00:00 2001
From: stojce <stojce@me>
Date: Sun, 6 Apr 2014 16:13:15 +0200
Subject: [PATCH] Models browser fixes

---
 interface/src/ui/FramelessDialog.h     |  5 -----
 interface/src/ui/ModelsBrowser.cpp     |  2 +-
 interface/src/ui/PreferencesDialog.cpp | 17 +++++++++++++++--
 interface/src/ui/PreferencesDialog.h   |  2 ++
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/interface/src/ui/FramelessDialog.h b/interface/src/ui/FramelessDialog.h
index f13219a688..aa83960b8b 100644
--- a/interface/src/ui/FramelessDialog.h
+++ b/interface/src/ui/FramelessDialog.h
@@ -10,11 +10,6 @@
 #define __hifi__FramelessDialog__
 
 #include <QDialog>
-#include <QGridLayout>
-#include <QString>
-#include <QPainter>
-#include <QStyleOptionTitleBar>
-#include <QtCore/QTimer>
 
 class FramelessDialog : public QDialog {
     Q_OBJECT
diff --git a/interface/src/ui/ModelsBrowser.cpp b/interface/src/ui/ModelsBrowser.cpp
index 616aba3881..52c10a51d7 100644
--- a/interface/src/ui/ModelsBrowser.cpp
+++ b/interface/src/ui/ModelsBrowser.cpp
@@ -62,7 +62,7 @@ static const QString propertiesIds[MODEL_METADATA_COUNT] = {
 };
 
 ModelsBrowser::ModelsBrowser(ModelType modelsType, QWidget* parent) :
-    QWidget(parent),
+    QWidget(parent, Qt::WindowStaysOnTopHint),
     _handler(new ModelHandler(modelsType))
 {
     connect(_handler, SIGNAL(doneDownloading()), SLOT(resizeView()));
diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp
index 3aa439558a..96ffe662c7 100644
--- a/interface/src/ui/PreferencesDialog.cpp
+++ b/interface/src/ui/PreferencesDialog.cpp
@@ -21,6 +21,7 @@ PreferencesDialog::PreferencesDialog(QWidget* parent, Qt::WindowFlags flags) : F
     setStyleSheetFile("styles/preferences.qss");
     loadPreferences();
     connect(ui.closeButton, &QPushButton::clicked, this, &QDialog::close);
+
     connect(ui.buttonBrowseHead, &QPushButton::clicked, this, &PreferencesDialog::openHeadModelBrowser);
     connect(ui.buttonBrowseBody, &QPushButton::clicked, this, &PreferencesDialog::openBodyModelBrowser);
 }
@@ -34,16 +35,28 @@ void PreferencesDialog::accept() {
     close();
 }
 
+void PreferencesDialog::setHeadUrl(QString modelUrl) {
+    ui.faceURLEdit->setText(modelUrl);
+    setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
+}
+
+void PreferencesDialog::setSkeletonUrl(QString modelUrl) {
+    ui.skeletonURLEdit->setText(modelUrl);
+    setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
+}
+
 void PreferencesDialog::openHeadModelBrowser() {
+    setWindowFlags(windowFlags() & ~Qt::WindowStaysOnTopHint);
     ModelsBrowser modelBrowser(Head);
+    connect(&modelBrowser, &ModelsBrowser::selected, this, &PreferencesDialog::setHeadUrl);
     modelBrowser.browse();
-    connect(&modelBrowser, &ModelsBrowser::selected, ui.faceURLEdit, &QLineEdit::setText);
 }
 
 void PreferencesDialog::openBodyModelBrowser() {
+    setWindowFlags(windowFlags() & ~Qt::WindowStaysOnTopHint);
     ModelsBrowser modelBrowser(Skeleton);
+    connect(&modelBrowser, &ModelsBrowser::selected, this, &PreferencesDialog::setSkeletonUrl);
     modelBrowser.browse();
-    connect(&modelBrowser, &ModelsBrowser::selected, ui.skeletonURLEdit, &QLineEdit::setText);
 }
 
 void PreferencesDialog::resizeEvent(QResizeEvent *resizeEvent) {
diff --git a/interface/src/ui/PreferencesDialog.h b/interface/src/ui/PreferencesDialog.h
index f1f37c66cd..c7f8f43616 100644
--- a/interface/src/ui/PreferencesDialog.h
+++ b/interface/src/ui/PreferencesDialog.h
@@ -37,6 +37,8 @@ private:
 
 private slots:
     void accept();
+    void setHeadUrl(QString modelUrl);
+    void setSkeletonUrl(QString modelUrl);
     
 };