diff --git a/interface/resources/qml/hifi/commerce/common/SortableListModel.qml b/interface/resources/qml/hifi/commerce/common/SortableListModel.qml
index 0951d25950..cfdd4abe04 100644
--- a/interface/resources/qml/hifi/commerce/common/SortableListModel.qml
+++ b/interface/resources/qml/hifi/commerce/common/SortableListModel.qml
@@ -22,7 +22,7 @@ ListModel {
function swap(a, b) {
if (a < b) {
move(a, b, 1);
- move (b - 1, a, 1);
+ move(b - 1, a, 1);
} else if (a > b) {
move(b, a, 1);
move(a - 1, b, 1);
@@ -34,16 +34,17 @@ ListModel {
var piv = get(pivot)[sortColumnName];
swap(pivot, end - 1);
var store = begin;
+ var i;
- for (var i = begin; i < end - 1; ++i) {
+ for (i = begin; i < end - 1; ++i) {
var currentElement = get(i)[sortColumnName];
if (isSortingDescending) {
- if (currentElement < piv) {
+ if (currentElement > piv) {
swap(store, i);
++store;
}
} else {
- if (currentElement > piv) {
+ if (currentElement < piv) {
swap(store, i);
++store;
}
@@ -56,16 +57,17 @@ ListModel {
var piv = get(pivot)[sortColumnName].toLowerCase();
swap(pivot, end - 1);
var store = begin;
+ var i;
- for (var i = begin; i < end - 1; ++i) {
+ for (i = begin; i < end - 1; ++i) {
var currentElement = get(i)[sortColumnName].toLowerCase();
if (isSortingDescending) {
- if (currentElement < piv) {
+ if (currentElement > piv) {
swap(store, i);
++store;
}
} else {
- if (currentElement > piv) {
+ if (currentElement < piv) {
swap(store, i);
++store;
}
diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
index a9961dc17e..2743677683 100644
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -317,6 +317,7 @@ Rectangle {
HifiControlsUit.TextField {
id: filterBar;
+ property string previousText: "";
colorScheme: hifi.colorSchemes.faintGray;
hasClearButton: true;
hasRoundedBorder: true;
@@ -329,6 +330,8 @@ Rectangle {
onTextChanged: {
buildFilteredPurchasesModel();
+ purchasesContentsList.positionViewAtIndex(0, ListView.Beginning)
+ filterBar.previousText = filterBar.text;
}
onAccepted: {
@@ -647,7 +650,8 @@ Rectangle {
function sortByDate() {
filteredPurchasesModel.sortColumnName = "purchase_date";
- filteredPurchasesModel.isSortingDescending = false;
+ filteredPurchasesModel.isSortingDescending = true;
+ filteredPurchasesModel.valuesAreNumerical = true;
filteredPurchasesModel.quickSort();
}
@@ -677,7 +681,7 @@ Rectangle {
}
}
- if (sameItemCount !== tempPurchasesModel.count || filterBar.text !== "") {
+ if (sameItemCount !== tempPurchasesModel.count || filterBar.text !== filterBar.previousText) {
filteredPurchasesModel.clear();
for (var i = 0; i < tempPurchasesModel.count; i++) {
filteredPurchasesModel.append(tempPurchasesModel.get(i));
diff --git a/interface/resources/styles/global.qss b/interface/resources/styles/global.qss
index 2554f3b2c9..778e5759b3 100644
--- a/interface/resources/styles/global.qss
+++ b/interface/resources/styles/global.qss
@@ -41,14 +41,14 @@ QSpinBox, QDoubleSpinBox {
QDoubleSpinBox::up-arrow,
QSpinBox::up-arrow {
- background-image: url(styles/up.svg);
+ background-image: url(:/styles/up.svg);
background-repeat: no-repeat;
background-position: center center;
}
QDoubleSpinBox::down-arrow,
QSpinBox::down-arrow {
- background-image: url(styles/down.svg);
+ background-image: url(:/styles/down.svg);
background-repeat: no-repeat;
background-position: center center;
}
@@ -88,7 +88,7 @@ QSlider {
QSlider::groove:horizontal {
border: none;
- background-image: url(styles/slider-bg.svg);
+ background-image: url(:/styles/slider-bg.svg);
background-repeat: no-repeat;
background-position: center center;
}
@@ -96,7 +96,7 @@ QSlider::groove:horizontal {
QSlider::handle:horizontal {
width: 18px;
height: 18px;
- background-image: url(styles/slider-handle.svg);
+ background-image: url(:/styles/slider-handle.svg);
background-repeat: no-repeat;
background-position: center center;
}
@@ -107,7 +107,7 @@ QPushButton#closeButton {
border-width: 1px;
border-radius: 0;
background-color: #fff;
- background-image: url(styles/close.svg);
+ background-image: url(:/styles/close.svg);
background-repeat: no-repeat;
background-position: center center;
}
diff --git a/interface/resources/styles/import_dialog.qss b/interface/resources/styles/import_dialog.qss
index 8fe04ae1b7..3c2dbdcce9 100644
--- a/interface/resources/styles/import_dialog.qss
+++ b/interface/resources/styles/import_dialog.qss
@@ -63,17 +63,17 @@ QPushButton#cancelButton {
}
#backButton {
- background-image: url(icons/backButton.svg);
+ background-image: url(:/icons/backButton.svg);
border-radius: 0px;
}
#forwardButton {
- background-image: url(icons/forwardButton.svg);
+ background-image: url(:/icons/forwardButton.svg);
border-radius: 0px;
}
#toParentButton {
- background-image: url(icons/toParentButton.svg);
+ background-image: url(:/icons/toParentButton.svg);
border-radius: 0px;
}
diff --git a/interface/resources/styles/log_dialog.qss b/interface/resources/styles/log_dialog.qss
index 33473d2903..e0ec17549d 100644
--- a/interface/resources/styles/log_dialog.qss
+++ b/interface/resources/styles/log_dialog.qss
@@ -22,7 +22,7 @@ QLineEdit {
}
QPushButton#searchButton {
- background: url(styles/search.svg);
+ background: url(:/styles/search.svg);
background-repeat: none;
background-position: left center;
background-origin: content;
@@ -55,7 +55,7 @@ QPushButton#searchPrevButton {
QPushButton#revealLogButton {
font-family: Helvetica, Arial, sans-serif;
- background: url(styles/txt-file.svg);
+ background: url(:/styles/txt-file.svg);
background-repeat: none;
background-position: left center;
background-origin: content;
@@ -86,11 +86,11 @@ QCheckBox {
}
QCheckBox::indicator:unchecked {
- image: url(styles/unchecked.svg);
+ image: url(:/styles/unchecked.svg);
}
QCheckBox::indicator:checked {
- image: url(styles/checked.svg);
+ image: url(:/styles/checked.svg);
}
QComboBox {
@@ -110,6 +110,6 @@ QComboBox::drop-down {
}
QComboBox::down-arrow {
- image: url(styles/filter.png);
+ image: url(:/styles/filter.png);
border-width: 0px;
}
\ No newline at end of file
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index c2b22b3772..9379c85fdd 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2724,7 +2724,7 @@ void Application::showHelp() {
queryString.addQueryItem("defaultTab", defaultTab);
auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
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();
//InfoView::show(INFO_HELP_PATH, false, queryString.toString());
}
diff --git a/interface/src/ui/BaseLogDialog.cpp b/interface/src/ui/BaseLogDialog.cpp
index 6830de6e35..969f9895de 100644
--- a/interface/src/ui/BaseLogDialog.cpp
+++ b/interface/src/ui/BaseLogDialog.cpp
@@ -39,7 +39,6 @@ BaseLogDialog::BaseLogDialog(QWidget* parent) : QDialog(parent, Qt::Window) {
QFile styleSheet(PathUtils::resourcesPath() + "styles/log_dialog.qss");
if (styleSheet.open(QIODevice::ReadOnly)) {
- QDir::setCurrent(PathUtils::resourcesPath());
setStyleSheet(styleSheet.readAll());
}
diff --git a/interface/src/ui/overlays/ContextOverlayInterface.cpp b/interface/src/ui/overlays/ContextOverlayInterface.cpp
index d690880f99..d4138941ae 100644
--- a/interface/src/ui/overlays/ContextOverlayInterface.cpp
+++ b/interface/src/ui/overlays/ContextOverlayInterface.cpp
@@ -168,7 +168,7 @@ bool ContextOverlayInterface::createOrDestroyContextOverlay(const EntityItemID&
_contextOverlay->setColorPulse(CONTEXT_OVERLAY_UNHOVERED_COLORPULSE);
_contextOverlay->setIgnoreRayIntersection(false);
_contextOverlay->setDrawInFront(true);
- _contextOverlay->setURL(PathUtils::resourcesPath() + "images/inspect-icon.png");
+ _contextOverlay->setURL(PathUtils::resourcesUrl() + "images/inspect-icon.png");
_contextOverlay->setIsFacingAvatar(true);
_contextOverlayID = qApp->getOverlays().addOverlay(_contextOverlay);
}
diff --git a/libraries/render/src/render/Engine.cpp b/libraries/render/src/render/Engine.cpp
index 5f67d40d17..463b45451b 100644
--- a/libraries/render/src/render/Engine.cpp
+++ b/libraries/render/src/render/Engine.cpp
@@ -45,8 +45,8 @@ void Engine::load() {
auto config = getConfiguration();
const QString configFile= "config/render.json";
- QUrl path(PathUtils::resourcesPath() + configFile);
- QFile file(path.toString());
+ QString path(PathUtils::resourcesPath() + configFile);
+ QFile file(path);
if (!file.exists()) {
qWarning() << "Engine configuration file" << path << "does not exist";
} else if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {