DISTRHO
/
JUCE
mirror of https://github.com/DISTRHO/JUCE
1
0
Fork 0
Code Releases 1 Activity
Browse Source

Projucer: Removed analytics

tags/2021-05-28
ed 5 years ago
parent
521c250413
commit
de23ef7b1f
31 changed files with 32 additions and 1056 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -14
      extras/Projucer/Builds/LinuxMakefile/Makefile
  2. +2
    -54
      extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj
  3. +4
    -25
      extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj
  4. +0
    -48
      extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj.filters
  5. +4
    -25
      extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj
  6. +0
    -48
      extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj.filters
  7. +4
    -25
      extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj
  8. +0
    -48
      extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj.filters
  9. +0
    -2
      extras/Projucer/CMakeLists.txt
  10. +0
    -1
      extras/Projucer/JuceLibraryCode/JuceHeader.h
  11. +0
    -8
      extras/Projucer/JuceLibraryCode/include_juce_analytics.cpp
  12. +0
    -12
      extras/Projucer/Projucer.jucer
  13. +0
    -156
      extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h
  14. +2
    -94
      extras/Projucer/Source/Application/jucer_Application.cpp
  15. +2
    -15
      extras/Projucer/Source/Application/jucer_Application.h
  16. +1
    -2
      extras/Projucer/Source/Application/jucer_CommandIDs.h
  17. +0
    -1
      extras/Projucer/Source/Application/jucer_Main.cpp
  18. +0
    -246
      extras/Projucer/Source/Application/jucer_ProjucerAnalytics.cpp
  19. +0
    -61
      extras/Projucer/Source/Application/jucer_ProjucerAnalytics.h
  20. +0
    -6
      extras/Projucer/Source/ComponentEditor/UI/jucer_JucerDocumentEditor.cpp
  21. +0
    -42
      extras/Projucer/Source/Licenses/jucer_LicenseController.cpp
  22. +2
    -14
      extras/Projucer/Source/Licenses/jucer_LicenseController.h
  23. +2
    -3
      extras/Projucer/Source/Project/UI/Sidebar/jucer_ModuleTreeItems.h
  24. +0
    -16
      extras/Projucer/Source/Project/UI/jucer_HeaderComponent.cpp
  25. +0
    -17
      extras/Projucer/Source/Project/UI/jucer_ProjectContentComponent.cpp
  26. +3
    -12
      extras/Projucer/Source/Project/jucer_Module.cpp
  27. +1
    -1
      extras/Projucer/Source/Project/jucer_Module.h
  28. +2
    -40
      extras/Projucer/Source/Project/jucer_Project.cpp
  29. +0
    -6
      extras/Projucer/Source/Project/jucer_Project.h
  30. +1
    -6
      extras/Projucer/Source/Wizards/jucer_NewProjectWizard.h
  31. +0
    -8
      extras/Projucer/Source/Wizards/jucer_TemplateThumbnailsComponent.h

+ 2
- 14
extras/Projucer/Builds/LinuxMakefile/Makefile View File

@@ -35,7 +35,7 @@ ifeq ($(CONFIG),Debug)
TARGET_ARCH :=
endif

JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=6.0.0" "-DJUCE_APP_VERSION_HEX=0x60000" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_REPORT_APP_USAGE=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60000" "-DJUCE_MODULE_AVAILABLE_juce_analytics=1" "-DJUCE_MODULE_AVAILABLE_juce_build_tools=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_LOG_ASSERTIONS=1" "-DJUCE_USE_CURL=1" "-DJUCE_LOAD_CURL_SYMBOLS_LAZILY=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_STANDALONE_APPLICATION=1" $(shell pkg-config --cflags freetype2 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules -I../../../Build $(CPPFLAGS)
JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=6.0.0" "-DJUCE_APP_VERSION_HEX=0x60000" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_REPORT_APP_USAGE=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60000" "-DJUCE_MODULE_AVAILABLE_juce_build_tools=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_LOG_ASSERTIONS=1" "-DJUCE_USE_CURL=1" "-DJUCE_LOAD_CURL_SYMBOLS_LAZILY=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_STANDALONE_APPLICATION=1" $(shell pkg-config --cflags freetype2 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../Build -I../../../../modules $(CPPFLAGS)
JUCE_CPPFLAGS_APP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_RTAS=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0"
JUCE_TARGET_APP := Projucer

@@ -56,7 +56,7 @@ ifeq ($(CONFIG),Release)
TARGET_ARCH :=
endif

JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=6.0.0" "-DJUCE_APP_VERSION_HEX=0x60000" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_REPORT_APP_USAGE=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60000" "-DJUCE_MODULE_AVAILABLE_juce_analytics=1" "-DJUCE_MODULE_AVAILABLE_juce_build_tools=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_LOG_ASSERTIONS=1" "-DJUCE_USE_CURL=1" "-DJUCE_LOAD_CURL_SYMBOLS_LAZILY=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_STANDALONE_APPLICATION=1" $(shell pkg-config --cflags freetype2 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules -I../../../Build $(CPPFLAGS)
JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=6.0.0" "-DJUCE_APP_VERSION_HEX=0x60000" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_REPORT_APP_USAGE=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60000" "-DJUCE_MODULE_AVAILABLE_juce_build_tools=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_LOG_ASSERTIONS=1" "-DJUCE_USE_CURL=1" "-DJUCE_LOAD_CURL_SYMBOLS_LAZILY=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_STANDALONE_APPLICATION=1" $(shell pkg-config --cflags freetype2 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../Build -I../../../../modules $(CPPFLAGS)
JUCE_CPPFLAGS_APP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_RTAS=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0"
JUCE_TARGET_APP := Projucer

@@ -72,7 +72,6 @@ OBJECTS_APP := \
$(JUCE_OBJDIR)/jucer_CommandLine_f35de107.o \
$(JUCE_OBJDIR)/jucer_Main_f8488f5b.o \
$(JUCE_OBJDIR)/jucer_MainWindow_1e163aeb.o \
$(JUCE_OBJDIR)/jucer_ProjucerAnalytics_5740f336.o \
$(JUCE_OBJDIR)/jucer_DocumentEditorComponent_bc853a2f.o \
$(JUCE_OBJDIR)/jucer_OpenDocumentManager_ba866622.o \
$(JUCE_OBJDIR)/jucer_SourceCodeEditor_55965985.o \
@@ -122,7 +121,6 @@ OBJECTS_APP := \
$(JUCE_OBJDIR)/jucer_NewFileWizard_fac97f47.o \
$(JUCE_OBJDIR)/jucer_NewProjectWizardClasses_891f6fa2.o \
$(JUCE_OBJDIR)/BinaryData_ce4232d4.o \
$(JUCE_OBJDIR)/include_juce_analytics_f8e9fa94.o \
$(JUCE_OBJDIR)/include_juce_build_tools_f5069398.o \
$(JUCE_OBJDIR)/include_juce_core_f26d17db.o \
$(JUCE_OBJDIR)/include_juce_cryptography_8cb807a8.o \
@@ -165,11 +163,6 @@ $(JUCE_OBJDIR)/jucer_MainWindow_1e163aeb.o: ../../Source/Application/jucer_MainW
@echo "Compiling jucer_MainWindow.cpp"
$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"

$(JUCE_OBJDIR)/jucer_ProjucerAnalytics_5740f336.o: ../../Source/Application/jucer_ProjucerAnalytics.cpp
-$(V_AT)mkdir -p $(JUCE_OBJDIR)
@echo "Compiling jucer_ProjucerAnalytics.cpp"
$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"

$(JUCE_OBJDIR)/jucer_DocumentEditorComponent_bc853a2f.o: ../../Source/CodeEditor/jucer_DocumentEditorComponent.cpp
-$(V_AT)mkdir -p $(JUCE_OBJDIR)
@echo "Compiling jucer_DocumentEditorComponent.cpp"
@@ -415,11 +408,6 @@ $(JUCE_OBJDIR)/BinaryData_ce4232d4.o: ../../JuceLibraryCode/BinaryData.cpp
@echo "Compiling BinaryData.cpp"
$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"

$(JUCE_OBJDIR)/include_juce_analytics_f8e9fa94.o: ../../JuceLibraryCode/include_juce_analytics.cpp
-$(V_AT)mkdir -p $(JUCE_OBJDIR)
@echo "Compiling include_juce_analytics.cpp"
$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"

$(JUCE_OBJDIR)/include_juce_build_tools_f5069398.o: ../../JuceLibraryCode/include_juce_build_tools.cpp
-$(V_AT)mkdir -p $(JUCE_OBJDIR)
@echo "Compiling include_juce_build_tools.cpp"


+ 2
- 54
extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj View File

@@ -93,10 +93,6 @@
isa = PBXBuildFile;
fileRef = 9069981E414A631B036CC9AC;
};
98F9BB4612E82EE59689E15C = {
isa = PBXBuildFile;
fileRef = B6496F16ACE80CACC5721570;
};
09C4EDDF7F8B6E75EA3CE3A9 = {
isa = PBXBuildFile;
fileRef = BC3B310D42C489E8B8D93327;
@@ -293,10 +289,6 @@
isa = PBXBuildFile;
fileRef = 472F9A90F685220D730EBF6C;
};
202DC8CF15ACBE096CC327EA = {
isa = PBXBuildFile;
fileRef = 805A3A5FBA3B9E28363DD77B;
};
4C743A3DA8682EEE89BDBD28 = {
isa = PBXBuildFile;
fileRef = E2687B099347B364D1919A9B;
@@ -938,13 +930,6 @@
path = ../../JuceLibraryCode/BinaryData.cpp;
sourceTree = "SOURCE_ROOT";
};
4818A05DE44ADA03D85E1083 = {
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h;
name = "jucer_ProjucerAnalytics.h";
path = "../../Source/Application/jucer_ProjucerAnalytics.h";
sourceTree = "SOURCE_ROOT";
};
486E8D02DAD2A0BF54A901C0 = {
isa = PBXFileReference;
lastKnownFileType = sourcecode.cpp.cpp;
@@ -1134,13 +1119,6 @@
path = "../../JuceLibraryCode/include_juce_events.mm";
sourceTree = "SOURCE_ROOT";
};
58DE91CE6B05AFBACADDB251 = {
isa = PBXFileReference;
lastKnownFileType = file;
name = "juce_analytics";
path = "../../../../modules/juce_analytics";
sourceTree = "SOURCE_ROOT";
};
58F1FF52E887887A93E84FC2 = {
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h;
@@ -1442,13 +1420,6 @@
path = "../../Source/ComponentEditor/Properties/jucer_ColourPropertyComponent.h";
sourceTree = "SOURCE_ROOT";
};
805A3A5FBA3B9E28363DD77B = {
isa = PBXFileReference;
lastKnownFileType = sourcecode.cpp.cpp;
name = "include_juce_analytics.cpp";
path = "../../JuceLibraryCode/include_juce_analytics.cpp";
sourceTree = "SOURCE_ROOT";
};
807049CA2D5B6DE18EA078F2 = {
isa = PBXFileReference;
lastKnownFileType = file.svg;
@@ -1967,13 +1938,6 @@
path = "../../Source/Utility/Helpers/jucer_FileHelpers.cpp";
sourceTree = "SOURCE_ROOT";
};
B6496F16ACE80CACC5721570 = {
isa = PBXFileReference;
lastKnownFileType = sourcecode.cpp.cpp;
name = "jucer_ProjucerAnalytics.cpp";
path = "../../Source/Application/jucer_ProjucerAnalytics.cpp";
sourceTree = "SOURCE_ROOT";
};
B6F2905330EA5C560D527209 = {
isa = PBXFileReference;
lastKnownFileType = file;
@@ -1988,13 +1952,6 @@
path = "../../Source/BinaryData/Icons/juce_icon.png";
sourceTree = "SOURCE_ROOT";
};
B83DAADA1A871F21582FFB23 = {
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h;
name = "jucer_ApplicationUsageDataWindowComponent.h";
path = "../../Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h";
sourceTree = "SOURCE_ROOT";
};
B97D60D2531CFD0D8555BA5C = {
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h;
@@ -2643,7 +2600,6 @@
isa = PBXGroup;
children = (
DE4A987B2D5529990A6AA9D4,
B83DAADA1A871F21582FFB23,
D91E7F8FEF9290195D56782C,
C736264708F3F68BA745BA29,
EB2E723DC3DB150A8A644D08,
@@ -2671,8 +2627,6 @@
8C52A3DDA62A746AA7A68535,
9069981E414A631B036CC9AC,
2CD34A70B4032C0426F7AA10,
B6496F16ACE80CACC5721570,
4818A05DE44ADA03D85E1083,
);
name = Application;
sourceTree = "<group>";
@@ -3155,7 +3109,6 @@
8A24D1B6925535A868974986 = {
isa = PBXGroup;
children = (
58DE91CE6B05AFBACADDB251,
EE12741389A87D1BF04AE795,
BA159A3B7D129771F5C15EA3,
AA1C44E89D792DDC4867B2C8,
@@ -3173,7 +3126,6 @@
children = (
472F9A90F685220D730EBF6C,
4F687965FBE86EAFDB3ACFEC,
805A3A5FBA3B9E28363DD77B,
E2687B099347B364D1919A9B,
DB9C8E35DF815B803CB4A9CF,
D766BB9D8C32B5560F0493F3,
@@ -3270,7 +3222,6 @@
"JUCE_REPORT_APP_USAGE=0",
"JUCE_USE_DARK_SPLASH_SCREEN=1",
"JUCE_PROJUCER_VERSION=0x60000",
"JUCE_MODULE_AVAILABLE_juce_analytics=1",
"JUCE_MODULE_AVAILABLE_juce_build_tools=1",
"JUCE_MODULE_AVAILABLE_juce_core=1",
"JUCE_MODULE_AVAILABLE_juce_cryptography=1",
@@ -3290,8 +3241,8 @@
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = (
"../../JuceLibraryCode",
"../../../../modules",
"../../../Build",
"../../../../modules",
"$(inherited)",
);
INFOPLIST_FILE = Info-App.plist;
@@ -3335,7 +3286,6 @@
"JUCE_REPORT_APP_USAGE=0",
"JUCE_USE_DARK_SPLASH_SCREEN=1",
"JUCE_PROJUCER_VERSION=0x60000",
"JUCE_MODULE_AVAILABLE_juce_analytics=1",
"JUCE_MODULE_AVAILABLE_juce_build_tools=1",
"JUCE_MODULE_AVAILABLE_juce_core=1",
"JUCE_MODULE_AVAILABLE_juce_cryptography=1",
@@ -3355,8 +3305,8 @@
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = (
"../../JuceLibraryCode",
"../../../../modules",
"../../../Build",
"../../../../modules",
"$(inherited)",
);
INFOPLIST_FILE = Info-App.plist;
@@ -3506,7 +3456,6 @@
954A036F5DDB375DB23FFB3E,
95B44E6C74B1DED31DBE37EB,
AA9D0B8E23F3D87A23DE9F8A,
98F9BB4612E82EE59689E15C,
09C4EDDF7F8B6E75EA3CE3A9,
71713DE4716DCEDB45A206E2,
940CE4E081E9E685243C07AA,
@@ -3556,7 +3505,6 @@
518DD443B6F17A5AFD707263,
B7EBA1A83575F48CD08140B9,
3C5267E06A897B0DC0F7EA50,
202DC8CF15ACBE096CC327EA,
4C743A3DA8682EEE89BDBD28,
5DD883699B85E4C492CAD065,
D5C9125F65493CA481F18E53,


+ 4
- 25
extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj View File

@@ -63,8 +63,8 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;..\..\..\Build;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_build_tools=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_LOG_ASSERTIONS=1;JUCE_USE_CURL=1;JUCE_LOAD_CURL_SYMBOLS_LAZILY=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\Build;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_build_tools=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_LOG_ASSERTIONS=1;JUCE_USE_CURL=1;JUCE_LOAD_CURL_SYMBOLS_LAZILY=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/>
@@ -105,8 +105,8 @@
</Midl>
<ClCompile>
<Optimization>Full</Optimization>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;..\..\..\Build;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_build_tools=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_LOG_ASSERTIONS=1;JUCE_USE_CURL=1;JUCE_LOAD_CURL_SYMBOLS_LAZILY=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\Build;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_build_tools=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_LOG_ASSERTIONS=1;JUCE_USE_CURL=1;JUCE_LOAD_CURL_SYMBOLS_LAZILY=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/>
@@ -147,7 +147,6 @@
<ClCompile Include="..\..\Source\Application\jucer_CommandLine.cpp"/>
<ClCompile Include="..\..\Source\Application\jucer_Main.cpp"/>
<ClCompile Include="..\..\Source\Application\jucer_MainWindow.cpp"/>
<ClCompile Include="..\..\Source\Application\jucer_ProjucerAnalytics.cpp"/>
<ClCompile Include="..\..\Source\BinaryData\Templates\jucer_AnimatedComponentTemplate.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@@ -238,18 +237,6 @@
<ClCompile Include="..\..\Source\Utility\UI\jucer_SlidingPanelComponent.cpp"/>
<ClCompile Include="..\..\Source\Wizards\jucer_NewFileWizard.cpp"/>
<ClCompile Include="..\..\Source\Wizards\jucer_NewProjectWizardClasses.cpp"/>
<ClCompile Include="..\..\..\..\modules\juce_analytics\analytics\juce_Analytics.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_analytics\analytics\juce_ButtonTracker.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_analytics\destinations\juce_ThreadedAnalyticsDestination.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_analytics\juce_analytics.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\Build\juce_build_tools\utils\juce_BinaryResourceFile.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@@ -1487,7 +1474,6 @@
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\JuceLibraryCode\BinaryData.cpp"/>
<ClCompile Include="..\..\JuceLibraryCode\include_juce_analytics.cpp"/>
<ClCompile Include="..\..\JuceLibraryCode\include_juce_build_tools.cpp"/>
<ClCompile Include="..\..\JuceLibraryCode\include_juce_core.cpp"/>
<ClCompile Include="..\..\JuceLibraryCode\include_juce_cryptography.cpp"/>
@@ -1499,7 +1485,6 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\Source\Application\Windows\jucer_AboutWindowComponent.h"/>
<ClInclude Include="..\..\Source\Application\Windows\jucer_ApplicationUsageDataWindowComponent.h"/>
<ClInclude Include="..\..\Source\Application\Windows\jucer_EditorColourSchemeWindowComponent.h"/>
<ClInclude Include="..\..\Source\Application\Windows\jucer_FloatingToolWindow.h"/>
<ClInclude Include="..\..\Source\Application\Windows\jucer_GlobalPathsWindowComponent.h"/>
@@ -1514,7 +1499,6 @@
<ClInclude Include="..\..\Source\Application\jucer_CommonHeaders.h"/>
<ClInclude Include="..\..\Source\Application\jucer_Headers.h"/>
<ClInclude Include="..\..\Source\Application\jucer_MainWindow.h"/>
<ClInclude Include="..\..\Source\Application\jucer_ProjucerAnalytics.h"/>
<ClInclude Include="..\..\Source\BinaryData\Templates\jucer_AnimatedComponentSimpleTemplate.h"/>
<ClInclude Include="..\..\Source\BinaryData\Templates\jucer_AnimatedComponentTemplate.h"/>
<ClInclude Include="..\..\Source\BinaryData\Templates\jucer_AudioComponentSimpleTemplate.h"/>
@@ -1685,11 +1669,6 @@
<ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_StaticLibrary.h"/>
<ClInclude Include="..\..\Source\Wizards\jucer_StartPageComponent.h"/>
<ClInclude Include="..\..\Source\Wizards\jucer_TemplateThumbnailsComponent.h"/>
<ClInclude Include="..\..\..\..\modules\juce_analytics\analytics\juce_Analytics.h"/>
<ClInclude Include="..\..\..\..\modules\juce_analytics\analytics\juce_ButtonTracker.h"/>
<ClInclude Include="..\..\..\..\modules\juce_analytics\destinations\juce_AnalyticsDestination.h"/>
<ClInclude Include="..\..\..\..\modules\juce_analytics\destinations\juce_ThreadedAnalyticsDestination.h"/>
<ClInclude Include="..\..\..\..\modules\juce_analytics\juce_analytics.h"/>
<ClInclude Include="..\..\..\Build\juce_build_tools\utils\juce_BinaryResourceFile.h"/>
<ClInclude Include="..\..\..\Build\juce_build_tools\utils\juce_BuildHelperFunctions.h"/>
<ClInclude Include="..\..\..\Build\juce_build_tools\utils\juce_Entitlements.h"/>


+ 0
- 48
extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj.filters View File

@@ -86,15 +86,6 @@
<Filter Include="Projucer">
<UniqueIdentifier>{7DBEF27C-2AFE-DA02-1DBF-E80FAAC99EA7}</UniqueIdentifier>
</Filter>
<Filter Include="JUCE Modules\juce_analytics\analytics">
<UniqueIdentifier>{E3CEC08A-FA14-D343-5BFF-3D6A4A4FD713}</UniqueIdentifier>
</Filter>
<Filter Include="JUCE Modules\juce_analytics\destinations">
<UniqueIdentifier>{B3BC836A-3932-C1E4-CA3C-A1C0D83281BA}</UniqueIdentifier>
</Filter>
<Filter Include="JUCE Modules\juce_analytics">
<UniqueIdentifier>{97F7F593-75F8-D6B2-DC96-C946C3976226}</UniqueIdentifier>
</Filter>
<Filter Include="JUCE Modules\juce_build_tools\utils">
<UniqueIdentifier>{D9FAFF6D-6737-F775-056A-D0B29BE13820}</UniqueIdentifier>
</Filter>
@@ -337,9 +328,6 @@
<ClCompile Include="..\..\Source\Application\jucer_MainWindow.cpp">
<Filter>Projucer\Application</Filter>
</ClCompile>
<ClCompile Include="..\..\Source\Application\jucer_ProjucerAnalytics.cpp">
<Filter>Projucer\Application</Filter>
</ClCompile>
<ClCompile Include="..\..\Source\BinaryData\Templates\jucer_AnimatedComponentTemplate.cpp">
<Filter>Projucer\BinaryData\Templates</Filter>
</ClCompile>
@@ -526,18 +514,6 @@
<ClCompile Include="..\..\Source\Wizards\jucer_NewProjectWizardClasses.cpp">
<Filter>Projucer\Wizards</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_analytics\analytics\juce_Analytics.cpp">
<Filter>JUCE Modules\juce_analytics\analytics</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_analytics\analytics\juce_ButtonTracker.cpp">
<Filter>JUCE Modules\juce_analytics\analytics</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_analytics\destinations\juce_ThreadedAnalyticsDestination.cpp">
<Filter>JUCE Modules\juce_analytics\destinations</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_analytics\juce_analytics.cpp">
<Filter>JUCE Modules\juce_analytics</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Build\juce_build_tools\utils\juce_BinaryResourceFile.cpp">
<Filter>JUCE Modules\juce_build_tools\utils</Filter>
</ClCompile>
@@ -1861,9 +1837,6 @@
<ClCompile Include="..\..\JuceLibraryCode\BinaryData.cpp">
<Filter>JUCE Library Code</Filter>
</ClCompile>
<ClCompile Include="..\..\JuceLibraryCode\include_juce_analytics.cpp">
<Filter>JUCE Library Code</Filter>
</ClCompile>
<ClCompile Include="..\..\JuceLibraryCode\include_juce_build_tools.cpp">
<Filter>JUCE Library Code</Filter>
</ClCompile>
@@ -1893,9 +1866,6 @@
<ClInclude Include="..\..\Source\Application\Windows\jucer_AboutWindowComponent.h">
<Filter>Projucer\Application\Windows</Filter>
</ClInclude>
<ClInclude Include="..\..\Source\Application\Windows\jucer_ApplicationUsageDataWindowComponent.h">
<Filter>Projucer\Application\Windows</Filter>
</ClInclude>
<ClInclude Include="..\..\Source\Application\Windows\jucer_EditorColourSchemeWindowComponent.h">
<Filter>Projucer\Application\Windows</Filter>
</ClInclude>
@@ -1938,9 +1908,6 @@
<ClInclude Include="..\..\Source\Application\jucer_MainWindow.h">
<Filter>Projucer\Application</Filter>
</ClInclude>
<ClInclude Include="..\..\Source\Application\jucer_ProjucerAnalytics.h">
<Filter>Projucer\Application</Filter>
</ClInclude>
<ClInclude Include="..\..\Source\BinaryData\Templates\jucer_AnimatedComponentSimpleTemplate.h">
<Filter>Projucer\BinaryData\Templates</Filter>
</ClInclude>
@@ -2451,21 +2418,6 @@
<ClInclude Include="..\..\Source\Wizards\jucer_TemplateThumbnailsComponent.h">
<Filter>Projucer\Wizards</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_analytics\analytics\juce_Analytics.h">
<Filter>JUCE Modules\juce_analytics\analytics</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_analytics\analytics\juce_ButtonTracker.h">
<Filter>JUCE Modules\juce_analytics\analytics</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_analytics\destinations\juce_AnalyticsDestination.h">
<Filter>JUCE Modules\juce_analytics\destinations</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_analytics\destinations\juce_ThreadedAnalyticsDestination.h">
<Filter>JUCE Modules\juce_analytics\destinations</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_analytics\juce_analytics.h">
<Filter>JUCE Modules\juce_analytics</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Build\juce_build_tools\utils\juce_BinaryResourceFile.h">
<Filter>JUCE Modules\juce_build_tools\utils</Filter>
</ClInclude>


+ 4
- 25
extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj View File

@@ -63,8 +63,8 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;..\..\..\Build;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_build_tools=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_LOG_ASSERTIONS=1;JUCE_USE_CURL=1;JUCE_LOAD_CURL_SYMBOLS_LAZILY=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\Build;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_build_tools=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_LOG_ASSERTIONS=1;JUCE_USE_CURL=1;JUCE_LOAD_CURL_SYMBOLS_LAZILY=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/>
@@ -105,8 +105,8 @@
</Midl>
<ClCompile>
<Optimization>Full</Optimization>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;..\..\..\Build;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_build_tools=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_LOG_ASSERTIONS=1;JUCE_USE_CURL=1;JUCE_LOAD_CURL_SYMBOLS_LAZILY=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\Build;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_build_tools=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_LOG_ASSERTIONS=1;JUCE_USE_CURL=1;JUCE_LOAD_CURL_SYMBOLS_LAZILY=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/>
@@ -147,7 +147,6 @@
<ClCompile Include="..\..\Source\Application\jucer_CommandLine.cpp"/>
<ClCompile Include="..\..\Source\Application\jucer_Main.cpp"/>
<ClCompile Include="..\..\Source\Application\jucer_MainWindow.cpp"/>
<ClCompile Include="..\..\Source\Application\jucer_ProjucerAnalytics.cpp"/>
<ClCompile Include="..\..\Source\BinaryData\Templates\jucer_AnimatedComponentTemplate.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@@ -238,18 +237,6 @@
<ClCompile Include="..\..\Source\Utility\UI\jucer_SlidingPanelComponent.cpp"/>
<ClCompile Include="..\..\Source\Wizards\jucer_NewFileWizard.cpp"/>
<ClCompile Include="..\..\Source\Wizards\jucer_NewProjectWizardClasses.cpp"/>
<ClCompile Include="..\..\..\..\modules\juce_analytics\analytics\juce_Analytics.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_analytics\analytics\juce_ButtonTracker.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_analytics\destinations\juce_ThreadedAnalyticsDestination.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_analytics\juce_analytics.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\Build\juce_build_tools\utils\juce_BinaryResourceFile.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@@ -1487,7 +1474,6 @@
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\JuceLibraryCode\BinaryData.cpp"/>
<ClCompile Include="..\..\JuceLibraryCode\include_juce_analytics.cpp"/>
<ClCompile Include="..\..\JuceLibraryCode\include_juce_build_tools.cpp"/>
<ClCompile Include="..\..\JuceLibraryCode\include_juce_core.cpp"/>
<ClCompile Include="..\..\JuceLibraryCode\include_juce_cryptography.cpp"/>
@@ -1499,7 +1485,6 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\Source\Application\Windows\jucer_AboutWindowComponent.h"/>
<ClInclude Include="..\..\Source\Application\Windows\jucer_ApplicationUsageDataWindowComponent.h"/>
<ClInclude Include="..\..\Source\Application\Windows\jucer_EditorColourSchemeWindowComponent.h"/>
<ClInclude Include="..\..\Source\Application\Windows\jucer_FloatingToolWindow.h"/>
<ClInclude Include="..\..\Source\Application\Windows\jucer_GlobalPathsWindowComponent.h"/>
@@ -1514,7 +1499,6 @@
<ClInclude Include="..\..\Source\Application\jucer_CommonHeaders.h"/>
<ClInclude Include="..\..\Source\Application\jucer_Headers.h"/>
<ClInclude Include="..\..\Source\Application\jucer_MainWindow.h"/>
<ClInclude Include="..\..\Source\Application\jucer_ProjucerAnalytics.h"/>
<ClInclude Include="..\..\Source\BinaryData\Templates\jucer_AnimatedComponentSimpleTemplate.h"/>
<ClInclude Include="..\..\Source\BinaryData\Templates\jucer_AnimatedComponentTemplate.h"/>
<ClInclude Include="..\..\Source\BinaryData\Templates\jucer_AudioComponentSimpleTemplate.h"/>
@@ -1685,11 +1669,6 @@
<ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_StaticLibrary.h"/>
<ClInclude Include="..\..\Source\Wizards\jucer_StartPageComponent.h"/>
<ClInclude Include="..\..\Source\Wizards\jucer_TemplateThumbnailsComponent.h"/>
<ClInclude Include="..\..\..\..\modules\juce_analytics\analytics\juce_Analytics.h"/>
<ClInclude Include="..\..\..\..\modules\juce_analytics\analytics\juce_ButtonTracker.h"/>
<ClInclude Include="..\..\..\..\modules\juce_analytics\destinations\juce_AnalyticsDestination.h"/>
<ClInclude Include="..\..\..\..\modules\juce_analytics\destinations\juce_ThreadedAnalyticsDestination.h"/>
<ClInclude Include="..\..\..\..\modules\juce_analytics\juce_analytics.h"/>
<ClInclude Include="..\..\..\Build\juce_build_tools\utils\juce_BinaryResourceFile.h"/>
<ClInclude Include="..\..\..\Build\juce_build_tools\utils\juce_BuildHelperFunctions.h"/>
<ClInclude Include="..\..\..\Build\juce_build_tools\utils\juce_Entitlements.h"/>


+ 0
- 48
extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj.filters View File

@@ -86,15 +86,6 @@
<Filter Include="Projucer">
<UniqueIdentifier>{7DBEF27C-2AFE-DA02-1DBF-E80FAAC99EA7}</UniqueIdentifier>
</Filter>
<Filter Include="JUCE Modules\juce_analytics\analytics">
<UniqueIdentifier>{E3CEC08A-FA14-D343-5BFF-3D6A4A4FD713}</UniqueIdentifier>
</Filter>
<Filter Include="JUCE Modules\juce_analytics\destinations">
<UniqueIdentifier>{B3BC836A-3932-C1E4-CA3C-A1C0D83281BA}</UniqueIdentifier>
</Filter>
<Filter Include="JUCE Modules\juce_analytics">
<UniqueIdentifier>{97F7F593-75F8-D6B2-DC96-C946C3976226}</UniqueIdentifier>
</Filter>
<Filter Include="JUCE Modules\juce_build_tools\utils">
<UniqueIdentifier>{D9FAFF6D-6737-F775-056A-D0B29BE13820}</UniqueIdentifier>
</Filter>
@@ -337,9 +328,6 @@
<ClCompile Include="..\..\Source\Application\jucer_MainWindow.cpp">
<Filter>Projucer\Application</Filter>
</ClCompile>
<ClCompile Include="..\..\Source\Application\jucer_ProjucerAnalytics.cpp">
<Filter>Projucer\Application</Filter>
</ClCompile>
<ClCompile Include="..\..\Source\BinaryData\Templates\jucer_AnimatedComponentTemplate.cpp">
<Filter>Projucer\BinaryData\Templates</Filter>
</ClCompile>
@@ -526,18 +514,6 @@
<ClCompile Include="..\..\Source\Wizards\jucer_NewProjectWizardClasses.cpp">
<Filter>Projucer\Wizards</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_analytics\analytics\juce_Analytics.cpp">
<Filter>JUCE Modules\juce_analytics\analytics</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_analytics\analytics\juce_ButtonTracker.cpp">
<Filter>JUCE Modules\juce_analytics\analytics</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_analytics\destinations\juce_ThreadedAnalyticsDestination.cpp">
<Filter>JUCE Modules\juce_analytics\destinations</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_analytics\juce_analytics.cpp">
<Filter>JUCE Modules\juce_analytics</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Build\juce_build_tools\utils\juce_BinaryResourceFile.cpp">
<Filter>JUCE Modules\juce_build_tools\utils</Filter>
</ClCompile>
@@ -1861,9 +1837,6 @@
<ClCompile Include="..\..\JuceLibraryCode\BinaryData.cpp">
<Filter>JUCE Library Code</Filter>
</ClCompile>
<ClCompile Include="..\..\JuceLibraryCode\include_juce_analytics.cpp">
<Filter>JUCE Library Code</Filter>
</ClCompile>
<ClCompile Include="..\..\JuceLibraryCode\include_juce_build_tools.cpp">
<Filter>JUCE Library Code</Filter>
</ClCompile>
@@ -1893,9 +1866,6 @@
<ClInclude Include="..\..\Source\Application\Windows\jucer_AboutWindowComponent.h">
<Filter>Projucer\Application\Windows</Filter>
</ClInclude>
<ClInclude Include="..\..\Source\Application\Windows\jucer_ApplicationUsageDataWindowComponent.h">
<Filter>Projucer\Application\Windows</Filter>
</ClInclude>
<ClInclude Include="..\..\Source\Application\Windows\jucer_EditorColourSchemeWindowComponent.h">
<Filter>Projucer\Application\Windows</Filter>
</ClInclude>
@@ -1938,9 +1908,6 @@
<ClInclude Include="..\..\Source\Application\jucer_MainWindow.h">
<Filter>Projucer\Application</Filter>
</ClInclude>
<ClInclude Include="..\..\Source\Application\jucer_ProjucerAnalytics.h">
<Filter>Projucer\Application</Filter>
</ClInclude>
<ClInclude Include="..\..\Source\BinaryData\Templates\jucer_AnimatedComponentSimpleTemplate.h">
<Filter>Projucer\BinaryData\Templates</Filter>
</ClInclude>
@@ -2451,21 +2418,6 @@
<ClInclude Include="..\..\Source\Wizards\jucer_TemplateThumbnailsComponent.h">
<Filter>Projucer\Wizards</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_analytics\analytics\juce_Analytics.h">
<Filter>JUCE Modules\juce_analytics\analytics</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_analytics\analytics\juce_ButtonTracker.h">
<Filter>JUCE Modules\juce_analytics\analytics</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_analytics\destinations\juce_AnalyticsDestination.h">
<Filter>JUCE Modules\juce_analytics\destinations</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_analytics\destinations\juce_ThreadedAnalyticsDestination.h">
<Filter>JUCE Modules\juce_analytics\destinations</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_analytics\juce_analytics.h">
<Filter>JUCE Modules\juce_analytics</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Build\juce_build_tools\utils\juce_BinaryResourceFile.h">
<Filter>JUCE Modules\juce_build_tools\utils</Filter>
</ClInclude>


+ 4
- 25
extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj View File

@@ -63,8 +63,8 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;..\..\..\Build;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_build_tools=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_LOG_ASSERTIONS=1;JUCE_USE_CURL=1;JUCE_LOAD_CURL_SYMBOLS_LAZILY=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\Build;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_build_tools=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_LOG_ASSERTIONS=1;JUCE_USE_CURL=1;JUCE_LOAD_CURL_SYMBOLS_LAZILY=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/>
@@ -105,8 +105,8 @@
</Midl>
<ClCompile>
<Optimization>Full</Optimization>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;..\..\..\Build;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_build_tools=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_LOG_ASSERTIONS=1;JUCE_USE_CURL=1;JUCE_LOAD_CURL_SYMBOLS_LAZILY=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\Build;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_build_tools=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_LOG_ASSERTIONS=1;JUCE_USE_CURL=1;JUCE_LOAD_CURL_SYMBOLS_LAZILY=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/>
@@ -147,7 +147,6 @@
<ClCompile Include="..\..\Source\Application\jucer_CommandLine.cpp"/>
<ClCompile Include="..\..\Source\Application\jucer_Main.cpp"/>
<ClCompile Include="..\..\Source\Application\jucer_MainWindow.cpp"/>
<ClCompile Include="..\..\Source\Application\jucer_ProjucerAnalytics.cpp"/>
<ClCompile Include="..\..\Source\BinaryData\Templates\jucer_AnimatedComponentTemplate.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@@ -238,18 +237,6 @@
<ClCompile Include="..\..\Source\Utility\UI\jucer_SlidingPanelComponent.cpp"/>
<ClCompile Include="..\..\Source\Wizards\jucer_NewFileWizard.cpp"/>
<ClCompile Include="..\..\Source\Wizards\jucer_NewProjectWizardClasses.cpp"/>
<ClCompile Include="..\..\..\..\modules\juce_analytics\analytics\juce_Analytics.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_analytics\analytics\juce_ButtonTracker.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_analytics\destinations\juce_ThreadedAnalyticsDestination.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_analytics\juce_analytics.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\Build\juce_build_tools\utils\juce_BinaryResourceFile.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@@ -1487,7 +1474,6 @@
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\JuceLibraryCode\BinaryData.cpp"/>
<ClCompile Include="..\..\JuceLibraryCode\include_juce_analytics.cpp"/>
<ClCompile Include="..\..\JuceLibraryCode\include_juce_build_tools.cpp"/>
<ClCompile Include="..\..\JuceLibraryCode\include_juce_core.cpp"/>
<ClCompile Include="..\..\JuceLibraryCode\include_juce_cryptography.cpp"/>
@@ -1499,7 +1485,6 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\Source\Application\Windows\jucer_AboutWindowComponent.h"/>
<ClInclude Include="..\..\Source\Application\Windows\jucer_ApplicationUsageDataWindowComponent.h"/>
<ClInclude Include="..\..\Source\Application\Windows\jucer_EditorColourSchemeWindowComponent.h"/>
<ClInclude Include="..\..\Source\Application\Windows\jucer_FloatingToolWindow.h"/>
<ClInclude Include="..\..\Source\Application\Windows\jucer_GlobalPathsWindowComponent.h"/>
@@ -1514,7 +1499,6 @@
<ClInclude Include="..\..\Source\Application\jucer_CommonHeaders.h"/>
<ClInclude Include="..\..\Source\Application\jucer_Headers.h"/>
<ClInclude Include="..\..\Source\Application\jucer_MainWindow.h"/>
<ClInclude Include="..\..\Source\Application\jucer_ProjucerAnalytics.h"/>
<ClInclude Include="..\..\Source\BinaryData\Templates\jucer_AnimatedComponentSimpleTemplate.h"/>
<ClInclude Include="..\..\Source\BinaryData\Templates\jucer_AnimatedComponentTemplate.h"/>
<ClInclude Include="..\..\Source\BinaryData\Templates\jucer_AudioComponentSimpleTemplate.h"/>
@@ -1685,11 +1669,6 @@
<ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_StaticLibrary.h"/>
<ClInclude Include="..\..\Source\Wizards\jucer_StartPageComponent.h"/>
<ClInclude Include="..\..\Source\Wizards\jucer_TemplateThumbnailsComponent.h"/>
<ClInclude Include="..\..\..\..\modules\juce_analytics\analytics\juce_Analytics.h"/>
<ClInclude Include="..\..\..\..\modules\juce_analytics\analytics\juce_ButtonTracker.h"/>
<ClInclude Include="..\..\..\..\modules\juce_analytics\destinations\juce_AnalyticsDestination.h"/>
<ClInclude Include="..\..\..\..\modules\juce_analytics\destinations\juce_ThreadedAnalyticsDestination.h"/>
<ClInclude Include="..\..\..\..\modules\juce_analytics\juce_analytics.h"/>
<ClInclude Include="..\..\..\Build\juce_build_tools\utils\juce_BinaryResourceFile.h"/>
<ClInclude Include="..\..\..\Build\juce_build_tools\utils\juce_BuildHelperFunctions.h"/>
<ClInclude Include="..\..\..\Build\juce_build_tools\utils\juce_Entitlements.h"/>


+ 0
- 48
extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj.filters View File

@@ -86,15 +86,6 @@
<Filter Include="Projucer">
<UniqueIdentifier>{7DBEF27C-2AFE-DA02-1DBF-E80FAAC99EA7}</UniqueIdentifier>
</Filter>
<Filter Include="JUCE Modules\juce_analytics\analytics">
<UniqueIdentifier>{E3CEC08A-FA14-D343-5BFF-3D6A4A4FD713}</UniqueIdentifier>
</Filter>
<Filter Include="JUCE Modules\juce_analytics\destinations">
<UniqueIdentifier>{B3BC836A-3932-C1E4-CA3C-A1C0D83281BA}</UniqueIdentifier>
</Filter>
<Filter Include="JUCE Modules\juce_analytics">
<UniqueIdentifier>{97F7F593-75F8-D6B2-DC96-C946C3976226}</UniqueIdentifier>
</Filter>
<Filter Include="JUCE Modules\juce_build_tools\utils">
<UniqueIdentifier>{D9FAFF6D-6737-F775-056A-D0B29BE13820}</UniqueIdentifier>
</Filter>
@@ -337,9 +328,6 @@
<ClCompile Include="..\..\Source\Application\jucer_MainWindow.cpp">
<Filter>Projucer\Application</Filter>
</ClCompile>
<ClCompile Include="..\..\Source\Application\jucer_ProjucerAnalytics.cpp">
<Filter>Projucer\Application</Filter>
</ClCompile>
<ClCompile Include="..\..\Source\BinaryData\Templates\jucer_AnimatedComponentTemplate.cpp">
<Filter>Projucer\BinaryData\Templates</Filter>
</ClCompile>
@@ -526,18 +514,6 @@
<ClCompile Include="..\..\Source\Wizards\jucer_NewProjectWizardClasses.cpp">
<Filter>Projucer\Wizards</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_analytics\analytics\juce_Analytics.cpp">
<Filter>JUCE Modules\juce_analytics\analytics</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_analytics\analytics\juce_ButtonTracker.cpp">
<Filter>JUCE Modules\juce_analytics\analytics</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_analytics\destinations\juce_ThreadedAnalyticsDestination.cpp">
<Filter>JUCE Modules\juce_analytics\destinations</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\modules\juce_analytics\juce_analytics.cpp">
<Filter>JUCE Modules\juce_analytics</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Build\juce_build_tools\utils\juce_BinaryResourceFile.cpp">
<Filter>JUCE Modules\juce_build_tools\utils</Filter>
</ClCompile>
@@ -1861,9 +1837,6 @@
<ClCompile Include="..\..\JuceLibraryCode\BinaryData.cpp">
<Filter>JUCE Library Code</Filter>
</ClCompile>
<ClCompile Include="..\..\JuceLibraryCode\include_juce_analytics.cpp">
<Filter>JUCE Library Code</Filter>
</ClCompile>
<ClCompile Include="..\..\JuceLibraryCode\include_juce_build_tools.cpp">
<Filter>JUCE Library Code</Filter>
</ClCompile>
@@ -1893,9 +1866,6 @@
<ClInclude Include="..\..\Source\Application\Windows\jucer_AboutWindowComponent.h">
<Filter>Projucer\Application\Windows</Filter>
</ClInclude>
<ClInclude Include="..\..\Source\Application\Windows\jucer_ApplicationUsageDataWindowComponent.h">
<Filter>Projucer\Application\Windows</Filter>
</ClInclude>
<ClInclude Include="..\..\Source\Application\Windows\jucer_EditorColourSchemeWindowComponent.h">
<Filter>Projucer\Application\Windows</Filter>
</ClInclude>
@@ -1938,9 +1908,6 @@
<ClInclude Include="..\..\Source\Application\jucer_MainWindow.h">
<Filter>Projucer\Application</Filter>
</ClInclude>
<ClInclude Include="..\..\Source\Application\jucer_ProjucerAnalytics.h">
<Filter>Projucer\Application</Filter>
</ClInclude>
<ClInclude Include="..\..\Source\BinaryData\Templates\jucer_AnimatedComponentSimpleTemplate.h">
<Filter>Projucer\BinaryData\Templates</Filter>
</ClInclude>
@@ -2451,21 +2418,6 @@
<ClInclude Include="..\..\Source\Wizards\jucer_TemplateThumbnailsComponent.h">
<Filter>Projucer\Wizards</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_analytics\analytics\juce_Analytics.h">
<Filter>JUCE Modules\juce_analytics\analytics</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_analytics\analytics\juce_ButtonTracker.h">
<Filter>JUCE Modules\juce_analytics\analytics</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_analytics\destinations\juce_AnalyticsDestination.h">
<Filter>JUCE Modules\juce_analytics\destinations</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_analytics\destinations\juce_ThreadedAnalyticsDestination.h">
<Filter>JUCE Modules\juce_analytics\destinations</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_analytics\juce_analytics.h">
<Filter>JUCE Modules\juce_analytics</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Build\juce_build_tools\utils\juce_BinaryResourceFile.h">
<Filter>JUCE Modules\juce_build_tools\utils</Filter>
</ClInclude>


+ 0
- 2
extras/Projucer/CMakeLists.txt View File

@@ -32,7 +32,6 @@ target_sources(Projucer PRIVATE
Source/Application/jucer_CommandLine.cpp
Source/Application/jucer_Main.cpp
Source/Application/jucer_MainWindow.cpp
Source/Application/jucer_ProjucerAnalytics.cpp
Source/CodeEditor/jucer_DocumentEditorComponent.cpp
Source/CodeEditor/jucer_OpenDocumentManager.cpp
Source/CodeEditor/jucer_SourceCodeEditor.cpp
@@ -160,7 +159,6 @@ juce_add_binary_data(ProjucerData SOURCES

target_link_libraries(Projucer PRIVATE
ProjucerData
juce::juce_analytics
juce::juce_build_tools
juce::juce_cryptography
juce::juce_gui_extra)

+ 0
- 1
extras/Projucer/JuceLibraryCode/JuceHeader.h View File

@@ -13,7 +13,6 @@
#pragma once
#include <juce_analytics/juce_analytics.h>
#include <juce_build_tools/juce_build_tools.h>
#include <juce_core/juce_core.h>
#include <juce_cryptography/juce_cryptography.h>


+ 0
- 8
extras/Projucer/JuceLibraryCode/include_juce_analytics.cpp View File

@@ -1,8 +0,0 @@
/*
IMPORTANT! This file is auto-generated each time you save your
project - if you alter its contents, your changes may be overwritten!
*/
#include <juce_analytics/juce_analytics.cpp>

+ 0
- 12
extras/Projucer/Projucer.jucer View File

@@ -24,7 +24,6 @@
<MODULEPATH id="juce_data_structures" path="../../modules"/>
<MODULEPATH id="juce_cryptography" path="../../modules"/>
<MODULEPATH id="juce_core" path="../../modules"/>
<MODULEPATH id="juce_analytics" path="../../modules"/>
<MODULEPATH id="juce_build_tools" path="../Build"/>
</MODULEPATHS>
</XCODE_MAC>
@@ -44,7 +43,6 @@
<MODULEPATH id="juce_data_structures" path="../../modules"/>
<MODULEPATH id="juce_cryptography" path="../../modules"/>
<MODULEPATH id="juce_core" path="../../modules"/>
<MODULEPATH id="juce_analytics" path="../../modules"/>
<MODULEPATH id="juce_build_tools" path="../Build"/>
</MODULEPATHS>
</VS2015>
@@ -63,7 +61,6 @@
<MODULEPATH id="juce_data_structures" path="../../modules"/>
<MODULEPATH id="juce_cryptography" path="../../modules"/>
<MODULEPATH id="juce_core" path="../../modules"/>
<MODULEPATH id="juce_analytics" path="../../modules"/>
<MODULEPATH id="juce_build_tools" path="../Build"/>
</MODULEPATHS>
</VS2017>
@@ -82,7 +79,6 @@
<MODULEPATH id="juce_data_structures" path="../../modules"/>
<MODULEPATH id="juce_cryptography" path="../../modules"/>
<MODULEPATH id="juce_core" path="../../modules"/>
<MODULEPATH id="juce_analytics" path="../../modules"/>
<MODULEPATH id="juce_build_tools" path="../Build"/>
</MODULEPATHS>
</VS2019>
@@ -99,7 +95,6 @@
<MODULEPATH id="juce_data_structures" path="../../modules"/>
<MODULEPATH id="juce_cryptography" path="../../modules"/>
<MODULEPATH id="juce_core" path="../../modules"/>
<MODULEPATH id="juce_analytics" path="../../modules"/>
<MODULEPATH id="juce_build_tools" path="../Build"/>
</MODULEPATHS>
</LINUX_MAKE>
@@ -109,8 +104,6 @@
<GROUP id="{2F08ABDF-C7BB-5F54-55F5-0C2E27983930}" name="Windows">
<FILE id="w1XB4w" name="jucer_AboutWindowComponent.h" compile="0" resource="0"
file="Source/Application/Windows/jucer_AboutWindowComponent.h"/>
<FILE id="cWiY1u" name="jucer_ApplicationUsageDataWindowComponent.h"
compile="0" resource="0" file="Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h"/>
<FILE id="gAju2c" name="jucer_EditorColourSchemeWindowComponent.h"
compile="0" resource="0" file="Source/Application/Windows/jucer_EditorColourSchemeWindowComponent.h"/>
<FILE id="YO9U3v" name="jucer_FloatingToolWindow.h" compile="0" resource="0"
@@ -148,10 +141,6 @@
file="Source/Application/jucer_MainWindow.cpp"/>
<FILE id="HmkREh" name="jucer_MainWindow.h" compile="0" resource="0"
file="Source/Application/jucer_MainWindow.h"/>
<FILE id="HcONni" name="jucer_ProjucerAnalytics.cpp" compile="1" resource="0"
file="Source/Application/jucer_ProjucerAnalytics.cpp"/>
<FILE id="spHBY0" name="jucer_ProjucerAnalytics.h" compile="0" resource="0"
file="Source/Application/jucer_ProjucerAnalytics.h"/>
</GROUP>
<GROUP id="{BFDB3102-5EB6-41E0-043A-05C0DFF7A34D}" name="BinaryData">
<FILE id="QRvesq" name="LaunchScreen.storyboard" compile="0" resource="1"
@@ -730,7 +719,6 @@
<JUCEOPTIONS JUCE_LOG_ASSERTIONS="1" JUCE_USE_CURL="1" JUCE_ALLOW_STATIC_NULL_VARIABLES="0"
JUCE_STRICT_REFCOUNTEDPOINTER="1" JUCE_LOAD_CURL_SYMBOLS_LAZILY="1"/>
<MODULES>
<MODULE id="juce_analytics" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/>
<MODULE id="juce_build_tools" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/>
<MODULE id="juce_core" showAllCode="1"/>
<MODULE id="juce_cryptography" showAllCode="1"/>


+ 0
- 156
extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h View File

@@ -1,156 +0,0 @@
/*
==============================================================================
This file is part of the JUCE 6 technical preview.
Copyright (c) 2017 - ROLI Ltd.
You may use this code under the terms of the GPL v3
(see www.gnu.org/licenses).
For this technical preview, this file is not subject to commercial licensing.
JUCE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL WARRANTIES, WHETHER
EXPRESSED OR IMPLIED, INCLUDING MERCHANTABILITY AND FITNESS FOR PURPOSE, ARE
DISCLAIMED.
==============================================================================
*/
#pragma once
//==============================================================================
class ApplicationUsageDataWindowComponent : public Component
{
public:
ApplicationUsageDataWindowComponent (bool showCheckbox)
{
addAndMakeVisible (headerLabel);
headerLabel.setText ("Application Usage Analytics", dontSendNotification);
headerLabel.setFont (Font (20.0f, Font::FontStyleFlags::bold));
headerLabel.setJustificationType (Justification::centred);
auto textToShow = String ("We use analytics services to understand how developers use our software in order for JUCE to improve its software and services. ");
if (! showCheckbox)
textToShow += String (" Analytics can be disabled with an Indie or Pro license. ");
textToShow += String ("For more information, please read the JUCE EULA and Privacy policy:");
addAndMakeVisible (bodyLabel);
bodyLabel.setText (textToShow, dontSendNotification);
bodyLabel.setFont (Font (14.0f));
bodyLabel.setJustificationType (Justification::centredLeft);
addAndMakeVisible (juceEULALink);
juceEULALink.setButtonText ("JUCE EULA");
juceEULALink.setFont (Font (14.0f), false);
juceEULALink.setURL (URL ("https://juce.com/juce-5-license"));
addAndMakeVisible (privacyPolicyLink);
privacyPolicyLink.setButtonText ("Privacy Policy");
privacyPolicyLink.setFont (Font (14.0f), false);
privacyPolicyLink.setURL (URL ("https://juce.com/juce-5-privacy-policy"));
addAndMakeVisible (okButton);
if (showCheckbox)
{
shareApplicationUsageDataToggle.reset (new ToggleButton());
addAndMakeVisible (shareApplicationUsageDataToggle.get());
auto* controller = ProjucerApplication::getApp().licenseController.get();
if (controller != nullptr && controller->getState().applicationUsageDataState == LicenseState::ApplicationUsageData::disabled)
shareApplicationUsageDataToggle->setToggleState (false, dontSendNotification);
else
shareApplicationUsageDataToggle->setToggleState (true, dontSendNotification);
addAndMakeVisible (shareApplicationUsageDataLabel);
shareApplicationUsageDataLabel.setFont (Font (14.0f));
shareApplicationUsageDataLabel.setMinimumHorizontalScale (1.0f);
}
else
{
addAndMakeVisible (upgradeLicenseButton);
upgradeLicenseButton.setColour (TextButton::buttonColourId, findColour (secondaryButtonBackgroundColourId));
upgradeLicenseButton.onClick = []
{
if (auto* controller = ProjucerApplication::getApp().licenseController.get())
controller->chooseNewLicense();
};
}
}
~ApplicationUsageDataWindowComponent() override
{
if (auto* controller = ProjucerApplication::getApp().licenseController.get())
{
auto newApplicationUsageDataState = LicenseState::ApplicationUsageData::enabled;
if (shareApplicationUsageDataToggle != nullptr && ! shareApplicationUsageDataToggle->getToggleState())
newApplicationUsageDataState = LicenseState::ApplicationUsageData::disabled;
controller->setApplicationUsageDataState (newApplicationUsageDataState);
}
}
void resized() override
{
auto bounds = getLocalBounds().reduced (20);
headerLabel.setBounds (bounds.removeFromTop (40));
bodyLabel.setBounds (bounds.removeFromTop (75));
bounds.removeFromTop (10);
auto linkBounds = bounds.removeFromTop (20);
juceEULALink.setBounds (linkBounds.removeFromLeft (linkBounds.getWidth() / 2).reduced (2));
privacyPolicyLink.setBounds (linkBounds.reduced (2));
if (shareApplicationUsageDataToggle != nullptr)
{
bounds.removeFromTop (10);
auto toggleBounds = bounds.removeFromTop (40);
shareApplicationUsageDataToggle->setBounds (toggleBounds.removeFromLeft (40).reduced (5));
shareApplicationUsageDataLabel.setBounds (toggleBounds);
}
bounds.removeFromTop (10);
auto buttonW = 125;
auto buttonH = 40;
if (upgradeLicenseButton.isShowing())
{
auto left = bounds.removeFromLeft (bounds.getWidth() / 2);
upgradeLicenseButton.setSize (buttonW, buttonH);
upgradeLicenseButton.setCentrePosition (left.getCentreX(), left.getCentreY());
}
okButton.setSize (buttonW, buttonH);
okButton.setCentrePosition (bounds.getCentreX(), bounds.getCentreY());
okButton.onClick = [] { ProjucerApplication::getApp().dismissApplicationUsageDataAgreementPopup(); };
}
void paint (Graphics& g) override
{
g.fillAll (findColour (backgroundColourId));
}
private:
Label headerLabel, bodyLabel;
HyperlinkButton juceEULALink, privacyPolicyLink;
Label shareApplicationUsageDataLabel { {}, "Help JUCE to improve its software and services by sharing my application usage data" };
std::unique_ptr<ToggleButton> shareApplicationUsageDataToggle;
TextButton okButton { "OK" }, upgradeLicenseButton { "Upgrade License" };
void lookAndFeelChanged() override
{
upgradeLicenseButton.setColour (TextButton::buttonColourId, findColour (secondaryButtonBackgroundColourId));
}
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ApplicationUsageDataWindowComponent)
};

+ 2
- 94
extras/Projucer/Source/Application/jucer_Application.cpp View File

@@ -171,12 +171,6 @@ void ProjucerApplication::handleAsyncUpdate()
if (getGlobalProperties().getValue (Ids::dontQueryForUpdate, {}).isEmpty())
LatestVersionCheckerAndUpdater::getInstance()->checkForNewVersion (false);
if (licenseController != nullptr)
{
setAnalyticsEnabled (licenseController->getState().applicationUsageDataState == LicenseState::ApplicationUsageData::enabled);
Analytics::getInstance()->logEvent ("Startup", {}, ProjucerAnalyticsEvent::appEvent);
}
if (! isRunningCommandLine && settings->shouldAskUserToSetJUCEPath())
showSetJUCEPathAlert();
}
@@ -191,9 +185,6 @@ void ProjucerApplication::initialiseWindows (const String& commandLine)
mainWindowList.reopenLastProjects();
mainWindowList.createWindowIfNoneAreOpen();
if (licenseController->getState().applicationUsageDataState == LicenseState::ApplicationUsageData::notChosenYet)
showApplicationUsageDataAgreementPopup();
}
static void deleteTemporaryFiles()
@@ -249,8 +240,6 @@ void ProjucerApplication::shutdown()
Logger::writeToLog ("Shutdown");
deleteLogger();
Analytics::getInstance()->logEvent ("Shutdown", {}, ProjucerAnalyticsEvent::appEvent);
}
struct AsyncQuitRetrier : private Timer
@@ -430,7 +419,6 @@ void ProjucerApplication::createFileMenu (PopupMenu& menu)
#if ! JUCE_MAC
menu.addCommandItem (commandManager.get(), CommandIDs::showAboutWindow);
menu.addCommandItem (commandManager.get(), CommandIDs::showAppUsageWindow);
menu.addCommandItem (commandManager.get(), CommandIDs::checkForNewVersion);
menu.addCommandItem (commandManager.get(), CommandIDs::showGlobalPathsWindow);
menu.addSeparator();
@@ -588,7 +576,6 @@ void ProjucerApplication::createHelpMenu (PopupMenu& menu)
void ProjucerApplication::createExtraAppleMenuItems (PopupMenu& menu)
{
menu.addCommandItem (commandManager.get(), CommandIDs::showAboutWindow);
menu.addCommandItem (commandManager.get(), CommandIDs::showAppUsageWindow);
menu.addCommandItem (commandManager.get(), CommandIDs::checkForNewVersion);
menu.addSeparator();
menu.addCommandItem (commandManager.get(), CommandIDs::showGlobalPathsWindow);
@@ -708,11 +695,6 @@ void ProjucerApplication::findAndLaunchExample (int selectedIndex)
jassert (example != File());
findWindowAndOpenPIP (example);
StringPairArray data;
data.set ("label", example.getFileNameWithoutExtension());
Analytics::getInstance()->logEvent ("Example Opened", data, ProjucerAnalyticsEvent::exampleEvent);
}
//==============================================================================
@@ -879,18 +861,8 @@ void ProjucerApplication::launchDemoRunner()
{
auto demoRunnerFile = tryToFindDemoRunnerExecutable();
if (demoRunnerFile != File())
{
auto succeeded = demoRunnerFile.startAsProcess();
StringPairArray data;
data.set ("label", succeeded ? "Success" : "Failure");
Analytics::getInstance()->logEvent ("Launch DemoRunner", data, ProjucerAnalyticsEvent::exampleEvent);
if (succeeded)
return;
}
if (demoRunnerFile != File() && demoRunnerFile.startAsProcess())
return;
demoRunnerFile = tryToFindDemoRunnerProject();
@@ -913,11 +885,6 @@ void ProjucerApplication::launchDemoRunner()
{
demoRunnerAlert.reset (nullptr);
StringPairArray data;
data.set ("label", retVal == 1 ? "Opened" : "Cancelled");
Analytics::getInstance()->logEvent ("Open DemoRunner Project", data, ProjucerAnalyticsEvent::exampleEvent);
if (retVal == 1)
{
#if JUCE_LINUX
@@ -985,7 +952,6 @@ void ProjucerApplication::getAllCommands (Array <CommandID>& commands)
CommandIDs::showUTF8Tool,
CommandIDs::showSVGPathTool,
CommandIDs::showAboutWindow,
CommandIDs::showAppUsageWindow,
CommandIDs::checkForNewVersion,
CommandIDs::showForum,
CommandIDs::showAPIModules,
@@ -1073,10 +1039,6 @@ void ProjucerApplication::getCommandInfo (CommandID commandID, ApplicationComman
result.setInfo ("About Projucer", "Shows the Projucer's 'About' page.", CommandCategories::general, 0);
break;
case CommandIDs::showAppUsageWindow:
result.setInfo ("Application Usage Data", "Shows the application usage data agreement window", CommandCategories::general, 0);
break;
case CommandIDs::checkForNewVersion:
result.setInfo ("Check for New Version...", "Checks the web server for a new version of JUCE", CommandCategories::general, 0);
break;
@@ -1139,7 +1101,6 @@ bool ProjucerApplication::perform (const InvocationInfo& info)
case CommandIDs::showSVGPathTool: showSVGPathDataToolWindow(); break;
case CommandIDs::showGlobalPathsWindow: showPathsWindow (false); break;
case CommandIDs::showAboutWindow: showAboutWindow(); break;
case CommandIDs::showAppUsageWindow: showApplicationUsageDataAgreementPopup(); break;
case CommandIDs::checkForNewVersion: LatestVersionCheckerAndUpdater::getInstance()->checkForNewVersion (true); break;
case CommandIDs::showForum: launchForumBrowser(); break;
case CommandIDs::showAPIModules: launchModulesBrowser(); break;
@@ -1268,22 +1229,6 @@ void ProjucerApplication::showAboutWindow()
500, 300, 500, 300, 500, 300);
}
void ProjucerApplication::showApplicationUsageDataAgreementPopup()
{
if (applicationUsageDataWindow != nullptr)
applicationUsageDataWindow->toFront (true);
else
new FloatingToolWindow ("Application Usage Analytics", {},
new ApplicationUsageDataWindowComponent (isPaidOrGPL()), applicationUsageDataWindow, false,
400, 300, 400, 300, 400, 300);
}
void ProjucerApplication::dismissApplicationUsageDataAgreementPopup()
{
if (applicationUsageDataWindow != nullptr)
applicationUsageDataWindow.reset();
}
void ProjucerApplication::showPathsWindow (bool highlightJUCEPath)
{
if (pathsWindow != nullptr)
@@ -1427,42 +1372,6 @@ void ProjucerApplication::initCommandManager()
registerGUIEditorCommands();
}
void ProjucerApplication::setAnalyticsEnabled (bool enabled)
{
resetAnalytics();
if (enabled)
setupAnalytics();
}
void ProjucerApplication::resetAnalytics() noexcept
{
auto analyticsInstance = Analytics::getInstance();
analyticsInstance->setUserId ({});
analyticsInstance->setUserProperties ({});
analyticsInstance->getDestinations().clear();
}
void ProjucerApplication::setupAnalytics()
{
Analytics::getInstance()->addDestination (new ProjucerAnalyticsDestination());
auto deviceString = SystemStats::getDeviceIdentifiers().joinIntoString (":");
auto deviceIdentifier = String::toHexString (deviceString.hashCode64());
Analytics::getInstance()->setUserId (deviceIdentifier);
StringPairArray userData;
userData.set ("cd1", getApplicationName());
userData.set ("cd2", getApplicationVersion());
userData.set ("cd3", SystemStats::getDeviceDescription());
userData.set ("cd4", deviceString);
userData.set ("cd5", SystemStats::getOperatingSystemName());
Analytics::getInstance()->setUserProperties (userData);
}
void ProjucerApplication::showSetJUCEPathAlert()
{
auto& lf = Desktop::getInstance().getDefaultLookAndFeel();
@@ -1529,7 +1438,6 @@ void ProjucerApplication::setColourScheme (int index, bool saveSetting)
if (utf8Window != nullptr) utf8Window->sendLookAndFeelChange();
if (svgPathWindow != nullptr) svgPathWindow->sendLookAndFeelChange();
if (aboutWindow != nullptr) aboutWindow->sendLookAndFeelChange();
if (applicationUsageDataWindow != nullptr) applicationUsageDataWindow->sendLookAndFeelChange();
if (pathsWindow != nullptr) pathsWindow->sendLookAndFeelChange();
if (editorColourSchemeWindow != nullptr) editorColourSchemeWindow->sendLookAndFeelChange();
if (pipCreatorWindow != nullptr) pipCreatorWindow->sendLookAndFeelChange();


+ 2
- 15
extras/Projucer/Source/Application/jucer_Application.h View File

@@ -25,10 +25,6 @@
#include "../Utility/UI/jucer_ProjucerLookAndFeel.h"
#include "../Licenses/jucer_LicenseController.h"
#if JUCE_MODULE_AVAILABLE_juce_analytics
#include "jucer_ProjucerAnalytics.h"
#endif
struct ChildProcessCache;
//==============================================================================
@@ -101,9 +97,6 @@ public:
void showSVGPathDataToolWindow();
void showAboutWindow();
void showApplicationUsageDataAgreementPopup();
void dismissApplicationUsageDataAgreementPopup();
void showPathsWindow (bool highlightJUCEPath = false);
void showEditorColourSchemeWindow();
@@ -127,9 +120,6 @@ public:
static bool isEditorColourSchemeADefaultScheme (const StringArray& schemes, int editorColourSchemeIndex);
static int getEditorColourSchemeForGUIColourScheme (const StringArray& schemes, int guiColourSchemeIndex);
//==============================================================================
void setAnalyticsEnabled (bool);
//==============================================================================
void rescanJUCEPathModules();
void rescanUserPathModules();
@@ -150,8 +140,8 @@ public:
OpenDocumentManager openDocumentManager;
std::unique_ptr<ApplicationCommandManager> commandManager;
std::unique_ptr<Component> utf8Window, svgPathWindow, aboutWindow, applicationUsageDataWindow,
pathsWindow, editorColourSchemeWindow, pipCreatorWindow;
std::unique_ptr<Component> utf8Window, svgPathWindow, aboutWindow, pathsWindow,
editorColourSchemeWindow, pipCreatorWindow;
std::unique_ptr<FileLogger> logger;
@@ -175,9 +165,6 @@ private:
File tryToFindDemoRunnerProject();
void launchDemoRunner();
void resetAnalytics() noexcept;
void setupAnalytics();
void showSetJUCEPathAlert();
void setColourScheme (int index, bool saveSetting);


+ 1
- 2
extras/Projucer/Source/Application/jucer_CommandIDs.h View File

@@ -47,8 +47,7 @@ namespace CommandIDs
showTranslationTool = 0x300022,
showSVGPathTool = 0x300023,
showAboutWindow = 0x300024,
showAppUsageWindow = 0x300025,
checkForNewVersion = 0x300026,
checkForNewVersion = 0x300025,
showProjectSettings = 0x300030,
showProjectTab = 0x300031,


+ 0
- 1
extras/Projucer/Source/Application/jucer_Main.cpp View File

@@ -26,7 +26,6 @@
#include "Windows/jucer_UTF8WindowComponent.h"
#include "Windows/jucer_SVGPathDataWindowComponent.h"
#include "Windows/jucer_AboutWindowComponent.h"
#include "Windows/jucer_ApplicationUsageDataWindowComponent.h"
#include "Windows/jucer_EditorColourSchemeWindowComponent.h"
#include "Windows/jucer_GlobalPathsWindowComponent.h"
#include "Windows/jucer_PIPCreatorWindowComponent.h"


+ 0
- 246
extras/Projucer/Source/Application/jucer_ProjucerAnalytics.cpp View File

@@ -1,246 +0,0 @@
/*
==============================================================================
This file is part of the JUCE 6 technical preview.
Copyright (c) 2017 - ROLI Ltd.
You may use this code under the terms of the GPL v3
(see www.gnu.org/licenses).
For this technical preview, this file is not subject to commercial licensing.
JUCE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL WARRANTIES, WHETHER
EXPRESSED OR IMPLIED, INCLUDING MERCHANTABILITY AND FITNESS FOR PURPOSE, ARE
DISCLAIMED.
==============================================================================
*/
#include "jucer_ProjucerAnalytics.h"
//==============================================================================
ProjucerAnalyticsDestination::ProjucerAnalyticsDestination()
: ThreadedAnalyticsDestination ("ProjucerAnalyticsThread")
{
{
MemoryOutputStream mo;
if (Base64::convertFromBase64 (mo, BinaryData::nothingtoseehere_txt))
apiKey = mo.toString();
}
auto dataDir = File::getSpecialLocation (File::userApplicationDataDirectory)
#if JUCE_MAC
.getChildFile ("Application Support")
#endif
.getChildFile ("Projucer")
.getChildFile ("Analytics");
if (! dataDir.exists())
dataDir.createDirectory();
savedEventsFile = dataDir.getChildFile ("analytics_events.xml");
startAnalyticsThread (initialPeriodMs);
}
ProjucerAnalyticsDestination::~ProjucerAnalyticsDestination()
{
Thread::sleep (initialPeriodMs);
stopAnalyticsThread (1000);
}
//==============================================================================
static void setData (const AnalyticsDestination::AnalyticsEvent& event, StringPairArray& data)
{
data.set ("ea", event.name);
if (event.parameters.getAllKeys().contains ("label"))
data.set ("el", event.parameters.getValue ("label", {}));
data.addArray (event.userProperties);
}
bool ProjucerAnalyticsDestination::logBatchedEvents (const Array<AnalyticsEvent>& events)
{
String appData ("v=1&aip=1&tid=" + apiKey);
StringArray postData;
for (auto& event : events)
{
StringPairArray data;
data.set ("t", "event");
data.set ("cid", event.userID);
switch (event.eventType)
{
case ProjucerAnalyticsEvent::appEvent:
{
data.set ("ec", "App");
setData (event, data);
break;
}
case ProjucerAnalyticsEvent::projectEvent:
{
data.set ("ec", "Project");
setData (event, data);
break;
}
case ProjucerAnalyticsEvent::userEvent:
{
data.set ("ec", "User");
setData (event, data);
break;
}
case ProjucerAnalyticsEvent::exampleEvent:
{
data.set ("ec", "Example");
setData (event, data);
break;
}
case ProjucerAnalyticsEvent::startPageEvent:
{
data.set ("ec", "Start Page");
setData (event, data);
break;
}
default:
{
// unknown event type!
jassertfalse;
break;
}
}
StringArray eventData;
for (auto& key : data.getAllKeys())
eventData.add (key + "=" + URL::addEscapeChars (data[key], true));
postData.add (appData + "&" + eventData.joinIntoString ("&"));
}
auto url = URL ("https://www.google-analytics.com/batch")
.withPOSTData (postData.joinIntoString ("\n"));
{
const ScopedLock lock (webStreamCreation);
if (shouldExit)
return false;
webStream.reset (new WebInputStream (url, true));
}
auto success = webStream->connect (nullptr);
// Do an exponential backoff if we failed to connect.
if (success)
periodMs = initialPeriodMs;
else
periodMs *= 2;
setBatchPeriod (periodMs);
return success;
}
void ProjucerAnalyticsDestination::stopLoggingEvents()
{
const ScopedLock lock (webStreamCreation);
shouldExit = true;
if (webStream.get() != nullptr)
webStream->cancel();
}
//==============================================================================
void ProjucerAnalyticsDestination::saveUnloggedEvents (const std::deque<AnalyticsEvent>& eventsToSave)
{
auto xml = parseXMLIfTagMatches (savedEventsFile, "events");
if (xml == nullptr)
xml = std::make_unique<XmlElement> ("events");
for (auto& event : eventsToSave)
{
auto* xmlEvent = new XmlElement ("google_analytics_event");
xmlEvent->setAttribute ("name", event.name);
xmlEvent->setAttribute ("type", event.eventType);
xmlEvent->setAttribute ("timestamp", (int) event.timestamp);
xmlEvent->setAttribute ("user_id", event.userID);
auto* parameters = new XmlElement ("parameters");
for (auto& key : event.parameters.getAllKeys())
parameters->setAttribute (key, event.parameters[key]);
xmlEvent->addChildElement (parameters);
auto* userProperties = new XmlElement ("user_properties");
for (auto& key : event.userProperties.getAllKeys())
userProperties->setAttribute (key, event.userProperties[key]);
xmlEvent->addChildElement (userProperties);
xml->addChildElement (xmlEvent);
}
xml->writeTo (savedEventsFile, {});
}
void ProjucerAnalyticsDestination::restoreUnloggedEvents (std::deque<AnalyticsEvent>& restoredEventQueue)
{
auto xml = parseXMLIfTagMatches (savedEventsFile, "events");
if (xml == nullptr)
return;
auto numEvents = xml->getNumChildElements();
for (int iEvent = 0; iEvent < numEvents; ++iEvent)
{
auto* xmlEvent = xml->getChildElement (iEvent);
StringPairArray parameters;
auto* xmlParameters = xmlEvent->getChildByName ("parameters");
auto numParameters = xmlParameters->getNumAttributes();
for (int iParam = 0; iParam < numParameters; ++iParam)
parameters.set (xmlParameters->getAttributeName (iParam),
xmlParameters->getAttributeValue (iParam));
StringPairArray userProperties;
auto* xmlUserProperties = xmlEvent->getChildByName ("user_properties");
auto numUserProperties = xmlUserProperties->getNumAttributes();
for (int iProp = 0; iProp < numUserProperties; ++iProp)
userProperties.set (xmlUserProperties->getAttributeName (iProp),
xmlUserProperties->getAttributeValue (iProp));
restoredEventQueue.push_back ({
xmlEvent->getStringAttribute ("name"),
xmlEvent->getIntAttribute ("type"),
static_cast<uint32> (xmlEvent->getIntAttribute ("timestamp")),
parameters,
xmlEvent->getStringAttribute ("user_id"),
userProperties
});
}
savedEventsFile.deleteFile();
}

+ 0
- 61
extras/Projucer/Source/Application/jucer_ProjucerAnalytics.h View File

@@ -1,61 +0,0 @@
/*
==============================================================================
This file is part of the JUCE 6 technical preview.
Copyright (c) 2017 - ROLI Ltd.
You may use this code under the terms of the GPL v3
(see www.gnu.org/licenses).
For this technical preview, this file is not subject to commercial licensing.
JUCE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL WARRANTIES, WHETHER
EXPRESSED OR IMPLIED, INCLUDING MERCHANTABILITY AND FITNESS FOR PURPOSE, ARE
DISCLAIMED.
==============================================================================
*/
#pragma once
#include "jucer_Headers.h"
//==============================================================================
enum ProjucerAnalyticsEvent
{
appEvent,
projectEvent,
userEvent,
exampleEvent,
startPageEvent
};
//==============================================================================
class ProjucerAnalyticsDestination : public ThreadedAnalyticsDestination
{
public:
ProjucerAnalyticsDestination();
~ProjucerAnalyticsDestination() override;
//==============================================================================
bool logBatchedEvents (const Array<AnalyticsEvent>&) override;
void stopLoggingEvents() override;
int getMaximumBatchSize() override { return 20; }
private:
void saveUnloggedEvents (const std::deque<AnalyticsEvent>&) override;
void restoreUnloggedEvents (std::deque<AnalyticsEvent>&) override;
//==============================================================================
String apiKey;
const int initialPeriodMs = 1000;
int periodMs = initialPeriodMs;
CriticalSection webStreamCreation;
bool shouldExit = false;
std::unique_ptr<WebInputStream> webStream;
File savedEventsFile;
};

+ 0
- 6
extras/Projucer/Source/ComponentEditor/UI/jucer_JucerDocumentEditor.cpp View File

@@ -347,12 +347,6 @@ JucerDocumentEditor::JucerDocumentEditor (JucerDocument* const doc)
refreshPropertiesPanel();
changeListenerCallback (nullptr);
if (auto* project = document->getCppDocument().getProject())
{
if (project->shouldSendGUIBuilderAnalyticsEvent())
Analytics::getInstance()->logEvent ("GUI Builder", {}, ProjucerAnalyticsEvent::projectEvent);
}
}
}


+ 0
- 42
extras/Projucer/Source/Licenses/jucer_LicenseController.cpp View File

@@ -67,24 +67,6 @@ static LicenseState::Type getLicenseTypeFromValue (const String& d)
return LicenseState::Type::noLicenseChosenYet;
}
static const char* getApplicationUsageDataStateValue (LicenseState::ApplicationUsageData type)
{
switch (type)
{
case LicenseState::ApplicationUsageData::enabled: return "enabled";
case LicenseState::ApplicationUsageData::disabled: return "disabled";
case LicenseState::ApplicationUsageData::notChosenYet:
default: return "notChosen";
}
}
static LicenseState::ApplicationUsageData getApplicationUsageDataTypeFromValue (const String& value)
{
if (value == getApplicationUsageDataStateValue (LicenseState::ApplicationUsageData::enabled)) return LicenseState::ApplicationUsageData::enabled;
if (value == getApplicationUsageDataStateValue (LicenseState::ApplicationUsageData::disabled)) return LicenseState::ApplicationUsageData::disabled;
return LicenseState::ApplicationUsageData::notChosenYet;
}
#if ! JUCER_ENABLE_GPL_MODE
struct LicenseController::ModalCompletionCallback : ModalComponentManager::Callback
{
@@ -172,17 +154,6 @@ void LicenseController::chooseNewLicense()
#endif
}
void LicenseController::setApplicationUsageDataState (LicenseState::ApplicationUsageData newState)
{
if (state.applicationUsageDataState != newState)
{
state.applicationUsageDataState = newState;
ProjucerApplication::getApp().setAnalyticsEnabled (newState == LicenseState::ApplicationUsageData::enabled);
updateState (state);
}
}
//==============================================================================
#if ! JUCER_ENABLE_GPL_MODE
void LicenseController::closeWebview (int result)
@@ -254,27 +225,16 @@ void LicenseController::updateState (const LicenseState& newState)
{
auto& props = ProjucerApplication::getApp().settings->getGlobalProperties();
auto oldLicenseType = state.type;
state = newState;
licenseStateToSettings (state, props);
auto stateParam = getState();
listeners.call ([&] (StateChangedCallback& l) { l.licenseStateChanged (stateParam); });
if (oldLicenseType != state.type)
{
StringPairArray data;
data.set ("label", state.licenseTypeToString (state.type));
Analytics::getInstance()->logEvent ("License Type", data, ProjucerAnalyticsEvent::userEvent);
}
}
LicenseState LicenseController::licenseStateFromOldSettings (XmlElement* licenseXml)
{
LicenseState result;
result.type = getLicenseTypeFromValue (licenseXml->getChildElementAllSubText ("type", {}));
result.applicationUsageDataState = getApplicationUsageDataTypeFromValue (licenseXml->getChildElementAllSubText ("applicationUsageData", {}));
result.username = licenseXml->getChildElementAllSubText ("username", {});
result.email = licenseXml->getChildElementAllSubText ("email", {});
result.authToken = licenseXml->getChildElementAllSubText ("authToken", {});
@@ -302,7 +262,6 @@ LicenseState LicenseController::licenseStateFromSettings (PropertiesFile& props)
LicenseState result;
result.type = getLicenseTypeFromValue (licenseXml->getStringAttribute ("type", {}));
result.applicationUsageDataState = getApplicationUsageDataTypeFromValue (licenseXml->getStringAttribute ("applicationUsageData", {}));
result.username = licenseXml->getStringAttribute ("username", {});
result.email = licenseXml->getStringAttribute ("email", {});
result.authToken = licenseXml->getStringAttribute ("authToken", {});
@@ -328,7 +287,6 @@ void LicenseController::licenseStateToSettings (const LicenseState& state, Prope
if (auto* typeString = getLicenseStateValue (state.type))
licenseXml.setAttribute ("type", typeString);
licenseXml.setAttribute ("applicationUsageData", getApplicationUsageDataStateValue (state.applicationUsageDataState));
licenseXml.setAttribute ("username", state.username);
licenseXml.setAttribute ("email", state.email);
licenseXml.setAttribute ("authToken", state.authToken);


+ 2
- 14
extras/Projucer/Source/Licenses/jucer_LicenseController.h View File

@@ -36,23 +36,12 @@ struct LicenseState
pro
};
enum class ApplicationUsageData
{
notChosenYet,
enabled,
disabled
};
Type type = Type::notLoggedIn;
ApplicationUsageData applicationUsageDataState = ApplicationUsageData::notChosenYet;
String username;
String email;
String authToken;
String username, email, authToken;
static const char* licenseTypeToString (Type licenseType);
bool isPaidOrGPL() const noexcept { return (type == Type::GPL || type == Type::indie || type == Type::pro); }
bool isPaidOrGPL() const noexcept { return (type == Type::GPL || type == Type::indie || type == Type::pro); }
Image avatar;
};
@@ -78,7 +67,6 @@ public:
LicenseState getState() const noexcept;
void logout();
void chooseNewLicense();
void setApplicationUsageDataState (LicenseState::ApplicationUsageData newState);
//==============================================================================
void addLicenseStatusChangedCallback (StateChangedCallback* callback) { listeners.add (callback); }


+ 2
- 3
extras/Projucer/Source/Project/UI/Sidebar/jucer_ModuleTreeItems.h View File

@@ -399,7 +399,7 @@ private:
auto mod = project.getModuleWithID (missingModule);
if (mod.second != File())
enabledModules.addModule (mod.second, copyLocally, useGlobalPath, false);
enabledModules.addModule (mod.second, copyLocally, useGlobalPath);
else
missing.add (missingModule);
}
@@ -541,8 +541,7 @@ public:
for (int i = 0; i < modules.size(); ++i)
project.getEnabledModules().addModule (modules.getReference(i).moduleFolder,
project.getEnabledModules().areMostModulesCopiedLocally(),
project.getEnabledModules().areMostModulesUsingGlobalPath(),
true);
project.getEnabledModules().areMostModulesUsingGlobalPath());
}
void addSubItems() override


+ 0
- 16
extras/Projucer/Source/Project/UI/jucer_HeaderComponent.cpp View File

@@ -254,14 +254,6 @@ void HeaderComponent::timerCallback()
}
//==============================================================================
static void sendProjectButtonAnalyticsEvent (StringRef label)
{
StringPairArray data;
data.set ("label", label);
Analytics::getInstance()->logEvent ("Project Button", data, ProjucerAnalyticsEvent::projectEvent);
}
void HeaderComponent::initialiseButtons() noexcept
{
auto& icons = getIcons();
@@ -270,8 +262,6 @@ void HeaderComponent::initialiseButtons() noexcept
addAndMakeVisible (projectSettingsButton.get());
projectSettingsButton->onClick = [this]
{
sendProjectButtonAnalyticsEvent ("Project Settings");
if (auto* pcc = findParentComponentOfClass<ProjectContentComponent>())
pcc->showProjectSettings();
};
@@ -281,8 +271,6 @@ void HeaderComponent::initialiseButtons() noexcept
saveAndOpenInIDEButton->isIDEButton = true;
saveAndOpenInIDEButton->onClick = [this]
{
sendProjectButtonAnalyticsEvent ("Save and Open in IDE (" + exporterBox.getText() + ")");
if (auto* pcc = findParentComponentOfClass<ProjectContentComponent>())
pcc->openInSelectedIDE (true);
};
@@ -292,8 +280,6 @@ void HeaderComponent::initialiseButtons() noexcept
userSettingsButton->isUserButton = true;
userSettingsButton->onClick = [this]
{
sendProjectButtonAnalyticsEvent ("User Settings");
if (findParentComponentOfClass<ProjectContentComponent>() != nullptr)
showUserSettings();
};
@@ -302,8 +288,6 @@ void HeaderComponent::initialiseButtons() noexcept
addAndMakeVisible (runAppButton.get());
runAppButton->onClick = [this]
{
sendProjectButtonAnalyticsEvent ("Run Application");
if (childProcess != nullptr)
childProcess->launchApp();
};


+ 0
- 17
extras/Projucer/Source/Project/UI/jucer_ProjectContentComponent.cpp View File

@@ -680,14 +680,7 @@ static void newExporterMenuCallback (int result, ProjectContentComponent* comp)
auto exporterName= ProjectExporter::getExporterNames() [result - 1];
if (exporterName.isNotEmpty())
{
p->addNewExporter (exporterName);
StringPairArray data;
data.set ("label", exporterName);
Analytics::getInstance()->logEvent ("Exporter Added", data, ProjucerAnalyticsEvent::projectEvent);
}
}
}
}
@@ -1186,11 +1179,6 @@ void ProjectContentComponent::setBuildEnabled (bool isEnabled, bool displayError
project->getCompileEngineSettings().setBuildEnabled (isEnabled);
killChildProcess();
refreshTabsIfBuildStatusChanged();
StringPairArray data;
data.set ("label", isEnabled ? "Enabled" : "Disabled");
Analytics::getInstance()->logEvent ("Live-Build", data, ProjucerAnalyticsEvent::projectEvent);
}
}
@@ -1214,11 +1202,6 @@ void ProjectContentComponent::handleCrash (const String& message)
setBuildEnabled (false, true);
showBuildTab();
}
StringPairArray data;
data.set ("label", "Crash");
Analytics::getInstance()->logEvent ("Live-Build", data, ProjucerAnalyticsEvent::projectEvent);
}
bool ProjectContentComponent::isBuildEnabled() const


