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

Merge branch 'master' of github.com:highfidelity/hifi into marketplace-window

Browse source
This commit is contained in:
Ryan Huffman 2015-03-13 11:46:21 -07:00
commit 33f255fad2
4 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
examples/edit.js
View file

@ -130,7 +130,7 @@ var toolBar = (function () {
// Hide active button for now - this may come back, so not deleting yet. // Hide active button for now - this may come back, so not deleting yet.
activeButton = toolBar.addTool({ activeButton = toolBar.addTool({
imageURL: toolIconUrl + "models-tool.svg", imageURL: toolIconUrl + "edit-status.svg",
subImage: { x: 0, y: Tool.IMAGE_WIDTH, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT }, subImage: { x: 0, y: Tool.IMAGE_WIDTH, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT },
width: toolWidth, width: toolWidth,
height: toolHeight, height: toolHeight,
@ -139,7 +139,7 @@ var toolBar = (function () {
}, true, false); }, true, false);
newModelButton = toolBar.addTool({ newModelButton = toolBar.addTool({
imageURL: toolIconUrl + "add-model-tool.svg", imageURL: toolIconUrl + "upload.svg",
subImage: { x: 0, y: Tool.IMAGE_WIDTH, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT }, subImage: { x: 0, y: Tool.IMAGE_WIDTH, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT },
width: toolWidth, width: toolWidth,
height: toolHeight, height: toolHeight,
@ -148,7 +148,7 @@ var toolBar = (function () {
}); });
browseModelsButton = toolBar.addTool({ browseModelsButton = toolBar.addTool({
imageURL: toolIconUrl + "list-icon.svg", imageURL: toolIconUrl + "marketplace.svg",
width: toolWidth, width: toolWidth,
height: toolHeight, height: toolHeight,
alpha: 0.9, alpha: 0.9,

4
examples/libraries/toolBars.js
View file

@ -94,7 +94,7 @@ Tool = function(properties, selectable, selected) { // selectable and selected a
} }
selected = doSelect; selected = doSelect;
properties.subImage.y = (selected ? 2 : 1) * properties.subImage.height; properties.subImage.y = (selected ? 0 : 1) * properties.subImage.height;
Overlays.editOverlay(this.overlay(), { subImage: properties.subImage }); Overlays.editOverlay(this.overlay(), { subImage: properties.subImage });
} }
this.toggle = function() { this.toggle = function() {
@ -102,7 +102,7 @@ Tool = function(properties, selectable, selected) { // selectable and selected a
return; return;
} }
selected = !selected; selected = !selected;
properties.subImage.y = (selected ? 2 : 1) * properties.subImage.height; properties.subImage.y = (selected ? 0 : 1) * properties.subImage.height;
Overlays.editOverlay(this.overlay(), { subImage: properties.subImage }); Overlays.editOverlay(this.overlay(), { subImage: properties.subImage });
return selected; return selected;

7
interface/src/Application.cpp
View file

@ -889,7 +889,7 @@ bool Application::event(QEvent* event) {
if (!url.isEmpty()) { if (!url.isEmpty()) {
if (url.scheme() == HIFI_URL_SCHEME) { if (url.scheme() == HIFI_URL_SCHEME) {
DependencyManager::get<AddressManager>()->handleLookupString(fileEvent->url().toString()); DependencyManager::get<AddressManager>()->handleLookupString(fileEvent->url().toString());
} else if (url.url().toLower().endsWith(SVO_EXTENSION)) { } else if (url.path().toLower().endsWith(SVO_EXTENSION)) {
emit svoImportRequested(url.url()); emit svoImportRequested(url.url());
} }
} }
@ -1455,10 +1455,11 @@ void Application::dropEvent(QDropEvent *event) {
QString snapshotPath; QString snapshotPath;
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.path().toLower();
if (lower.endsWith(SNAPSHOT_EXTENSION)) {
snapshotPath = url.toLocalFile(); snapshotPath = url.toLocalFile();
break; break;
} else if (url.url().toLower().endsWith(SVO_EXTENSION)) { } else if (lower.endsWith(SVO_EXTENSION)) {
emit svoImportRequested(url.url()); emit svoImportRequested(url.url());
event->acceptProposedAction(); event->acceptProposedAction();
return; return;

2
interface/src/GLCanvas.cpp
View file

@ -170,7 +170,7 @@ 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()) {
auto lower = url.url().toLower(); auto lower = url.path().toLower();
if (lower.endsWith(SNAPSHOT_EXTENSION) || lower.endsWith(SVO_EXTENSION)) { if (lower.endsWith(SNAPSHOT_EXTENSION) || lower.endsWith(SVO_EXTENSION)) {
event->acceptProposedAction(); event->acceptProposedAction();
break; break;