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

Merge pull request #11848 from zfox23/commerce_flipTheSwitch

Browse source 
Turn Commerce on by default!
This commit is contained in:
Howard Stearns 2017-11-20 16:18:53 -08:00 committed by GitHub
commit 4018b99118
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
interface/resources/qml/hifi/commerce/wallet/Help.qml
View file

@ -55,37 +55,6 @@ Item {
// Style // Style
color: hifi.colors.blueHighlight; color: hifi.colors.blueHighlight;
} }
HifiControlsUit.Button {
id: clearCachedPassphraseButton;
visible: root.showDebugButtons;
color: hifi.buttons.black;
colorScheme: hifi.colorSchemes.dark;
anchors.top: parent.top;
anchors.left: helpTitleText.right;
anchors.leftMargin: 20;
height: 40;
width: 150;
text: "DBG: Clear Pass";
onClicked: {
commerce.setPassphrase("");
sendSignalToWallet({method: 'passphraseReset'});
}
}
HifiControlsUit.Button {
id: resetButton;
visible: root.showDebugButtons;
color: hifi.buttons.red;
colorScheme: hifi.colorSchemes.dark;
anchors.top: clearCachedPassphraseButton.top;
anchors.left: clearCachedPassphraseButton.right;
height: 40;
width: 150;
text: "DBG: RST Wallet";
onClicked: {
commerce.reset();
sendSignalToWallet({method: 'walletReset'});
}
}
ListModel { ListModel {
id: helpModel; id: helpModel;

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

@ -204,7 +204,7 @@ bool ContextOverlayInterface::createOrDestroyContextOverlay(const EntityItemID&
bool ContextOverlayInterface::contextOverlayFilterPassed(const EntityItemID& entityItemID) { bool ContextOverlayInterface::contextOverlayFilterPassed(const EntityItemID& entityItemID) {
EntityItemProperties entityProperties = _entityScriptingInterface->getEntityProperties(entityItemID, _entityPropertyFlags); EntityItemProperties entityProperties = _entityScriptingInterface->getEntityProperties(entityItemID, _entityPropertyFlags);
Setting::Handle<bool> _settingSwitch{ "commerce", false }; Setting::Handle<bool> _settingSwitch{ "commerce", true };
if (_settingSwitch.get()) { if (_settingSwitch.get()) {
return (entityProperties.getCertificateID().length() != 0); return (entityProperties.getCertificateID().length() != 0);
} else { } else {
@ -234,7 +234,7 @@ bool ContextOverlayInterface::destroyContextOverlay(const EntityItemID& entityIt
void ContextOverlayInterface::contextOverlays_mousePressOnOverlay(const OverlayID& overlayID, const PointerEvent& event) { void ContextOverlayInterface::contextOverlays_mousePressOnOverlay(const OverlayID& overlayID, const PointerEvent& event) {
if (overlayID == _contextOverlayID && event.getButton() == PointerEvent::PrimaryButton) { if (overlayID == _contextOverlayID && event.getButton() == PointerEvent::PrimaryButton) {
qCDebug(context_overlay) << "Clicked Context Overlay. Entity ID:" << _currentEntityWithContextOverlay << "Overlay ID:" << overlayID; qCDebug(context_overlay) << "Clicked Context Overlay. Entity ID:" << _currentEntityWithContextOverlay << "Overlay ID:" << overlayID;
Setting::Handle<bool> _settingSwitch{ "commerce", false }; Setting::Handle<bool> _settingSwitch{ "commerce", true };
if (_settingSwitch.get()) { if (_settingSwitch.get()) {
openInspectionCertificate(); openInspectionCertificate();
} else { } else {

2
libraries/ui/src/ui/types/RequestFilters.cpp
View file

@ -62,7 +62,7 @@ void RequestFilters::interceptHFWebEngineRequest(QWebEngineUrlRequestInfo& info)
// During the period in which we have HFC commerce in the system, but not applied everywhere: // During the period in which we have HFC commerce in the system, but not applied everywhere:
const QString tokenStringCommerce{ "Chrome/48.0 (HighFidelityInterface WithHFC)" }; const QString tokenStringCommerce{ "Chrome/48.0 (HighFidelityInterface WithHFC)" };
Setting::Handle<bool> _settingSwitch{ "commerce", false }; Setting::Handle<bool> _settingSwitch{ "commerce", true };
bool isMoney = _settingSwitch.get(); bool isMoney = _settingSwitch.get();
const QString tokenString = !isAuthable ? tokenStringMobile : (isMoney ? tokenStringCommerce : tokenStringMetaverse); const QString tokenString = !isAuthable ? tokenStringMobile : (isMoney ? tokenStringCommerce : tokenStringMetaverse);

2
scripts/system/commerce/wallet.js
View file

@ -145,7 +145,7 @@
var button; var button;
var buttonName = "WALLET"; var buttonName = "WALLET";
var tablet = null; var tablet = null;
var walletEnabled = Settings.getValue("commerce", false); var walletEnabled = Settings.getValue("commerce", true);
function startup() { function startup() {
if (walletEnabled) { if (walletEnabled) {
tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system"); tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");

2
scripts/system/marketplaces/marketplaces.js
View file

@ -160,7 +160,7 @@
type: "marketplaces", type: "marketplaces",
action: "commerceSetting", action: "commerceSetting",
data: { data: {
commerceMode: Settings.getValue("commerce", false), commerceMode: Settings.getValue("commerce", true),
userIsLoggedIn: Account.loggedIn, userIsLoggedIn: Account.loggedIn,
walletNeedsSetup: Wallet.walletStatus === 1, walletNeedsSetup: Wallet.walletStatus === 1,
metaverseServerURL: Account.metaverseServerURL metaverseServerURL: Account.metaverseServerURL