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

fix location DataWebDialog missing InterfaceLocation object

Browse source
This commit is contained in:
Stephen Birarda 2014-10-28 15:32:23 -07:00
parent 86b455e58f
commit 2816e8f114
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Menu.cpp
View file

@ -1315,7 +1315,7 @@ void Menu::displayNameLocationResponse(const QString& errorString) {
void Menu::toggleLocationList() { void Menu::toggleLocationList() {
if (!_userLocationsDialog) { if (!_userLocationsDialog) {
JavascriptObjectMap locationObjectMap; JavascriptObjectMap locationObjectMap;
locationObjectMap.insert("InterfaceLocation", LocationScriptingInterface::getInstance()); locationObjectMap.insert("InterfaceLocation", &AddressManager::getInstance());
_userLocationsDialog = DataWebDialog::dialogForPath("/user/locations", locationObjectMap); _userLocationsDialog = DataWebDialog::dialogForPath("/user/locations", locationObjectMap);
} }
@ -1359,7 +1359,7 @@ void Menu::nameLocation() {
if (!_newLocationDialog) { if (!_newLocationDialog) {
JavascriptObjectMap locationObjectMap; JavascriptObjectMap locationObjectMap;
locationObjectMap.insert("InterfaceLocation", LocationScriptingInterface::getInstance()); locationObjectMap.insert("InterfaceLocation", &AddressManager::getInstance());
_newLocationDialog = DataWebDialog::dialogForPath("/user/locations/new", locationObjectMap); _newLocationDialog = DataWebDialog::dialogForPath("/user/locations/new", locationObjectMap);
} }

4
libraries/networking/src/AddressManager.cpp
View file

@ -71,6 +71,10 @@ const QString AddressManager::currentPath(bool withOrientation) const {
} }
} }
QString AddressManager::getDomainID() const {
return NodeList::getInstance()->getDomainHandler().getUUID().toString();
}
const JSONCallbackParameters& AddressManager::apiCallbackParameters() { const JSONCallbackParameters& AddressManager::apiCallbackParameters() {
static bool hasSetupParameters = false; static bool hasSetupParameters = false;
static JSONCallbackParameters callbackParams; static JSONCallbackParameters callbackParams;

2
libraries/networking/src/AddressManager.h
View file

@ -31,6 +31,7 @@ class AddressManager : public QObject {
Q_PROPERTY(QString protocol READ getProtocol) Q_PROPERTY(QString protocol READ getProtocol)
Q_PROPERTY(QString hostname READ getCurrentDomain) Q_PROPERTY(QString hostname READ getCurrentDomain)
Q_PROPERTY(QString pathname READ currentPath) Q_PROPERTY(QString pathname READ currentPath)
Q_PROPERTY(QString domainID READ getDomainID)
public: public:
static AddressManager& getInstance(); static AddressManager& getInstance();
@ -41,6 +42,7 @@ public:
const QString currentPath(bool withOrientation = true) const; const QString currentPath(bool withOrientation = true) const;
const QString& getCurrentDomain() const { return _currentDomain; } const QString& getCurrentDomain() const { return _currentDomain; }
QString getDomainID() const;
void attemptPlaceNameLookup(const QString& lookupString); void attemptPlaceNameLookup(const QString& lookupString);