diff --git a/extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp b/extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp
index 3d4f94c9cd..755eb37fc4 100644
--- a/extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp
+++ b/extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp
@@ -138,475 +138,475 @@
-
+
+
-
+
-
+
-
+
-
+
+
-
-
+
-
+
-
-
+
-
-
+
-
+
-
+
-
+
-
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
-
+
+
-
-
+
+
-
-
+
+
-
-
+
-
+
-
-
+
-
-
+
-
-
+
+
-
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
-
-
+
-
-
+
-
+
-
+
+
-
+
-
-
+
+
-
+
+
-
+
-
+
+
-
+
+
-
+
+
-
+
-
+
+
-
+
-
+
+
-
+
+
-
+
+
-
+
+
-
+
+
-
+
+
-
-
+
+
-
-
+
-
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
+
-
+
-
-
+
-
+
-
+
-
+
-
+
+
-
+
-
+
+
-
+
+
-
+
-
+
-
+
-
+
+
-
+
+
-
+
+
-
+
-
+
+
-
-
+
+
-
+
+
-
-
+
+
-
-
+
-
+
-
-
+
+
-
-
+
-
-
+
-
+
-
-
+
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
+
-
+
+
diff --git a/extras/Introjucer/Builds/Linux/Makefile b/extras/Introjucer/Builds/Linux/Makefile
index f8ac76ef0e..40aeff3e6e 100644
--- a/extras/Introjucer/Builds/Linux/Makefile
+++ b/extras/Introjucer/Builds/Linux/Makefile
@@ -57,21 +57,6 @@ OBJECTS := \
$(OBJDIR)/jucer_Main_f8488f5b.o \
$(OBJDIR)/jucer_MainWindow_1e163aeb.o \
$(OBJDIR)/jucer_OpenDocumentManager_4c72d210.o \
- $(OBJDIR)/jucer_Module_3f7666a5.o \
- $(OBJDIR)/jucer_Project_c131864a.o \
- $(OBJDIR)/jucer_ProjectContentComponent_60de0eee.o \
- $(OBJDIR)/jucer_ProjectType_1bc27a24.o \
- $(OBJDIR)/jucer_ProjectExporter_eefe2e5b.o \
- $(OBJDIR)/jucer_ResourceFile_6af120d3.o \
- $(OBJDIR)/jucer_SlidingPanelComponent_9aa7a2ab.o \
- $(OBJDIR)/jucer_CodeHelpers_c317179c.o \
- $(OBJDIR)/jucer_FileHelpers_f98ed0ad.o \
- $(OBJDIR)/jucer_Icons_9db2f51e.o \
- $(OBJDIR)/jucer_JucerTreeViewBase_d043309d.o \
- $(OBJDIR)/jucer_MiscUtilities_25b68c82.o \
- $(OBJDIR)/jucer_StoredSettings_26078d2c.o \
- $(OBJDIR)/jucer_NewFileWizard_fac97f47.o \
- $(OBJDIR)/jucer_NewProjectWizardClasses_891f6fa2.o \
$(OBJDIR)/jucer_SourceCodeEditor_461f5487.o \
$(OBJDIR)/jucer_ComponentTypeHandler_6bec6262.o \
$(OBJDIR)/jucer_ButtonDocument_56c341cc.o \
@@ -93,6 +78,21 @@ OBJECTS := \
$(OBJDIR)/jucer_JucerDocument_ff8afcc2.o \
$(OBJDIR)/jucer_ObjectTypes_4406f01c.o \
$(OBJDIR)/jucer_PaintRoutine_e1e891ee.o \
+ $(OBJDIR)/jucer_ProjectExporter_eefe2e5b.o \
+ $(OBJDIR)/jucer_ResourceFile_6af120d3.o \
+ $(OBJDIR)/jucer_Module_3f7666a5.o \
+ $(OBJDIR)/jucer_Project_c131864a.o \
+ $(OBJDIR)/jucer_ProjectContentComponent_60de0eee.o \
+ $(OBJDIR)/jucer_ProjectType_1bc27a24.o \
+ $(OBJDIR)/jucer_SlidingPanelComponent_9aa7a2ab.o \
+ $(OBJDIR)/jucer_CodeHelpers_c317179c.o \
+ $(OBJDIR)/jucer_FileHelpers_f98ed0ad.o \
+ $(OBJDIR)/jucer_Icons_9db2f51e.o \
+ $(OBJDIR)/jucer_JucerTreeViewBase_d043309d.o \
+ $(OBJDIR)/jucer_MiscUtilities_25b68c82.o \
+ $(OBJDIR)/jucer_StoredSettings_26078d2c.o \
+ $(OBJDIR)/jucer_NewFileWizard_fac97f47.o \
+ $(OBJDIR)/jucer_NewProjectWizardClasses_891f6fa2.o \
$(OBJDIR)/BinaryData_ce4232d4.o \
$(OBJDIR)/juce_core_1ee54a40.o \
$(OBJDIR)/juce_cryptography_3b1f489a.o \
@@ -149,184 +149,184 @@ $(OBJDIR)/jucer_OpenDocumentManager_4c72d210.o: ../../Source/Application/jucer_O
@echo "Compiling jucer_OpenDocumentManager.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_Module_3f7666a5.o: ../../Source/Project/jucer_Module.cpp
+$(OBJDIR)/jucer_SourceCodeEditor_461f5487.o: ../../Source/Code\ Editor/jucer_SourceCodeEditor.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_Module.cpp"
+ @echo "Compiling jucer_SourceCodeEditor.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_Project_c131864a.o: ../../Source/Project/jucer_Project.cpp
+$(OBJDIR)/jucer_ComponentTypeHandler_6bec6262.o: ../../Source/ComponentEditor/components/jucer_ComponentTypeHandler.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_Project.cpp"
+ @echo "Compiling jucer_ComponentTypeHandler.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_ProjectContentComponent_60de0eee.o: ../../Source/Project/jucer_ProjectContentComponent.cpp
+$(OBJDIR)/jucer_ButtonDocument_56c341cc.o: ../../Source/ComponentEditor/documents/jucer_ButtonDocument.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_ProjectContentComponent.cpp"
+ @echo "Compiling jucer_ButtonDocument.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_ProjectType_1bc27a24.o: ../../Source/Project/jucer_ProjectType.cpp
+$(OBJDIR)/jucer_ComponentDocument_92868083.o: ../../Source/ComponentEditor/documents/jucer_ComponentDocument.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_ProjectType.cpp"
+ @echo "Compiling jucer_ComponentDocument.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_ProjectExporter_eefe2e5b.o: ../../Source/Project\ Saving/jucer_ProjectExporter.cpp
+$(OBJDIR)/jucer_ColouredElement_70cbc839.o: ../../Source/ComponentEditor/paintelements/jucer_ColouredElement.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_ProjectExporter.cpp"
+ @echo "Compiling jucer_ColouredElement.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_ResourceFile_6af120d3.o: ../../Source/Project\ Saving/jucer_ResourceFile.cpp
+$(OBJDIR)/jucer_PaintElement_653460.o: ../../Source/ComponentEditor/paintelements/jucer_PaintElement.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_ResourceFile.cpp"
+ @echo "Compiling jucer_PaintElement.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_SlidingPanelComponent_9aa7a2ab.o: ../../Source/Utility/jucer_SlidingPanelComponent.cpp
+$(OBJDIR)/jucer_PaintElementPath_908894a5.o: ../../Source/ComponentEditor/paintelements/jucer_PaintElementPath.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_SlidingPanelComponent.cpp"
+ @echo "Compiling jucer_PaintElementPath.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_CodeHelpers_c317179c.o: ../../Source/Utility/jucer_CodeHelpers.cpp
+$(OBJDIR)/jucer_ComponentLayoutEditor_aeb44f8d.o: ../../Source/ComponentEditor/ui/jucer_ComponentLayoutEditor.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_CodeHelpers.cpp"
+ @echo "Compiling jucer_ComponentLayoutEditor.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_FileHelpers_f98ed0ad.o: ../../Source/Utility/jucer_FileHelpers.cpp
+$(OBJDIR)/jucer_ComponentOverlayComponent_fd508d63.o: ../../Source/ComponentEditor/ui/jucer_ComponentOverlayComponent.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_FileHelpers.cpp"
+ @echo "Compiling jucer_ComponentOverlayComponent.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_Icons_9db2f51e.o: ../../Source/Utility/jucer_Icons.cpp
+$(OBJDIR)/jucer_EditingPanelBase_6c2ed9ee.o: ../../Source/ComponentEditor/ui/jucer_EditingPanelBase.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_Icons.cpp"
+ @echo "Compiling jucer_EditingPanelBase.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_JucerTreeViewBase_d043309d.o: ../../Source/Utility/jucer_JucerTreeViewBase.cpp
+$(OBJDIR)/jucer_JucerDocumentEditor_2c581e26.o: ../../Source/ComponentEditor/ui/jucer_JucerDocumentEditor.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_JucerTreeViewBase.cpp"
+ @echo "Compiling jucer_JucerDocumentEditor.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_MiscUtilities_25b68c82.o: ../../Source/Utility/jucer_MiscUtilities.cpp
+$(OBJDIR)/jucer_PaintRoutineEditor_f6ac0344.o: ../../Source/ComponentEditor/ui/jucer_PaintRoutineEditor.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_MiscUtilities.cpp"
+ @echo "Compiling jucer_PaintRoutineEditor.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_StoredSettings_26078d2c.o: ../../Source/Utility/jucer_StoredSettings.cpp
+$(OBJDIR)/jucer_PaintRoutinePanel_c309a0d7.o: ../../Source/ComponentEditor/ui/jucer_PaintRoutinePanel.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_StoredSettings.cpp"
+ @echo "Compiling jucer_PaintRoutinePanel.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_NewFileWizard_fac97f47.o: ../../Source/Wizards/jucer_NewFileWizard.cpp
+$(OBJDIR)/jucer_ResourceEditorPanel_a558f2e2.o: ../../Source/ComponentEditor/ui/jucer_ResourceEditorPanel.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_NewFileWizard.cpp"
+ @echo "Compiling jucer_ResourceEditorPanel.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_NewProjectWizardClasses_891f6fa2.o: ../../Source/Wizards/jucer_NewProjectWizardClasses.cpp
+$(OBJDIR)/jucer_TestComponent_db757dc4.o: ../../Source/ComponentEditor/ui/jucer_TestComponent.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_NewProjectWizardClasses.cpp"
+ @echo "Compiling jucer_TestComponent.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_SourceCodeEditor_461f5487.o: ../../Source/Code\ Editor/jucer_SourceCodeEditor.cpp
+$(OBJDIR)/jucer_BinaryResources_e0f99b46.o: ../../Source/ComponentEditor/jucer_BinaryResources.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_SourceCodeEditor.cpp"
+ @echo "Compiling jucer_BinaryResources.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_ComponentTypeHandler_6bec6262.o: ../../Source/ComponentEditor/components/jucer_ComponentTypeHandler.cpp
+$(OBJDIR)/jucer_ComponentLayout_6ea00129.o: ../../Source/ComponentEditor/jucer_ComponentLayout.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_ComponentTypeHandler.cpp"
+ @echo "Compiling jucer_ComponentLayout.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_ButtonDocument_56c341cc.o: ../../Source/ComponentEditor/documents/jucer_ButtonDocument.cpp
+$(OBJDIR)/jucer_GeneratedCode_9ca4ef7e.o: ../../Source/ComponentEditor/jucer_GeneratedCode.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_ButtonDocument.cpp"
+ @echo "Compiling jucer_GeneratedCode.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_ComponentDocument_92868083.o: ../../Source/ComponentEditor/documents/jucer_ComponentDocument.cpp
+$(OBJDIR)/jucer_JucerDocument_ff8afcc2.o: ../../Source/ComponentEditor/jucer_JucerDocument.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_ComponentDocument.cpp"
+ @echo "Compiling jucer_JucerDocument.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_ColouredElement_70cbc839.o: ../../Source/ComponentEditor/paintelements/jucer_ColouredElement.cpp
+$(OBJDIR)/jucer_ObjectTypes_4406f01c.o: ../../Source/ComponentEditor/jucer_ObjectTypes.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_ColouredElement.cpp"
+ @echo "Compiling jucer_ObjectTypes.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_PaintElement_653460.o: ../../Source/ComponentEditor/paintelements/jucer_PaintElement.cpp
+$(OBJDIR)/jucer_PaintRoutine_e1e891ee.o: ../../Source/ComponentEditor/jucer_PaintRoutine.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_PaintElement.cpp"
+ @echo "Compiling jucer_PaintRoutine.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_PaintElementPath_908894a5.o: ../../Source/ComponentEditor/paintelements/jucer_PaintElementPath.cpp
+$(OBJDIR)/jucer_ProjectExporter_eefe2e5b.o: ../../Source/Project\ Saving/jucer_ProjectExporter.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_PaintElementPath.cpp"
+ @echo "Compiling jucer_ProjectExporter.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_ComponentLayoutEditor_aeb44f8d.o: ../../Source/ComponentEditor/ui/jucer_ComponentLayoutEditor.cpp
+$(OBJDIR)/jucer_ResourceFile_6af120d3.o: ../../Source/Project\ Saving/jucer_ResourceFile.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_ComponentLayoutEditor.cpp"
+ @echo "Compiling jucer_ResourceFile.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_ComponentOverlayComponent_fd508d63.o: ../../Source/ComponentEditor/ui/jucer_ComponentOverlayComponent.cpp
+$(OBJDIR)/jucer_Module_3f7666a5.o: ../../Source/Project/jucer_Module.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_ComponentOverlayComponent.cpp"
+ @echo "Compiling jucer_Module.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_EditingPanelBase_6c2ed9ee.o: ../../Source/ComponentEditor/ui/jucer_EditingPanelBase.cpp
+$(OBJDIR)/jucer_Project_c131864a.o: ../../Source/Project/jucer_Project.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_EditingPanelBase.cpp"
+ @echo "Compiling jucer_Project.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_JucerDocumentEditor_2c581e26.o: ../../Source/ComponentEditor/ui/jucer_JucerDocumentEditor.cpp
+$(OBJDIR)/jucer_ProjectContentComponent_60de0eee.o: ../../Source/Project/jucer_ProjectContentComponent.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_JucerDocumentEditor.cpp"
+ @echo "Compiling jucer_ProjectContentComponent.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_PaintRoutineEditor_f6ac0344.o: ../../Source/ComponentEditor/ui/jucer_PaintRoutineEditor.cpp
+$(OBJDIR)/jucer_ProjectType_1bc27a24.o: ../../Source/Project/jucer_ProjectType.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_PaintRoutineEditor.cpp"
+ @echo "Compiling jucer_ProjectType.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_PaintRoutinePanel_c309a0d7.o: ../../Source/ComponentEditor/ui/jucer_PaintRoutinePanel.cpp
+$(OBJDIR)/jucer_SlidingPanelComponent_9aa7a2ab.o: ../../Source/Utility/jucer_SlidingPanelComponent.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_PaintRoutinePanel.cpp"
+ @echo "Compiling jucer_SlidingPanelComponent.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_ResourceEditorPanel_a558f2e2.o: ../../Source/ComponentEditor/ui/jucer_ResourceEditorPanel.cpp
+$(OBJDIR)/jucer_CodeHelpers_c317179c.o: ../../Source/Utility/jucer_CodeHelpers.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_ResourceEditorPanel.cpp"
+ @echo "Compiling jucer_CodeHelpers.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_TestComponent_db757dc4.o: ../../Source/ComponentEditor/ui/jucer_TestComponent.cpp
+$(OBJDIR)/jucer_FileHelpers_f98ed0ad.o: ../../Source/Utility/jucer_FileHelpers.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_TestComponent.cpp"
+ @echo "Compiling jucer_FileHelpers.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_BinaryResources_e0f99b46.o: ../../Source/ComponentEditor/jucer_BinaryResources.cpp
+$(OBJDIR)/jucer_Icons_9db2f51e.o: ../../Source/Utility/jucer_Icons.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_BinaryResources.cpp"
+ @echo "Compiling jucer_Icons.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_ComponentLayout_6ea00129.o: ../../Source/ComponentEditor/jucer_ComponentLayout.cpp
+$(OBJDIR)/jucer_JucerTreeViewBase_d043309d.o: ../../Source/Utility/jucer_JucerTreeViewBase.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_ComponentLayout.cpp"
+ @echo "Compiling jucer_JucerTreeViewBase.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_GeneratedCode_9ca4ef7e.o: ../../Source/ComponentEditor/jucer_GeneratedCode.cpp
+$(OBJDIR)/jucer_MiscUtilities_25b68c82.o: ../../Source/Utility/jucer_MiscUtilities.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_GeneratedCode.cpp"
+ @echo "Compiling jucer_MiscUtilities.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_JucerDocument_ff8afcc2.o: ../../Source/ComponentEditor/jucer_JucerDocument.cpp
+$(OBJDIR)/jucer_StoredSettings_26078d2c.o: ../../Source/Utility/jucer_StoredSettings.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_JucerDocument.cpp"
+ @echo "Compiling jucer_StoredSettings.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_ObjectTypes_4406f01c.o: ../../Source/ComponentEditor/jucer_ObjectTypes.cpp
+$(OBJDIR)/jucer_NewFileWizard_fac97f47.o: ../../Source/Wizards/jucer_NewFileWizard.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_ObjectTypes.cpp"
+ @echo "Compiling jucer_NewFileWizard.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-$(OBJDIR)/jucer_PaintRoutine_e1e891ee.o: ../../Source/ComponentEditor/jucer_PaintRoutine.cpp
+$(OBJDIR)/jucer_NewProjectWizardClasses_891f6fa2.o: ../../Source/Wizards/jucer_NewProjectWizardClasses.cpp
-@mkdir -p $(OBJDIR)
- @echo "Compiling jucer_PaintRoutine.cpp"
+ @echo "Compiling jucer_NewProjectWizardClasses.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
$(OBJDIR)/BinaryData_ce4232d4.o: ../../JuceLibraryCode/BinaryData.cpp
diff --git a/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj
index 692e27374b..c6f6f7707f 100644
--- a/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj
+++ b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj
@@ -19,21 +19,6 @@
95B44E6C74B1DED31DBE37EB = {isa = PBXBuildFile; fileRef = 8C52A3DDA62A746AA7A68535; };
AA9D0B8E23F3D87A23DE9F8A = {isa = PBXBuildFile; fileRef = 9069981E414A631B036CC9AC; };
244BA1BDA5FAA465EA3F9C6D = {isa = PBXBuildFile; fileRef = 2247EE920DF0610CAF9F4513; };
- 3FCA61C401007B243E2E9035 = {isa = PBXBuildFile; fileRef = F797071D88542C813CF7222A; };
- 30B921C38DCEE787B294B746 = {isa = PBXBuildFile; fileRef = BAC43B20E14A340CCF14119C; };
- 676D2E1E750E61AA2FAA335E = {isa = PBXBuildFile; fileRef = 86E468DE6556BB2AD76A3D80; };
- 8012E6487639A7368E4C4470 = {isa = PBXBuildFile; fileRef = E70CA21960A64CCB835725FF; };
- 1F37544891EC8DBB5E500C1C = {isa = PBXBuildFile; fileRef = F71AF6D2DF3E652F8B51EBAB; };
- 110221CD5578153B528AD2BE = {isa = PBXBuildFile; fileRef = D10D51A0A2D63F38B4D86A60; };
- 4A1DB797F1356E85110FF871 = {isa = PBXBuildFile; fileRef = 20FAAE9F3A7B96C2D8C75BB2; };
- CD4F7B119CE718BCE78D61F4 = {isa = PBXBuildFile; fileRef = 9B9CAD20E1243B4351B4C8D8; };
- 78CB463DD98A55313A543859 = {isa = PBXBuildFile; fileRef = 1729AEDC34001C31B8CC357C; };
- 1499DF2E85B05AC1BF423773 = {isa = PBXBuildFile; fileRef = CF21D9DB3AEC0A4DCAB36A99; };
- 123810DAF8AF758928916ECE = {isa = PBXBuildFile; fileRef = 47DD50A5A9091F9900E0EAD9; };
- C9F11BA62D6D092A300363F7 = {isa = PBXBuildFile; fileRef = 0F249640243FBD5717F6ADD9; };
- F6635694A01FFBF5EF0968DB = {isa = PBXBuildFile; fileRef = 631983AA62673015F8D7453B; };
- 518DD443B6F17A5AFD707263 = {isa = PBXBuildFile; fileRef = A69024A225F2AC31F17B1314; };
- B7EBA1A83575F48CD08140B9 = {isa = PBXBuildFile; fileRef = 4B083E951ECB62217C46CB01; };
FCE6F604C00039A32649CB69 = {isa = PBXBuildFile; fileRef = 2E680E2C65684A4272AE079A; };
9BF773500BA51A8B5C6C7348 = {isa = PBXBuildFile; fileRef = 65C498761CE166072A202AA0; };
57B1F32A372143B4D3B1C517 = {isa = PBXBuildFile; fileRef = 3E03B7C7A19E63A724EB79F4; };
@@ -55,6 +40,21 @@
209FCCC2155A1FCB7E11E20D = {isa = PBXBuildFile; fileRef = 269A454F1FF081DA67FFD578; };
C93569F47B4AC1A8E37992ED = {isa = PBXBuildFile; fileRef = 9D7689451732AF8333402B3A; };
1B988E139004D8E2850EB656 = {isa = PBXBuildFile; fileRef = C187718F7B9EBA88584B43F3; };
+ 1F37544891EC8DBB5E500C1C = {isa = PBXBuildFile; fileRef = F71AF6D2DF3E652F8B51EBAB; };
+ 110221CD5578153B528AD2BE = {isa = PBXBuildFile; fileRef = D10D51A0A2D63F38B4D86A60; };
+ 3FCA61C401007B243E2E9035 = {isa = PBXBuildFile; fileRef = F797071D88542C813CF7222A; };
+ 30B921C38DCEE787B294B746 = {isa = PBXBuildFile; fileRef = BAC43B20E14A340CCF14119C; };
+ 676D2E1E750E61AA2FAA335E = {isa = PBXBuildFile; fileRef = 86E468DE6556BB2AD76A3D80; };
+ 8012E6487639A7368E4C4470 = {isa = PBXBuildFile; fileRef = E70CA21960A64CCB835725FF; };
+ 4A1DB797F1356E85110FF871 = {isa = PBXBuildFile; fileRef = 20FAAE9F3A7B96C2D8C75BB2; };
+ CD4F7B119CE718BCE78D61F4 = {isa = PBXBuildFile; fileRef = 9B9CAD20E1243B4351B4C8D8; };
+ 78CB463DD98A55313A543859 = {isa = PBXBuildFile; fileRef = 1729AEDC34001C31B8CC357C; };
+ 1499DF2E85B05AC1BF423773 = {isa = PBXBuildFile; fileRef = CF21D9DB3AEC0A4DCAB36A99; };
+ 123810DAF8AF758928916ECE = {isa = PBXBuildFile; fileRef = 47DD50A5A9091F9900E0EAD9; };
+ C9F11BA62D6D092A300363F7 = {isa = PBXBuildFile; fileRef = 0F249640243FBD5717F6ADD9; };
+ F6635694A01FFBF5EF0968DB = {isa = PBXBuildFile; fileRef = 631983AA62673015F8D7453B; };
+ 518DD443B6F17A5AFD707263 = {isa = PBXBuildFile; fileRef = A69024A225F2AC31F17B1314; };
+ B7EBA1A83575F48CD08140B9 = {isa = PBXBuildFile; fileRef = 4B083E951ECB62217C46CB01; };
6FC19EBA7A51423C3D22F77B = {isa = PBXBuildFile; fileRef = B483D960309FAFC193F9CDA2; };
3C5267E06A897B0DC0F7EA50 = {isa = PBXBuildFile; fileRef = 472F9A90F685220D730EBF6C; };
7E72CB84146E1B4B168356CA = {isa = PBXBuildFile; fileRef = 38F29C2049566C47993A6D92; };
@@ -783,7 +783,6 @@
D374DC78AAC02504576AA9B3 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_GroupComponentHandler.h"; path = "../../Source/ComponentEditor/components/jucer_GroupComponentHandler.h"; sourceTree = "SOURCE_ROOT"; };
D376B9B54EC944E766AFEC45 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_PopupMenu.cpp"; path = "../../../../modules/juce_gui_basics/menus/juce_PopupMenu.cpp"; sourceTree = "SOURCE_ROOT"; };
D3E139185095C486DD3D61F2 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_TranslationTool.h"; path = "../../Source/Utility/jucer_TranslationTool.h"; sourceTree = "SOURCE_ROOT"; };
- D4444EC6342A2A7BC4F7BC46 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ComponentTextProperty.h"; path = "../../Source/ComponentEditor/properties/jucer_ComponentTextProperty.h"; sourceTree = "SOURCE_ROOT"; };
D4697A0232AECE5DAC5E332E = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ChoicePropertyComponent.cpp"; path = "../../../../modules/juce_gui_basics/properties/juce_ChoicePropertyComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
D4E56676E2EF83404EDCBA8C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_TextEditor.cpp"; path = "../../../../modules/juce_gui_basics/widgets/juce_TextEditor.cpp"; sourceTree = "SOURCE_ROOT"; };
D4F2D42C58F4D86E00E76F31 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ApplicationCommandID.h"; path = "../../../../modules/juce_gui_basics/commands/juce_ApplicationCommandID.h"; sourceTree = "SOURCE_ROOT"; };
@@ -799,18 +798,15 @@
D7A7F1AA9F313B0CCAAA73A0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MathsFunctions.h"; path = "../../../../modules/juce_core/maths/juce_MathsFunctions.h"; sourceTree = "SOURCE_ROOT"; };
D7CCD84E625F03C3F2F8AEC3 = {isa = PBXFileReference; lastKnownFileType = file.svg; name = iconOpenfile.svg; path = ../../Source/BinaryData/iconOpenfile.svg; sourceTree = "SOURCE_ROOT"; };
D800DE818BEDBF4579D15B1D = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_AppleRemote.mm"; path = "../../../../modules/juce_gui_extra/native/juce_mac_AppleRemote.mm"; sourceTree = "SOURCE_ROOT"; };
- D87FC8F6834E9DC9C8E88B94 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_JustificationProperty.h"; path = "../../Source/ComponentEditor/properties/jucer_JustificationProperty.h"; sourceTree = "SOURCE_ROOT"; };
D926E13AB5AD647A7A00F486 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Network.cpp"; path = "../../../../modules/juce_core/native/juce_linux_Network.cpp"; sourceTree = "SOURCE_ROOT"; };
D92A6E9404A30EED32DCE4ED = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_RelativePositionedRectangle.h"; path = "../../Source/ComponentEditor/ui/jucer_RelativePositionedRectangle.h"; sourceTree = "SOURCE_ROOT"; };
D9342535EA61901A1AD816C6 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_WebBrowserComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_WebBrowserComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
D95D7B49EC6C6BDCB5A1B988 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_ios_MessageManager.mm"; path = "../../../../modules/juce_events/native/juce_ios_MessageManager.mm"; sourceTree = "SOURCE_ROOT"; };
D9B077E2ECDDA94961E134D7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StringPairArray.h"; path = "../../../../modules/juce_core/text/juce_StringPairArray.h"; sourceTree = "SOURCE_ROOT"; };
D9E59DE07A815AB303A297D9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_data_structures.mm"; path = "../../../../modules/juce_data_structures/juce_data_structures.mm"; sourceTree = "SOURCE_ROOT"; };
- DA345D5B9DABD049F90DC96F = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_GeneratedCode.h"; path = "../../Source/ComponentEditor/jucer_GeneratedCode.h"; sourceTree = "SOURCE_ROOT"; };
DAF84A553D264705FA6EB6FF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_TreeViewHandler.h"; path = "../../Source/ComponentEditor/components/jucer_TreeViewHandler.h"; sourceTree = "SOURCE_ROOT"; };
DB20268A566DABEAE3F2CBEE = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_RectanglePlacement.cpp"; path = "../../../../modules/juce_graphics/placement/juce_RectanglePlacement.cpp"; sourceTree = "SOURCE_ROOT"; };
DB876F7873F42DC685A58CA7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_JPEGLoader.cpp"; path = "../../../../modules/juce_graphics/image_formats/juce_JPEGLoader.cpp"; sourceTree = "SOURCE_ROOT"; };
- DBE0CDE1B017190ABBFF557C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectExport_CodeBlocks.h"; path = "../../Source/Project Saving/jucer_ProjectExport_CodeBlocks.h"; sourceTree = "SOURCE_ROOT"; };
DC5E7FF30B01118F6DAEC38F = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Time.cpp"; path = "../../../../modules/juce_core/time/juce_Time.cpp"; sourceTree = "SOURCE_ROOT"; };
DC922C6A65D260C18E888E49 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_ComponentTemplate.cpp"; path = "../../Source/BinaryData/jucer_ComponentTemplate.cpp"; sourceTree = "SOURCE_ROOT"; };
DCCB75165B7C73A589498E87 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Windowing.cpp"; path = "../../../../modules/juce_gui_basics/native/juce_linux_Windowing.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -832,38 +828,42 @@
E27F0860F27023BAA9798B46 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Rectangle.h"; path = "../../../../modules/juce_graphics/geometry/juce_Rectangle.h"; sourceTree = "SOURCE_ROOT"; };
E284B565DBD647DC0830D23B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ButtonPropertyComponent.cpp"; path = "../../../../modules/juce_gui_basics/properties/juce_ButtonPropertyComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
E293F9DE1162A7D27E1FAC1F = {isa = PBXFileReference; lastKnownFileType = image.png; name = projectIconVisualStudio08.png; path = ../../Source/BinaryData/projectIconVisualStudio08.png; sourceTree = "SOURCE_ROOT"; };
- E2C1C995D554A3F0A363CE58 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Thread.h"; path = "../../../../modules/juce_core/threads/juce_Thread.h"; sourceTree = "SOURCE_ROOT"; };
- E2DBA3307837B64AFCCD8F8D = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_File.cpp"; path = "../../../../modules/juce_core/files/juce_File.cpp"; sourceTree = "SOURCE_ROOT"; };
E3869AC657E984565F1718AA = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ConnectedChildProcess.h"; path = "../../../../modules/juce_events/interprocess/juce_ConnectedChildProcess.h"; sourceTree = "SOURCE_ROOT"; };
E3FF16862AA1B2F943DC616C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ImageCache.cpp"; path = "../../../../modules/juce_graphics/images/juce_ImageCache.cpp"; sourceTree = "SOURCE_ROOT"; };
- E446FFE889CD490FDE3F0F2B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ThreadWithProgressWindow.cpp"; path = "../../../../modules/juce_gui_basics/windows/juce_ThreadWithProgressWindow.cpp"; sourceTree = "SOURCE_ROOT"; };
+ E4BB22E27C5AA4B666F265BD = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_TextButtonHandler.h"; path = "../../Source/ComponentEditor/components/jucer_TextButtonHandler.h"; sourceTree = "SOURCE_ROOT"; };
E4E74B2BC3F3CB5A4F4DC55E = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_module_info"; path = "../../../../modules/juce_gui_basics/juce_module_info"; sourceTree = "SOURCE_ROOT"; };
E4F9D1E097CC2C1D1291823C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel_V2.cpp"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp"; sourceTree = "SOURCE_ROOT"; };
+ E5D6C36496F5BC84D7213BE8 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
+ E62D9BA6E92FE7BB6EF65699 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_JSON.h"; path = "../../../../modules/juce_core/javascript/juce_JSON.h"; sourceTree = "SOURCE_ROOT"; };
+ E63F54CF8D5D922A319C6962 = {isa = PBXFileReference; lastKnownFileType = image.png; name = projectIconXcodeIOS.png; path = ../../Source/BinaryData/projectIconXcodeIOS.png; sourceTree = "SOURCE_ROOT"; };
+ E65A820D34BF39478B7C5925 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_DocumentEditorComponent.h"; path = "../../Source/Application/jucer_DocumentEditorComponent.h"; sourceTree = "SOURCE_ROOT"; };
+ E7E122AE104E79BB641B07B3 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_module_info"; path = "../../../../modules/juce_data_structures/juce_module_info"; sourceTree = "SOURCE_ROOT"; };
+ E96597BBC6A98255B51B94DC = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
+ 25F52316D256B4534BED16D1 = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Introjucer.app; sourceTree = "BUILT_PRODUCTS_DIR"; };
+ D4444EC6342A2A7BC4F7BC46 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ComponentTextProperty.h"; path = "../../Source/ComponentEditor/properties/jucer_ComponentTextProperty.h"; sourceTree = "SOURCE_ROOT"; };
+ D87FC8F6834E9DC9C8E88B94 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_JustificationProperty.h"; path = "../../Source/ComponentEditor/properties/jucer_JustificationProperty.h"; sourceTree = "SOURCE_ROOT"; };
+ DA345D5B9DABD049F90DC96F = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_GeneratedCode.h"; path = "../../Source/ComponentEditor/jucer_GeneratedCode.h"; sourceTree = "SOURCE_ROOT"; };
+ DBE0CDE1B017190ABBFF557C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectExport_CodeBlocks.h"; path = "../../Source/Project Saving/jucer_ProjectExport_CodeBlocks.h"; sourceTree = "SOURCE_ROOT"; };
+ E2C1C995D554A3F0A363CE58 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Thread.h"; path = "../../../../modules/juce_core/threads/juce_Thread.h"; sourceTree = "SOURCE_ROOT"; };
+ E2DBA3307837B64AFCCD8F8D = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_File.cpp"; path = "../../../../modules/juce_core/files/juce_File.cpp"; sourceTree = "SOURCE_ROOT"; };
+ E446FFE889CD490FDE3F0F2B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ThreadWithProgressWindow.cpp"; path = "../../../../modules/juce_gui_basics/windows/juce_ThreadWithProgressWindow.cpp"; sourceTree = "SOURCE_ROOT"; };
E530742870F07704E9616358 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ToolbarItemComponent.h"; path = "../../../../modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.h"; sourceTree = "SOURCE_ROOT"; };
E54D0994D31E20A0A05EBA2B = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_SystemTrayIconComponent.h"; path = "../../../../modules/juce_gui_extra/misc/juce_SystemTrayIconComponent.h"; sourceTree = "SOURCE_ROOT"; };
E570E57CC1FCEF78B54A7084 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FileOutputStream.h"; path = "../../../../modules/juce_core/files/juce_FileOutputStream.h"; sourceTree = "SOURCE_ROOT"; };
- E5D6C36496F5BC84D7213BE8 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
E60E28D1B7491047DEA236AE = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectContentComponent.h"; path = "../../Source/Project/jucer_ProjectContentComponent.h"; sourceTree = "SOURCE_ROOT"; };
- E62D9BA6E92FE7BB6EF65699 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_JSON.h"; path = "../../../../modules/juce_core/javascript/juce_JSON.h"; sourceTree = "SOURCE_ROOT"; };
- E63F54CF8D5D922A319C6962 = {isa = PBXFileReference; lastKnownFileType = image.png; name = projectIconXcodeIOS.png; path = ../../Source/BinaryData/projectIconXcodeIOS.png; sourceTree = "SOURCE_ROOT"; };
E642193A9990C48CFB6479A9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FileListComponent.h"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_FileListComponent.h"; sourceTree = "SOURCE_ROOT"; };
- E65A820D34BF39478B7C5925 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_DocumentEditorComponent.h"; path = "../../Source/Application/jucer_DocumentEditorComponent.h"; sourceTree = "SOURCE_ROOT"; };
+ E654E3A3CD45A888C5F773DF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MenuBarModel.h"; path = "../../../../modules/juce_gui_basics/menus/juce_MenuBarModel.h"; sourceTree = "SOURCE_ROOT"; };
E6F5CEC32EDC917B054467EF = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ReadWriteLock.cpp"; path = "../../../../modules/juce_core/threads/juce_ReadWriteLock.cpp"; sourceTree = "SOURCE_ROOT"; };
E70CA21960A64CCB835725FF = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_ProjectType.cpp"; path = "../../Source/Project/jucer_ProjectType.cpp"; sourceTree = "SOURCE_ROOT"; };
E720FBCD836FF3AA466C31B6 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_HighResolutionTimer.cpp"; path = "../../../../modules/juce_core/threads/juce_HighResolutionTimer.cpp"; sourceTree = "SOURCE_ROOT"; };
+ E73C7E17116F6085765622E3 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Drawable.h"; path = "../../../../modules/juce_gui_basics/drawables/juce_Drawable.h"; sourceTree = "SOURCE_ROOT"; };
E7A4604F766ABC8BE26C94A1 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_RelativeParallelogram.cpp"; path = "../../../../modules/juce_gui_basics/positioning/juce_RelativeParallelogram.cpp"; sourceTree = "SOURCE_ROOT"; };
+ E7B6A0CBA0D27A095E83F5B7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_WebBrowserComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_win32_WebBrowserComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
E7D09B860F4D4A13D4312C38 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_PropertiesFile.cpp"; path = "../../../../modules/juce_data_structures/app_properties/juce_PropertiesFile.cpp"; sourceTree = "SOURCE_ROOT"; };
- E7E122AE104E79BB641B07B3 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_module_info"; path = "../../../../modules/juce_data_structures/juce_module_info"; sourceTree = "SOURCE_ROOT"; };
+ E7E1C4F416CFA44BE7DD1A74 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_KeyboardFocusTraverser.h"; path = "../../../../modules/juce_gui_basics/keyboard/juce_KeyboardFocusTraverser.h"; sourceTree = "SOURCE_ROOT"; };
E7E1D60BC7AEF79AA7B65B7C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_String.cpp"; path = "../../../../modules/juce_core/text/juce_String.cpp"; sourceTree = "SOURCE_ROOT"; };
E7F098BA306EC789242AB9A8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel_V1.cpp"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.cpp"; sourceTree = "SOURCE_ROOT"; };
E82C9EF1A74D867BBFF2090D = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_RSAKey.cpp"; path = "../../../../modules/juce_cryptography/encryption/juce_RSAKey.cpp"; sourceTree = "SOURCE_ROOT"; };
- E96597BBC6A98255B51B94DC = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
- 25F52316D256B4534BED16D1 = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Introjucer.app; sourceTree = "BUILT_PRODUCTS_DIR"; };
- E4BB22E27C5AA4B666F265BD = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_TextButtonHandler.h"; path = "../../Source/ComponentEditor/components/jucer_TextButtonHandler.h"; sourceTree = "SOURCE_ROOT"; };
- E654E3A3CD45A888C5F773DF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MenuBarModel.h"; path = "../../../../modules/juce_gui_basics/menus/juce_MenuBarModel.h"; sourceTree = "SOURCE_ROOT"; };
- E73C7E17116F6085765622E3 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Drawable.h"; path = "../../../../modules/juce_gui_basics/drawables/juce_Drawable.h"; sourceTree = "SOURCE_ROOT"; };
- E7B6A0CBA0D27A095E83F5B7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_WebBrowserComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_win32_WebBrowserComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
- E7E1C4F416CFA44BE7DD1A74 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_KeyboardFocusTraverser.h"; path = "../../../../modules/juce_gui_basics/keyboard/juce_KeyboardFocusTraverser.h"; sourceTree = "SOURCE_ROOT"; };
E99F5A31373E9BDEAC40792F = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_android_FileChooser.cpp"; path = "../../../../modules/juce_gui_basics/native/juce_android_FileChooser.cpp"; sourceTree = "SOURCE_ROOT"; };
E9B8C3CA480AE94BEA852EA9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_ios_Windowing.mm"; path = "../../../../modules/juce_gui_basics/native/juce_ios_Windowing.mm"; sourceTree = "SOURCE_ROOT"; };
EA0D43AB5F47506D5CDA81BB = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MultiDocumentPanel.cpp"; path = "../../../../modules/juce_gui_basics/layout/juce_MultiDocumentPanel.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -945,69 +945,6 @@
2CD34A70B4032C0426F7AA10,
2247EE920DF0610CAF9F4513,
563091B0916AD9AAA36C7DC5, ); name = Application; sourceTree = ""; };
- 891F84627A03FA733F37A199 = {isa = PBXGroup; children = (
- 93D03B2BC76998A3BDA747E8,
- 8F8BF1A7130D858E0A239F9E,
- 7B4E33B1E04139F359FB484B,
- 9F75811FE7B5F8D1321BEC69,
- C7B47372A9D5970E3D9A5400,
- F797071D88542C813CF7222A,
- 7211101FFA28400ADBB1D47A,
- AFEBD8423B07599B1DE175A3,
- BAC43B20E14A340CCF14119C,
- BF3CEF080FA013E2778DCE90,
- 86E468DE6556BB2AD76A3D80,
- E60E28D1B7491047DEA236AE,
- 375AFDF06A908D89DEC5205F,
- 47B49049B85EED74D29C9906,
- 4F6365A0D2D51337151D85C3,
- E70CA21960A64CCB835725FF,
- B8385E9A644BD3CD94876448, ); name = Project; sourceTree = ""; };
- E345840128627D533DF908AC = {isa = PBXGroup; children = (
- 6E7353DFEA8825B515049ABB,
- DBE0CDE1B017190ABBFF557C,
- 05076CDF1511A5F8A8E18F1D,
- C8A229ACD244F402C57286CD,
- 974B862C51DA9A16CBBB3A29,
- F71AF6D2DF3E652F8B51EBAB,
- 35CB48D497F35BF3F6998F5D,
- 9C04F9680F82BF279D528688,
- D10D51A0A2D63F38B4D86A60,
- C9616830BB2474066AC8C910, ); name = "Project Saving"; sourceTree = ""; };
- D93DED1F5F1B0E49E10A6760 = {isa = PBXGroup; children = (
- 20FAAE9F3A7B96C2D8C75BB2,
- C22791DB75870C4F102AA8A3,
- 9B9CAD20E1243B4351B4C8D8,
- 914ADDB50ED7365F08BA91F9,
- 188D03A4247F4BC0539F5C49,
- 1729AEDC34001C31B8CC357C,
- 553725A0E3A391651ED1731E,
- CF21D9DB3AEC0A4DCAB36A99,
- 515FF6E74826E3E3F7273621,
- 47DD50A5A9091F9900E0EAD9,
- 820291543BF93243B718F0EE,
- 0F249640243FBD5717F6ADD9,
- 4A41FD3066D0979DB48691E5,
- 1AF7EFBE4961C7B6C834BF54,
- 1F421199C40092BFEE0658C2,
- 631983AA62673015F8D7453B,
- 9BC8AE609A07657CEF587548,
- D3E139185095C486DD3D61F2,
- 8090981F07A76E465DAAADF4, ); name = Utility; sourceTree = ""; };
- EA13CB5FD121EE215A7A51BE = {isa = PBXGroup; children = (
- 714267352CE5C4357ADBC231,
- 087CB3A961CD3C7434D660A4,
- C09BBB58CA45B66D693E8C31,
- 9D36626E41832F1C6687A0F0,
- 015AFF2CAC4BD4FD91E51D22,
- 12CC2BC36B76F99E2B1DD864,
- 4D4935CB2D04939D99E3D8F9,
- 64B19786481DB13E2B05AB57,
- 8BD8E9DA627D6EF9BA10FB9E,
- A69024A225F2AC31F17B1314,
- 11DC04468BC6023671017EBF,
- 4B083E951ECB62217C46CB01,
- C2990A8D054BC230E7C637C3, ); name = Wizards; sourceTree = ""; };
FC22321797D433148500EDDA = {isa = PBXGroup; children = (
2E680E2C65684A4272AE079A,
78CA0E0F336229E2E2F111B0, ); name = "Code Editor"; sourceTree = ""; };
@@ -1106,6 +1043,69 @@
C187718F7B9EBA88584B43F3,
66B49F08C5EC3E4974825FF8,
5432B7B9B2CF2EAEC8B66D5C, ); name = ComponentEditor; sourceTree = ""; };
+ E345840128627D533DF908AC = {isa = PBXGroup; children = (
+ 6E7353DFEA8825B515049ABB,
+ DBE0CDE1B017190ABBFF557C,
+ 05076CDF1511A5F8A8E18F1D,
+ C8A229ACD244F402C57286CD,
+ 974B862C51DA9A16CBBB3A29,
+ F71AF6D2DF3E652F8B51EBAB,
+ 35CB48D497F35BF3F6998F5D,
+ 9C04F9680F82BF279D528688,
+ D10D51A0A2D63F38B4D86A60,
+ C9616830BB2474066AC8C910, ); name = "Project Saving"; sourceTree = ""; };
+ 891F84627A03FA733F37A199 = {isa = PBXGroup; children = (
+ 93D03B2BC76998A3BDA747E8,
+ 8F8BF1A7130D858E0A239F9E,
+ 7B4E33B1E04139F359FB484B,
+ 9F75811FE7B5F8D1321BEC69,
+ C7B47372A9D5970E3D9A5400,
+ F797071D88542C813CF7222A,
+ 7211101FFA28400ADBB1D47A,
+ AFEBD8423B07599B1DE175A3,
+ BAC43B20E14A340CCF14119C,
+ BF3CEF080FA013E2778DCE90,
+ 86E468DE6556BB2AD76A3D80,
+ E60E28D1B7491047DEA236AE,
+ 375AFDF06A908D89DEC5205F,
+ 47B49049B85EED74D29C9906,
+ 4F6365A0D2D51337151D85C3,
+ E70CA21960A64CCB835725FF,
+ B8385E9A644BD3CD94876448, ); name = Project; sourceTree = ""; };
+ D93DED1F5F1B0E49E10A6760 = {isa = PBXGroup; children = (
+ 20FAAE9F3A7B96C2D8C75BB2,
+ C22791DB75870C4F102AA8A3,
+ 9B9CAD20E1243B4351B4C8D8,
+ 914ADDB50ED7365F08BA91F9,
+ 188D03A4247F4BC0539F5C49,
+ 1729AEDC34001C31B8CC357C,
+ 553725A0E3A391651ED1731E,
+ CF21D9DB3AEC0A4DCAB36A99,
+ 515FF6E74826E3E3F7273621,
+ 47DD50A5A9091F9900E0EAD9,
+ 820291543BF93243B718F0EE,
+ 0F249640243FBD5717F6ADD9,
+ 4A41FD3066D0979DB48691E5,
+ 1AF7EFBE4961C7B6C834BF54,
+ 1F421199C40092BFEE0658C2,
+ 631983AA62673015F8D7453B,
+ 9BC8AE609A07657CEF587548,
+ D3E139185095C486DD3D61F2,
+ 8090981F07A76E465DAAADF4, ); name = Utility; sourceTree = ""; };
+ EA13CB5FD121EE215A7A51BE = {isa = PBXGroup; children = (
+ 714267352CE5C4357ADBC231,
+ 087CB3A961CD3C7434D660A4,
+ C09BBB58CA45B66D693E8C31,
+ 9D36626E41832F1C6687A0F0,
+ 015AFF2CAC4BD4FD91E51D22,
+ 12CC2BC36B76F99E2B1DD864,
+ 4D4935CB2D04939D99E3D8F9,
+ 64B19786481DB13E2B05AB57,
+ 8BD8E9DA627D6EF9BA10FB9E,
+ A69024A225F2AC31F17B1314,
+ 11DC04468BC6023671017EBF,
+ 4B083E951ECB62217C46CB01,
+ C2990A8D054BC230E7C637C3, ); name = Wizards; sourceTree = ""; };
88DFD62CB6545EE8CA5C485B = {isa = PBXGroup; children = (
1A8E24245E48C7C4DB0164E6,
353E622BE257074B5589199D,
@@ -1152,12 +1152,12 @@
58139D8D454051C59E77609B, ); name = BinaryData; sourceTree = ""; };
D3109994DA6AD871BE85C4E2 = {isa = PBXGroup; children = (
ACBAFA7D92DD82AD44ABE68A,
- 891F84627A03FA733F37A199,
+ FC22321797D433148500EDDA,
+ 825956EA572E23B506C8236F,
E345840128627D533DF908AC,
+ 891F84627A03FA733F37A199,
D93DED1F5F1B0E49E10A6760,
EA13CB5FD121EE215A7A51BE,
- FC22321797D433148500EDDA,
- 825956EA572E23B506C8236F,
88DFD62CB6545EE8CA5C485B, ); name = "The Introjucer"; sourceTree = ""; };
ED7BB3F297250D7B43B2A536 = {isa = PBXGroup; children = (
795AF1D634CA3E6FA899E0B0,
@@ -2055,21 +2055,6 @@
95B44E6C74B1DED31DBE37EB,
AA9D0B8E23F3D87A23DE9F8A,
244BA1BDA5FAA465EA3F9C6D,
- 3FCA61C401007B243E2E9035,
- 30B921C38DCEE787B294B746,
- 676D2E1E750E61AA2FAA335E,
- 8012E6487639A7368E4C4470,
- 1F37544891EC8DBB5E500C1C,
- 110221CD5578153B528AD2BE,
- 4A1DB797F1356E85110FF871,
- CD4F7B119CE718BCE78D61F4,
- 78CB463DD98A55313A543859,
- 1499DF2E85B05AC1BF423773,
- 123810DAF8AF758928916ECE,
- C9F11BA62D6D092A300363F7,
- F6635694A01FFBF5EF0968DB,
- 518DD443B6F17A5AFD707263,
- B7EBA1A83575F48CD08140B9,
FCE6F604C00039A32649CB69,
9BF773500BA51A8B5C6C7348,
57B1F32A372143B4D3B1C517,
@@ -2091,6 +2076,21 @@
209FCCC2155A1FCB7E11E20D,
C93569F47B4AC1A8E37992ED,
1B988E139004D8E2850EB656,
+ 1F37544891EC8DBB5E500C1C,
+ 110221CD5578153B528AD2BE,
+ 3FCA61C401007B243E2E9035,
+ 30B921C38DCEE787B294B746,
+ 676D2E1E750E61AA2FAA335E,
+ 8012E6487639A7368E4C4470,
+ 4A1DB797F1356E85110FF871,
+ CD4F7B119CE718BCE78D61F4,
+ 78CB463DD98A55313A543859,
+ 1499DF2E85B05AC1BF423773,
+ 123810DAF8AF758928916ECE,
+ C9F11BA62D6D092A300363F7,
+ F6635694A01FFBF5EF0968DB,
+ 518DD443B6F17A5AFD707263,
+ B7EBA1A83575F48CD08140B9,
3C5267E06A897B0DC0F7EA50,
7E72CB84146E1B4B168356CA,
24AE6B973834AF7E0DE1F228,
diff --git a/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj b/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj
index 648d6bb089..f62489d960 100644
--- a/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj
+++ b/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj
@@ -145,73 +145,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -312,6 +245,73 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -312,6 +245,73 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -167,6 +152,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
true
@@ -1039,50 +1039,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1148,6 +1104,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters
index be6499f017..e9d60e62a3 100644
--- a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters
+++ b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters
@@ -8,18 +8,6 @@
{BCABA310-8FA8-9483-44C8-901CB254B038}
-
- {9CFC1C13-C955-D9BB-A0F7-363446AC2CBB}
-
-
- {330A7495-9D53-820D-AD63-2DC83D2ED767}
-
-
- {BF742880-2B1E-3276-CFB8-089DC7DD5EE5}
-
-
- {CB03A00B-C740-D8D3-A019-4C165270265F}
-
{D05B051C-4835-D6A6-3AF4-B61963EFC368}
@@ -41,6 +29,18 @@
{3CBBC95A-4009-C9C5-036C-B226EF4E113E}
+
+ {330A7495-9D53-820D-AD63-2DC83D2ED767}
+
+
+ {9CFC1C13-C955-D9BB-A0F7-363446AC2CBB}
+
+
+ {BF742880-2B1E-3276-CFB8-089DC7DD5EE5}
+
+
+ {CB03A00B-C740-D8D3-A019-4C165270265F}
+
{768EDA37-3A9B-E5C5-8D35-27FEF74CCBA0}
@@ -265,51 +265,6 @@
The Introjucer\Application
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project Saving
-
-
- The Introjucer\Project Saving
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Wizards
-
-
- The Introjucer\Wizards
-
The Introjucer\Code Editor
@@ -373,6 +328,51 @@
The Introjucer\ComponentEditor
+
+ The Introjucer\Project Saving
+
+
+ The Introjucer\Project Saving
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Wizards
+
+
+ The Introjucer\Wizards
+
The Introjucer\BinaryData
@@ -1341,138 +1341,6 @@
The Introjucer\Application
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project Saving
-
-
- The Introjucer\Project Saving
-
-
- The Introjucer\Project Saving
-
-
- The Introjucer\Project Saving
-
-
- The Introjucer\Project Saving
-
-
- The Introjucer\Project Saving
-
-
- The Introjucer\Project Saving
-
-
- The Introjucer\Project Saving
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Wizards
-
-
- The Introjucer\Wizards
-
-
- The Introjucer\Wizards
-
-
- The Introjucer\Wizards
-
-
- The Introjucer\Wizards
-
-
- The Introjucer\Wizards
-
-
- The Introjucer\Wizards
-
-
- The Introjucer\Wizards
-
-
- The Introjucer\Wizards
-
-
- The Introjucer\Wizards
-
-
- The Introjucer\Wizards
-
The Introjucer\Code Editor
@@ -1668,6 +1536,138 @@
The Introjucer\ComponentEditor
+
+ The Introjucer\Project Saving
+
+
+ The Introjucer\Project Saving
+
+
+ The Introjucer\Project Saving
+
+
+ The Introjucer\Project Saving
+
+
+ The Introjucer\Project Saving
+
+
+ The Introjucer\Project Saving
+
+
+ The Introjucer\Project Saving
+
+
+ The Introjucer\Project Saving
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Wizards
+
+
+ The Introjucer\Wizards
+
+
+ The Introjucer\Wizards
+
+
+ The Introjucer\Wizards
+
+
+ The Introjucer\Wizards
+
+
+ The Introjucer\Wizards
+
+
+ The Introjucer\Wizards
+
+
+ The Introjucer\Wizards
+
+
+ The Introjucer\Wizards
+
+
+ The Introjucer\Wizards
+
+
+ The Introjucer\Wizards
+
The Introjucer\BinaryData
diff --git a/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj b/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj
index 1d98737a12..9e9b0229f2 100644
--- a/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj
+++ b/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj
@@ -137,21 +137,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -173,6 +158,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
true
@@ -1045,50 +1045,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1154,6 +1110,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj.filters b/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj.filters
index be6499f017..e9d60e62a3 100644
--- a/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj.filters
+++ b/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj.filters
@@ -8,18 +8,6 @@
{BCABA310-8FA8-9483-44C8-901CB254B038}
-
- {9CFC1C13-C955-D9BB-A0F7-363446AC2CBB}
-
-
- {330A7495-9D53-820D-AD63-2DC83D2ED767}
-
-
- {BF742880-2B1E-3276-CFB8-089DC7DD5EE5}
-
-
- {CB03A00B-C740-D8D3-A019-4C165270265F}
-
{D05B051C-4835-D6A6-3AF4-B61963EFC368}
@@ -41,6 +29,18 @@
{3CBBC95A-4009-C9C5-036C-B226EF4E113E}
+
+ {330A7495-9D53-820D-AD63-2DC83D2ED767}
+
+
+ {9CFC1C13-C955-D9BB-A0F7-363446AC2CBB}
+
+
+ {BF742880-2B1E-3276-CFB8-089DC7DD5EE5}
+
+
+ {CB03A00B-C740-D8D3-A019-4C165270265F}
+
{768EDA37-3A9B-E5C5-8D35-27FEF74CCBA0}
@@ -265,51 +265,6 @@
The Introjucer\Application
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project Saving
-
-
- The Introjucer\Project Saving
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Wizards
-
-
- The Introjucer\Wizards
-
The Introjucer\Code Editor
@@ -373,6 +328,51 @@
The Introjucer\ComponentEditor
+
+ The Introjucer\Project Saving
+
+
+ The Introjucer\Project Saving
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Wizards
+
+
+ The Introjucer\Wizards
+
The Introjucer\BinaryData
@@ -1341,138 +1341,6 @@
The Introjucer\Application
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project Saving
-
-
- The Introjucer\Project Saving
-
-
- The Introjucer\Project Saving
-
-
- The Introjucer\Project Saving
-
-
- The Introjucer\Project Saving
-
-
- The Introjucer\Project Saving
-
-
- The Introjucer\Project Saving
-
-
- The Introjucer\Project Saving
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Wizards
-
-
- The Introjucer\Wizards
-
-
- The Introjucer\Wizards
-
-
- The Introjucer\Wizards
-
-
- The Introjucer\Wizards
-
-
- The Introjucer\Wizards
-
-
- The Introjucer\Wizards
-
-
- The Introjucer\Wizards
-
-
- The Introjucer\Wizards
-
-
- The Introjucer\Wizards
-
-
- The Introjucer\Wizards
-
The Introjucer\Code Editor
@@ -1668,6 +1536,138 @@
The Introjucer\ComponentEditor
+
+ The Introjucer\Project Saving
+
+
+ The Introjucer\Project Saving
+
+
+ The Introjucer\Project Saving
+
+
+ The Introjucer\Project Saving
+
+
+ The Introjucer\Project Saving
+
+
+ The Introjucer\Project Saving
+
+
+ The Introjucer\Project Saving
+
+
+ The Introjucer\Project Saving
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Wizards
+
+
+ The Introjucer\Wizards
+
+
+ The Introjucer\Wizards
+
+
+ The Introjucer\Wizards
+
+
+ The Introjucer\Wizards
+
+
+ The Introjucer\Wizards
+
+
+ The Introjucer\Wizards
+
+
+ The Introjucer\Wizards
+
+
+ The Introjucer\Wizards
+
+
+ The Introjucer\Wizards
+
+
+ The Introjucer\Wizards
+
The Introjucer\BinaryData
diff --git a/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj b/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj
index cf7b5ac13c..d4e692d89d 100644
--- a/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj
+++ b/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj
@@ -137,21 +137,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -173,6 +158,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
true
@@ -1045,50 +1045,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1154,6 +1110,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj.filters b/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj.filters
index 64bce25327..db5a713561 100644
--- a/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj.filters
+++ b/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj.filters
@@ -8,18 +8,6 @@
{BCABA310-8FA8-9483-44C8-901CB254B038}
-
- {9CFC1C13-C955-D9BB-A0F7-363446AC2CBB}
-
-
- {330A7495-9D53-820D-AD63-2DC83D2ED767}
-
-
- {BF742880-2B1E-3276-CFB8-089DC7DD5EE5}
-
-
- {CB03A00B-C740-D8D3-A019-4C165270265F}
-
{D05B051C-4835-D6A6-3AF4-B61963EFC368}
@@ -41,6 +29,18 @@
{3CBBC95A-4009-C9C5-036C-B226EF4E113E}
+
+ {330A7495-9D53-820D-AD63-2DC83D2ED767}
+
+
+ {9CFC1C13-C955-D9BB-A0F7-363446AC2CBB}
+
+
+ {BF742880-2B1E-3276-CFB8-089DC7DD5EE5}
+
+
+ {CB03A00B-C740-D8D3-A019-4C165270265F}
+
{768EDA37-3A9B-E5C5-8D35-27FEF74CCBA0}
@@ -265,51 +265,6 @@
The Introjucer\Application
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project Saving
-
-
- The Introjucer\Project Saving
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Wizards
-
-
- The Introjucer\Wizards
-
The Introjucer\Code Editor
@@ -373,6 +328,51 @@
The Introjucer\ComponentEditor
+
+ The Introjucer\Project Saving
+
+
+ The Introjucer\Project Saving
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Wizards
+
+
+ The Introjucer\Wizards
+
The Introjucer\BinaryData
@@ -1341,138 +1341,6 @@
The Introjucer\Application
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project
-
-
- The Introjucer\Project Saving
-
-
- The Introjucer\Project Saving
-
-
- The Introjucer\Project Saving
-
-
- The Introjucer\Project Saving
-
-
- The Introjucer\Project Saving
-
-
- The Introjucer\Project Saving
-
-
- The Introjucer\Project Saving
-
-
- The Introjucer\Project Saving
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Utility
-
-
- The Introjucer\Wizards
-
-
- The Introjucer\Wizards
-
-
- The Introjucer\Wizards
-
-
- The Introjucer\Wizards
-
-
- The Introjucer\Wizards
-
-
- The Introjucer\Wizards
-
-
- The Introjucer\Wizards
-
-
- The Introjucer\Wizards
-
-
- The Introjucer\Wizards
-
-
- The Introjucer\Wizards
-
-
- The Introjucer\Wizards
-
The Introjucer\Code Editor
@@ -1668,6 +1536,138 @@
The Introjucer\ComponentEditor
+
+ The Introjucer\Project Saving
+
+
+ The Introjucer\Project Saving
+
+
+ The Introjucer\Project Saving
+
+
+ The Introjucer\Project Saving
+
+
+ The Introjucer\Project Saving
+
+
+ The Introjucer\Project Saving
+
+
+ The Introjucer\Project Saving
+
+
+ The Introjucer\Project Saving
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Project
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Utility
+
+
+ The Introjucer\Wizards
+
+
+ The Introjucer\Wizards
+
+
+ The Introjucer\Wizards
+
+
+ The Introjucer\Wizards
+
+
+ The Introjucer\Wizards
+
+
+ The Introjucer\Wizards
+
+
+ The Introjucer\Wizards
+
+
+ The Introjucer\Wizards
+
+
+ The Introjucer\Wizards
+
+
+ The Introjucer\Wizards
+
+
+ The Introjucer\Wizards
+
The Introjucer\BinaryData
diff --git a/extras/Introjucer/Introjucer.jucer b/extras/Introjucer/Introjucer.jucer
index bde5350a00..d4e9c900fc 100644
--- a/extras/Introjucer/Introjucer.jucer
+++ b/extras/Introjucer/Introjucer.jucer
@@ -188,129 +188,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -497,6 +374,129 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/extras/Introjucer/Source/Application/jucer_MainWindow.cpp b/extras/Introjucer/Source/Application/jucer_MainWindow.cpp
index 59f3e6b77b..341ccce81a 100644
--- a/extras/Introjucer/Source/Application/jucer_MainWindow.cpp
+++ b/extras/Introjucer/Source/Application/jucer_MainWindow.cpp
@@ -39,7 +39,7 @@ MainWindow::MainWindow()
false)
{
setUsingNativeTitleBar (true);
-
+
#if ! JUCE_MAC
setMenuBar (IntrojucerApp::getApp().menuModel);
#endif
@@ -59,7 +59,7 @@ MainWindow::MainWindow()
{
commandManager.getKeyMappings()->resetToDefaultMappings();
- ScopedPointer keys (getGlobalProperties().getXmlValue ("keyMappings"));
+ ScopedPointer keys (getGlobalProperties().getXmlValue ("keyMappings"));
if (keys != nullptr)
commandManager.getKeyMappings()->restoreFromXml (*keys);
diff --git a/extras/Introjucer/Source/Utility/jucer_SlidingPanelComponent.cpp b/extras/Introjucer/Source/Utility/jucer_SlidingPanelComponent.cpp
index a49863aaf1..36c1e44c99 100644
--- a/extras/Introjucer/Source/Utility/jucer_SlidingPanelComponent.cpp
+++ b/extras/Introjucer/Source/Utility/jucer_SlidingPanelComponent.cpp
@@ -32,7 +32,7 @@
namespace TabbedComponentHelpers
{
const Identifier deleteComponentId ("deleteByTabComp_");
-
+
static void deleteIfNecessary (Component* const comp)
{
if (comp != nullptr && (bool) comp->getProperties() [deleteComponentId])
@@ -64,40 +64,40 @@ void SlidingPanelComponent::addTab (const String& tabName,
const int insertIndex)
{
contentComponents.insert (insertIndex, WeakReference (contentComponent));
-
+
tabNames.insert (insertIndex, tabName);
-
+
if (deleteComponentWhenNotNeeded && contentComponent != nullptr)
contentComponent->getProperties().set (TabbedComponentHelpers::deleteComponentId, true);
-
+
slide.addAndMakeVisible (contentComponent);
numTabs++;
-
+
resized();
}
void SlidingPanelComponent::goToTab (int targetTabIndex)
{
int xTranslation = (currentTabIndex - targetTabIndex) * getWidth();
-
+
currentTabIndex = targetTabIndex;
-
+
Desktop::getInstance().getAnimator().animateComponent (&slide, slide.getBounds().translated(xTranslation, 0), 1.0f, 600, false, 0.0, 0.0);
-
+
repaint();
}
void SlidingPanelComponent::paint (Graphics& g)
{
-
+
Rectangle dotHolder = getLocalBounds();
-
+
dotHolder.reduce ((getWidth() - dotSize * numTabs)/2, 20);
dotHolder = dotHolder.removeFromBottom (dotSize);
-
+
g.setColour (Colours::white);
-
+
for (int i = 0; i < numTabs; i++)
{
if (i == currentTabIndex)
@@ -114,13 +114,12 @@ void SlidingPanelComponent::paint (Graphics& g)
void SlidingPanelComponent::resized()
{
slide.setBounds (-currentTabIndex*getWidth(), slide.getPosition().y, numTabs * getWidth(), getHeight());
-
+
Rectangle content (getLocalBounds());
-
+
content.removeFromBottom (20 + 2 * dotSize);
-
+
for (int i = contentComponents.size(); --i >= 0;)
if (Component* c = contentComponents.getReference(i))
c->setBounds (content.translated (i*content.getWidth(), 0));
}
-
diff --git a/extras/Introjucer/Source/Utility/jucer_SlidingPanelComponent.h b/extras/Introjucer/Source/Utility/jucer_SlidingPanelComponent.h
index 1dd5a3450f..b179476325 100644
--- a/extras/Introjucer/Source/Utility/jucer_SlidingPanelComponent.h
+++ b/extras/Introjucer/Source/Utility/jucer_SlidingPanelComponent.h
@@ -34,44 +34,44 @@ class SlidingPanelComponent : public Component
public:
SlidingPanelComponent ();
~SlidingPanelComponent();
-
+
/** Adds a new tab to the panel slider. */
void addTab (const String& tabName,
Component* contentComponent,
bool deleteComponentWhenNotNeeded,
int insertIndex = -1);
-
+
/** Gets rid of one of the tabs. */
void removeTab (int tabIndex);
-
+
/** Gets index of current tab. */
int getCurrentTabIndex (){return currentTabIndex;};
-
+
/** Returns the number of tabs. */
int getNumTabs (){return numTabs;};
-
+
/** Animates the window to the desired tab. */
void goToTab (int targetTabIndex);
-
-
+
+
//==============================================================================
/** @internal */
void paint (Graphics&);
/** @internal */
void resized();
-
+
private:
Array > contentComponents;
Array tabNames;
-
+
Component slide;
-
+
int currentTabIndex;
int numTabs;
-
+
int dotSize;
-
+
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(SlidingPanelComponent);
};
-#endif // JUCER_SLIDINGPANELCOMPONENT_H_INCLUDED
\ No newline at end of file
+#endif // JUCER_SLIDINGPANELCOMPONENT_H_INCLUDED
diff --git a/extras/Introjucer/Source/Wizards/jucer_NewProjectWizardClasses.cpp b/extras/Introjucer/Source/Wizards/jucer_NewProjectWizardClasses.cpp
index 09dc7de381..da51bb15fa 100644
--- a/extras/Introjucer/Source/Wizards/jucer_NewProjectWizardClasses.cpp
+++ b/extras/Introjucer/Source/Wizards/jucer_NewProjectWizardClasses.cpp
@@ -33,7 +33,7 @@
struct NewProjectWizardClasses
{
#include "jucer_NewProjectWizard.h"
-
+
#include "jucer_GUIAppWizard.h"
#include "jucer_ConsoleAppWizard.h"
#include "jucer_AudioPluginAppWizard.h"
@@ -52,18 +52,3 @@ Component* createNewProjectWizardComponent()
{
return new NewProjectWizardComponents::StartPageComponent();
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/extras/Introjucer/Source/Wizards/jucer_NewProjectWizardComponent.h b/extras/Introjucer/Source/Wizards/jucer_NewProjectWizardComponent.h
index e9a963a9df..654e29dbf0 100644
--- a/extras/Introjucer/Source/Wizards/jucer_NewProjectWizardComponent.h
+++ b/extras/Introjucer/Source/Wizards/jucer_NewProjectWizardComponent.h
@@ -31,20 +31,20 @@ class PlatformTargetsComp : public Component,
private ListBoxModel
{
public:
-
+
PlatformTargetsComp()
{
setOpaque (false);
-
+
addAndMakeVisible (listBox);
-
+
listBox.setRowHeight (360 / getNumRows());
listBox.setModel (this);
listBox.setOpaque (false);
listBox.setMultipleSelectionEnabled (true);
listBox.setClickingTogglesRowSelection (true);
listBox.setColour (ListBox::ColourIds::backgroundColourId, Colours::white.withAlpha (0.0f));
-
+
platforms.add (new PlatformType (ImageCache::getFromMemory (BinaryData::projectIconXcode_png, BinaryData::projectIconXcode_pngSize), "Create a new XCode target"));
platforms.add (new PlatformType (ImageCache::getFromMemory (BinaryData::projectIconXcodeIOS_png, BinaryData::projectIconXcodeIOS_pngSize), "Create a new XCode IOS target"));
platforms.add (new PlatformType (ImageCache::getFromMemory (BinaryData::projectIconVisualStudio13_png, BinaryData::projectIconVisualStudio13_pngSize), "Create a new Visual Studio 2013 target"));
@@ -55,20 +55,20 @@ public:
platforms.add (new PlatformType (ImageCache::getFromMemory (BinaryData::projectIconAndroid_png, BinaryData::projectIconAndroid_pngSize), "Create a new Android target"));
platforms.add (new PlatformType (ImageCache::getFromMemory (BinaryData::projectIconCodeblocks_png, BinaryData::projectIconCodeblocks_pngSize), "Create a new Codeblocks target"));
platforms.add (new PlatformType (ImageCache::getFromMemory (BinaryData::projectIconLinuxMakefile_png, BinaryData::projectIconLinuxMakefile_pngSize), "Create a new linux makefile target"));
-
-
+
+
}
-
+
~PlatformTargetsComp()
{
}
-
+
void resized()
{
listBox.setBounds (getLocalBounds());
}
-
-
+
+
// these add the ListBoxModel virtual functions
int getNumRows()
{
@@ -83,7 +83,7 @@ public:
g.setColour (Colours::white);
g.drawEllipse (dotSelect, 1);
-
+
if (rowIsSelected)
{
g.fillAll (Colour(243, 145, 0));
@@ -95,9 +95,9 @@ public:
g.drawText (platforms.getUnchecked (rowNumber)->name, 90, 0, width, height, Justification::left);
}
-
+
private:
-
+
struct PlatformType {
PlatformType (const Image& platformIcon, const String& platformName){
icon = platformIcon;
@@ -108,9 +108,9 @@ private:
};
ListBox listBox;
-
+
OwnedArray platforms;
-
+
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (PlatformTargetsComp)
};
@@ -142,33 +142,33 @@ public:
platformTargets()
{
setOpaque (false);
-
+
addChildAndSetID (&projectName, "projectName");
projectName.setText ("NewProject");
projectName.setBounds ("120, 34, parent.width / 2 - 10, top + 22");
nameLabel.attachToComponent (&projectName, true);
projectName.addListener (this);
-
+
addChildAndSetID (&projectType, "projectType");
projectType.addItemList (getWizardNames(), 1);
projectType.setSelectedId (1, dontSendNotification);
projectType.setBounds ("120, projectName.bottom + 4, projectName.right, top + 22");
typeLabel.attachToComponent (&projectType, true);
projectType.addListener (this);
-
+
addChildAndSetID (&fileOutline, "fileOutline");
fileOutline.setColour (GroupComponent::outlineColourId, Colours::black.withAlpha (0.2f));
fileOutline.setTextLabelPosition (Justification::centred);
fileOutline.setBounds ("30, projectType.bottom + 20, projectType.right, parent.height - 30");
-
+
addChildAndSetID (&targetsOutline, "targetsOutline");
targetsOutline.setColour (GroupComponent::outlineColourId, Colours::black.withAlpha (0.2f));
targetsOutline.setTextLabelPosition (Justification::centred);
targetsOutline.setBounds ("fileOutline.right + 20, projectType.bottom + 20, parent.width - 30, parent.height - 70");
-
+
addChildAndSetID (&platformTargets, "platformTargets");
platformTargets.setBounds ("targetsOutline.left + 15, projectType.bottom + 45, parent.width - 40, parent.height - 90");
-
+
addChildAndSetID (&fileBrowser, "fileBrowser");
fileBrowser.setBounds ("fileOutline.left + 10, fileOutline.top + 20, fileOutline.right - 10, fileOutline.bottom - 32");
fileBrowser.setFilenameBoxLabel ("Folder:");
@@ -176,20 +176,20 @@ public:
addChildAndSetID (&createButton, "createButton");
createButton.setBounds ("right - 130, bottom - 34, parent.width - 30, parent.height - 30");
createButton.addListener (this);
-
+
addChildAndSetID (&cancelButton, "cancelButton");
cancelButton.addShortcut (KeyPress (KeyPress::escapeKey));
cancelButton.setBounds ("right - 130, createButton.top, createButton.left - 10, createButton.bottom");
cancelButton.addListener (this);
-
+
updateCustomItems();
updateCreateButton();
}
-
+
void paint (Graphics& g) override
{
Rectangle rect = getLocalBounds().reduced (10, 10);
-
+
g.setColour (Colours::white.withAlpha(0.3f));
g.fillRect (rect);
g.fillRect (rect.reduced (10, 10));
@@ -214,13 +214,13 @@ public:
{
MainWindow* mw = Component::findParentComponentOfClass();
jassert (mw != nullptr);
-
+
ScopedPointer wizard (createWizard());
-
+
if (wizard != nullptr)
{
Result result (wizard->processResultsFromSetupItems (*this));
-
+
if (result.failed())
{
AlertWindow::showMessageBox (AlertWindow::WarningIcon,
@@ -228,13 +228,13 @@ public:
result.getErrorMessage());
return;
}
-
+
if (! wizard->selectJuceFolder())
return;
-
+
ScopedPointer project (wizard->runWizard (mw, projectName.getText(),
fileBrowser.getSelectedFile (0)));
-
+
if (project != nullptr)
mw->setProject (project.release());
}
@@ -243,9 +243,9 @@ public:
void updateCustomItems()
{
customItems.clear();
-
+
ScopedPointer wizard (createWizard());
-
+
if (wizard != nullptr)
wizard->addSetupItems (*this, customItems);
}
@@ -304,20 +304,20 @@ static NewProjectWizardClasses::NewProjectWizard* createWizardType (int index)
case 4: return new NewProjectWizardClasses::DynamicLibraryWizard();
default: jassertfalse; break;
}
-
+
return nullptr;
}
static StringArray getWizardNames()
{
StringArray s;
-
+
for (int i = 0; i < getNumWizards(); ++i)
{
ScopedPointer wiz (createWizardType (i));
s.add (wiz->getName());
}
-
+
return s;
}
diff --git a/extras/Introjucer/Source/Wizards/jucer_StartPageComponent.h b/extras/Introjucer/Source/Wizards/jucer_StartPageComponent.h
index 0398c739c7..de2af3f755 100644
--- a/extras/Introjucer/Source/Wizards/jucer_StartPageComponent.h
+++ b/extras/Introjucer/Source/Wizards/jucer_StartPageComponent.h
@@ -34,9 +34,9 @@ StartPageComponent()
panel = new SlidingPanelComponent();
WizardComp* projectWizard = new WizardComp();
-
+
setSize (800, 650);
-
+
panel->addTab ("Create New Project", new TemplateTileBrowser (projectWizard), true);
panel->addTab ("New Project Options", projectWizard, true);
@@ -57,10 +57,10 @@ void resized()
{
panel->setBounds (getBounds());
}
-
+
private:
ScopedPointer panel;
-
+
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (StartPageComponent)
};
diff --git a/extras/Introjucer/Source/Wizards/jucer_TemplateThumbnailsComponent.h b/extras/Introjucer/Source/Wizards/jucer_TemplateThumbnailsComponent.h
index af9bbaca18..878d1c4c0f 100644
--- a/extras/Introjucer/Source/Wizards/jucer_TemplateThumbnailsComponent.h
+++ b/extras/Introjucer/Source/Wizards/jucer_TemplateThumbnailsComponent.h
@@ -28,7 +28,7 @@
//=====================================================================================================
/**
Template option tile button.
-the drawable button object class for the tile icons and buttons in the TemplateTileBrowser
+the drawable button object class for the tile icons and buttons in the TemplateTileBrowser
*/
class TemplateOptionButton : public DrawableButton
{
@@ -39,17 +39,17 @@ public:
// svg for thumbnail icon
ScopedPointer svg (XmlDocument::parse (thumbSvg));
assert (svg != nullptr);
-
+
thumb = Drawable::createFromSVG (*svg);
-
+
// svg for thumbnail background highlight
ScopedPointer backSvg (XmlDocument::parse (BinaryData::iconHighlight_svg));
assert (backSvg != nullptr);
-
+
hoverBackground = Drawable::createFromSVG (*backSvg);
-
+
name = buttonName;
-
+
description = "";
}
@@ -82,10 +82,10 @@ public:
g.drawRoundedRectangle (getLocalBounds().toFloat().reduced (2,2), 10.0f, 2.0f);
}
}
-
-
+
+
Rectangle textTarget;
-
+
// center the text for the text buttons or position the text in the image buttons
if (getStyle() != ButtonStyle::ImageFitted)
{
@@ -96,36 +96,36 @@ public:
textTarget = RectanglePlacement (RectanglePlacement::centred).appliedTo(thumb->getDrawableBounds(), getLocalBounds().toFloat());
textTarget = textTarget.removeFromBottom(textTarget.getHeight() * 0.3);
}
-
+
g.setColour (Colours::white);
g.drawText (name, textTarget, Justification::centred, true);
-
+
}
-
+
void resized()
{
thumb->setBoundsToFit (0, 0, getWidth(), getHeight(), Justification::centred, false);
}
-
+
void setDescription (String descript)
{
description = descript;
}
-
+
String getDescription()
{
return description;
}
-
+
private:
ScopedPointer thumb;
ScopedPointer hoverBackground;
-
+
String name;
-
+
String description;
-
-
+
+
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (TemplateOptionButton)
};
@@ -151,7 +151,7 @@ public:
addAndMakeVisible (optionButtons.add (new TemplateOptionButton ("Console Application", TemplateOptionButton::ButtonStyle::ImageFitted, BinaryData::iconConsole_svg)));
addAndMakeVisible (optionButtons.add (new TemplateOptionButton ("Static Library", TemplateOptionButton::ButtonStyle::ImageFitted, BinaryData::iconStatic_svg)));
addAndMakeVisible (optionButtons.add (new TemplateOptionButton ("Dynamic Library", TemplateOptionButton::ButtonStyle::ImageFitted, BinaryData::iconDynamic_svg)));
-
+
// Add the descriptions for each button
optionButtons.getUnchecked(0)->setDescription ("Creates a blank JUCE application with a single window component.");
optionButtons.getUnchecked(1)->setDescription ("Creates a blank JUCE application with a single window component and Audio and MIDI in/out functions.");
@@ -161,50 +161,50 @@ public:
optionButtons.getUnchecked(5)->setDescription ("Creates a blank console application with support for all JUCE features.");
optionButtons.getUnchecked(6)->setDescription ("Creates a Static Library template with support for all JUCE features");
optionButtons.getUnchecked(7)->setDescription ("Creates a Dynamic Library template with support for all JUCE features");
-
-
+
+
// Handle Open Project button functionality
ApplicationCommandManager& commandManager = IntrojucerApp::getCommandManager();
-
+
blankProjectButton = new TemplateOptionButton ("Create Blank Project", TemplateOptionButton::ButtonStyle::ImageOnButtonBackground, BinaryData::iconOpenfile_svg);
-
+
openProjectButton = new TemplateOptionButton ("Open Existing Project", TemplateOptionButton::ButtonStyle::ImageOnButtonBackground, BinaryData::iconOpenfile_svg);
openProjectButton->setCommandToTrigger (&commandManager, CommandIDs::open, true);
-
+
exampleProjectButton = new TemplateOptionButton ("Open Example Project", TemplateOptionButton::ButtonStyle::ImageOnButtonBackground, BinaryData::iconOpenfile_svg);
exampleProjectButton->setCommandToTrigger (&commandManager, CommandIDs::open, true);
-
+
addAndMakeVisible (blankProjectButton);
addAndMakeVisible (openProjectButton);
addAndMakeVisible (exampleProjectButton);
-
-
+
+
for (TemplateOptionButton* t : optionButtons)
{
t->addListener (this);
}
-
+
newProjectWizard = projectWizard;
}
-
+
void paint (Graphics& g) override
{
g.setColour (Colours::black.withAlpha (0.2f));
g.fillRect (0, 0, getWidth(), 60);
-
+
g.setColour (Colours::white);
g.setFont (20);
g.drawText ("Create New Project", 0, 0, getWidth(), 60, Justification::centred, true);
-
+
// draw the descriptions of each template if hovered;
// (repaint is called by the button listener on change state)
Rectangle descriptionBox = getBounds().reduced (30, 30);
descriptionBox = descriptionBox.removeFromBottom (50);
-
+
g.setColour (Colours::white.withAlpha (0.4f));
g.setFont(15);
-
+
for ( int i = 0; i < 8; i++ )
{
if (optionButtons.getUnchecked (i)->getState() == TemplateOptionButton::ButtonState::buttonOver)
@@ -218,28 +218,28 @@ public:
{
Rectangle allOpts = getBounds().reduced (40, 60);
allOpts.removeFromBottom (allOpts.getHeight() * 0.25);
-
+
int numHorizIcons = 4;
-
+
int optStep = allOpts.getWidth()/numHorizIcons;
-
+
for (int i = 0; i < 8; i++)
{
int yShift = i < numHorizIcons ? 0 : 1;
-
+
Rectangle bounds;
-
+
bounds = Rectangle (allOpts.getX() + i%numHorizIcons*optStep, allOpts.getY() + yShift * allOpts.getHeight() / 2, optStep, allOpts.getHeight() / 2);
bounds.reduce (10, 10);
-
+
optionButtons.getUnchecked (i)->setBounds (bounds);
}
-
+
Rectangle openButtonBounds = getBounds();
openButtonBounds.removeFromBottom (getHeight() * 0.12);
openButtonBounds = openButtonBounds.removeFromBottom (120);
openButtonBounds.reduce (50, 40);
-
+
blankProjectButton->setBounds (openButtonBounds.removeFromLeft (optStep - 20));
exampleProjectButton->setBounds (openButtonBounds.removeFromRight (optStep - 20));
openProjectButton->setBounds (openButtonBounds.reduced (18, 0));