| @@ -64,14 +64,14 @@ public: | |||||
| if (showCheckbox) | if (showCheckbox) | ||||
| { | { | ||||
| addAndMakeVisible (shareApplicationUsageDataToggle); | |||||
| addAndMakeVisible (shareApplicationUsageDataToggle = new ToggleButton()); | |||||
| auto* controller = ProjucerApplication::getApp().licenseController.get(); | auto* controller = ProjucerApplication::getApp().licenseController.get(); | ||||
| if (controller != nullptr && controller->getState().applicationUsageDataState == LicenseState::ApplicationUsageData::disabled) | if (controller != nullptr && controller->getState().applicationUsageDataState == LicenseState::ApplicationUsageData::disabled) | ||||
| shareApplicationUsageDataToggle.setToggleState (false, dontSendNotification); | |||||
| shareApplicationUsageDataToggle->setToggleState (false, dontSendNotification); | |||||
| else | else | ||||
| shareApplicationUsageDataToggle.setToggleState (true, dontSendNotification); | |||||
| shareApplicationUsageDataToggle->setToggleState (true, dontSendNotification); | |||||
| addAndMakeVisible (shareApplicationUsageDataLabel); | addAndMakeVisible (shareApplicationUsageDataLabel); | ||||
| shareApplicationUsageDataLabel.setFont (Font (14.0f)); | shareApplicationUsageDataLabel.setFont (Font (14.0f)); | ||||
| @@ -96,7 +96,7 @@ public: | |||||
| { | { | ||||
| auto newApplicationUsageDataState = LicenseState::ApplicationUsageData::enabled; | auto newApplicationUsageDataState = LicenseState::ApplicationUsageData::enabled; | ||||
| if (shareApplicationUsageDataToggle.isShowing() && ! shareApplicationUsageDataToggle.getToggleState()) | |||||
| if (shareApplicationUsageDataToggle != nullptr && ! shareApplicationUsageDataToggle->getToggleState()) | |||||
| newApplicationUsageDataState = LicenseState::ApplicationUsageData::disabled; | newApplicationUsageDataState = LicenseState::ApplicationUsageData::disabled; | ||||
| controller->setApplicationUsageDataState (newApplicationUsageDataState); | controller->setApplicationUsageDataState (newApplicationUsageDataState); | ||||
| @@ -115,12 +115,12 @@ public: | |||||
| juceEULALink.setBounds (linkBounds.removeFromLeft (linkBounds.getWidth() / 2).reduced (2)); | juceEULALink.setBounds (linkBounds.removeFromLeft (linkBounds.getWidth() / 2).reduced (2)); | ||||
| privacyPolicyLink.setBounds (linkBounds.reduced (2)); | privacyPolicyLink.setBounds (linkBounds.reduced (2)); | ||||
| if (shareApplicationUsageDataToggle.isShowing()) | |||||
| if (shareApplicationUsageDataToggle != nullptr) | |||||
| { | { | ||||
| bounds.removeFromTop (10); | bounds.removeFromTop (10); | ||||
| auto toggleBounds = bounds.removeFromTop (40); | auto toggleBounds = bounds.removeFromTop (40); | ||||
| shareApplicationUsageDataToggle.setBounds (toggleBounds.removeFromLeft (40).reduced (5)); | |||||
| shareApplicationUsageDataToggle->setBounds (toggleBounds.removeFromLeft (40).reduced (5)); | |||||
| shareApplicationUsageDataLabel.setBounds (toggleBounds); | shareApplicationUsageDataLabel.setBounds (toggleBounds); | ||||
| } | } | ||||
| @@ -151,7 +151,7 @@ private: | |||||
| Label headerLabel, bodyLabel; | Label headerLabel, bodyLabel; | ||||
| HyperlinkButton juceEULALink, privacyPolicyLink; | HyperlinkButton juceEULALink, privacyPolicyLink; | ||||
| Label shareApplicationUsageDataLabel { {}, "Help JUCE to improve its software and services by sharing my application usage data" }; | Label shareApplicationUsageDataLabel { {}, "Help JUCE to improve its software and services by sharing my application usage data" }; | ||||
| ToggleButton shareApplicationUsageDataToggle; | |||||
| ScopedPointer<ToggleButton> shareApplicationUsageDataToggle; | |||||
| TextButton okButton { "OK" }, upgradeLicenseButton { "Upgrade License" }; | TextButton okButton { "OK" }, upgradeLicenseButton { "Upgrade License" }; | ||||
| void lookAndFeelChanged() override | void lookAndFeelChanged() override | ||||