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

Models browser fixes

Browse source
This commit is contained in:
stojce 2014-04-06 16:13:15 +02:00
parent ba5a092ad7
commit dd5a198740
4 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,11 +10,6 @@
#define __hifi__FramelessDialog__ #define __hifi__FramelessDialog__
#include <QDialog> #include <QDialog>
#include <QGridLayout>
#include <QString>
#include <QPainter>
#include <QStyleOptionTitleBar>
#include <QtCore/QTimer>
class FramelessDialog : public QDialog { class FramelessDialog : public QDialog {
Q_OBJECT Q_OBJECT

2
interface/src/ui/ModelsBrowser.cpp
View file

@ -62,7 +62,7 @@ static const QString propertiesIds[MODEL_METADATA_COUNT] = {
}; };
ModelsBrowser::ModelsBrowser(ModelType modelsType, QWidget* parent) : ModelsBrowser::ModelsBrowser(ModelType modelsType, QWidget* parent) :
QWidget(parent), QWidget(parent, Qt::WindowStaysOnTopHint),
_handler(new ModelHandler(modelsType)) _handler(new ModelHandler(modelsType))
{ {
connect(_handler, SIGNAL(doneDownloading()), SLOT(resizeView())); connect(_handler, SIGNAL(doneDownloading()), SLOT(resizeView()));

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

@ -21,6 +21,7 @@ PreferencesDialog::PreferencesDialog(QWidget* parent, Qt::WindowFlags flags) : F
setStyleSheetFile("styles/preferences.qss"); setStyleSheetFile("styles/preferences.qss");
loadPreferences(); loadPreferences();
connect(ui.closeButton, &QPushButton::clicked, this, &QDialog::close); connect(ui.closeButton, &QPushButton::clicked, this, &QDialog::close);
connect(ui.buttonBrowseHead, &QPushButton::clicked, this, &PreferencesDialog::openHeadModelBrowser); connect(ui.buttonBrowseHead, &QPushButton::clicked, this, &PreferencesDialog::openHeadModelBrowser);
connect(ui.buttonBrowseBody, &QPushButton::clicked, this, &PreferencesDialog::openBodyModelBrowser); connect(ui.buttonBrowseBody, &QPushButton::clicked, this, &PreferencesDialog::openBodyModelBrowser);
} }
@ -34,16 +35,28 @@ void PreferencesDialog::accept() {
close(); 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() { void PreferencesDialog::openHeadModelBrowser() {
setWindowFlags(windowFlags() & ~Qt::WindowStaysOnTopHint);
ModelsBrowser modelBrowser(Head); ModelsBrowser modelBrowser(Head);
connect(&modelBrowser, &ModelsBrowser::selected, this, &PreferencesDialog::setHeadUrl);
modelBrowser.browse(); modelBrowser.browse();
connect(&modelBrowser, &ModelsBrowser::selected, ui.faceURLEdit, &QLineEdit::setText);
} }
void PreferencesDialog::openBodyModelBrowser() { void PreferencesDialog::openBodyModelBrowser() {
setWindowFlags(windowFlags() & ~Qt::WindowStaysOnTopHint);
ModelsBrowser modelBrowser(Skeleton); ModelsBrowser modelBrowser(Skeleton);
connect(&modelBrowser, &ModelsBrowser::selected, this, &PreferencesDialog::setSkeletonUrl);
modelBrowser.browse(); modelBrowser.browse();
connect(&modelBrowser, &ModelsBrowser::selected, ui.skeletonURLEdit, &QLineEdit::setText);
} }
void PreferencesDialog::resizeEvent(QResizeEvent *resizeEvent) { void PreferencesDialog::resizeEvent(QResizeEvent *resizeEvent) {

2
interface/src/ui/PreferencesDialog.h
View file

@ -37,6 +37,8 @@ private:
private slots: private slots:
void accept(); void accept();
void setHeadUrl(QString modelUrl);
void setSkeletonUrl(QString modelUrl);
}; };