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

Merge pull request #12259 from jherico/fix/render_config

Browse source 
Fix a number of bugs caused by the binary resources migration
This commit is contained in:
John Conklin II 2018-01-25 14:28:47 -08:00 committed by GitHub
commit 37b53e3968
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/resources/styles/global.qss
View file

@ -41,14 +41,14 @@ QSpinBox, QDoubleSpinBox {
QDoubleSpinBox::up-arrow, QDoubleSpinBox::up-arrow,
QSpinBox::up-arrow { QSpinBox::up-arrow {
background-image: url(styles/up.svg); background-image: url(:/styles/up.svg);
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center center; background-position: center center;
} }
QDoubleSpinBox::down-arrow, QDoubleSpinBox::down-arrow,
QSpinBox::down-arrow { QSpinBox::down-arrow {
background-image: url(styles/down.svg); background-image: url(:/styles/down.svg);
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center center; background-position: center center;
} }
@ -88,7 +88,7 @@ QSlider {
QSlider::groove:horizontal { QSlider::groove:horizontal {
border: none; border: none;
background-image: url(styles/slider-bg.svg); background-image: url(:/styles/slider-bg.svg);
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center center; background-position: center center;
} }
@ -96,7 +96,7 @@ QSlider::groove:horizontal {
QSlider::handle:horizontal { QSlider::handle:horizontal {
width: 18px; width: 18px;
height: 18px; height: 18px;
background-image: url(styles/slider-handle.svg); background-image: url(:/styles/slider-handle.svg);
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center center; background-position: center center;
} }
@ -107,7 +107,7 @@ QPushButton#closeButton {
border-width: 1px; border-width: 1px;
border-radius: 0; border-radius: 0;
background-color: #fff; background-color: #fff;
background-image: url(styles/close.svg); background-image: url(:/styles/close.svg);
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center center; background-position: center center;
} }

6
interface/resources/styles/import_dialog.qss
View file

@ -63,17 +63,17 @@ QPushButton#cancelButton {
} }
#backButton { #backButton {
background-image: url(icons/backButton.svg); background-image: url(:/icons/backButton.svg);
border-radius: 0px; border-radius: 0px;
} }
#forwardButton { #forwardButton {
background-image: url(icons/forwardButton.svg); background-image: url(:/icons/forwardButton.svg);
border-radius: 0px; border-radius: 0px;
} }
#toParentButton { #toParentButton {
background-image: url(icons/toParentButton.svg); background-image: url(:/icons/toParentButton.svg);
border-radius: 0px; border-radius: 0px;
} }

10
interface/resources/styles/log_dialog.qss
View file

@ -22,7 +22,7 @@ QLineEdit {
} }
QPushButton#searchButton { QPushButton#searchButton {
background: url(styles/search.svg); background: url(:/styles/search.svg);
background-repeat: none; background-repeat: none;
background-position: left center; background-position: left center;
background-origin: content; background-origin: content;
@ -55,7 +55,7 @@ QPushButton#searchPrevButton {
QPushButton#revealLogButton { QPushButton#revealLogButton {
font-family: Helvetica, Arial, sans-serif; font-family: Helvetica, Arial, sans-serif;
background: url(styles/txt-file.svg); background: url(:/styles/txt-file.svg);
background-repeat: none; background-repeat: none;
background-position: left center; background-position: left center;
background-origin: content; background-origin: content;
@ -86,11 +86,11 @@ QCheckBox {
} }
QCheckBox::indicator:unchecked { QCheckBox::indicator:unchecked {
image: url(styles/unchecked.svg); image: url(:/styles/unchecked.svg);
} }
QCheckBox::indicator:checked { QCheckBox::indicator:checked {
image: url(styles/checked.svg); image: url(:/styles/checked.svg);
} }
QComboBox { QComboBox {
@ -110,6 +110,6 @@ QComboBox::drop-down {
} }
QComboBox::down-arrow { QComboBox::down-arrow {
image: url(styles/filter.png); image: url(:/styles/filter.png);
border-width: 0px; border-width: 0px;
} }

2
interface/src/Application.cpp
View file

@ -2724,7 +2724,7 @@ void Application::showHelp() {
queryString.addQueryItem("defaultTab", defaultTab); queryString.addQueryItem("defaultTab", defaultTab);
auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>(); auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
TabletProxy* tablet = dynamic_cast<TabletProxy*>(tabletScriptingInterface->getTablet(SYSTEM_TABLET)); TabletProxy* tablet = dynamic_cast<TabletProxy*>(tabletScriptingInterface->getTablet(SYSTEM_TABLET));
tablet->gotoWebScreen(PathUtils::resourcesPath() + INFO_HELP_PATH + "?" + queryString.toString()); tablet->gotoWebScreen(PathUtils::resourcesUrl() + INFO_HELP_PATH + "?" + queryString.toString());
DependencyManager::get<HMDScriptingInterface>()->openTablet(); DependencyManager::get<HMDScriptingInterface>()->openTablet();
//InfoView::show(INFO_HELP_PATH, false, queryString.toString()); //InfoView::show(INFO_HELP_PATH, false, queryString.toString());
} }

1
interface/src/ui/BaseLogDialog.cpp
View file

@ -39,7 +39,6 @@ BaseLogDialog::BaseLogDialog(QWidget* parent) : QDialog(parent, Qt::Window) {
QFile styleSheet(PathUtils::resourcesPath() + "styles/log_dialog.qss"); QFile styleSheet(PathUtils::resourcesPath() + "styles/log_dialog.qss");
if (styleSheet.open(QIODevice::ReadOnly)) { if (styleSheet.open(QIODevice::ReadOnly)) {
QDir::setCurrent(PathUtils::resourcesPath());
setStyleSheet(styleSheet.readAll()); setStyleSheet(styleSheet.readAll());
} }

2
interface/src/ui/overlays/ContextOverlayInterface.cpp
View file

@ -168,7 +168,7 @@ bool ContextOverlayInterface::createOrDestroyContextOverlay(const EntityItemID&
_contextOverlay->setColorPulse(CONTEXT_OVERLAY_UNHOVERED_COLORPULSE); _contextOverlay->setColorPulse(CONTEXT_OVERLAY_UNHOVERED_COLORPULSE);
_contextOverlay->setIgnoreRayIntersection(false); _contextOverlay->setIgnoreRayIntersection(false);
_contextOverlay->setDrawInFront(true); _contextOverlay->setDrawInFront(true);
_contextOverlay->setURL(PathUtils::resourcesPath() + "images/inspect-icon.png"); _contextOverlay->setURL(PathUtils::resourcesUrl() + "images/inspect-icon.png");
_contextOverlay->setIsFacingAvatar(true); _contextOverlay->setIsFacingAvatar(true);
_contextOverlayID = qApp->getOverlays().addOverlay(_contextOverlay); _contextOverlayID = qApp->getOverlays().addOverlay(_contextOverlay);
} }

4
libraries/render/src/render/Engine.cpp
View file

@ -45,8 +45,8 @@ void Engine::load() {
auto config = getConfiguration(); auto config = getConfiguration();
const QString configFile= "config/render.json"; const QString configFile= "config/render.json";
QUrl path(PathUtils::resourcesPath() + configFile); QString path(PathUtils::resourcesPath() + configFile);
QFile file(path.toString()); QFile file(path);
if (!file.exists()) { if (!file.exists()) {
qWarning() << "Engine configuration file" << path << "does not exist"; qWarning() << "Engine configuration file" << path << "does not exist";
} else if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { } else if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {