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

adjust .qml for useFeed being a c++ property instead of qml.

Browse source
This commit is contained in:
howard-stearns 2016-08-17 09:57:46 -07:00
parent 347b20e506
commit 17d9db487d
1 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
interface/resources/qml/AddressBarDialog.qml
View file

@ -47,7 +47,7 @@ Window {
}
function goCard(card) {
if (useFeed) {
if (addressBarDialog.useFeed) {
storyCard.imageUrl = card.imageUrl;
storyCard.userName = card.userName;
storyCard.placeName = card.placeName;
@ -60,7 +60,6 @@ Window {
addressLine.text = card.hifiUrl;
toggleOrGo(true);
}
property bool useFeed: false;
property var allPlaces: [];
property var allStories: [];
property int cardWidth: 200;
@ -74,6 +73,7 @@ Window {
// The buttons have their button state changed on hover, so we have to manually fix them up here
onBackEnabledChanged: backArrow.buttonState = addressBarDialog.backEnabled ? 1 : 0;
onForwardEnabledChanged: forwardArrow.buttonState = addressBarDialog.forwardEnabled ? 1 : 0;
onUseFeedChanged: { updateFeedState(); }
ListModel { id: suggestions }
@ -191,9 +191,9 @@ Window {
id: placesButton
imageURL: "../images/places.svg"
buttonState: 1
defaultState: useFeed ? 0 : 1;
hoverState: useFeed ? 2 : -1;
onClicked: useFeed ? toggleFeed() : identity()
defaultState: addressBarDialog.useFeed ? 0 : 1;
hoverState: addressBarDialog.useFeed ? 2 : -1;
onClicked: addressBarDialog.useFeed ? toggleFeed() : identity()
anchors {
right: feedButton.left;
bottom: addressLine.bottom;
@ -203,9 +203,9 @@ Window {
id: feedButton;
imageURL: "../images/snap-feed.svg";
buttonState: 0
defaultState: useFeed ? 1 : 0;
hoverState: useFeed ? -1 : 2;
onClicked: useFeed ? identity() : toggleFeed();
defaultState: addressBarDialog.useFeed ? 1 : 0;
hoverState: addressBarDialog.useFeed ? -1 : 2;
onClicked: addressBarDialog.useFeed ? identity() : toggleFeed();
anchors {
right: parent.right;
bottom: addressLine.bottom;
@ -231,10 +231,13 @@ Window {
}
function toggleFeed () {
useFeed = !useFeed;
placesButton.buttonState = useFeed ? 0 : 1;
feedButton.buttonState = useFeed ? 1 : 0;
function toggleFeed() {
addressBarDialog.useFeed = !addressBarDialog.useFeed;
updateFeedState();
}
function updateFeedState() {
placesButton.buttonState = addressBarDialog.useFeed ? 0 : 1;
feedButton.buttonState = addressBarDialog.useFeed ? 1 : 0;
filterChoicesByText();
}
function getRequest(url, cb) { // cb(error, responseOfCorrectContentType) of url. General for 'get' text/html/json, but without redirects.
@ -371,7 +374,7 @@ Window {
}
function suggestable(place) {
if (useFeed) {
if (addressBarDialog.useFeed) {
return true;
}
return (place.place_name !== AddressManager.hostname) // Not our entry, but do show other entry points to current domain.
@ -406,7 +409,7 @@ Window {
// pageResults is now [ [ placeDataOneForDomainOne, placeDataTwoForDomainOne, ...], [ placeDataTwoForDomainTwo...] ]
pageResults.forEach(function (domainResults) {
allPlaces = allPlaces.concat(domainResults);
if (!addressLine.text && !useFeed) { // Don't add if the user is already filtering
if (!addressLine.text && !addressBarDialog.useFeed) { // Don't add if the user is already filtering
domainResults.forEach(function (place) {
if (suggestable(place)) {
suggestions.append(place);
@ -431,7 +434,7 @@ Window {
return makeModelData(story);
});
allStories = allStories.concat(stories);
if (!addressLine.text && useFeed) { // Don't add if the user is already filtering
if (!addressLine.text && addressBarDialog.useFeed) { // Don't add if the user is already filtering
stories.forEach(function (story) {
suggestions.append(story);
});
@ -445,7 +448,7 @@ Window {
function filterChoicesByText() {
suggestions.clear();
var words = addressLine.text.toUpperCase().split(/\s+/).filter(identity),
data = useFeed ? allStories : allPlaces;
data = addressBarDialog.useFeed ? allStories : allPlaces;
function matches(place) {
if (!words.length) {
return suggestable(place);