+ 3
- 12
extras/Projucer/Source/Project/jucer_Module.cpp View File

@@ -708,7 +708,7 @@ bool EnabledModuleList::areMostModulesCopiedLocally() const
return numYes > numNo;
}
void EnabledModuleList::addModule (const File& moduleFolder, bool copyLocally, bool useGlobalPath, bool sendAnalyticsEvent)
void EnabledModuleList::addModule (const File& moduleFolder, bool copyLocally, bool useGlobalPath)
{
ModuleDescription info (moduleFolder);
@@ -737,14 +737,6 @@ void EnabledModuleList::addModule (const File& moduleFolder, bool copyLocally, b
if (! useGlobalPath)
project.rescanExporterPathModules (false);
if (sendAnalyticsEvent)
{
StringPairArray data;
data.set ("label", moduleID);
Analytics::getInstance()->logEvent ("Module Added", data, ProjucerAnalyticsEvent::projectEvent);
}
}
}
}
@@ -755,7 +747,7 @@ void EnabledModuleList::addModuleInteractive (const String& moduleID)
if (f != File())
{
addModule (f, areMostModulesCopiedLocally(), areMostModulesUsingGlobalPath(), true);
addModule (f, areMostModulesCopiedLocally(), areMostModulesUsingGlobalPath());
return;
}
@@ -794,8 +786,7 @@ void EnabledModuleList::addModuleOfferingToCopy (const File& f, bool isFromUserS
}
addModule (m.moduleFolder, areMostModulesCopiedLocally(),
isFromUserSpecifiedFolder ? false : areMostModulesUsingGlobalPath(),
true);
isFromUserSpecifiedFolder ? false : areMostModulesUsingGlobalPath());
}
void EnabledModuleList::removeModule (String moduleID) // must be pass-by-value, and not a const ref!


