diff --git a/extras/Jucer (experimental)/Builds/Linux/Makefile b/extras/Jucer (experimental)/Builds/Linux/Makefile index 4e57acc71e..43c5cc8784 100644 --- a/extras/Jucer (experimental)/Builds/Linux/Makefile +++ b/extras/Jucer (experimental)/Builds/Linux/Makefile @@ -43,21 +43,12 @@ ifeq ($(CONFIG),Release) endif OBJECTS := \ - $(OBJDIR)/jucer_CodeGenerator_294a5b95.o \ - $(OBJDIR)/jucer_ComponentDocument_d2c1f367.o \ - $(OBJDIR)/jucer_ComponentTypeManager_21664b47.o \ - $(OBJDIR)/jucer_DrawableDocument_d699b7df.o \ - $(OBJDIR)/jucer_DrawableTypeHandler_5b2f1d76.o \ $(OBJDIR)/jucer_NewFileWizard_6b466712.o \ $(OBJDIR)/jucer_Project_60ace9e4.o \ $(OBJDIR)/jucer_ProjectExporter_8b6a09e5.o \ $(OBJDIR)/jucer_ProjectWizard_2f72feaf.o \ $(OBJDIR)/jucer_ResourceFile_4a6c0189.o \ $(OBJDIR)/jucer_SourceCodeEditor_39e7ba7a.o \ - $(OBJDIR)/jucer_ComponentEditor_bb50044d.o \ - $(OBJDIR)/jucer_ComponentViewer_c7a43a72.o \ - $(OBJDIR)/jucer_DrawableEditor_fdd9b221.o \ - $(OBJDIR)/jucer_EditorCanvas_26232846.o \ $(OBJDIR)/jucer_DocumentEditorComponent_18f9dc69.o \ $(OBJDIR)/jucer_JucerTreeViewBase_15bcb6cd.o \ $(OBJDIR)/jucer_MainWindow_a480b21f.o \ @@ -94,31 +85,6 @@ clean: -@rm -rf $(OBJDIR)/* -@rm -rf $(OBJDIR) -$(OBJDIR)/jucer_CodeGenerator_294a5b95.o: ../../Source/model/Component/jucer_CodeGenerator.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_CodeGenerator.cpp" - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/jucer_ComponentDocument_d2c1f367.o: ../../Source/model/Component/jucer_ComponentDocument.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_ComponentDocument.cpp" - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/jucer_ComponentTypeManager_21664b47.o: ../../Source/model/Component/Types/jucer_ComponentTypeManager.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_ComponentTypeManager.cpp" - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/jucer_DrawableDocument_d699b7df.o: ../../Source/model/Drawable/jucer_DrawableDocument.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_DrawableDocument.cpp" - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/jucer_DrawableTypeHandler_5b2f1d76.o: ../../Source/model/Drawable/jucer_DrawableTypeHandler.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_DrawableTypeHandler.cpp" - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/jucer_NewFileWizard_6b466712.o: ../../Source/model/Project/jucer_NewFileWizard.cpp -@mkdir -p $(OBJDIR) @echo "Compiling jucer_NewFileWizard.cpp" @@ -149,26 +115,6 @@ $(OBJDIR)/jucer_SourceCodeEditor_39e7ba7a.o: ../../Source/ui/Code\ Editor/jucer_ @echo "Compiling jucer_SourceCodeEditor.cpp" @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/jucer_ComponentEditor_bb50044d.o: ../../Source/ui/Component\ Editor/jucer_ComponentEditor.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_ComponentEditor.cpp" - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/jucer_ComponentViewer_c7a43a72.o: ../../Source/ui/Component\ Editor/jucer_ComponentViewer.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_ComponentViewer.cpp" - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/jucer_DrawableEditor_fdd9b221.o: ../../Source/ui/Drawable\ Editor/jucer_DrawableEditor.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_DrawableEditor.cpp" - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - -$(OBJDIR)/jucer_EditorCanvas_26232846.o: ../../Source/ui/Editor\ Base/jucer_EditorCanvas.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling jucer_EditorCanvas.cpp" - @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" - $(OBJDIR)/jucer_DocumentEditorComponent_18f9dc69.o: ../../Source/ui/jucer_DocumentEditorComponent.cpp -@mkdir -p $(OBJDIR) @echo "Compiling jucer_DocumentEditorComponent.cpp" diff --git a/extras/Jucer (experimental)/Builds/MacOSX/The Jucer.xcodeproj/project.pbxproj b/extras/Jucer (experimental)/Builds/MacOSX/The Jucer.xcodeproj/project.pbxproj index 7987583a53..baa41a8763 100644 --- a/extras/Jucer (experimental)/Builds/MacOSX/The Jucer.xcodeproj/project.pbxproj +++ b/extras/Jucer (experimental)/Builds/MacOSX/The Jucer.xcodeproj/project.pbxproj @@ -17,21 +17,12 @@ DBE3CE9482B19CF1AE700805 = { isa = PBXBuildFile; fileRef = 23CF69B4C644D1E6E61E5C82; }; 93C9F3F27602A33DDC9C2250 = { isa = PBXBuildFile; fileRef = 2767E1D082874D301D5D5F43; }; 2E6836738CE7EB452FDC7E9A = { isa = PBXBuildFile; fileRef = D9FB1A5365FEEB854A0FF7BF; }; - A7EB756F566FB773ABE3DFA9 = { isa = PBXBuildFile; fileRef = 1BCF8B6367CCC73AEEF03818; }; - 061C981D0E9FB70DE5A3D32C = { isa = PBXBuildFile; fileRef = 829C5DA65FB46B99756428C5; }; - FEDBCD721085272D356BBAEB = { isa = PBXBuildFile; fileRef = D08D9DB99315F76093CF6EE6; }; - 268807D7091702D29033CC27 = { isa = PBXBuildFile; fileRef = B1471E8698D193FBCF0DD13D; }; - 91CCD0421DDD432C1C4903D4 = { isa = PBXBuildFile; fileRef = 330A51CC68AED92F7F5BEC15; }; 06838545183964D8C1E60530 = { isa = PBXBuildFile; fileRef = 9DCB32BBD7053ACCB598CE79; }; 048D33BDE7413EFE05D09901 = { isa = PBXBuildFile; fileRef = 4179D4C7BF616A4A3C3E11CA; }; 9DA1913A62297D7111E0A6C9 = { isa = PBXBuildFile; fileRef = 48A4236550741B9D05208C60; }; 44C2E5705EEA4F01309D8960 = { isa = PBXBuildFile; fileRef = 9034F31FCBD5A2A297427537; }; 7C9FFFC0B129F5C3FAEE13E9 = { isa = PBXBuildFile; fileRef = A6D148E4503AAD3DE6DDCD8B; }; 33E1A095D656AF109DD54170 = { isa = PBXBuildFile; fileRef = 31F175F277299B3CEA857F96; }; - D706C3B5016318D85FE452C2 = { isa = PBXBuildFile; fileRef = 3263F4099F45D6FACD28F08D; }; - 872B76525D184228B4F69372 = { isa = PBXBuildFile; fileRef = 06F5D2DB198F068520732796; }; - E43D00B370F289420379B759 = { isa = PBXBuildFile; fileRef = 82F91CF84A296665177CB79A; }; - EFFCA85EFB4F06F1BEB9AB97 = { isa = PBXBuildFile; fileRef = 03E9C079FBBF727D50A2B678; }; 944CE0EADAD951F48EC77071 = { isa = PBXBuildFile; fileRef = 3B2C45064E85B3B631D4F921; }; 2417927E323BFE201D5985B9 = { isa = PBXBuildFile; fileRef = 3C60CAE9481EE0113C15A0B9; }; A1CB18029E09A66E192D9A29 = { isa = PBXBuildFile; fileRef = 17F5B1F00F15DB37EA4A4AEA; }; @@ -65,28 +56,6 @@ D9FB1A5365FEEB854A0FF7BF = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = System/Library/Frameworks/QuickTime.framework; sourceTree = SDKROOT; }; 12E1601866B3489844AFD645 = { isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Jucer.app; sourceTree = BUILT_PRODUCTS_DIR; }; F4C5CF1AA7EB9298043D89D3 = { isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Info.plist; sourceTree = SOURCE_ROOT; }; - 1BCF8B6367CCC73AEEF03818 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = jucer_CodeGenerator.cpp; path = ../../Source/model/Component/jucer_CodeGenerator.cpp; sourceTree = SOURCE_ROOT; }; - 868978C505781890533E282C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_CodeGenerator.h; path = ../../Source/model/Component/jucer_CodeGenerator.h; sourceTree = SOURCE_ROOT; }; - 829C5DA65FB46B99756428C5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = jucer_ComponentDocument.cpp; path = ../../Source/model/Component/jucer_ComponentDocument.cpp; sourceTree = SOURCE_ROOT; }; - 82F1014486AD8B0C3152FF91 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_ComponentDocument.h; path = ../../Source/model/Component/jucer_ComponentDocument.h; sourceTree = SOURCE_ROOT; }; - 776686405B2531413AAA7281 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_ComboBox.h; path = ../../Source/model/Component/Types/jucer_ComboBox.h; sourceTree = SOURCE_ROOT; }; - D08D9DB99315F76093CF6EE6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = jucer_ComponentTypeManager.cpp; path = ../../Source/model/Component/Types/jucer_ComponentTypeManager.cpp; sourceTree = SOURCE_ROOT; }; - 03C51600B53B70BD0514254D = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_ComponentTypeManager.h; path = ../../Source/model/Component/Types/jucer_ComponentTypeManager.h; sourceTree = SOURCE_ROOT; }; - A8A4F96A0009D7FB79B210FC = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_ComponentTypes.h; path = ../../Source/model/Component/Types/jucer_ComponentTypes.h; sourceTree = SOURCE_ROOT; }; - F05C6A0FF88238E712A23568 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_GenericComponent.h; path = ../../Source/model/Component/Types/jucer_GenericComponent.h; sourceTree = SOURCE_ROOT; }; - A424C2E4ADB30C62EB33215C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_GroupComponent.h; path = ../../Source/model/Component/Types/jucer_GroupComponent.h; sourceTree = SOURCE_ROOT; }; - 4C0233A3D179C9D367132655 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_JucerComponent.h; path = ../../Source/model/Component/Types/jucer_JucerComponent.h; sourceTree = SOURCE_ROOT; }; - CC648C0D7428D809C1EF603E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_Label.h; path = ../../Source/model/Component/Types/jucer_Label.h; sourceTree = SOURCE_ROOT; }; - 4CCA45827EB24DAC35225C8B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_Slider.h; path = ../../Source/model/Component/Types/jucer_Slider.h; sourceTree = SOURCE_ROOT; }; - 6891A060A1898C4EEE87C5F9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_TabbedComponent.h; path = ../../Source/model/Component/Types/jucer_TabbedComponent.h; sourceTree = SOURCE_ROOT; }; - 65BECAE9AB24EEDFBC637BF4 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_TextButton.h; path = ../../Source/model/Component/Types/jucer_TextButton.h; sourceTree = SOURCE_ROOT; }; - 9FE1B72EAF687BC6D8447106 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_TextEditor.h; path = ../../Source/model/Component/Types/jucer_TextEditor.h; sourceTree = SOURCE_ROOT; }; - A3909FC517682D61645E63EF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_ToggleButton.h; path = ../../Source/model/Component/Types/jucer_ToggleButton.h; sourceTree = SOURCE_ROOT; }; - E894E1F6D582678EE1F02763 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_Viewport.h; path = ../../Source/model/Component/Types/jucer_Viewport.h; sourceTree = SOURCE_ROOT; }; - B1471E8698D193FBCF0DD13D = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = jucer_DrawableDocument.cpp; path = ../../Source/model/Drawable/jucer_DrawableDocument.cpp; sourceTree = SOURCE_ROOT; }; - 739F94CA6213B43D867AB0FD = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_DrawableDocument.h; path = ../../Source/model/Drawable/jucer_DrawableDocument.h; sourceTree = SOURCE_ROOT; }; - 330A51CC68AED92F7F5BEC15 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = jucer_DrawableTypeHandler.cpp; path = ../../Source/model/Drawable/jucer_DrawableTypeHandler.cpp; sourceTree = SOURCE_ROOT; }; - BDE8CD9273E1B0D0E500D283 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_DrawableTypeHandler.h; path = ../../Source/model/Drawable/jucer_DrawableTypeHandler.h; sourceTree = SOURCE_ROOT; }; 9DCB32BBD7053ACCB598CE79 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = jucer_NewFileWizard.cpp; path = ../../Source/model/Project/jucer_NewFileWizard.cpp; sourceTree = SOURCE_ROOT; }; 201DF0B7B4AA3E03B1AA5144 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_NewFileWizard.h; path = ../../Source/model/Project/jucer_NewFileWizard.h; sourceTree = SOURCE_ROOT; }; 4179D4C7BF616A4A3C3E11CA = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = jucer_Project.cpp; path = ../../Source/model/Project/jucer_Project.cpp; sourceTree = SOURCE_ROOT; }; @@ -103,23 +72,6 @@ 5923DFBB741171B1D6EA62F4 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_ResourceFile.h; path = ../../Source/model/Project/jucer_ResourceFile.h; sourceTree = SOURCE_ROOT; }; 31F175F277299B3CEA857F96 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = jucer_SourceCodeEditor.cpp; path = "../../Source/ui/Code Editor/jucer_SourceCodeEditor.cpp"; sourceTree = SOURCE_ROOT; }; B85B1F0F8634A2D7DC1F8809 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_SourceCodeEditor.h; path = "../../Source/ui/Code Editor/jucer_SourceCodeEditor.h"; sourceTree = SOURCE_ROOT; }; - 3263F4099F45D6FACD28F08D = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = jucer_ComponentEditor.cpp; path = "../../Source/ui/Component Editor/jucer_ComponentEditor.cpp"; sourceTree = SOURCE_ROOT; }; - 16328135EAE8536A5E2AB454 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_ComponentEditor.h; path = "../../Source/ui/Component Editor/jucer_ComponentEditor.h"; sourceTree = SOURCE_ROOT; }; - 3B77C7A8D9A2386088D75CFE = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_ComponentEditorCanvas.h; path = "../../Source/ui/Component Editor/jucer_ComponentEditorCanvas.h"; sourceTree = SOURCE_ROOT; }; - 7CB154C3682F8C786134A6F3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_ComponentEditorCodeView.h; path = "../../Source/ui/Component Editor/jucer_ComponentEditorCodeView.h"; sourceTree = SOURCE_ROOT; }; - B5F5AD9FC53F60610C71367C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_ComponentEditorToolbar.h; path = "../../Source/ui/Component Editor/jucer_ComponentEditorToolbar.h"; sourceTree = SOURCE_ROOT; }; - 8CB73D6F1D0FFC4B379D1240 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_ComponentEditorTreeView.h; path = "../../Source/ui/Component Editor/jucer_ComponentEditorTreeView.h"; sourceTree = SOURCE_ROOT; }; - 06F5D2DB198F068520732796 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = jucer_ComponentViewer.cpp; path = "../../Source/ui/Component Editor/jucer_ComponentViewer.cpp"; sourceTree = SOURCE_ROOT; }; - 1309F36592198D9DC738FDE6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_ComponentViewer.h; path = "../../Source/ui/Component Editor/jucer_ComponentViewer.h"; sourceTree = SOURCE_ROOT; }; - 82F91CF84A296665177CB79A = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = jucer_DrawableEditor.cpp; path = "../../Source/ui/Drawable Editor/jucer_DrawableEditor.cpp"; sourceTree = SOURCE_ROOT; }; - D1776C5F3E6BB7E8C698BAD6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_DrawableEditor.h; path = "../../Source/ui/Drawable Editor/jucer_DrawableEditor.h"; sourceTree = SOURCE_ROOT; }; - B19F19A0ED7386FAA7DD854E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_DrawableEditorCanvas.h; path = "../../Source/ui/Drawable Editor/jucer_DrawableEditorCanvas.h"; sourceTree = SOURCE_ROOT; }; - F93FC34AEC400642196A0238 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_DrawableEditorToolbar.h; path = "../../Source/ui/Drawable Editor/jucer_DrawableEditorToolbar.h"; sourceTree = SOURCE_ROOT; }; - F195C9668F12CC21CD2708AA = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_DrawableEditorTreeView.h; path = "../../Source/ui/Drawable Editor/jucer_DrawableEditorTreeView.h"; sourceTree = SOURCE_ROOT; }; - 03E9C079FBBF727D50A2B678 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = jucer_EditorCanvas.cpp; path = "../../Source/ui/Editor Base/jucer_EditorCanvas.cpp"; sourceTree = SOURCE_ROOT; }; - E84D46270BBB219BED0446F7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_EditorCanvas.h; path = "../../Source/ui/Editor Base/jucer_EditorCanvas.h"; sourceTree = SOURCE_ROOT; }; - BF1C973255F7BFD3965016AE = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_EditorDragOperation.h; path = "../../Source/ui/Editor Base/jucer_EditorDragOperation.h"; sourceTree = SOURCE_ROOT; }; - 064C5F11CA954DAEFA7ACD3A = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_EditorPanel.h; path = "../../Source/ui/Editor Base/jucer_EditorPanel.h"; sourceTree = SOURCE_ROOT; }; E6BB0D9B515B50E418D98B9C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_CommandIDs.h; path = ../../Source/ui/jucer_CommandIDs.h; sourceTree = SOURCE_ROOT; }; 3B2C45064E85B3B631D4F921 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = jucer_DocumentEditorComponent.cpp; path = ../../Source/ui/jucer_DocumentEditorComponent.cpp; sourceTree = SOURCE_ROOT; }; 156F72179BBFCD0D9804C266 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_DocumentEditorComponent.h; path = ../../Source/ui/jucer_DocumentEditorComponent.h; sourceTree = SOURCE_ROOT; }; @@ -143,21 +95,18 @@ 119004FCF601190AC8929BBD = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_TreeViewTypes.h; path = "../../Source/ui/Project Editor/jucer_TreeViewTypes.h"; sourceTree = SOURCE_ROOT; }; 78E0309CB6D5E7E80B5BED7D = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = jucer_CodeHelpers.cpp; path = ../../Source/utility/jucer_CodeHelpers.cpp; sourceTree = SOURCE_ROOT; }; 9C58E022906C193862372BC1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_CodeHelpers.h; path = ../../Source/utility/jucer_CodeHelpers.h; sourceTree = SOURCE_ROOT; }; - F09B64E34443A4030EA1DA30 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_ColourPropertyComponent.h; path = ../../Source/utility/jucer_ColourPropertyComponent.h; sourceTree = SOURCE_ROOT; }; 9736236B5C4D6A16FC7E03AC = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_Colours.h; path = ../../Source/utility/jucer_Colours.h; sourceTree = SOURCE_ROOT; }; - CC9A3046B8B9FCDFE2092F51 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_CoordinatePropertyComponent.h; path = ../../Source/utility/jucer_CoordinatePropertyComponent.h; sourceTree = SOURCE_ROOT; }; 5533704F0D30A9C62058FEC7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = jucer_FileHelpers.cpp; path = ../../Source/utility/jucer_FileHelpers.cpp; sourceTree = SOURCE_ROOT; }; 27E71DE11448E4D6721D5508 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_FileHelpers.h; path = ../../Source/utility/jucer_FileHelpers.h; sourceTree = SOURCE_ROOT; }; - BE9E52ADB12C9D4F783AFE42 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_FillTypePropertyComponent.h; path = ../../Source/utility/jucer_FillTypePropertyComponent.h; sourceTree = SOURCE_ROOT; }; - BB7B42859CABFB8385039712 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_FontPropertyComponent.h; path = ../../Source/utility/jucer_FontPropertyComponent.h; sourceTree = SOURCE_ROOT; }; - 848F9EFCBB691000A4B32346 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_MarkerListBase.h; path = ../../Source/utility/jucer_MarkerListBase.h; sourceTree = SOURCE_ROOT; }; 49A1C43070A68985C25F34C7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = jucer_MiscUtilities.cpp; path = ../../Source/utility/jucer_MiscUtilities.cpp; sourceTree = SOURCE_ROOT; }; 2B2A6FCA85F56682698864EC = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_MiscUtilities.h; path = ../../Source/utility/jucer_MiscUtilities.h; sourceTree = SOURCE_ROOT; }; + 9E6DBB6CE79ED8F4C72BAEE1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_PresetIDs.h; path = ../../Source/utility/jucer_PresetIDs.h; sourceTree = SOURCE_ROOT; }; F99858EE1CD3B23057B8BEBD = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_RelativePath.h; path = ../../Source/utility/jucer_RelativePath.h; sourceTree = SOURCE_ROOT; }; 7A1CD936BD306A6E0BEFB046 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = jucer_StoredSettings.cpp; path = ../../Source/utility/jucer_StoredSettings.cpp; sourceTree = SOURCE_ROOT; }; E99413C9561A66310DAD5EEB = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_StoredSettings.h; path = ../../Source/utility/jucer_StoredSettings.h; sourceTree = SOURCE_ROOT; }; - 7530E3F9877E4F322CD81801 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_TickIterator.h; path = ../../Source/utility/jucer_TickIterator.h; sourceTree = SOURCE_ROOT; }; C693F6EF4381328D5F5891CF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_ValueSourceHelpers.h; path = ../../Source/utility/jucer_ValueSourceHelpers.h; sourceTree = SOURCE_ROOT; }; + 532637EC12F1DC4B2EACCC38 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_Application.h; path = ../../Source/jucer_Application.h; sourceTree = SOURCE_ROOT; }; + BFC668863418EE80443FAA44 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_CommonHeaders.h; path = ../../Source/jucer_CommonHeaders.h; sourceTree = SOURCE_ROOT; }; 0CA0CCCEBFA0AC8C577FC915 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_Headers.h; path = ../../Source/jucer_Headers.h; sourceTree = SOURCE_ROOT; }; 0DC331A7B856F30AD266A3E6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = jucer_Main.cpp; path = ../../Source/jucer_Main.cpp; sourceTree = SOURCE_ROOT; }; E50666EA86CAD5FB338A8756 = { isa = PBXFileReference; lastKnownFileType = image.png; name = brushed_aluminium.png; path = ../../Source/templates/brushed_aluminium.png; sourceTree = SOURCE_ROOT; }; @@ -166,8 +115,6 @@ 1C52B91B15DF56E0A37F3EEE = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_AudioPluginEditorTemplate.h; path = ../../Source/templates/jucer_AudioPluginEditorTemplate.h; sourceTree = SOURCE_ROOT; }; 4D62A4E094921086FBB82248 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = jucer_AudioPluginFilterTemplate.cpp; path = ../../Source/templates/jucer_AudioPluginFilterTemplate.cpp; sourceTree = SOURCE_ROOT; }; C2AE936214AC10DC4FABAC2F = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_AudioPluginFilterTemplate.h; path = ../../Source/templates/jucer_AudioPluginFilterTemplate.h; sourceTree = SOURCE_ROOT; }; - AC0E488751C4C402D9D84B93 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = jucer_ComponentTemplate.cpp; path = ../../Source/templates/jucer_ComponentTemplate.cpp; sourceTree = SOURCE_ROOT; }; - B2FB0FD53553DB371FD1C748 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_ComponentTemplate.h; path = ../../Source/templates/jucer_ComponentTemplate.h; sourceTree = SOURCE_ROOT; }; 061B86C84B0D279F1EABBBE2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = jucer_MainConsoleAppTemplate.cpp; path = ../../Source/templates/jucer_MainConsoleAppTemplate.cpp; sourceTree = SOURCE_ROOT; }; 1EC5B7483B37A4163CA19549 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = jucer_MainTemplate.cpp; path = ../../Source/templates/jucer_MainTemplate.cpp; sourceTree = SOURCE_ROOT; }; 4A80C6415DB1C1CB47DBE23F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = jucer_NewCppFileTemplate.cpp; path = ../../Source/templates/jucer_NewCppFileTemplate.cpp; sourceTree = SOURCE_ROOT; }; @@ -183,32 +130,6 @@ DD6476FF0F8BE833CD54C01F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = JuceLibraryCode2.mm; path = ../../JuceLibraryCode/JuceLibraryCode2.mm; sourceTree = SOURCE_ROOT; }; 268B4FFB1C675B679138545F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = JuceLibraryCode3.mm; path = ../../JuceLibraryCode/JuceLibraryCode3.mm; sourceTree = SOURCE_ROOT; }; 60A217F62952DE8A752BD79F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = JuceLibraryCode4.mm; path = ../../JuceLibraryCode/JuceLibraryCode4.mm; sourceTree = SOURCE_ROOT; }; - 7C95A5CDB1B24D227D92749E = { isa = PBXGroup; children = ( - 776686405B2531413AAA7281, - D08D9DB99315F76093CF6EE6, - 03C51600B53B70BD0514254D, - A8A4F96A0009D7FB79B210FC, - F05C6A0FF88238E712A23568, - A424C2E4ADB30C62EB33215C, - 4C0233A3D179C9D367132655, - CC648C0D7428D809C1EF603E, - 4CCA45827EB24DAC35225C8B, - 6891A060A1898C4EEE87C5F9, - 65BECAE9AB24EEDFBC637BF4, - 9FE1B72EAF687BC6D8447106, - A3909FC517682D61645E63EF, - E894E1F6D582678EE1F02763 ); name = Types; sourceTree = ""; }; - E874A7599C1FEEE538F2DFF2 = { isa = PBXGroup; children = ( - 1BCF8B6367CCC73AEEF03818, - 868978C505781890533E282C, - 829C5DA65FB46B99756428C5, - 82F1014486AD8B0C3152FF91, - 7C95A5CDB1B24D227D92749E ); name = Component; sourceTree = ""; }; - E70E3BE796E91EA86CFE10FE = { isa = PBXGroup; children = ( - B1471E8698D193FBCF0DD13D, - 739F94CA6213B43D867AB0FD, - 330A51CC68AED92F7F5BEC15, - BDE8CD9273E1B0D0E500D283 ); name = Drawable; sourceTree = ""; }; ADA17383E5554BCDF567AACC = { isa = PBXGroup; children = ( 9DCB32BBD7053ACCB598CE79, 201DF0B7B4AA3E03B1AA5144, @@ -225,32 +146,10 @@ A6D148E4503AAD3DE6DDCD8B, 5923DFBB741171B1D6EA62F4 ); name = Project; sourceTree = ""; }; BF6238C9155879B9A9C47213 = { isa = PBXGroup; children = ( - E874A7599C1FEEE538F2DFF2, - E70E3BE796E91EA86CFE10FE, ADA17383E5554BCDF567AACC ); name = Model; sourceTree = ""; }; 336D07CB9ED81D2A985A8543 = { isa = PBXGroup; children = ( 31F175F277299B3CEA857F96, B85B1F0F8634A2D7DC1F8809 ); name = "Code Editor"; sourceTree = ""; }; - 3A0BE83502CB509D623C2C07 = { isa = PBXGroup; children = ( - 3263F4099F45D6FACD28F08D, - 16328135EAE8536A5E2AB454, - 3B77C7A8D9A2386088D75CFE, - 7CB154C3682F8C786134A6F3, - B5F5AD9FC53F60610C71367C, - 8CB73D6F1D0FFC4B379D1240, - 06F5D2DB198F068520732796, - 1309F36592198D9DC738FDE6 ); name = "Component Editor"; sourceTree = ""; }; - E6053BD673F80E900DDA3593 = { isa = PBXGroup; children = ( - 82F91CF84A296665177CB79A, - D1776C5F3E6BB7E8C698BAD6, - B19F19A0ED7386FAA7DD854E, - F93FC34AEC400642196A0238, - F195C9668F12CC21CD2708AA ); name = "Drawable Editor"; sourceTree = ""; }; - F4B31EE979DF2BE5AA276EAF = { isa = PBXGroup; children = ( - 03E9C079FBBF727D50A2B678, - E84D46270BBB219BED0446F7, - BF1C973255F7BFD3965016AE, - 064C5F11CA954DAEFA7ACD3A ); name = "Editor Base"; sourceTree = ""; }; 73551B9BCDF3BAC06FECEAF8 = { isa = PBXGroup; children = ( 63C3715BB513E5F84B1159AB, 9605019A62439E2D81587677, @@ -266,9 +165,6 @@ 119004FCF601190AC8929BBD ); name = "Project Editor"; sourceTree = ""; }; 63A4428C116D97D7C5C05DC8 = { isa = PBXGroup; children = ( 336D07CB9ED81D2A985A8543, - 3A0BE83502CB509D623C2C07, - E6053BD673F80E900DDA3593, - F4B31EE979DF2BE5AA276EAF, E6BB0D9B515B50E418D98B9C, 3B2C45064E85B3B631D4F921, 156F72179BBFCD0D9804C266, @@ -282,22 +178,19 @@ 14B5B6D3D07644058F0F526F = { isa = PBXGroup; children = ( 78E0309CB6D5E7E80B5BED7D, 9C58E022906C193862372BC1, - F09B64E34443A4030EA1DA30, 9736236B5C4D6A16FC7E03AC, - CC9A3046B8B9FCDFE2092F51, 5533704F0D30A9C62058FEC7, 27E71DE11448E4D6721D5508, - BE9E52ADB12C9D4F783AFE42, - BB7B42859CABFB8385039712, - 848F9EFCBB691000A4B32346, 49A1C43070A68985C25F34C7, 2B2A6FCA85F56682698864EC, + 9E6DBB6CE79ED8F4C72BAEE1, F99858EE1CD3B23057B8BEBD, 7A1CD936BD306A6E0BEFB046, E99413C9561A66310DAD5EEB, - 7530E3F9877E4F322CD81801, C693F6EF4381328D5F5891CF ); name = Utility; sourceTree = ""; }; FAFBE12D4C5798FC1BB3A4BA = { isa = PBXGroup; children = ( + 532637EC12F1DC4B2EACCC38, + BFC668863418EE80443FAA44, 0CA0CCCEBFA0AC8C577FC915, 0DC331A7B856F30AD266A3E6 ); name = Main; sourceTree = ""; }; A3AA50DFBB048C92A2213BC1 = { isa = PBXGroup; children = ( @@ -307,8 +200,6 @@ 1C52B91B15DF56E0A37F3EEE, 4D62A4E094921086FBB82248, C2AE936214AC10DC4FABAC2F, - AC0E488751C4C402D9D84B93, - B2FB0FD53553DB371FD1C748, 061B86C84B0D279F1EABBBE2, 1EC5B7483B37A4163CA19549, 4A80C6415DB1C1CB47DBE23F, @@ -417,21 +308,12 @@ 673FACB8969ADED17ACEFF7C ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; 87CCE4CB1FAB40B6F21DEACE = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; 5362E03ADF975A126C1F2F7B = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - A7EB756F566FB773ABE3DFA9, - 061C981D0E9FB70DE5A3D32C, - FEDBCD721085272D356BBAEB, - 268807D7091702D29033CC27, - 91CCD0421DDD432C1C4903D4, 06838545183964D8C1E60530, 048D33BDE7413EFE05D09901, 9DA1913A62297D7111E0A6C9, 44C2E5705EEA4F01309D8960, 7C9FFFC0B129F5C3FAEE13E9, 33E1A095D656AF109DD54170, - D706C3B5016318D85FE452C2, - 872B76525D184228B4F69372, - E43D00B370F289420379B759, - EFFCA85EFB4F06F1BEB9AB97, 944CE0EADAD951F48EC77071, 2417927E323BFE201D5985B9, A1CB18029E09A66E192D9A29, diff --git a/extras/Jucer (experimental)/Builds/VisualStudio2005/The Jucer.vcproj b/extras/Jucer (experimental)/Builds/VisualStudio2005/The Jucer.vcproj index 72b3b2161f..c2d34c5794 100644 --- a/extras/Jucer (experimental)/Builds/VisualStudio2005/The Jucer.vcproj +++ b/extras/Jucer (experimental)/Builds/VisualStudio2005/The Jucer.vcproj @@ -129,34 +129,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -179,29 +151,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -229,23 +178,20 @@ - - - - - + - + + @@ -310,26 +256,6 @@ - - - - - - - - - - - - - - - - diff --git a/extras/Jucer (experimental)/Builds/VisualStudio2008/The Jucer.vcproj b/extras/Jucer (experimental)/Builds/VisualStudio2008/The Jucer.vcproj index 720823471c..b4406d89ea 100644 --- a/extras/Jucer (experimental)/Builds/VisualStudio2008/The Jucer.vcproj +++ b/extras/Jucer (experimental)/Builds/VisualStudio2008/The Jucer.vcproj @@ -129,34 +129,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -179,29 +151,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -229,23 +178,20 @@ - - - - - + - + + @@ -310,26 +256,6 @@ - - - - - - - - - - - - - - - - diff --git a/extras/Jucer (experimental)/Builds/VisualStudio2010/The Jucer.vcxproj b/extras/Jucer (experimental)/Builds/VisualStudio2010/The Jucer.vcxproj index d81d065bd1..56b5cf39d1 100644 --- a/extras/Jucer (experimental)/Builds/VisualStudio2010/The Jucer.vcxproj +++ b/extras/Jucer (experimental)/Builds/VisualStudio2010/The Jucer.vcxproj @@ -122,21 +122,12 @@ - - - - - - - - - @@ -159,23 +150,6 @@ - - - - - - - - - - - - - - - - - @@ -186,19 +160,6 @@ - - - - - - - - - - - - - @@ -211,22 +172,18 @@ - - - - - + - + + - diff --git a/extras/Jucer (experimental)/Builds/VisualStudio2010/The Jucer.vcxproj.filters b/extras/Jucer (experimental)/Builds/VisualStudio2010/The Jucer.vcxproj.filters index 6b832497b8..e2efa49d49 100644 --- a/extras/Jucer (experimental)/Builds/VisualStudio2010/The Jucer.vcxproj.filters +++ b/extras/Jucer (experimental)/Builds/VisualStudio2010/The Jucer.vcxproj.filters @@ -8,15 +8,6 @@ {A5344922-0D8B-B045-F28C-FED2183BC2C7} - - {BB130AC7-0080-F6A3-9A33-66D8D081545C} - - - {373D0BD7-814C-7145-4C25-6D9C9E6D1D5D} - - - {7C9CA237-B750-662B-7DF8-5FD8FCAF4E3C} - {F9D69347-AF9F-BE13-7C53-9C497443E5AE} @@ -26,15 +17,6 @@ {F4F08AA9-6601-8093-5779-F29289064327} - - {F476DB92-615F-54AF-2D4B-35031423FB68} - - - {37D72050-852A-B36C-3674-277B759737F1} - - - {04730C9B-9F60-192C-2577-97984C6BC024} - {B34892C3-DBB0-4445-A3A2-FF5FB798F25B} @@ -52,21 +34,6 @@ - - The Jucer\Model\Component - - - The Jucer\Model\Component - - - The Jucer\Model\Component\Types - - - The Jucer\Model\Drawable - - - The Jucer\Model\Drawable - The Jucer\Model\Project @@ -85,18 +52,6 @@ The Jucer\UI\Code Editor - - The Jucer\UI\Component Editor - - - The Jucer\UI\Component Editor - - - The Jucer\UI\Drawable Editor - - - The Jucer\UI\Editor Base - The Jucer\UI @@ -154,9 +109,6 @@ The Jucer\Resources - - The Jucer\Resources - The Jucer\Resources @@ -189,57 +141,6 @@ - - The Jucer\Model\Component - - - The Jucer\Model\Component - - - The Jucer\Model\Component\Types - - - The Jucer\Model\Component\Types - - - The Jucer\Model\Component\Types - - - The Jucer\Model\Component\Types - - - The Jucer\Model\Component\Types - - - The Jucer\Model\Component\Types - - - The Jucer\Model\Component\Types - - - The Jucer\Model\Component\Types - - - The Jucer\Model\Component\Types - - - The Jucer\Model\Component\Types - - - The Jucer\Model\Component\Types - - - The Jucer\Model\Component\Types - - - The Jucer\Model\Component\Types - - - The Jucer\Model\Drawable - - - The Jucer\Model\Drawable - The Jucer\Model\Project @@ -270,45 +171,6 @@ The Jucer\UI\Code Editor - - The Jucer\UI\Component Editor - - - The Jucer\UI\Component Editor - - - The Jucer\UI\Component Editor - - - The Jucer\UI\Component Editor - - - The Jucer\UI\Component Editor - - - The Jucer\UI\Component Editor - - - The Jucer\UI\Drawable Editor - - - The Jucer\UI\Drawable Editor - - - The Jucer\UI\Drawable Editor - - - The Jucer\UI\Drawable Editor - - - The Jucer\UI\Editor Base - - - The Jucer\UI\Editor Base - - - The Jucer\UI\Editor Base - The Jucer\UI @@ -345,42 +207,33 @@ The Jucer\Utility - - The Jucer\Utility - The Jucer\Utility - - The Jucer\Utility - The Jucer\Utility - - The Jucer\Utility - - - The Jucer\Utility - - - The Jucer\Utility - The Jucer\Utility + + The Jucer\Utility + The Jucer\Utility The Jucer\Utility - - The Jucer\Utility - The Jucer\Utility + + The Jucer\Main + + + The Jucer\Main + The Jucer\Main @@ -390,9 +243,6 @@ The Jucer\Resources - - The Jucer\Resources - The Jucer\Resources diff --git a/extras/Jucer (experimental)/JuceLibraryCode/BinaryData.cpp b/extras/Jucer (experimental)/JuceLibraryCode/BinaryData.cpp index 862d572556..fa9de15b86 100644 --- a/extras/Jucer (experimental)/JuceLibraryCode/BinaryData.cpp +++ b/extras/Jucer (experimental)/JuceLibraryCode/BinaryData.cpp @@ -23,8 +23,6 @@ const char* BinaryData::getNamedResource (const char* resourceNameUTF8, int& num case 0x4d0721bf: numBytes = BinaryData::jucer_AudioPluginEditorTemplate_hSize; return BinaryData::jucer_AudioPluginEditorTemplate_h; case 0x51b49ac5: numBytes = BinaryData::jucer_AudioPluginFilterTemplate_cppSize; return BinaryData::jucer_AudioPluginFilterTemplate_cpp; case 0x488afa0a: numBytes = BinaryData::jucer_AudioPluginFilterTemplate_hSize; return BinaryData::jucer_AudioPluginFilterTemplate_h; - case 0xabad7041: numBytes = BinaryData::jucer_ComponentTemplate_cppSize; return BinaryData::jucer_ComponentTemplate_cpp; - case 0xfc72fe86: numBytes = BinaryData::jucer_ComponentTemplate_hSize; return BinaryData::jucer_ComponentTemplate_h; case 0x8905395b: numBytes = BinaryData::jucer_MainConsoleAppTemplate_cppSize; return BinaryData::jucer_MainConsoleAppTemplate_cpp; case 0x7a0186b1: numBytes = BinaryData::jucer_MainTemplate_cppSize; return BinaryData::jucer_MainTemplate_cpp; case 0x02a2a077: numBytes = BinaryData::jucer_NewCppFileTemplate_cppSize; return BinaryData::jucer_NewCppFileTemplate_cpp; @@ -631,151 +629,6 @@ static const unsigned char temp_a7c425dd[] = const char* BinaryData::jucer_AudioPluginFilterTemplate_h = (const char*) temp_a7c425dd; -//================== jucer_ComponentTemplate.cpp ================== -static const unsigned char temp_73015554[] = -"/*\r\n" -" ==============================================================================\r\n" -"\r\n" -" This is an automatically generated file created by the Jucer!\r\n" -"\r\n" -" Be careful when adding custom code to these files, as only the code within\r\n" -" the \"//[xyz]\" and \"//[/xyz]\" sections will be retained when the file is loaded\r\n" -" and re-saved.\r\n" -"\r\n" -" Created for JUCE version: %%juceVersion%%\r\n" -"\r\n" -" ------------------------------------------------------------------------------\r\n" -"\r\n" -" JUCE and the Jucer are copyright 2004-10 by Raw Material Software ltd.\r\n" -"\r\n" -" ==============================================================================\r\n" -"*/\r\n" -"\r\n" -"//[CppHeaders] You can add your own extra header files here...\r\n" -"//[/CppHeaders]\r\n" -"\r\n" -"%%includeFilesCPP%%\r\n" -"\r\n" -"//[MiscUserDefs] You can add your own user definitions and misc code here...\r\n" -"//[/MiscUserDefs]\r\n" -"\r\n" -"extern const unsigned char %%className%%_ComponentStateData[];\r\n" -"\r\n" -"//==============================================================================\r\n" -"%%className%%::%%className%% (%%constructorParams%%)\r\n" -"%%initialisers%%{\r\n" -" componentState = ValueTree::readFromData (%%className%%_ComponentStateData, %%statedatasize%%);\r\n" -" jassert (componentState.isValid());\r\n" -" const ValueTree componentStateList (componentState.getChildByName (\"COMPONENTS\"));\r\n" -"\r\n" -" %%constructor%%\r\n" -"\r\n" -" //[Constructor] You can add your own custom stuff here..\r\n" -" //[/Constructor]\r\n" -"}\r\n" -"\r\n" -"%%className%%::~%%className%%()\r\n" -"{\r\n" -" //[Destructor_pre]. You can add your own custom destruction code here..\r\n" -" //[/Destructor_pre]\r\n" -"\r\n" -" %%destructor%%\r\n" -"\r\n" -" //[Destructor]. You can add your own custom destruction code here..\r\n" -" //[/Destructor]\r\n" -"}\r\n" -"\r\n" -"//==============================================================================\r\n" -"%%methodDefinitions%%\r\n" -"\r\n" -"//[MiscUserCode] You can add your own definitions of your custom methods or any other code here...\r\n" -"//[/MiscUserCode]\r\n" -"\r\n" -"%%staticMemberDefinitions%%\r\n" -"\r\n" -"//==============================================================================\r\n" -"//======================= Jucer Information Section ==========================\r\n" -"//==============================================================================\r\n" -"#if 0\r\n" -"/* This section stores the Jucer's metadata - edit it at your own risk!\r\n" -"\r\n" -"%%metadata%%\r\n" -"*/\r\n" -"#endif\r\n"; - -const char* BinaryData::jucer_ComponentTemplate_cpp = (const char*) temp_73015554; - -//================== jucer_ComponentTemplate.h ================== -static const unsigned char temp_b930c59[] = -"/*\r\n" -" ==============================================================================\r\n" -"\r\n" -" This is an automatically generated file created by the Jucer!\r\n" -"\r\n" -" Be careful when adding custom code to these files, as only the code within\r\n" -" the \"//[xyz]\" and \"//[/xyz]\" sections will be retained when the file is loaded\r\n" -" and re-saved.\r\n" -"\r\n" -" Created for JUCE version: %%juceVersion%%\r\n" -"\r\n" -" ------------------------------------------------------------------------------\r\n" -"\r\n" -" JUCE and the Jucer are copyright 2004-10 by Raw Material Software ltd.\r\n" -"\r\n" -" ==============================================================================\r\n" -"*/\r\n" -"\r\n" -"#ifndef %%headerGuard%%\r\n" -"#define %%headerGuard%%\r\n" -"\r\n" -"//[Headers] -- You can add your own extra header files here --\r\n" -"%%defaultJuceInclude%%\r\n" -"//[/Headers]\r\n" -"\r\n" -"%%includeFilesH%%\r\n" -"\r\n" -"//==============================================================================\r\n" -"/**\r\n" -" //[Comments]\r\n" -" An auto-generated component, created by the Jucer.\r\n" -"\r\n" -" Describe your class and how it works here!\r\n" -" //[/Comments]\r\n" -"*/\r\n" -"%%classDeclaration%%\r\n" -"{\r\n" -"public:\r\n" -" //==============================================================================\r\n" -" %%className%% (%%constructorParams%%);\r\n" -" ~%%className%%();\r\n" -"\r\n" -" //==============================================================================\r\n" -" //[UserMethods] -- You can add your own custom methods in this section.\r\n" -" //[/UserMethods]\r\n" -"\r\n" -" %%publicMemberDeclarations%%\r\n" -"\r\n" -" //==============================================================================\r\n" -" juce_UseDebuggingNewOperator\r\n" -"\r\n" -"private:\r\n" -" //[UserVariables] -- You can add your own custom variables in this section.\r\n" -" //[/UserVariables]\r\n" -"\r\n" -" //==============================================================================\r\n" -" %%privateMemberDeclarations%%\r\n" -"\r\n" -" //==============================================================================\r\n" -" // (prevent copy constructor and operator= being generated..)\r\n" -" %%className%% (const %%className%%&);\r\n" -" %%className%%& operator= (const %%className%%&);\r\n" -"};\r\n" -"\r\n" -"\r\n" -"#endif // %%headerGuard%%\r\n"; - -const char* BinaryData::jucer_ComponentTemplate_h = (const char*) temp_b930c59; - //================== jucer_MainConsoleAppTemplate.cpp ================== static const unsigned char temp_a4c7812a[] = "/*\r\n" diff --git a/extras/Jucer (experimental)/JuceLibraryCode/BinaryData.h b/extras/Jucer (experimental)/JuceLibraryCode/BinaryData.h index 0c156266ad..8a80f71587 100644 --- a/extras/Jucer (experimental)/JuceLibraryCode/BinaryData.h +++ b/extras/Jucer (experimental)/JuceLibraryCode/BinaryData.h @@ -25,12 +25,6 @@ namespace BinaryData extern const char* jucer_AudioPluginFilterTemplate_h; const int jucer_AudioPluginFilterTemplate_hSize = 2353; - extern const char* jucer_ComponentTemplate_cpp; - const int jucer_ComponentTemplate_cppSize = 2274; - - extern const char* jucer_ComponentTemplate_h; - const int jucer_ComponentTemplate_hSize = 2239; - extern const char* jucer_MainConsoleAppTemplate_cpp; const int jucer_MainConsoleAppTemplate_cppSize = 749; diff --git a/extras/Jucer (experimental)/Jucer.jucer b/extras/Jucer (experimental)/Jucer.jucer index 1d4dd2fa77..1127abbeb6 100644 --- a/extras/Jucer (experimental)/Jucer.jucer +++ b/extras/Jucer (experimental)/Jucer.jucer @@ -29,56 +29,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -117,46 +67,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + - - registerAllCommandsForTarget (this); + + theMainWindow = new MainWindow(); + doExtraInitialisation(); + + ImageCache::setCacheTimeout (30 * 1000); + + if (commandLine.trim().isNotEmpty() && ! commandLine.trim().startsWithChar ('-')) + anotherInstanceStarted (commandLine); + + theMainWindow->reloadLastProject(); + + theMainWindow->getLookAndFeel().setColour (ColourSelector::backgroundColourId, Colours::transparentBlack); + } + + void shutdown() + { + theMainWindow = 0; + + OpenDocumentManager::deleteInstance(); + deleteAndZero (commandManager); + } + + //============================================================================== + void systemRequestedQuit() + { + if (theMainWindow == 0 || theMainWindow->closeCurrentProject()) + { + theMainWindow = 0; + StoredSettings::deleteInstance(); + + quit(); + } + } + + //============================================================================== + const String getApplicationName() + { + return "The Jucer V" + getApplicationVersion(); + } + + const String getApplicationVersion() + { + return ProjectInfo::versionString; + } + + bool moreThanOneInstanceAllowed() + { +#ifndef JUCE_LINUX + return false; +#else + return true; //xxx should be false but doesn't work on linux.. +#endif + } + + void anotherInstanceStarted (const String& commandLine) + { + if (theMainWindow != 0) + theMainWindow->openFile (commandLine.unquoted()); + } + + virtual void doExtraInitialisation() {} + +private: + ScopedPointer theMainWindow; +}; + + +#endif // __JUCER_APPLICATION_H_6595C2A8__ diff --git a/extras/Jucer (experimental)/Source/model/Component/Types/jucer_ComponentTypes.h b/extras/Jucer (experimental)/Source/jucer_CommonHeaders.h similarity index 53% rename from extras/Jucer (experimental)/Source/model/Component/Types/jucer_ComponentTypes.h rename to extras/Jucer (experimental)/Source/jucer_CommonHeaders.h index 7657365224..5531f54570 100644 --- a/extras/Jucer (experimental)/Source/model/Component/Types/jucer_ComponentTypes.h +++ b/extras/Jucer (experimental)/Source/jucer_CommonHeaders.h @@ -23,14 +23,31 @@ ============================================================================== */ -#include "jucer_TextButton.h" -#include "jucer_ToggleButton.h" -#include "jucer_TextEditor.h" -#include "jucer_Label.h" -#include "jucer_ComboBox.h" -#include "jucer_Slider.h" -#include "jucer_GroupComponent.h" -#include "jucer_Viewport.h" -#include "jucer_TabbedComponent.h" -#include "jucer_JucerComponent.h" -#include "jucer_GenericComponent.h" +#ifndef __JUCER_COMMONINCLUDES_H__ +#define __JUCER_COMMONINCLUDES_H__ + + +#include "utility/jucer_StoredSettings.h" +#include "utility/jucer_MiscUtilities.h" +#include "utility/jucer_CodeHelpers.h" +#include "utility/jucer_FileHelpers.h" +#include "utility/jucer_RelativePath.h" +#include "utility/jucer_ValueSourceHelpers.h" +#include "utility/jucer_PresetIDs.h" +#include "ui/jucer_CommandIDs.h" + +//============================================================================== +extern ApplicationCommandManager* commandManager; + +//============================================================================== +static const char* const newLine = "\r\n"; + +const char* const projectItemDragType = "Project Items"; +const char* const drawableItemDragType = "Drawable Items"; +const char* const componentItemDragType = "Components"; + +const char* const sourceFileExtensions = "cpp;mm;m;c;h;hpp"; +const char* const headerFileExtensions = "h;hpp"; + + +#endif \ No newline at end of file diff --git a/extras/Jucer (experimental)/Source/jucer_Headers.h b/extras/Jucer (experimental)/Source/jucer_Headers.h index 41f17c12eb..123c75be92 100644 --- a/extras/Jucer (experimental)/Source/jucer_Headers.h +++ b/extras/Jucer (experimental)/Source/jucer_Headers.h @@ -28,115 +28,11 @@ #ifdef _MSC_VER #pragma warning (disable: 4100 4505) - #define DONT_LIST_JUCE_AUTOLINKEDLIBS 1 #endif //============================================================================== #include "../JuceLibraryCode/JuceHeader.h" -#include "utility/jucer_StoredSettings.h" -#include "utility/jucer_MiscUtilities.h" -#include "utility/jucer_CodeHelpers.h" -#include "utility/jucer_FileHelpers.h" -#include "utility/jucer_RelativePath.h" -#include "utility/jucer_ValueSourceHelpers.h" -#include "ui/jucer_CommandIDs.h" +#include "jucer_CommonHeaders.h" -//============================================================================== -extern ApplicationCommandManager* commandManager; - -//============================================================================== -static const char* const newLine = "\r\n"; - -const char* const projectItemDragType = "Project Items"; -const char* const drawableItemDragType = "Drawable Items"; -const char* const componentItemDragType = "Components"; - -const char* const textFileExtensions = "cpp;h;hpp;mm;m;c;txt;xml;plist;rtf;html;htm;php;py;rb;cs"; -const char* const sourceFileExtensions = "cpp;mm;m;c;h;hpp"; -const char* const headerFileExtensions = "h;hpp"; - -const int numSwatchColours = 24; -const int snapSizes[] = { 2, 3, 4, 5, 6, 8, 10, 12, 16, 20, 24, 32 }; - -const float snapDistance = 8.0f; -static const Colour alignmentMarkerColour (0x77ff0000); -static const Colour resizableBorderColour (0x7066aaff); - -// Handy list of static Identifiers.. -namespace Ids -{ - #define DECLARE_ID(name) const Identifier name (#name) - - DECLARE_ID (text); - DECLARE_ID (name); - DECLARE_ID (file); - DECLARE_ID (font); - DECLARE_ID (mode); - DECLARE_ID (type); - DECLARE_ID (version); - DECLARE_ID (position); - DECLARE_ID (source); - DECLARE_ID (readOnly); - DECLARE_ID (editMode); - DECLARE_ID (justification); - DECLARE_ID (items); - DECLARE_ID (editable); - DECLARE_ID (textJustification); - DECLARE_ID (unselectedText); - DECLARE_ID (noItemsText); - DECLARE_ID (min); - DECLARE_ID (max); - DECLARE_ID (width); - DECLARE_ID (height); - DECLARE_ID (background); - DECLARE_ID (interval); - DECLARE_ID (textBoxPos); - DECLARE_ID (textBoxWidth); - DECLARE_ID (textBoxHeight); - DECLARE_ID (skew); - DECLARE_ID (scrollBarV); - DECLARE_ID (scrollBarH); - DECLARE_ID (scrollbarWidth); - DECLARE_ID (initialState); - DECLARE_ID (scrollbarsShown); - DECLARE_ID (caretVisible); - DECLARE_ID (popupMenuEnabled); - DECLARE_ID (radioGroup); - DECLARE_ID (connectedLeft); - DECLARE_ID (connectedRight); - DECLARE_ID (connectedTop); - DECLARE_ID (connectedBottom); - DECLARE_ID (juceFolder); - DECLARE_ID (targetFolder); - DECLARE_ID (vstFolder); - DECLARE_ID (rtasFolder); - DECLARE_ID (auFolder); - DECLARE_ID (extraCompilerFlags); - DECLARE_ID (extraLinkerFlags); - DECLARE_ID (extraDefs); - DECLARE_ID (libraryName_Debug); - DECLARE_ID (libraryName_Release); - DECLARE_ID (libraryType); - DECLARE_ID (isDebug); - DECLARE_ID (targetName); - DECLARE_ID (binaryPath); - DECLARE_ID (optimisation); - DECLARE_ID (defines); - DECLARE_ID (headerPath); - DECLARE_ID (osxSDK); - DECLARE_ID (osxCompatibility); - DECLARE_ID (jucerVersion); - DECLARE_ID (projectType); - DECLARE_ID (juceLinkage); - DECLARE_ID (buildVST); - DECLARE_ID (bundleIdentifier); - DECLARE_ID (compile); - DECLARE_ID (resource); - DECLARE_ID (className); - DECLARE_ID (classDesc); - DECLARE_ID (controlPoint); - const Identifier class_ ("class"); - const Identifier id_ ("id"); -} #endif // __JUCER_HEADERS_JUCEHEADER__ diff --git a/extras/Jucer (experimental)/Source/jucer_Main.cpp b/extras/Jucer (experimental)/Source/jucer_Main.cpp index ae593144d2..082eb38bd8 100644 --- a/extras/Jucer (experimental)/Source/jucer_Main.cpp +++ b/extras/Jucer (experimental)/Source/jucer_Main.cpp @@ -23,136 +23,6 @@ ============================================================================== */ -#include "jucer_Headers.h" -#include "ui/jucer_MainWindow.h" - -ApplicationCommandManager* commandManager = 0; - - -//============================================================================== -class JucerApplication : public JUCEApplication -{ -public: - //============================================================================== - JucerApplication() - { - } - - ~JucerApplication() - { - } - - //============================================================================== - void initialise (const String& commandLine) - { - /* Running a command-line of the form "Jucer --resave foobar.jucer" will try to load that - jucer file and re-export all of its projects. - */ - if (commandLine.startsWithIgnoreCase ("-resave ") || commandLine.startsWithIgnoreCase ("--resave ")) - { - resaveJucerFile (File::getCurrentWorkingDirectory() - .getChildFile (commandLine.fromFirstOccurrenceOf (" ", false, false).unquoted())); - quit(); - return; - } - - commandManager = new ApplicationCommandManager(); - - theMainWindow = new MainWindow(); - theMainWindow->setVisible (true); - - ImageCache::setCacheTimeout (30 * 1000); - - if (commandLine.trim().isNotEmpty() - && ! commandLine.trim().startsWithChar ('-')) - anotherInstanceStarted (commandLine); - - theMainWindow->reloadLastProject(); - - theMainWindow->getLookAndFeel().setColour (ColourSelector::backgroundColourId, Colours::transparentBlack); - } - - void shutdown() - { - theMainWindow = 0; - - OpenDocumentManager::deleteInstance(); - deleteAndZero (commandManager); - } - - //============================================================================== - void systemRequestedQuit() - { - if (theMainWindow == 0 || theMainWindow->closeCurrentProject()) - { - theMainWindow = 0; - StoredSettings::deleteInstance(); - - quit(); - } - } - - //============================================================================== - const String getApplicationName() - { - return "The Jucer V" + getApplicationVersion(); - } - - const String getApplicationVersion() - { - return ProjectInfo::versionString; - } - - bool moreThanOneInstanceAllowed() - { -#ifndef JUCE_LINUX - return false; -#else - return true; //xxx should be false but doesn't work on linux.. -#endif - } - - void anotherInstanceStarted (const String& commandLine) - { - if (theMainWindow != 0) - theMainWindow->openFile (commandLine.unquoted()); - } - -private: - ScopedPointer theMainWindow; - - void resaveJucerFile (const File& file) - { - if (! file.exists()) - { - std::cout << "The file " << file.getFullPathName() << " doesn't exist!" << std::endl; - return; - } - - if (! file.hasFileExtension (Project::projectFileExtension)) - { - std::cout << file.getFullPathName() << " isn't a valid jucer project file!" << std::endl; - return; - } - - ScopedPointer newDoc (new Project (file)); - - if (! newDoc->loadFrom (file, true)) - { - std::cout << "Failed to load the project file: " << file.getFullPathName() << std::endl; - return; - } - - std::cout << "The Jucer - Re-saving file: " << file.getFullPathName() << std::endl; - String error (newDoc->saveDocument (file)); - - if (error.isNotEmpty()) - { - std::cout << "Error when writing project: " << error << std::endl; - return; - } - } -}; - +#include "jucer_Application.h" START_JUCE_APPLICATION(JucerApplication) diff --git a/extras/Jucer (experimental)/Source/model/Component/Types/jucer_ComboBox.h b/extras/Jucer (experimental)/Source/model/Component/Types/jucer_ComboBox.h deleted file mode 100644 index bc92d12fea..0000000000 --- a/extras/Jucer (experimental)/Source/model/Component/Types/jucer_ComboBox.h +++ /dev/null @@ -1,134 +0,0 @@ -/* - ============================================================================== - - This file is part of the JUCE library - "Jules' Utility Class Extensions" - Copyright 2004-10 by Raw Material Software Ltd. - - ------------------------------------------------------------------------------ - - JUCE can be redistributed and/or modified under the terms of the GNU General - Public License (Version 2), as published by the Free Software Foundation. - A copy of the license is included in the JUCE distribution, or can be found - online at www.gnu.org/licenses. - - JUCE is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - ------------------------------------------------------------------------------ - - To release a closed-source product which uses JUCE, commercial licenses are - available: visit www.rawmaterialsoftware.com/juce for more information. - - ============================================================================== -*/ - -#ifdef ADD_TO_LIST - ADD_TO_LIST (ComboBoxHandler); -#else - -#include "../jucer_ComponentDocument.h" - - -//============================================================================== -class ComboBoxHandler : public ComponentTypeHelper -{ -public: - ComboBoxHandler() : ComponentTypeHelper ("ComboBox", "ComboBox", "COMBOBOX", "comboBox") - { - addEditableColour (ComboBox::backgroundColourId, "Background", "backgroundColour"); - addEditableColour (ComboBox::textColourId, "Text", "textColour"); - addEditableColour (ComboBox::outlineColourId, "Outline", "outlineColour"); - addEditableColour (ComboBox::buttonColourId, "Button", "buttonColour"); - addEditableColour (ComboBox::arrowColourId, "Arrow", "arrowColour"); - } - - ~ComboBoxHandler() {} - - Component* createComponent() { return new ComboBox(); } - const Rectangle getDefaultSize() { return Rectangle (0, 0, 180, 24); } - - void initialiseNew (ComponentTypeInstance& item) - { - item.set (Ids::items, "Item 1\nItem 2"); - item.set (Ids::editable, false); - item.set (Ids::textJustification, (int) Justification::centredLeft); - item.set (Ids::unselectedText, ""); - item.set (Ids::noItemsText, "(No Choices)"); - } - - void updateItems (ComboBox* comp, const String& itemString) - { - StringArray items; - items.addLines (itemString); - items.removeEmptyStrings (true); - - StringArray existingItems; - - for (int i = 0; i < comp->getNumItems(); ++i) - existingItems.add (comp->getItemText (i)); - - if (existingItems != items) - { - comp->clear(); - - for (int i = 0; i < items.size(); ++i) - comp->addItem (items[i], i + 1); - } - } - - void update (ComponentTypeInstance& item, ComboBox* comp) - { - updateItems (comp, item [Ids::items]); - comp->setEditableText (item [Ids::editable]); - comp->setJustificationType ((int) item [Ids::textJustification]); - comp->setTextWhenNothingSelected (item [Ids::unselectedText].toString()); - comp->setTextWhenNoChoicesAvailable (item [Ids::noItemsText].toString()); - } - - void createProperties (ComponentTypeInstance& item, Array & props) - { - item.addTooltipProperty (props); - item.addFocusOrderProperty (props); - - props.add (new TextPropertyComponent (item.getValue (Ids::items), "Items", 16384, true)); - props.getLast()->setTooltip ("A list of items to use to initialise the ComboBox"); - - props.add (new BooleanPropertyComponent (item.getValue (Ids::editable), "Editable", "Text is editable")); - item.addJustificationProperty (props, "Text Position", item.getValue (Ids::textJustification), false); - props.add (new TextPropertyComponent (item.getValue (Ids::unselectedText), "Text when none selected", 512, false)); - props.add (new TextPropertyComponent (item.getValue (Ids::noItemsText), "Text when no items", 512, false)); - - addEditableColourProperties (item, props); - } - - void createCode (ComponentTypeInstance& item, CodeGenerator& code) - { - ComboBox defaultBox; - - code.constructorCode - << item.createConstructorStatement (String::empty) - << item.getMemberName() << "->setEditableText (" << CodeHelpers::boolLiteral (item [Ids::editable]) << ");" << newLine; - - Justification justification ((int) item [Ids::textJustification]); - if (justification.getFlags() != 0 && justification != defaultBox.getJustificationType()) - code.constructorCode << item.getMemberName() << "->setJustificationType (" << CodeHelpers::justificationToCode (justification) << ");" << newLine; - - if (item [Ids::unselectedText].toString() != defaultBox.getTextWhenNothingSelected()) - code.constructorCode << item.getMemberName() << "->setTextWhenNothingSelected (" - << CodeHelpers::stringLiteral (item [Ids::unselectedText]) << ");" << newLine; - - if (item [Ids::noItemsText].toString() != defaultBox.getTextWhenNoChoicesAvailable()) - code.constructorCode << item.getMemberName() << "->setTextWhenNoChoicesAvailable (" - << CodeHelpers::stringLiteral (item [Ids::noItemsText]) << ");" << newLine; - - StringArray items; - items.addLines (item [Ids::items]); - items.removeEmptyStrings (true); - - for (int i = 0; i < items.size(); ++i) - code.constructorCode << item.getMemberName() << "->addItem (" << CodeHelpers::stringLiteral (items[i]) << ");" << newLine; - } -}; - -#endif diff --git a/extras/Jucer (experimental)/Source/model/Component/Types/jucer_ComponentTypeManager.cpp b/extras/Jucer (experimental)/Source/model/Component/Types/jucer_ComponentTypeManager.cpp deleted file mode 100644 index 196fdb3487..0000000000 --- a/extras/Jucer (experimental)/Source/model/Component/Types/jucer_ComponentTypeManager.cpp +++ /dev/null @@ -1,414 +0,0 @@ -/* - ============================================================================== - - This file is part of the JUCE library - "Jules' Utility Class Extensions" - Copyright 2004-10 by Raw Material Software Ltd. - - ------------------------------------------------------------------------------ - - JUCE can be redistributed and/or modified under the terms of the GNU General - Public License (Version 2), as published by the Free Software Foundation. - A copy of the license is included in the JUCE distribution, or can be found - online at www.gnu.org/licenses. - - JUCE is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - ------------------------------------------------------------------------------ - - To release a closed-source product which uses JUCE, commercial licenses are - available: visit www.rawmaterialsoftware.com/juce for more information. - - ============================================================================== -*/ - -#include "jucer_ComponentTypeManager.h" -#include "jucer_ComponentTypes.h" -#include "../../../utility/jucer_CoordinatePropertyComponent.h" -#include "../../../utility/jucer_FontPropertyComponent.h" - - -//============================================================================== -class ComponentBoundsEditor : public CoordinatePropertyComponent -{ -public: - enum Type - { - left, top, right, bottom - }; - - //============================================================================== - ComponentBoundsEditor (ComponentDocument& document_, const String& name, Type type_, - const ValueTree& compState_, const Value& coordValue_) - : CoordinatePropertyComponent (&document_, name, - Value (new CoordExtractor (coordValue_, type_)), - type_ == left || type_ == right), - document (document_), - type (type_), - compState (compState_) - { - } - - ~ComponentBoundsEditor() - { - } - - //============================================================================== - class CoordExtractor : public Value::ValueSource, - public Value::Listener - { - public: - CoordExtractor (const Value& sourceValue_, Type type_) - : sourceValue (sourceValue_), type (type_) - { - sourceValue.addListener (this); - } - - ~CoordExtractor() {} - - const var getValue() const - { - RelativeRectangle r (sourceValue.toString()); - return getCoord (r).toString(); - } - - void setValue (const var& newValue) - { - RelativeRectangle r (sourceValue.toString()); - RelativeCoordinate& coord = getCoord (r); - coord = RelativeCoordinate (newValue.toString(), type == left || type == right); - - const String newVal (r.toString()); - if (sourceValue != newVal) - sourceValue = newVal; - } - - void valueChanged (Value&) - { - sendChangeMessage (true); - } - - //============================================================================== - juce_UseDebuggingNewOperator - - protected: - Value sourceValue; - Type type; - - static RelativeCoordinate& getCoordForType (const Type type, RelativeRectangle& r) - { - switch (type) - { - case left: return r.left; - case right: return r.right; - case top: return r.top; - case bottom: return r.bottom; - default: jassertfalse; break; - } - - return r.left; - } - - RelativeCoordinate& getCoord (RelativeRectangle& r) const - { - return getCoordForType (type, r); - } - - CoordExtractor (const CoordExtractor&); - const CoordExtractor& operator= (const CoordExtractor&); - }; - - const String pickMarker (TextButton* button, const String& currentMarker, bool isAnchor1) - { - RelativeCoordinate coord (getCoordinate()); - - PopupMenu m; - document.addComponentMarkerMenuItems (compState, getTypeName(), coord, m, isAnchor1, type == left || type == right); - - const int r = m.showAt (button); - - if (r > 0) - return document.getChosenMarkerMenuItem (compState, coord, r, type == left || type == right); - - return String::empty; - } - -private: - ComponentDocument& document; - Type type; - ValueTree compState; - - const String getTypeName() const - { - switch (type) - { - case left: return RelativeCoordinate::Strings::left; - case right: return RelativeCoordinate::Strings::right; - case top: return RelativeCoordinate::Strings::top; - case bottom: return RelativeCoordinate::Strings::bottom; - default: jassertfalse; break; - } - - return String::empty; - } -}; - -//============================================================================== -ComponentTypeManager::ComponentTypeManager() -{ - #define ADD_TO_LIST(HandlerType) handlers.add (new HandlerType()); - #include "jucer_ComponentTypes.h" - #undef ADD_TO_LIST -} - -ComponentTypeManager::~ComponentTypeManager() -{ -} - -Component* ComponentTypeManager::createFromStoredType (ComponentDocument& document, const ValueTree& value) -{ - ComponentTypeHandler* handler = getHandlerFor (value.getType()); - if (handler == 0) - return 0; - - Component* c = handler->createComponent(); - if (c != 0) - { - ComponentTypeInstance item (document, value); - handler->updateComponent (item, c); - } - - return c; -} - -ComponentTypeHandler* ComponentTypeManager::getHandlerFor (const Identifier& type) -{ - for (int i = handlers.size(); --i >= 0;) - if (handlers.getUnchecked(i)->getValueTreeType() == type) - return handlers.getUnchecked(i); - - return 0; -} - -const StringArray ComponentTypeManager::getDisplayNames() const -{ - StringArray s; - for (int i = 0; i < handlers.size(); ++i) - s.add (handlers.getUnchecked(i)->getDisplayName()); - - return s; -} - -juce_ImplementSingleton_SingleThreaded (ComponentTypeManager); - - - -//============================================================================== -ComponentTypeHandler::ComponentTypeHandler (const String& displayName_, const String& className_, - const Identifier& valueTreeType_, const String& memberNameRoot_) - : displayName (displayName_), className (className_), valueTreeType (valueTreeType_), - memberNameRoot (memberNameRoot_) -{ -} - -ComponentTypeHandler::~ComponentTypeHandler() -{ -} - -//============================================================================== -class CompMemberNameValueSource : public Value::ValueSource, - public Value::Listener -{ -public: - CompMemberNameValueSource (ComponentTypeInstance& item_) - : sourceValue (item_.getValue (ComponentDocument::memberNameProperty)), - item (item_) - { - sourceValue.addListener (this); - } - - ~CompMemberNameValueSource() {} - - void valueChanged (Value&) { sendChangeMessage (true); } - const var getValue() const { return sourceValue.toString(); } - - void setValue (const var& newValue) - { - if (newValue == sourceValue) - return; - - const String name (item.getDocument().getNonexistentMemberName (newValue)); - - if (sourceValue != name) - { - item.getDocument().renameAnchor (sourceValue.toString(), name); - sourceValue = name; - } - } - -private: - Value sourceValue; - ComponentTypeInstance item; - - CompMemberNameValueSource (const CompMemberNameValueSource&); - const CompMemberNameValueSource& operator= (const CompMemberNameValueSource&); -}; - - -//============================================================================== -ComponentTypeInstance::ComponentTypeInstance (ComponentDocument& document_, const ValueTree& state_) - : document (document_), state (state_) -{ -} - -Value ComponentTypeInstance::getValue (const Identifier& name) const -{ - return state.getPropertyAsValue (name, document.getUndoManager()); -} - -void ComponentTypeInstance::set (const Identifier& name, const var& value) -{ - state.setProperty (name, value, 0); -} - -ComponentTypeHandler* ComponentTypeInstance::getHandler() const -{ - ComponentTypeHandler* const handler = ComponentTypeManager::getInstance()->getHandlerFor (state.getType()); - jassert (handler != 0); - return handler; -} - -void ComponentTypeInstance::updateComponent (Component* comp) -{ - getHandler()->updateComponent (*this, comp); -} - -void ComponentTypeInstance::createProperties (Array & props) -{ - getHandler()->createPropertyEditors (*this, props); -} - -void ComponentTypeInstance::createCode (CodeGenerator& code) -{ - code.addPrivateMember (getHandler()->getClassName (*this) + "*", getMemberName()); - code.memberInitialisers.add (getMemberName() + " (0)"); - getHandler()->createCode (*this, code); -} - -//============================================================================== -void ComponentTypeInstance::initialiseNewItemBasics() -{ - ComponentTypeHandler* handler = getHandler(); - - set (ComponentDocument::compNameProperty, String::empty); - set (ComponentDocument::memberNameProperty, document.getNonexistentMemberName (handler->getMemberNameRoot())); - - Rectangle bounds (handler->getDefaultSize()); - int cw = document.getCanvasWidth().getValue(); - int ch = document.getCanvasHeight().getValue(); - bounds.setPosition (Random::getSystemRandom().nextInt (cw / 3) + cw / 4, - Random::getSystemRandom().nextInt (ch / 3) + ch / 4); - - set (ComponentDocument::compBoundsProperty, RelativeRectangle (bounds.toFloat(), getMemberName()).toString()); -} - -void ComponentTypeInstance::updateComponentBasics (Component* comp) -{ - RelativeRectangle pos (state [ComponentDocument::compBoundsProperty].toString()); - comp->setBounds (pos.resolve (&document).getSmallestIntegerContainer()); - - //comp->setName (state [ComponentDocument::compNameProperty]); - - comp->setExplicitFocusOrder (state [ComponentDocument::compFocusOrderProperty]); - - SettableTooltipClient* tooltipClient = dynamic_cast (comp); - if (tooltipClient != 0) - tooltipClient->setTooltip (state [ComponentDocument::compTooltipProperty]); -} - -void ComponentTypeInstance::addMemberNameProperty (Array & props) -{ - props.add (new TextPropertyComponent (Value (new CompMemberNameValueSource (*this)), - "Member Name", 256, false)); -} - -void ComponentTypeInstance::addBoundsProperties (Array & props) -{ - const Value bounds (getValue (ComponentDocument::compBoundsProperty)); - props.add (new ComponentBoundsEditor (document, "Left", ComponentBoundsEditor::left, state, bounds)); - props.add (new ComponentBoundsEditor (document, "Right", ComponentBoundsEditor::right, state, bounds)); - props.add (new ComponentBoundsEditor (document, "Top", ComponentBoundsEditor::top, state, bounds)); - props.add (new ComponentBoundsEditor (document, "Bottom", ComponentBoundsEditor::bottom, state, bounds)); -} - -void ComponentTypeInstance::addTooltipProperty (Array & props) -{ - props.add (new TextPropertyComponent (getValue (ComponentDocument::compTooltipProperty), - "Tooltip", 4096, false)); -} - -void ComponentTypeInstance::addFocusOrderProperty (Array & props) -{ - props.add (new TextPropertyComponent (Value (new NumericValueSource (getValue (ComponentDocument::compFocusOrderProperty))), - "Focus Order", 10, false)); -} - -void ComponentTypeInstance::addColourProperty (Array & props, int colourId, const String& name, const Identifier& propertyName) -{ - props.add (new ColourPropertyComponent (document.getUndoManager(), name, getValue (propertyName), - LookAndFeel::getDefaultLookAndFeel().findColour (colourId), true)); -} - -void ComponentTypeInstance::addFontProperties (Array & props, const Identifier& name) -{ - Value v (getValue (name)); - props.add (FontNameValueSource::createProperty ("Font", v)); - props.add (FontSizeValueSource::createProperty ("Font Size", v)); - props.add (FontStyleValueSource::createProperty ("Font Style", v)); -} - -//============================================================================== -void ComponentTypeInstance::addJustificationProperty (Array & props, const String& name, const Value& value, bool onlyHorizontal) -{ - StringArray strings; - - if (onlyHorizontal) - { - const char* const layouts[] = { "Left", "Centred", "Right", 0 }; - const var justifications[] = { (int) Justification::left, (int) Justification::centred, (int) Justification::right, 0 }; - - props.add (new ChoicePropertyComponent (value, name, StringArray (layouts), Array (justifications))); - } - else - { - const char* const layouts[] = { "Centred", "Centred-left", "Centred-right", "Centred-top", "Centred-bottom", "Top-left", - "Top-right", "Bottom-left", "Bottom-right", 0 }; - const var justifications[] = { (int) Justification::centred, (int) Justification::centredLeft, (int) Justification::centredRight, - (int) Justification::centredTop, (int) Justification::centredBottom, (int) Justification::topLeft, - (int) Justification::topRight, (int) Justification::bottomLeft, (int) Justification::bottomRight, var() }; - - props.add (new ChoicePropertyComponent (value, name, StringArray (layouts), Array (justifications))); - } -} - -//============================================================================== -const String ComponentTypeInstance::createConstructorStatement (const String& params) -{ - String s; - s << "addAndMakeVisible (" << getMemberName() - << " = new " << getHandler()->getClassName (*this); - - if (params.isEmpty()) - s << "());" << newLine; - else - { - s << " ("; - s << CodeHelpers::indent (params.trim(), s.length(), false) << "));" << newLine; - } - -// s << getMemberName() << "->updateStateFrom (componentStateList.getChild (" - // << document.getComponentGroup().indexOf (state) << ");" << newLine; - - return s; -} diff --git a/extras/Jucer (experimental)/Source/model/Component/Types/jucer_ComponentTypeManager.h b/extras/Jucer (experimental)/Source/model/Component/Types/jucer_ComponentTypeManager.h deleted file mode 100644 index 5a9cefd8fc..0000000000 --- a/extras/Jucer (experimental)/Source/model/Component/Types/jucer_ComponentTypeManager.h +++ /dev/null @@ -1,235 +0,0 @@ -/* - ============================================================================== - - This file is part of the JUCE library - "Jules' Utility Class Extensions" - Copyright 2004-10 by Raw Material Software Ltd. - - ------------------------------------------------------------------------------ - - JUCE can be redistributed and/or modified under the terms of the GNU General - Public License (Version 2), as published by the Free Software Foundation. - A copy of the license is included in the JUCE distribution, or can be found - online at www.gnu.org/licenses. - - JUCE is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - ------------------------------------------------------------------------------ - - To release a closed-source product which uses JUCE, commercial licenses are - available: visit www.rawmaterialsoftware.com/juce for more information. - - ============================================================================== -*/ - -#ifndef __JUCER_COMPONENTTYPEMANAGER_H_734EBF1__ -#define __JUCER_COMPONENTTYPEMANAGER_H_734EBF1__ - -#include "../../../jucer_Headers.h" -#include "../jucer_ComponentDocument.h" -#include "../../../utility/jucer_ColourPropertyComponent.h" - -class ComponentTypeHandler; - - -//============================================================================== -/** Temporary wrapper around a document and a component's ValueTree, providing lots of useful - functions that can be performed on the component. -*/ -class ComponentTypeInstance -{ -public: - ComponentTypeInstance (ComponentDocument& document_, const ValueTree& state_); - - //============================================================================== - ComponentDocument& getDocument() throw() { return document; } - ValueTree& getState() throw() { return state; } - - Value getValue (const Identifier& name) const; - void set (const Identifier& name, const var& value); - const var operator[] (const Identifier& name) const { return state [name] ;} - - const String getMemberName() const { return state [ComponentDocument::memberNameProperty]; } - const String getComponentName() const { return state [ComponentDocument::compNameProperty]; } - - //============================================================================== - void initialiseNewItemBasics(); - void updateComponentBasics (Component* comp); - - void addMemberNameProperty (Array & props); - void addBoundsProperties (Array & props); - void addTooltipProperty (Array & props); - void addFocusOrderProperty (Array & props); - void addColourProperty (Array & props, int colourId, const String& name, const Identifier& propertyName); - void addFontProperties (Array & props, const Identifier& name); - void addJustificationProperty (Array & props, const String& name, const Value& value, bool onlyHorizontal); - - //============================================================================== - const String createConstructorStatement (const String& params); - - //============================================================================== - ComponentTypeHandler* getHandler() const; - void updateComponent (Component* comp); - void createProperties (Array & props); - void createCode (CodeGenerator& code); - -private: - //============================================================================== - ComponentDocument& document; - ValueTree state; - - ComponentTypeInstance& operator= (const ComponentTypeInstance&); -}; - - -//============================================================================== -class ComponentTypeHandler -{ -public: - //============================================================================== - ComponentTypeHandler (const String& displayName_, const String& className_, - const Identifier& valueTreeType_, const String& memberNameRoot_); - virtual ~ComponentTypeHandler(); - - const String& getDisplayName() const { return displayName; } - const Identifier& getValueTreeType() const { return valueTreeType; } - const String& getMemberNameRoot() const { return memberNameRoot; } - - virtual Component* createComponent() = 0; - virtual const Rectangle getDefaultSize() = 0; - - virtual void initialiseNewItem (ComponentTypeInstance& item) = 0; - virtual void updateComponent (ComponentTypeInstance& item, Component* comp) = 0; - virtual void createPropertyEditors (ComponentTypeInstance& item, Array & props) = 0; - virtual void itemDoubleClicked (const MouseEvent& e, ComponentTypeInstance& item) = 0; - virtual void createCode (ComponentTypeInstance& item, CodeGenerator& code) = 0; - virtual const String getClassName (ComponentTypeInstance& item) const { return className; } - -protected: - //============================================================================== - const String displayName, className, memberNameRoot; - const Identifier valueTreeType; - -private: - ComponentTypeHandler (const ComponentTypeHandler&); - ComponentTypeHandler& operator= (const ComponentTypeHandler&); -}; - - -//============================================================================== -class ComponentTypeManager : public DeletedAtShutdown -{ -public: - //============================================================================== - ComponentTypeManager(); - ~ComponentTypeManager(); - - juce_DeclareSingleton_SingleThreaded_Minimal (ComponentTypeManager); - - //============================================================================== - Component* createFromStoredType (ComponentDocument& document, const ValueTree& value); - - int getNumHandlers() const { return handlers.size(); } - ComponentTypeHandler* getHandler (const int index) const { return handlers[index]; } - - ComponentTypeHandler* getHandlerFor (const Identifier& type); - const StringArray getDisplayNames() const; - -private: - //============================================================================== - OwnedArray handlers; -}; - - -//============================================================================== -template -class ComponentTypeHelper : public ComponentTypeHandler -{ -public: - //============================================================================== - ComponentTypeHelper (const String& displayName_, const String& className_, const String& xmlTag_, const String& memberNameRoot_) - : ComponentTypeHandler (displayName_, className_, xmlTag_, memberNameRoot_) - { - } - - virtual void initialiseNew (ComponentTypeInstance& item) = 0; - virtual void update (ComponentTypeInstance& item, ComponentClass* comp) = 0; - virtual void createProperties (ComponentTypeInstance& item, Array & props) = 0; - - void initialiseNewItem (ComponentTypeInstance& item) - { - item.initialiseNewItemBasics(); - initialiseNew (item); - } - - void updateComponent (ComponentTypeInstance& item, Component* comp) - { - item.updateComponentBasics (comp); - - ComponentClass* const c = dynamic_cast (comp); - jassert (c != 0); - updateComponentColours (item, c); - - update (item, c); - } - - void createPropertyEditors (ComponentTypeInstance& item, Array & props) - { - item.addMemberNameProperty (props); - item.addBoundsProperties (props); - - createProperties (item, props); - } - - void itemDoubleClicked (const MouseEvent&, ComponentTypeInstance&) - { - } - -protected: - //============================================================================== - struct EditableColour - { - int colourId; - String name; - Identifier propertyName; - }; - - Array editableColours; - - void addEditableColour (int colourId, const String& displayName, const Identifier& propertyName) - { - EditableColour ec; - ec.colourId = colourId; - ec.name = displayName; - ec.propertyName = propertyName; - editableColours.add (ec); - } - - void addEditableColourProperties (ComponentTypeInstance& item, Array & props) - { - for (int i = 0; i < editableColours.size(); ++i) - { - const EditableColour& ec = editableColours.getReference(i); - item.addColourProperty (props, ec.colourId, ec.name, ec.propertyName); - } - } - - void updateComponentColours (ComponentTypeInstance& item, Component* component) - { - for (int i = 0; i < editableColours.size(); ++i) - { - const EditableColour& ec = editableColours.getReference(i); - - const String colour (item.getState() [ec.propertyName].toString()); - - if (colour.isNotEmpty()) - component->setColour (ec.colourId, Colour::fromString (colour)); - else - component->removeColour (ec.colourId); - } - } -}; - - -#endif // __JUCER_COMPONENTTYPEMANAGER_H_734EBF1__ diff --git a/extras/Jucer (experimental)/Source/model/Component/Types/jucer_GenericComponent.h b/extras/Jucer (experimental)/Source/model/Component/Types/jucer_GenericComponent.h deleted file mode 100644 index 4a1db5efd9..0000000000 --- a/extras/Jucer (experimental)/Source/model/Component/Types/jucer_GenericComponent.h +++ /dev/null @@ -1,99 +0,0 @@ -/* - ============================================================================== - - This file is part of the JUCE library - "Jules' Utility Class Extensions" - Copyright 2004-10 by Raw Material Software Ltd. - - ------------------------------------------------------------------------------ - - JUCE can be redistributed and/or modified under the terms of the GNU General - Public License (Version 2), as published by the Free Software Foundation. - A copy of the license is included in the JUCE distribution, or can be found - online at www.gnu.org/licenses. - - JUCE is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - ------------------------------------------------------------------------------ - - To release a closed-source product which uses JUCE, commercial licenses are - available: visit www.rawmaterialsoftware.com/juce for more information. - - ============================================================================== -*/ - -#ifdef ADD_TO_LIST - ADD_TO_LIST (GenericComponentHandler); -#else - -#include "../jucer_ComponentDocument.h" - - -//============================================================================== -class GenericComponentHandler : public ComponentTypeHelper -{ -public: - GenericComponentHandler() : ComponentTypeHelper ("Generic Component", "Component", "COMPONENT", "component") {} - ~GenericComponentHandler() {} - - //============================================================================== - class PlaceholderComp : public Component - { - public: - PlaceholderComp() - { - } - - void setDetails (const String& memberName, const String& className) - { - const String name (memberName + " (" + className + ")"); - - if (name != getName()) - { - setName (name); - repaint(); - } - } - - void paint (Graphics& g) - { - drawComponentPlaceholder (g, getWidth(), getHeight(), getName()); - } - }; - - //============================================================================== - Component* createComponent() { return new PlaceholderComp(); } - const Rectangle getDefaultSize() { return Rectangle (0, 0, 180, 24); } - - void initialiseNew (ComponentTypeInstance& item) - { - item.set (Ids::class_, "Component"); - } - - void update (ComponentTypeInstance& item, Component* comp) - { - static_cast (comp)->setDetails (item [ComponentDocument::memberNameProperty], - item [Ids::class_]); - } - - void createProperties (ComponentTypeInstance& item, Array & props) - { - item.addFocusOrderProperty (props); - - props.add (new TextPropertyComponent (item.getValue (Ids::class_), "Class", 256, false)); - props.getLast()->setTooltip ("The class that this component is an instance of."); - } - - const String getClassName (ComponentTypeInstance& item) const - { - return item [Ids::class_]; - } - - void createCode (ComponentTypeInstance& item, CodeGenerator& code) - { - code.constructorCode << item.createConstructorStatement (String::empty); - } -}; - -#endif diff --git a/extras/Jucer (experimental)/Source/model/Component/Types/jucer_GroupComponent.h b/extras/Jucer (experimental)/Source/model/Component/Types/jucer_GroupComponent.h deleted file mode 100644 index 277555514a..0000000000 --- a/extras/Jucer (experimental)/Source/model/Component/Types/jucer_GroupComponent.h +++ /dev/null @@ -1,78 +0,0 @@ -/* - ============================================================================== - - This file is part of the JUCE library - "Jules' Utility Class Extensions" - Copyright 2004-10 by Raw Material Software Ltd. - - ------------------------------------------------------------------------------ - - JUCE can be redistributed and/or modified under the terms of the GNU General - Public License (Version 2), as published by the Free Software Foundation. - A copy of the license is included in the JUCE distribution, or can be found - online at www.gnu.org/licenses. - - JUCE is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - ------------------------------------------------------------------------------ - - To release a closed-source product which uses JUCE, commercial licenses are - available: visit www.rawmaterialsoftware.com/juce for more information. - - ============================================================================== -*/ - -#ifdef ADD_TO_LIST - ADD_TO_LIST (GroupComponentHandler); -#else - -#include "../jucer_ComponentDocument.h" - - -//============================================================================== -class GroupComponentHandler : public ComponentTypeHelper -{ -public: - GroupComponentHandler() : ComponentTypeHelper ("GroupComponent", "GroupComponent", "GROUPCOMPONENT", "group") - { - addEditableColour (GroupComponent::outlineColourId, "Outline", "outlineColour"); - addEditableColour (GroupComponent::textColourId, "Text Colour", "textColour"); - } - - ~GroupComponentHandler() {} - - Component* createComponent() { return new GroupComponent(); } - const Rectangle getDefaultSize() { return Rectangle (0, 0, 200, 200); } - - void initialiseNew (ComponentTypeInstance& item) - { - item.set (Ids::text, "Group"); - item.set (Ids::justification, (int) Justification::left); - } - - void update (ComponentTypeInstance& item, GroupComponent* comp) - { - comp->setText (item [Ids::text].toString()); - comp->setTextLabelPosition ((int) item [Ids::justification]); - } - - void createProperties (ComponentTypeInstance& item, Array & props) - { - item.addTooltipProperty (props); - item.addFocusOrderProperty (props); - - props.add (new TextPropertyComponent (item.getValue (Ids::text), "Label", 512, false)); - props.getLast()->setTooltip ("The group's display name."); - - item.addJustificationProperty (props, "Text Position", item.getValue (Ids::justification), true); - addEditableColourProperties (item, props); - } - - void createCode (ComponentTypeInstance& item, CodeGenerator& code) - { - code.constructorCode << item.createConstructorStatement (String::empty); - } -}; - -#endif diff --git a/extras/Jucer (experimental)/Source/model/Component/Types/jucer_JucerComponent.h b/extras/Jucer (experimental)/Source/model/Component/Types/jucer_JucerComponent.h deleted file mode 100644 index 633c70a986..0000000000 --- a/extras/Jucer (experimental)/Source/model/Component/Types/jucer_JucerComponent.h +++ /dev/null @@ -1,194 +0,0 @@ -/* - ============================================================================== - - This file is part of the JUCE library - "Jules' Utility Class Extensions" - Copyright 2004-10 by Raw Material Software Ltd. - - ------------------------------------------------------------------------------ - - JUCE can be redistributed and/or modified under the terms of the GNU General - Public License (Version 2), as published by the Free Software Foundation. - A copy of the license is included in the JUCE distribution, or can be found - online at www.gnu.org/licenses. - - JUCE is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - ------------------------------------------------------------------------------ - - To release a closed-source product which uses JUCE, commercial licenses are - available: visit www.rawmaterialsoftware.com/juce for more information. - - ============================================================================== -*/ - -#ifdef ADD_TO_LIST - ADD_TO_LIST (JucerComponentHandler); -#else - -#include "../jucer_ComponentDocument.h" -#include "../../../ui/jucer_OpenDocumentManager.h" -#include "../../../ui/Project Editor/jucer_ProjectContentComponent.h" - - -//============================================================================== -class JucerComponent : public Component -{ -public: - JucerComponent() - { - } - - void paint (Graphics& g) - { - if (comp == 0) - drawComponentPlaceholder (g, getWidth(), getHeight(), "(Not a valid Jucer component)"); - } - - void resized() - { - if (comp != 0) - comp->setBounds (getLocalBounds()); - } - - void setJucerComp (ComponentTypeInstance& item, const String& newProjectId) - { - if (projectId != newProjectId) - { - projectId = newProjectId; - comp = 0; - - if (newProjectId.isNotEmpty()) - { - const File file (getDocumentFile (item, projectId)); - - if (file.exists()) - { - OpenDocumentManager::Document* doc = OpenDocumentManager::getInstance()->getDocumentForFile (item.getDocument().getProject(), file); - - if (doc != 0) - { - addAndMakeVisible (comp = doc->createViewer()); - resized(); - } - } - } - } - } - - static const File getDocumentFile (ComponentTypeInstance& item, const String projectItemId) - { - if (projectItemId.isNotEmpty()) - { - Project* project = item.getDocument().getProject(); - - if (project != 0) - { - Project::Item item (project->getMainGroup().findItemWithID (projectItemId)); - - if (item.isValid()) - return item.getFile(); - } - } - - return File::nonexistent; - } - -private: - String projectId; - ScopedPointer comp; -}; - -//============================================================================== -class JucerComponentHandler : public ComponentTypeHelper -{ -public: - JucerComponentHandler() : ComponentTypeHelper ("Jucer Component", "Component", "JUCERCOMPONENT", "jucerComp") {} - ~JucerComponentHandler() {} - - //============================================================================== - Component* createComponent() { return new JucerComponent(); } - const Rectangle getDefaultSize() { return Rectangle (0, 0, 150, 150); } - - void initialiseNew (ComponentTypeInstance& item) - { - } - - void update (ComponentTypeInstance& item, JucerComponent* comp) - { - comp->setJucerComp (item, item [Ids::source].toString()); - } - - void createProperties (ComponentTypeInstance& item, Array & props) - { - StringArray names; - Array ids; - - names.add (""); - ids.add (var::null); - names.add (String::empty); - ids.add (var::null); - - { - Array comps; - findAllComponentDocumentsInProject (item, comps); - - for (int i = 0; i < comps.size(); ++i) - { - if (comps.getReference(i).getFile() != item.getDocument().getCppFile()) - { - names.add (comps.getReference(i).getName().toString()); - ids.add (comps.getReference(i).getID()); - } - } - } - - props.add (new ChoicePropertyComponent (item.getValue (Ids::source), "Source", names, ids)); - item.addFocusOrderProperty (props); - } - - void itemDoubleClicked (const MouseEvent& e, ComponentTypeInstance& item) - { - ProjectContentComponent* pcc = e.originalComponent->findParentComponentOfClass ((ProjectContentComponent*) 0); - - if (pcc != 0) - pcc->showEditorForFile (JucerComponent::getDocumentFile (item, item [Ids::source].toString())); - } - - const String getClassName (ComponentTypeInstance& item) const - { - return "xxx"; - } - - void createCode (ComponentTypeInstance& item, CodeGenerator& code) - { - code.constructorCode << item.createConstructorStatement (String::empty); - } - - //============================================================================== - static void findAllComponentDocumentsInProject (ComponentTypeInstance& item, Array & comps) - { - Project* project = item.getDocument().getProject(); - - if (project != 0) - findAllComponentDocumentsInProjectItem (project->getMainGroup(), comps); - } - - static void findAllComponentDocumentsInProjectItem (const Project::Item& item, Array & comps) - { - if (item.isGroup()) - { - const int num = item.getNumChildren(); - for (int i = 0; i < num; ++i) - findAllComponentDocumentsInProjectItem (item.getChild (i), comps); - } - else if (item.isFile()) - { - if (ComponentDocument::isComponentFile (item.getFile())) - comps.add (item); - } - } -}; - -#endif diff --git a/extras/Jucer (experimental)/Source/model/Component/Types/jucer_Label.h b/extras/Jucer (experimental)/Source/model/Component/Types/jucer_Label.h deleted file mode 100644 index 7d44ddf00e..0000000000 --- a/extras/Jucer (experimental)/Source/model/Component/Types/jucer_Label.h +++ /dev/null @@ -1,103 +0,0 @@ -/* - ============================================================================== - - This file is part of the JUCE library - "Jules' Utility Class Extensions" - Copyright 2004-10 by Raw Material Software Ltd. - - ------------------------------------------------------------------------------ - - JUCE can be redistributed and/or modified under the terms of the GNU General - Public License (Version 2), as published by the Free Software Foundation. - A copy of the license is included in the JUCE distribution, or can be found - online at www.gnu.org/licenses. - - JUCE is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - ------------------------------------------------------------------------------ - - To release a closed-source product which uses JUCE, commercial licenses are - available: visit www.rawmaterialsoftware.com/juce for more information. - - ============================================================================== -*/ - -#ifdef ADD_TO_LIST - ADD_TO_LIST (LabelHandler); -#else - -#include "../jucer_ComponentDocument.h" - - -//============================================================================== -class LabelHandler : public ComponentTypeHelper