+ 1
- 1
extras/Projucer/Source/Project/jucer_Module.h View File

@@ -179,7 +179,7 @@ public:
bool areMostModulesCopiedLocally() const;
//==============================================================================
void addModule (const File& moduleManifestFile, bool copyLocally, bool useGlobalPath, bool sendAnalyticsEvent);
void addModule (const File& moduleManifestFile, bool copyLocally, bool useGlobalPath);
void addModuleInteractive (const String& moduleID);
void addModuleFromUserSelectedFile();
void addModuleOfferingToCopy (const File&, bool isFromUserSpecifiedFolder);


+ 2
- 40
extras/Projucer/Source/Project/jucer_Project.cpp View File

@@ -198,21 +198,11 @@ void Project::initialiseProjectValues()
displaySplashScreenValue.referTo (projectRoot, Ids::displaySplashScreen, getUndoManager(), ! ProjucerApplication::getApp().isPaidOrGPL());
splashScreenColourValue.referTo (projectRoot, Ids::splashScreenColour, getUndoManager(), "Dark");
reportAppUsageValue.referTo (projectRoot, Ids::reportAppUsage, getUndoManager());
reportAppUsageValue.referTo (projectRoot, Ids::reportAppUsage, getUndoManager(), ! ProjucerApplication::getApp().isPaidOrGPL());
useAppConfigValue.referTo (projectRoot, Ids::useAppConfig, getUndoManager(), true);
addUsingNamespaceToJuceHeader.referTo (projectRoot, Ids::addUsingNamespaceToJuceHeader, getUndoManager(), true);
if (ProjucerApplication::getApp().isPaidOrGPL())
{
reportAppUsageValue.setDefault (ProjucerApplication::getApp().licenseController->getState().applicationUsageDataState
== LicenseState::ApplicationUsageData::enabled);
}
else
{
reportAppUsageValue.setDefault (true);
}
cppStandardValue.referTo (projectRoot, Ids::cppLanguageStandard, getUndoManager(), "14");
headerSearchPathsValue.referTo (projectRoot, Ids::headerPath, getUndoManager());
@@ -703,23 +693,11 @@ bool Project::saveProjectRootToFile()
}
//==============================================================================
static void sendProjectSettingAnalyticsEvent (StringRef label)
{
StringPairArray data;
data.set ("label", label);
Analytics::getInstance()->logEvent ("Project Setting", data, ProjucerAnalyticsEvent::projectEvent);
}
void Project::valueTreePropertyChanged (ValueTree& tree, const Identifier& property)
{
if (tree.getRoot() == tree)
{
if (property == Ids::projectType)
{
sendProjectSettingAnalyticsEvent ("Project Type = " + projectTypeValue.get().toString());
}
else if (property == Ids::name)
if (property == Ids::name)
{
updateTitleDependencies();
}
@@ -731,10 +709,6 @@ void Project::valueTreePropertyChanged (ValueTree& tree, const Identifier& prope
{
parsedPreprocessorDefs = parsePreprocessorDefs (preprocessorDefsValue.get());
}
else if (property == Ids::cppLanguageStandard)
{
sendProjectSettingAnalyticsEvent ("C++ Standard = " + cppStandardValue.get().toString());
}
else if (property == Ids::pluginFormats)
{
if (shouldWriteLegacyPluginFormatSettings)
@@ -2125,18 +2099,6 @@ String Project::getUniqueTargetFolderSuffixForExporter (const String& exporterNa
return "_" + String (num);
}
//==============================================================================
bool Project::shouldSendGUIBuilderAnalyticsEvent() noexcept
{
if (! hasSentGUIBuilderAnalyticsEvent)
{
hasSentGUIBuilderAnalyticsEvent = true;
return true;
}
return false;
}
//==============================================================================
String Project::getFileTemplate (const String& templateName)
{


+ 0
- 6
extras/Projucer/Source/Project/jucer_Project.h View File

@@ -410,9 +410,6 @@ public:
void setOpenInIDEAfterSaving (bool open) noexcept { openInIDEAfterSaving = open; }
bool shouldOpenInIDEAfterSaving() const noexcept { return openInIDEAfterSaving; }
//==============================================================================
bool shouldSendGUIBuilderAnalyticsEvent() noexcept;
//==============================================================================
CompileEngineSettings& getCompileEngineSettings() { return *compileEngineSettings; }
@@ -459,9 +456,6 @@ private:
void moveTemporaryDirectory (const File&);
bool saveProjectRootToFile();
//==============================================================================
bool hasSentGUIBuilderAnalyticsEvent = false;
//==============================================================================
friend class Item;
bool isSaving = false;


+ 1
- 6
extras/Projucer/Source/Wizards/jucer_NewProjectWizard.h View File

@@ -155,11 +155,6 @@ struct NewProjectWizard
return nullptr;
}
StringPairArray data;
data.set ("label", "Project Type = " + project->getProjectTypeString());
Analytics::getInstance()->logEvent ("Project Setting", data, ProjucerAnalyticsEvent::projectEvent);
return project.release();
}
@@ -184,7 +179,7 @@ struct NewProjectWizard
for (auto& mod : list.getAllModules())
if (defaultModules.contains (mod.first))
project.getEnabledModules().addModule (mod.second, false, useGlobalPath, false);
project.getEnabledModules().addModule (mod.second, false, useGlobalPath);
}
void addExporters (Project& project, WizardComp& wizardComp)


+ 0
- 8
extras/Projucer/Source/Wizards/jucer_TemplateThumbnailsComponent.h View File

@@ -111,14 +111,6 @@ public:
}
private:
void clicked() override
{
StringPairArray data;
data.set ("label", getName());
Analytics::getInstance()->logEvent ("Start Page Button", data, ProjucerAnalyticsEvent::startPageEvent);
}
using DrawableButton::clicked;
std::unique_ptr<Drawable> thumb, hoverBackground;


Write Preview
Loading…
Cancel
Save