Changed LookAndFeel::getDefaultFolderImage and getDefaultDocumentFileImage to return drawables instead of images.

extras/Jucer (experimental)/Source/Project/jucer_GroupInformationComponent.cpp

@@ -94,9 +94,9 @@ public:
     void paint (Graphics& g)
     {
         int x = getHeight() + 6;
-        g.drawImageWithin (item.getIcon(), 2, 2, x - 4, getHeight() - 4,
-                           RectanglePlacement::centred | RectanglePlacement::onlyReduceInSize,
-                           false);
+
+        item.getIcon()->drawWithin (g, Rectangle<float> (2, 2, x - 4, getHeight() - 4),
+                                    RectanglePlacement::centred | RectanglePlacement::onlyReduceInSize, 1.0f);
 
         g.setColour (Colours::black);
         g.setFont (getHeight() * 0.6f);

extras/Jucer (experimental)/Source/Project/jucer_Project.cpp

@@ -745,12 +745,16 @@ bool Project::Item::addFile (const File& file, int insertIndex)
     return true;
 }
 
-const Image Project::Item::getIcon() const
+const Drawable* Project::Item::getIcon() const
 {
     if (isFile())
         return LookAndFeel::getDefaultLookAndFeel().getDefaultDocumentFileImage();
     else if (isMainGroup())
-        return ImageCache::getFromMemory (BinaryData::juce_icon_png, BinaryData::juce_icon_pngSize);
+    {
+        static DrawableImage im;
+        im.setImage (ImageCache::getFromMemory (BinaryData::juce_icon_png, BinaryData::juce_icon_pngSize));
+        return &im;
+    }
     else
         return LookAndFeel::getDefaultLookAndFeel().getDefaultFolderImage();
 }

extras/Jucer (experimental)/Source/Project/jucer_Project.h

@@ -203,7 +203,7 @@ public:
 
         Item getParent() const;
 
-        const Image getIcon() const;
+        const Drawable* getIcon() const;
 
     private:
         //==============================================================================

extras/Jucer (experimental)/Source/Project/jucer_ProjectTreeViewBase.cpp

@@ -433,19 +433,8 @@ void ProjectTreeViewBase::showMultiSelectionPopupMenu()
 
     switch (m.show())
     {
-    case 6:     deleteAllSelectedItems(); break;
-    default:    break;
-    }
-}
-
-void ProjectTreeViewBase::itemClicked (const MouseEvent& e)
-{
-    if (e.mods.isPopupMenu())
-    {
-        if (getOwnerView()->getNumSelectedItems() > 1)
-            showMultiSelectionPopupMenu();
-        else
-            showPopupMenu();
+        case 6:     deleteAllSelectedItems(); break;
+        default:    break;
     }
 }
 

extras/Jucer (experimental)/Source/Project/jucer_ProjectTreeViewBase.h

@@ -64,8 +64,6 @@ public:
 
     virtual void addFiles (const StringArray& files, int insertIndex);
     virtual void moveSelectedItemsTo (OwnedArray <Project::Item>& selectedNodes, int insertIndex);
-
-    virtual void showPopupMenu() = 0;
     virtual void showMultiSelectionPopupMenu();
 
     virtual ProjectTreeViewBase* findTreeViewItem (const Project::Item& itemToFind);
@@ -82,7 +80,6 @@ public:
     void itemOpennessChanged (bool isNowOpen);
     void refreshSubItems();
     bool canBeSelected() const                  { return true; }
-    void itemClicked (const MouseEvent& e);
     void itemDoubleClicked (const MouseEvent& e);
     void itemSelectionChanged (bool isNowSelected);
     const String getTooltip();
@@ -104,7 +101,7 @@ protected:
     //==============================================================================
     virtual void addSubItems();
     virtual ProjectTreeViewBase* createSubItem (const Project::Item& node) = 0;
-    const Image getIcon() const         { return item.getIcon(); }
+    const Drawable* getIcon() const         { return item.getIcon(); }
 
     //==============================================================================
     void triggerAsyncRename (const Project::Item& itemToRename);

extras/Jucer (experimental)/Source/Utility/jucer_JucerTreeViewBase.cpp

@@ -54,13 +54,13 @@ void JucerTreeViewBase::paintItem (Graphics& g, int width, int height)
 
     const int x = getTextX();
 
-    g.setColour (isMissing() ? Colours::red : Colours::black);
+    g.setColour (Colours::black);
 
-    g.drawImageWithin (getIcon(), 0, 2, height + 6, height - 4,
-                       RectanglePlacement::centred | RectanglePlacement::onlyReduceInSize,
-                       false);
+    getIcon()->drawWithin (g, Rectangle<float> (0.0f, 2.0f, height + 6.0f, height - 4.0f),
+                           RectanglePlacement::centred | RectanglePlacement::onlyReduceInSize, 1.0f);
 
     g.setFont (getFont());
+    g.setColour (isMissing() ? Colours::red : Colours::black);
     g.drawFittedText (getDisplayName(), x, 0, width - x, height, Justification::centredLeft, 1, 0.8f);
 }
 
@@ -132,3 +132,22 @@ void JucerTreeViewBase::showRenameBox()
     if (ed.runModalLoop() != 0)
         setName (ed.getText());
 }
+
+void JucerTreeViewBase::itemClicked (const MouseEvent& e)
+{
+    if (e.mods.isPopupMenu())
+    {
+        if (getOwnerView()->getNumSelectedItems() > 1)
+            showMultiSelectionPopupMenu();
+        else
+            showPopupMenu();
+    }
+}
+
+void JucerTreeViewBase::showPopupMenu()
+{
+}
+
+void JucerTreeViewBase::showMultiSelectionPopupMenu()
+{
+}

extras/Jucer (experimental)/Source/Utility/jucer_JucerTreeViewBase.h

@@ -46,15 +46,19 @@ public:
     void paintItem (Graphics& g, int width, int height);
     void paintOpenCloseButton (Graphics& g, int width, int height, bool isMouseOver);
     Component* createItemComponent();
+    void itemClicked (const MouseEvent& e);
 
     //==============================================================================
     virtual const String getRenamingName() const = 0;
     virtual const String getDisplayName() const = 0;
     virtual void setName (const String& newName) = 0;
     virtual bool isMissing() = 0;
-    virtual const Image getIcon() const = 0;
+    virtual const Drawable* getIcon() const = 0;
     virtual void createLeftEdgeComponents (Array<Component*>& components) = 0;
 
+    virtual void showPopupMenu();
+    virtual void showMultiSelectionPopupMenu();
+
     virtual void showRenameBox();
 
     // Text editor listener for renaming..

juce_amalgamated.h

@@ -64,7 +64,7 @@
 */
 #define JUCE_MAJOR_VERSION	  1
 #define JUCE_MINOR_VERSION	  52
-#define JUCE_BUILDNUMBER	82
+#define JUCE_BUILDNUMBER	83
 
 /** Current Juce version number.
 
@@ -6220,13 +6220,9 @@ public:
 	*/
 	const var getWithDefault (const Identifier& name, const var& defaultReturnValue) const;
 
-	/** Returns a pointer to the object holding a named value, or
-		null if there is no value with this name. */
-	var* getItem (const Identifier& name) const;
-
 	/** Changes or adds a named value.
-		@returns true if a value was changed or added; false if the
-				 value was already set the the value passed-in.
+		@returns	true if a value was changed or added; false if the
+					value was already set the the value passed-in.
 	*/
 	bool set (const Identifier& name, const var& newValue);
 
@@ -6254,6 +6250,14 @@ public:
 	/** Removes all values. */
 	void clear();
 
+	/** Returns a pointer to the var that holds a named value, or null if there is
+		no value with this name.
+
+		Do not use this method unless you really need access to the internal var object
+		for some reason - for normal reading and writing always prefer operator[]() and set().
+	*/
+	var* getVarPointer (const Identifier& name) const;
+
 	juce_UseDebuggingNewOperator
 
 private:
@@ -16403,7 +16407,7 @@ private:
 #endif
 
 	void init();
-	int findEndOfZipEntryTable (InputStream* in, int& numEntries);
+	int findEndOfZipEntryTable (InputStream& input, int& numEntries);
 	static int compareElements (const ZipEntryInfo* first, const ZipEntryInfo* second);
 
 	ZipFile (const ZipFile&);
@@ -16976,6 +16980,14 @@ public:
 						 int bufferSize,
 						 bool deleteSourceWhenDestroyed);
 
+	/** Creates a BufferedInputStream from an input source.
+
+		@param sourceStream	 the source stream to read from - the source stream  must not
+								be deleted until this object has been destroyed.
+		@param bufferSize	   the size of reservoir to use to buffer the source
+	*/
+	BufferedInputStream (InputStream& sourceStream, int bufferSize);
+
 	/** Destructor.
 
 		This may also delete the source stream, if that option was chosen when the
@@ -17051,8 +17063,6 @@ private:
 #ifndef __JUCE_GZIPCOMPRESSOROUTPUTSTREAM_JUCEHEADER__
 #define __JUCE_GZIPCOMPRESSOROUTPUTSTREAM_JUCEHEADER__
 
-class GZIPCompressorHelper;
-
 /**
 	A stream which uses zlib to compress the data written into it.
 
@@ -17094,6 +17104,8 @@ private:
 	OutputStream* const destStream;
 	ScopedPointer <OutputStream> streamToDelete;
 	HeapBlock <uint8> buffer;
+	class GZIPCompressorHelper;
+	friend class ScopedPointer <GZIPCompressorHelper>;
 	ScopedPointer <GZIPCompressorHelper> helper;
 	bool doNextBlock();
 
@@ -17112,8 +17124,6 @@ private:
 #ifndef __JUCE_GZIPDECOMPRESSORINPUTSTREAM_JUCEHEADER__
 #define __JUCE_GZIPDECOMPRESSORINPUTSTREAM_JUCEHEADER__
 
-class GZIPDecompressHelper;
-
 /**
 	This stream will decompress a source-stream using zlib.
 
@@ -17143,6 +17153,13 @@ public:
 								 bool noWrap = false,
 								 int64 uncompressedStreamLength = -1);
 
+	/** Creates a decompressor stream.
+
+		@param sourceStream	 the stream to read from - the source stream must not be
+								deleted until this object has been destroyed
+	*/
+	GZIPDecompressorInputStream (InputStream& sourceStream);
+
 	/** Destructor. */
 	~GZIPDecompressorInputStream();
 
@@ -17163,6 +17180,9 @@ private:
 	int activeBufferSize;
 	int64 originalSourcePos, currentPos;
 	HeapBlock <uint8> buffer;
+
+	class GZIPDecompressHelper;
+	friend class ScopedPointer <GZIPDecompressHelper>;
 	ScopedPointer <GZIPDecompressHelper> helper;
 
 	GZIPDecompressorInputStream (const GZIPDecompressorInputStream&);
@@ -54871,6 +54891,7 @@ class DirectoryContentsDisplayComponent;
 class FilePreviewComponent;
 class ImageButton;
 class CallOutBox;
+class Drawable;
 
 /**
 	LookAndFeel objects define the appearance of all the JUCE widgets, and subclasses
@@ -55091,9 +55112,10 @@ public:
 	virtual void fillTextEditorBackground (Graphics& g, int width, int height, TextEditor& textEditor);
 	virtual void drawTextEditorOutline (Graphics& g, int width, int height, TextEditor& textEditor);
 
-	// these return an image from the ImageCache, so use ImageCache::release() to free it
-	virtual const Image getDefaultFolderImage();
-	virtual const Image getDefaultDocumentFileImage();
+	// These return a pointer to an internally cached drawable - make sure you don't keep
+	// a copy of this pointer anywhere, as it may become invalid in the future.
+	virtual const Drawable* getDefaultFolderImage();
+	virtual const Drawable* getDefaultDocumentFileImage();
 
 	virtual void createFileChooserHeaderText (const String& title,
 											  const String& instructions,
@@ -55423,6 +55445,8 @@ private:
 	// default typeface names
 	String defaultSans, defaultSerif, defaultFixed;
 
+	ScopedPointer<Drawable> folderImage, documentImage;
+
 	void drawShinyButtonShape (Graphics& g,
 							   float x, float y, float w, float h, float maxCornerSize,
 							   const Colour& baseColour,
@@ -55435,6 +55459,8 @@ private:
 	// This has been deprecated - see the new parameter list..
 	virtual int drawFileBrowserRow (Graphics&, int, int, const String&, Image*, const String&, const String&, bool, bool, int) { return 0; }
 
+	static Drawable* loadDrawableFromData (const void* data, size_t numBytes);
+
 	LookAndFeel (const LookAndFeel&);
 	LookAndFeel& operator= (const LookAndFeel&);
 };

src/core/juce_StandardHeader.h

@@ -33,7 +33,7 @@
 */
 #define JUCE_MAJOR_VERSION      1
 #define JUCE_MINOR_VERSION      52
-#define JUCE_BUILDNUMBER        82
+#define JUCE_BUILDNUMBER        83
 
 /** Current Juce version number.
 

src/gui/components/lookandfeel/juce_LookAndFeel.cpp

@@ -69,25 +69,93 @@ BEGIN_JUCE_NAMESPACE
 #include "../special/juce_MidiKeyboardComponent.h"
 #include "../special/juce_ColourSelector.h"
 #include "../../../core/juce_PlatformUtilities.h"
-
+#include "../../../text/juce_XmlDocument.h"
+#include "../../../io/streams/juce_GZIPDecompressorInputStream.h"
+#include "../../../io/streams/juce_MemoryInputStream.h"
 
 //==============================================================================
-static const Colour createBaseColour (const Colour& buttonColour,
-                                      const bool hasKeyboardFocus,
-                                      const bool isMouseOverButton,
-                                      const bool isButtonDown) throw()
+namespace LookAndFeelHelpers
 {
-    const float sat = hasKeyboardFocus ? 1.3f : 0.9f;
-    const Colour baseColour (buttonColour.withMultipliedSaturation (sat));
+    void createRoundedPath (Path& p,
+                            const float x, const float y,
+                            const float w, const float h,
+                            const float cs,
+                            const bool curveTopLeft, const bool curveTopRight,
+                            const bool curveBottomLeft, const bool curveBottomRight) throw()
+    {
+        const float cs2 = 2.0f * cs;
 
-    if (isButtonDown)
-        return baseColour.contrasting (0.2f);
-    else if (isMouseOverButton)
-        return baseColour.contrasting (0.1f);
+        if (curveTopLeft)
+        {
+            p.startNewSubPath (x, y + cs);
+            p.addArc (x, y, cs2, cs2, float_Pi * 1.5f, float_Pi * 2.0f);
+        }
+        else
+        {
+            p.startNewSubPath (x, y);
+        }
 
-    return baseColour;
-}
+        if (curveTopRight)
+        {
+            p.lineTo (x + w - cs, y);
+            p.addArc (x + w - cs2, y, cs2, cs2, 0.0f, float_Pi * 0.5f);
+        }
+        else
+        {
+            p.lineTo (x + w, y);
+        }
+
+        if (curveBottomRight)
+        {
+            p.lineTo (x + w, y + h - cs);
+            p.addArc (x + w - cs2, y + h - cs2, cs2, cs2, float_Pi * 0.5f, float_Pi);
+        }
+        else
+        {
+            p.lineTo (x + w, y + h);
+        }
+
+        if (curveBottomLeft)
+        {
+            p.lineTo (x + cs, y + h);
+            p.addArc (x, y + h - cs2, cs2, cs2, float_Pi, float_Pi * 1.5f);
+        }
+        else
+        {
+            p.lineTo (x, y + h);
+        }
 
+        p.closeSubPath();
+    }
+
+    const Colour createBaseColour (const Colour& buttonColour,
+                                   const bool hasKeyboardFocus,
+                                   const bool isMouseOverButton,
+                                   const bool isButtonDown) throw()
+    {
+        const float sat = hasKeyboardFocus ? 1.3f : 0.9f;
+        const Colour baseColour (buttonColour.withMultipliedSaturation (sat));
+
+        if (isButtonDown)
+            return baseColour.contrasting (0.2f);
+        else if (isMouseOverButton)
+            return baseColour.contrasting (0.1f);
+
+        return baseColour;
+    }
+
+    const TextLayout layoutTooltipText (const String& text) throw()
+    {
+        const float tooltipFontSize = 12.0f;
+        const int maxToolTipWidth = 400;
+
+        const Font f (tooltipFontSize, Font::bold);
+        TextLayout tl (text, f);
+        tl.layout (maxToolTipWidth, Justification::left, true);
+
+        return tl;
+    }
+}
 
 //==============================================================================
 LookAndFeel::LookAndFeel()
@@ -364,9 +432,9 @@ void LookAndFeel::drawButtonBackground (Graphics& g,
     const float indentT = button.isConnectedOnTop()    ? 0.1f : halfThickness;
     const float indentB = button.isConnectedOnBottom() ? 0.1f : halfThickness;
 
-    const Colour baseColour (createBaseColour (backgroundColour,
-                                               button.hasKeyboardFocus (true),
-                                               isMouseOverButton, isButtonDown)
+    const Colour baseColour (LookAndFeelHelpers::createBaseColour (backgroundColour,
+                                                                   button.hasKeyboardFocus (true),
+                                                                   isMouseOverButton, isButtonDown)
                                .withMultipliedAlpha (button.isEnabled() ? 1.0f : 0.5f));
 
     drawGlassLozenge (g,
@@ -421,11 +489,9 @@ void LookAndFeel::drawTickBox (Graphics& g,
     const float boxSize = w * 0.7f;
 
     drawGlassSphere (g, x, y + (h - boxSize) * 0.5f, boxSize,
-                     createBaseColour (component.findColour (TextButton::buttonColourId)
-                                                .withMultipliedAlpha (isEnabled ? 1.0f : 0.5f),
-                                       true,
-                                       isMouseOverButton,
-                                       isButtonDown),
+                     LookAndFeelHelpers::createBaseColour (component.findColour (TextButton::buttonColourId)
+                                                                    .withMultipliedAlpha (isEnabled ? 1.0f : 0.5f),
+                                                           true, isMouseOverButton, isButtonDown),
                      isEnabled ? ((isButtonDown || isMouseOverButton) ? 1.1f : 0.5f) : 0.3f);
 
     if (ticked)
@@ -1146,7 +1212,7 @@ int LookAndFeel::getMenuWindowFlags()
 void LookAndFeel::drawMenuBarBackground (Graphics& g, int width, int height,
                                          bool, MenuBarComponent& menuBar)
 {
-    const Colour baseColour (createBaseColour (menuBar.findColour (PopupMenu::backgroundColourId), false, false, false));
+    const Colour baseColour (LookAndFeelHelpers::createBaseColour (menuBar.findColour (PopupMenu::backgroundColourId), false, false, false));
 
     if (menuBar.isEnabled())
     {
@@ -1259,10 +1325,10 @@ void LookAndFeel::drawComboBox (Graphics& g, int width, int height,
 
     const float outlineThickness = box.isEnabled() ? (isButtonDown ? 1.2f : 0.5f) : 0.3f;
 
-    const Colour baseColour (createBaseColour (box.findColour (ComboBox::buttonColourId),
-                                               box.hasKeyboardFocus (true),
-                                               false, isButtonDown)
-                               .withMultipliedAlpha (box.isEnabled() ? 1.0f : 0.5f));
+    const Colour baseColour (LookAndFeelHelpers::createBaseColour (box.findColour (ComboBox::buttonColourId),
+                                                                   box.hasKeyboardFocus (true),
+                                                                   false, isButtonDown)
+                                .withMultipliedAlpha (box.isEnabled() ? 1.0f : 0.5f));
 
     drawGlassLozenge (g,
                       buttonX + outlineThickness, buttonY + outlineThickness,
@@ -1397,10 +1463,10 @@ void LookAndFeel::drawLinearSliderThumb (Graphics& g,
 {
     const float sliderRadius = (float) (getSliderThumbRadius (slider) - 2);
 
-    Colour knobColour (createBaseColour (slider.findColour (Slider::thumbColourId),
-                                         slider.hasKeyboardFocus (false) && slider.isEnabled(),
-                                         slider.isMouseOverOrDragging() && slider.isEnabled(),
-                                         slider.isMouseButtonDown() && slider.isEnabled()));
+    Colour knobColour (LookAndFeelHelpers::createBaseColour (slider.findColour (Slider::thumbColourId),
+                                                             slider.hasKeyboardFocus (false) && slider.isEnabled(),
+                                                             slider.isMouseOverOrDragging() && slider.isEnabled(),
+                                                             slider.isMouseButtonDown() && slider.isEnabled()));
 
     const float outlineThickness = slider.isEnabled() ? 0.8f : 0.3f;
 
@@ -1483,11 +1549,10 @@ void LookAndFeel::drawLinearSlider (Graphics& g,
     {
         const bool isMouseOver = slider.isMouseOverOrDragging() && slider.isEnabled();
 
-        Colour baseColour (createBaseColour (slider.findColour (Slider::thumbColourId)
-                                                   .withMultipliedSaturation (slider.isEnabled() ? 1.0f : 0.5f),
-                                             false,
-                                             isMouseOver,
-                                             isMouseOver || slider.isMouseButtonDown()));
+        Colour baseColour (LookAndFeelHelpers::createBaseColour (slider.findColour (Slider::thumbColourId)
+                                                                       .withMultipliedSaturation (slider.isEnabled() ? 1.0f : 0.5f),
+                                                                 false, isMouseOver,
+                                                                 isMouseOver || slider.isMouseButtonDown()));
 
         drawShinyButtonShape (g,
                               (float) x, (float) y, sliderPos - (float) x, (float) height, 0.0f,
@@ -1630,21 +1695,9 @@ ImageEffectFilter* LookAndFeel::getSliderEffect()
 }
 
 //==============================================================================
-static const TextLayout layoutTooltipText (const String& text) throw()
-{
-    const float tooltipFontSize = 12.0f;
-    const int maxToolTipWidth = 400;
-
-    const Font f (tooltipFontSize, Font::bold);
-    TextLayout tl (text, f);
-    tl.layout (maxToolTipWidth, Justification::left, true);
-
-    return tl;
-}
-
 void LookAndFeel::getTooltipSize (const String& tipText, int& width, int& height)
 {
-    const TextLayout tl (layoutTooltipText (tipText));
+    const TextLayout tl (LookAndFeelHelpers::layoutTooltipText (tipText));
 
     width = tl.getWidth() + 14;
     height = tl.getHeight() + 6;
@@ -1661,7 +1714,7 @@ void LookAndFeel::drawTooltip (Graphics& g, const String& text, int width, int h
     g.drawRect (0, 0, width, height, 1);
 #endif
 
-    const TextLayout tl (layoutTooltipText (text));
+    const TextLayout tl (LookAndFeelHelpers::layoutTooltipText (text));
 
     g.setColour (findColour (TooltipWindow::textColourId));
     tl.drawWithin (g, 0, 0, width, height, Justification::centred);
@@ -2589,25 +2642,27 @@ void LookAndFeel::drawFileBrowserRow (Graphics& g, int width, int height,
     if (isItemSelected)
         g.fillAll (findColour (DirectoryContentsDisplayComponent::highlightColourId));
 
-    g.setColour (findColour (DirectoryContentsDisplayComponent::textColourId));
-    g.setFont (height * 0.7f);
-
-    Image im;
-    if (icon != 0)
-        im = *icon;
-
-    if (im.isNull())
-        im = isDirectory ? getDefaultFolderImage()
-                         : getDefaultDocumentFileImage();
-
     const int x = 32;
+    g.setColour (Colours::black);
 
-    if (im.isValid())
+    if (icon != 0 && icon->isValid())
     {
-        g.drawImageWithin (im, 2, 2, x - 4, height - 4,
+        g.drawImageWithin (*icon, 2, 2, x - 4, height - 4,
                            RectanglePlacement::centred | RectanglePlacement::onlyReduceInSize,
                            false);
     }
+    else
+    {
+        const Drawable* d = isDirectory ? getDefaultFolderImage()
+                                        : getDefaultDocumentFileImage();
+
+        if (d != 0)
+            d->drawWithin (g, Rectangle<float> (2.0f, 2.0f, x - 4.0f, height - 4.0f),
+                           RectanglePlacement::centred | RectanglePlacement::onlyReduceInSize, 1.0f);
+    }
+
+    g.setColour (findColour (DirectoryContentsDisplayComponent::textColourId));
+    g.setFont (height * 0.7f);
 
     if (width > 450 && ! isDirectory)
     {
@@ -2693,82 +2748,75 @@ void LookAndFeel::layoutFileBrowserComponent (FileBrowserComponent& browserComp,
     filenameBox->setBounds (x + 50, y, w - 50, controlsHeight);
 }
 
-const Image LookAndFeel::getDefaultFolderImage()
-{
-    static const unsigned char foldericon_png[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,28,8,6,0,0,0,0,194,189,34,0,0,0,4,103,65,77,65,0,0,175,200,55,5,
-        138,233,0,0,0,25,116,69,88,116,83,111,102,116,119,97,114,101,0,65,100,111,98,101,32,73,109,97,103,101,82,101,97,100,121,113,201,101,60,0,0,9,46,73,68,65,84,120,218,98,252,255,255,63,3,50,240,41,95,192,
-        197,205,198,32,202,204,202,33,241,254,235,47,133,47,191,24,180,213,164,133,152,69,24,222,44,234,42,77,188,245,31,170,129,145,145,145,1,29,128,164,226,91,86,113,252,248,207,200,171,37,39,204,239,170,43,
-        254,206,218,88,231,61,62,61,0,1,196,2,149,96,116,200,158,102,194,202,201,227,197,193,206,166,194,204,193,33,195,202,204,38,42,197,197,42,196,193,202,33,240,241,231,15,134,151,95,127,9,2,149,22,0,241,47,
-        152,230,128,134,245,204,63,191,188,103,83,144,16,16,228,229,102,151,76,239,217,32,199,204,198,169,205,254,159,65,245,203,79,6,169,131,151,30,47,1,42,91,10,196,127,208,236,101,76,235,90,43,101,160,40,242,
-        19,32,128,64,78,98,52,12,41,149,145,215,52,89,162,38,35,107,39,196,203,203,192,206,194,206,192,197,198,202,192,203,197,198,192,205,193,206,240,252,227,103,134,139,55,175,191,127,243,242,78,219,187,207,
-        63,215,255,98,23,48,228,227,96,83,98,102,102,85,225,224,228,80,20,224,230,86,226,225,228,150,103,101,97,101,230,227,228,96,224,0,234,191,243,252,5,195,222,19,199,38,191,127,112,161,83,66,199,86,141,131,
-        149,69,146,133,153,69,137,149,133,89,157,141,131,77,83,140,143,243,219,255,31,159,123,0,2,136,69,90,207,129,157,71,68,42,66,71,73,209,210,81,91,27,24,142,140,12,127,255,253,103,0,185,236,31,3,144,6,50,
-        148,68,216,25,216,24,117,4,239,11,243,214,49,50,51,84,178,48,114,240,112,177,114,177,240,115,113,49,241,112,112,48,176,179,178,51,176,48,49,3,85,255,99,248,253,247,15,195,247,159,191,25,30,191,126,253,
-        71,74,76,200,66,75,197,119,138,168,144,160,150,168,0,183,160,152,32,15,175,188,184,32,199,175,191,127,25,214,31,184,120,247,236,209,253,159,0,2,136,133,95,70,93,74,88,80,196,83,69,66,130,149,9,104,219,
-        151,31,191,193,150,194,146,6,136,102,102,98,100,16,227,231,103,16,23,210,230,101,101,102,100,248,255,143,137,225,223,63,6,6,22,102,38,134,239,191,126,49,220,123,241,134,225,227,247,175,64,7,252,101,96,
-        97,249,207,192,193,198,200,160,171,34,192,108,165,235,104,42,204,207,101,42,194,199,197,192,199,201,198,192,197,193,202,192,198,202,194,176,247,194,3,134,155,183,110,61,188,127,124,221,19,128,0,92,146,
-        49,14,64,64,16,69,63,153,85,16,52,18,74,71,112,6,87,119,0,165,160,86,138,32,172,216,29,49,182,84,253,169,94,94,230,127,17,87,133,34,146,174,3,88,126,240,219,164,147,113,31,145,244,152,112,179,211,130,
-        34,31,203,113,162,233,6,36,49,163,174,74,124,140,60,141,144,165,161,220,228,25,3,24,105,255,17,168,101,1,139,245,188,93,104,251,73,239,235,50,90,189,111,175,0,98,249,254,254,249,175,239,223,190,126,6,
-        5,27,19,47,90,170,102,0,249,158,129,129,141,133,25,228,20,6,38,38,72,74,7,185,243,243,247,239,12,23,31,60,98,228,231,253,207,144,227,107,206,32,202,199,193,240,249,251,127,134,95,191,255,49,124,249,250,
-        159,225,237,239,95,12,63,127,1,35,229,31,194,71,32,71,63,123,251,245,223,197,27,183,159,189,187,178,103,61,80,232,59,64,0,177,48,252,5,134,225,255,191,223,126,254,250,13,182,132,1,41,167,176,3,53,128,
-        188,254,226,253,103,96,212,252,96,120,247,249,203,255,79,223,191,254,255,250,235,199,191,239,63,191,255,87,145,17,100,73,116,181,100,252,249,243,63,195,149,123,223,193,14,132,101,55,96,52,3,125,255,15,
-        204,254,15,132,160,232,253,13,20,124,248,226,227,223,23,207,30,221,120,119,255,226,109,160,210,31,0,1,196,242,231,219,135,175,140,255,126,190,7,197,37,35,19,34,216,65,248,211,143,111,255,79,223,121,240,
-        255,211,183,79,76,220,156,172,12,236,204,140,140,252,124,28,140,250,226,82,140,106,82,34,140,124,156,156,12,175,222,253,1,90,4,137,162,63,127,33,161,6,178,242,215,239,255,224,160,255,15,198,12,64,7,48,
-        128,211,200,253,151,111,254,254,248,240,236,44,80,217,71,80,246,4,8,32,160,31,255,255,100,102,248,243,238,199,159,63,16,221,16,19,128,248,31,195,181,199,207,254,255,253,247,133,49,212,78,27,104,8,11,40,
-        94,25,184,216,89,129,108,38,70,144,242,183,31,17,105,230,63,148,248,15,97,49,252,248,249,15,20,85,72,105,9,148,187,254,49,220,127,254,242,207,243,75,135,14,128,130,31,84,64,1,4,16,203,247,143,175,127,
-        48,253,254,246,234,7,48,206,96,137,13,4,64,65,248,234,195,7,6,7,3,57,70,33,46,97,134,111,63,254,50,252,5,250,244,51,216,103,255,192,185,0,150,91,80,44,135,242,127,253,129,164,23,24,96,102,250,207,112,
-        255,213,219,255,247,31,63,188,251,246,201,173,199,176,2,13,32,128,88,62,188,121,241,243,211,231,207,31,126,2,147,236,63,168,6,144,193,223,190,255,254,207,198,198,192,40,35,44,206,240,252,205,79,6,132,
-        223,24,224,150,32,251,28,25,128,211,29,19,170,24,51,48,88,111,61,127,206,248,254,245,179,139,192,18,247,219,239,239,95,192,249,9,32,128,88,126,124,249,248,231,203,183,111,159,128,33,240,15,24,68,160,180,
-        2,204,223,140,12,111,63,127,102,16,228,229,4,6,53,35,195,31,176,119,25,112,3,70,84,55,0,203,50,112,33,134,108,249,103,160,7,159,189,126,253,235,235,227,203,7,255,255,251,247,13,86,63,0,4,16,168,46,248,
-        199,250,231,243,235,159,191,126,254,248,245,251,47,23,11,51,51,48,184,152,24,94,127,250,248,95,68,136,151,241,243,55,96,208,51,160,218,255,31,139,27,144,197,254,98,201,202,79,223,124,96,120,245,232,250,
-        185,119,143,174,95,250,243,243,219,119,152,60,64,0,129,2,234,223,183,215,15,95,48,254,255,253,3,146,109,192,229,5,195,135,47,159,25,248,184,121,24,126,0,227,29,88,240,49,252,101,36,14,255,1,90,249,7,156,
-        222,17,24,24,164,12,207,223,189,99,248,250,252,230,97,96,229,245,2,104,231,111,152,3,0,2,8,228,128,191,15,239,220,120,255,255,223,159,47,160,116,0,42,44,222,124,250,244,239,207,255,63,12,236,108,236,64,
-        67,65,81,0,52,244,63,113,248,47,52,10,96,14,98,2,230,191,119,223,127,48,60,121,254,248,235,151,55,207,46,1,163,252,35,114,128,1,4,16,40,10,254,191,121,249,252,199,175,159,63,191,254,2,230,45,118,22,22,
-        134,219,207,94,252,231,224,100,103,250,247,15,148,32,64,85,12,34,14,254,227,72,6,255,225,9,240,63,138,26,46,96,214,189,249,244,37,195,139,167,143,30,124,253,246,253,9,40,245,255,71,202,30,0,1,196,2,226,
-        0,243,232,159,239,63,127,124,253,11,202,94,64,169,23,31,62,50,138,137,242,49,50,0,211,195,223,255,80,7,252,199,159,6,224,137,145,9,146,231,153,160,165,218,23,96,29,240,244,237,59,134,111,175,31,95,250,
-        252,230,241,83,244,182,1,64,0,177,192,28,14,76,132,31,128,169,19,88,220,126,253,207,206,198,196,32,38,36,0,244,61,11,176,148,251,139,145,3,208,29,0,178,16,82,228,66,42,174,223,192,26,8,152,162,25,222,
-        125,248,200,240,242,253,39,134,151,79,238,126,254,242,242,238,177,15,47,30,190,5,215,242,72,0,32,128,224,14,96,254,255,231,61,168,92,123,241,254,253,127,1,62,78,6,78,110,78,134,223,64,195,254,50,98,183,
-        24,36,12,202,179,224,202,9,88,228,253,132,90,250,246,211,71,134,55,175,94,254,122,255,250,249,247,15,175,159,126,249,251,237,195,135,95,175,110,31,122,117,251,244,49,160,150,111,255,209,218,128,0,1,152,
-        44,183,21,0,65,32,136,110,247,254,255,243,122,9,187,64,105,174,74,22,138,25,173,80,208,194,188,238,156,151,217,217,15,32,182,197,37,83,201,4,31,243,178,169,232,242,214,224,223,252,103,175,35,85,1,41,129,
-        228,148,142,8,214,30,32,149,6,161,204,109,182,53,236,184,156,78,142,147,195,153,89,35,198,3,87,166,249,220,227,198,59,218,48,252,223,185,111,30,1,132,228,128,127,31,222,124,248,248,27,24,152,28,60,220,
-        220,12,44,172,172,224,224,103,5,102,98,144,133,160,236,244,229,231,47,134,239,223,127,49,188,121,251,158,225,241,179,103,12,31,223,189,254,251,227,221,139,55,191,62,188,120,246,235,205,189,59,207,238,
-        94,58,241,228,254,109,144,101,159,128,248,51,40,9,32,97,80,217,255,15,221,1,0,1,4,143,130,207,159,191,126,252,246,234,213,111,94,126,94,118,73,94,9,198,127,64,223,126,252,246,147,225,243,215,239,12,223,
-        128,229,198,251,15,239,24,62,189,126,249,227,203,171,135,47,63,189,122,252,228,235,155,199,247,95,63,188,118,227,197,227,123,247,127,255,250,249,30,104,198,7,32,126,11,181,252,7,212,183,160,4,247,7,155,
-        197,48,0,16,64,112,7,60,121,241,238,189,16,207,15,134,63,63,216,25,95,125,248,198,112,227,241,27,134,15,239,223,50,124,126,245,228,253,143,55,143,158,191,123,116,237,226,171,135,55,175,126,253,252,225,
-        229,183,47,159,95,254,253,245,227,253,175,159,223,223,193,124,7,181,20,84,105,252,70,143,103,124,0,32,128,224,14,224,102,253,251,81,144,253,223,235,167,207,30,254,124,127,231,252,155,143,175,159,188,250,
-        246,254,249,125,96,60,62,248,250,233,253,147,119,207,238,221,6,150,214,175,129,106,191,130,18,19,146,133,120,125,72,8,0,4,16,34,27,190,121,112,251,3,211,159,69,143,110,223,229,120,255,232,230,221,215,
-        79,239,62,4,102,203,207,72,241,9,11,218,63,72,89,137,20,207,98,100,93,16,0,8,32,70,144,1,64,14,168,209,199,7,196,194,160,166,27,212,135,95,96,65,10,173,95,254,34,219,6,51,128,88,7,96,235,21,129,0,64,0,
-        193,28,192,8,174,53,33,152,1,155,133,184,12,196,165,4,151,133,232,0,32,192,0,151,97,210,163,246,134,208,52,0,0,0,0,73,69,78,68,174,66,96,130,0,0};
-
-    return ImageCache::getFromMemory (foldericon_png, sizeof (foldericon_png));
-}
-
-const Image LookAndFeel::getDefaultDocumentFileImage()
-{
-    static const unsigned char fileicon_png[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,6,0,0,0,115,122,122,244,0,0,0,4,103,65,77,65,0,0,175,200,55,5,
-        138,233,0,0,0,25,116,69,88,116,83,111,102,116,119,97,114,101,0,65,100,111,98,101,32,73,109,97,103,101,82,101,97,100,121,113,201,101,60,0,0,4,99,73,68,65,84,120,218,98,252,255,255,63,3,12,48,50,50,50,1,
-        169,127,200,98,148,2,160,153,204,64,243,254,226,146,7,8,32,22,52,203,255,107,233,233,91,76,93,176,184,232,239,239,95,127,24,40,112,8,19,51,203,255,179,23,175,108,1,90,190,28,104,54,43,80,232,207,127,44,
-        62,3,8,32,6,144,24,84,156,25,132,189,252,3,146,255,83,9,220,127,254,242,134,162,138,170,10,208,92,144,3,152,97,118,33,99,128,0,98,66,114,11,200,1,92,255,254,252,225,32,215,215,32,127,64,240,127,80,60,
-        50,40,72,136,169,47,95,179,118,130,136,148,140,0,40,80,128,33,193,136,174,7,32,128,144,29,192,8,117,41,59,209,22,66,241,191,255,16,12,244,19,195,63,48,134,240,255,0,9,115,125,93,239,252,130,130,108,168,
-        249,44,232,102,0,4,16,19,22,62,51,33,11,255,195,44,4,211,255,25,96,16,33,6,117,24,56,226,25,24,202,139,10,75,226,51,115,66,160,105,13,197,17,0,1,196,68,172,79,255,33,91,206,192,192,128,176,22,17,10,200,
-        234,32,161,240,31,24,10,255,24,152,153,153,184,39,244,247,117,107,234,234,105,131,66,1,154,224,193,0,32,128,240,58,0,22,180,255,144,18,13,40,136,33,113,140,36,255,15,17,26,48,12,81,15,145,255,254,251,
-        31,131,0,59,171,84,81,73,105,33,208,216,191,200,161,12,16,64,44,248,131,251,63,10,31,198,253,143,38,6,83,7,11,33,228,232,2,123,4,202,226,228,96,151,132,166,49,144,35,126,131,196,0,2,136,5,103,60,51,252,
-        71,49,12,213,130,255,168,226,232,150,254,255,15,143,6,80,202,3,133,16,200,198,63,127,193,229,17,39,16,127,135,217,7,16,64,88,67,0,28,143,255,25,225,46,135,249,18,155,133,240,178,4,205,145,8,62,52,186,
-        32,234,152,160,118,194,179,35,64,0,177,96,11,123,144,236,95,104,92,162,228,113,36,11,81,125,140,112,56,186,131,96,226,176,172,137,148,229,193,0,32,128,88,112,167,248,255,112,223,48,34,165,110,6,124,190,
-        253,143,61,106,192,9,19,73,28,25,0,4,16,206,40,248,251,15,45,104,209,130,21,51,222,145,18,238,127,180,68,8,244,250,95,164,16,66,6,0,1,196,130,45,253,195,12,250,135,53,206,255,195,131,18,213,98,236,81,
-        243,31,154,11,144,115,8,50,0,8,32,156,81,0,203,227,12,80,223,98,230,4,68,72,96,38,78,84,11,65,9,250,47,146,3,145,1,64,0,97,117,192,95,112,34,68,138,130,255,176,224,251,143,226,51,6,6,68,29,192,136,20,
-        77,200,69,54,35,3,36,49,255,69,77,132,112,0,16,64,44,56,139,94,36,7,96,102,59,164,108,249,31,181,82,98,64,203,174,255,144,234,142,127,88,146,33,64,0,97,205,134,240,120,67,75,76,136,224,198,140,22,6,44,
-        142,66,201,41,255,177,231,2,128,0,194,25,5,255,254,161,134,192,127,6,28,229,0,129,242,1,150,56,33,81,138,209,28,96,0,8,32,172,81,0,78,3,104,190,68,182,224,31,146,197,224,56,6,146,140,176,202,135,17,169,
-        96,130,40,64,56,0,139,93,0,1,132,61,10,64,248,31,106,156,162,199,55,204,65,255,144,178,38,74,84,252,71,51,239,63,246,68,8,16,64,44,216,74,1,88,217,13,203,191,32,1,80,58,7,133,224,127,6,68,114,6,241,65,
-        81,197,8,101,255,71,114,33,92,237,127,228,52,128,233,2,128,0,98,193,149,3,64,117,193,255,127,255,81,75,191,127,168,5,18,136,255,31,45,161,49,32,151,134,72,252,127,12,216,203,98,128,0,98,193,210,144,135,
-        248,30,201,242,127,208,252,140,145,27,160,113,206,136,148,197,192,121,159,17,53,184,225,149,17,22,23,0,4,16,11,182,150,237,63,168,207,96,142,248,143,163,72,6,203,253,67,13,61,6,104,14,66,46,17,254,65,
-        19,40,182,16,0,8,32,22,108,109,235,255,176,234,24,35,79,255,199,222,30,64,81,135,90,35,194,211,4,142,92,0,16,64,88,29,0,107,7,254,251,247,31,53,78,241,54,207,80,29,135,209,96,249,143,189,46,0,8,32,116,
-        7,252,101,102,103,103,228,103,99,96,248,193,198,137,53,248,49,125,204,128,225,227,255,88,18,54,47,176,25,202,205,195,205,6,109,11,194,149,0,4,16,35,204,85,208,254,27,159,128,176,176,142,166,182,142,21,
-        48,4,248,129,41,143,13,217,16,70,52,95,147,0,254,0,187,69,95,223,188,122,125,235,206,141,107,7,129,252,247,64,123,193,237,66,128,0,66,118,0,168,189,198,3,196,252,32,135,64,105,54,228,230,19,185,29,100,
-        168,175,191,0,241,7,32,254,4,196,159,129,246,254,2,73,2,4,16,11,90,72,125,135,210,63,161,138,153,169,212,75,255,15,117,196,15,40,134,119,215,1,2,12,0,187,0,132,247,216,161,197,124,0,0,0,0,73,69,78,68,
-        174,66,96,130,0,0};
-
-    return ImageCache::getFromMemory (fileicon_png, sizeof (fileicon_png));
+// Pulls a drawable out of compressed valuetree data..
+Drawable* LookAndFeel::loadDrawableFromData (const void* data, size_t numBytes)
+{
+    MemoryInputStream m (data, numBytes, false);
+    GZIPDecompressorInputStream gz (m);
+    ValueTree drawable (ValueTree::readFromStream (gz));
+    return Drawable::createFromValueTree (drawable.getChild (0), 0);
+}
+
+const Drawable* LookAndFeel::getDefaultFolderImage()
+{
+    if (folderImage == 0)
+    {
+        static const unsigned char drawableData[] =
+        { 120,218,197,86,77,111,27,55,16,229,182,161,237,6,61,39,233,77,63,192,38,56,195,225,215,209,105,210,2,141,13,20,201,193,109,111,178,181,178,183,145,181,130,180,110,145,127,159,199,93,73,137,87,53,218,91,109,192,160,151,179,156,55,111,222,188,229,155,247,
+        231,87,231,175,47,222,170,234,155,229,244,190,86,213,115,253,102,61,253,123,122,189,168,85,51,83,213,119,250,238,221,47,231,151,175,223,169,170,250,121,221,62,172,84,245,172,60,63,209,243,118,49,171,215,170,107,87,23,245,188,83,213,145,182,167,19,91,
+        254,127,223,220,222,117,37,68,82,40,143,174,219,174,107,239,135,168,147,18,37,108,85,245,237,46,207,70,33,249,175,211,238,78,85,186,28,253,76,175,73,109,186,117,251,177,190,106,102,229,241,247,58,24,103,203,15,101,245,103,219,44,187,15,221,39,0,172,142,
+        245,125,211,1,196,205,116,181,125,114,164,175,31,186,78,45,219,229,31,245,186,189,106,150,179,102,121,139,100,154,240,231,167,102,177,64,72,247,105,213,23,122,187,158,206,154,122,217,169,85,57,18,1,47,53,101,107,18,135,204,167,147,192,201,216,20,114,
+        244,195,62,171,234,7,125,198,100,136,216,145,149,211,9,57,103,40,249,72,219,8,167,170,87,250,140,162,199,123,226,3,34,82,202,134,131,13,172,74,170,233,162,0,177,234,166,93,180,15,235,141,170,206,180,157,204,231,150,156,159,207,39,195,50,214,88,18,150,
+        245,205,124,250,104,169,212,135,158,19,144,53,20,112,172,55,237,2,132,13,199,149,130,230,115,145,112,147,147,82,61,157,32,238,178,253,11,145,213,138,10,52,138,38,103,111,99,164,211,137,139,198,35,177,35,167,212,143,15,215,205,13,160,109,163,172,225,152,
+        16,232,17,149,140,103,144,158,146,90,113,217,12,6,197,167,236,3,54,5,181,101,73,54,138,90,245,165,227,120,18,252,150,77,15,242,188,228,204,81,169,139,102,249,5,68,192,145,14,244,112,1,145,29,94,137,96,235,49,136,151,58,246,32,88,192,161,88,176,76,226,
+        36,247,24,176,7,232,62,16,83,42,155,201,160,30,222,65,72,98,82,76,33,198,254,197,96,124,10,150,243,8,130,48,228,36,94,124,6,4,43,38,0,142,205,99,30,4,221,13,33,230,220,71,177,65,49,142,243,150,7,1,51,20,2,5,96,96,84,225,56,217,188,3,33,46,24,228,112,
+        69,69,12,68,228,108,242,99,16,165,118,208,28,51,200,98,87,42,74,62,209,24,4,206,48,22,153,125,132,220,196,56,15,234,99,216,130,0,141,38,74,162,130,48,35,163,141,94,196,245,32,94,104,7,154,132,209,40,108,162,165,232,153,165,17,4,138,201,176,135,58,49,
+        165,130,122,108,114,54,28,240,64,17,89,188,79,177,116,149,10,4,246,91,30,94,104,112,96,226,144,131,144,142,98,78,177,7,128,81,242,224,140,36,249,80,208,145,196,12,202,15,16,60,161,200,69,187,169,213,86,198,123,87,224,255,199,21,94,105,134,72,40,177,245,
+        14,182,32,232,54,196,231,100,111,11,189,168,201,39,177,84,102,38,139,177,168,74,210,87,174,64,20,138,160,67,111,10,4,98,196,97,60,158,118,133,25,111,173,224,171,37,97,185,119,133,221,242,63,184,194,140,71,174,240,252,145,43,72,32,147,146,147,4,104,104,
+        117,134,10,18,12,107,212,40,72,148,57,6,71,69,135,222,248,16,160,168,3,169,144,55,201,69,41,147,137,134,99,50,97,8,178,85,43,217,140,201,151,192,152,10,242,190,24,11,59,183,29,25,42,115,236,98,14,229,252,32,80,66,0,162,17,136,72,6,67,5,45,242,224,10,
+        193,102,71,50,6,17,129,212,18,115,105,150,80,169,45,123,222,141,76,178,70,32,55,24,90,217,132,71,73,200,57,238,204,3,136,49,144,185,55,183,190,20,137,52,246,47,113,232,158,69,35,49,145,208,129,193,56,178,77,135,230,145,113,22,140,69,74,20,146,2,120,218,
+        155,135,48,32,10,89,30,156,165,204,254,222,193,160,12,19,49,6,210,59,11,70,62,4,31,15,64,196,2,157,98,33,58,1,104,32,152,50,31,128,64,148,183,197,108,209,89,107,240,41,75,36,123,16,208,108,180,44,236,250,182,227,27,20,137,118,76,60,165,137,221,92,94,
+        78,215,31,235,245,230,183,242,229,30,214,251,251,195,145,94,148,15,253,170,221,52,93,211,46,7,109,171,81,208,177,94,247,119,132,47,81,186,92,22,246,7,255,254,15,7,107,141,171,197,191,156,123,162,135,187,198,227,131,113,219,80,159,1,4,239,223,231,0,0 };
+
+        folderImage = loadDrawableFromData (drawableData, sizeof (drawableData));
+    }
+
+    return folderImage;
+}
+
+const Drawable* LookAndFeel::getDefaultDocumentFileImage()
+{
+    if (documentImage == 0)
+    {
+        static const unsigned char drawableData[] =
+        { 120,218,213,88,77,115,219,54,16,37,147,208,246,228,214,75,155,246,164,123,29,12,176,216,197,199,49,105,218,94,156,153,78,114,72,219,155,108,75,137,26,89,212,200,116,59,233,175,239,3,105,201,164,68,50,158,166,233,76,196,11,69,60,173,128,197,123,139,183,
+        124,241,234,217,155,103,207,207,126,204,242,7,171,233,213,44,203,31,23,47,54,211,191,166,231,203,89,182,184,204,242,147,226,195,165,219,252,125,150,229,249,207,155,242,102,157,229,143,210,227,199,197,101,121,113,115,53,91,85,89,85,174,207,102,243,42,
+        203,143,10,125,58,209,233,251,171,197,219,119,85,250,173,97,151,30,157,151,85,85,94,53,168,147,132,50,226,179,252,225,246,143,174,179,44,63,254,101,90,189,203,242,34,5,127,84,172,77,118,93,109,202,247,179,55,139,203,244,248,97,161,179,63,202,197,170,
+        122,93,125,192,196,242,227,226,106,81,205,54,217,197,116,125,251,228,168,56,191,169,170,108,85,174,126,159,109,202,55,139,213,229,98,245,182,249,97,254,240,167,197,114,137,5,86,31,214,245,111,175,203,37,254,230,162,92,150,55,155,180,148,249,237,39,203,
+        94,215,127,58,10,213,245,39,203,234,249,102,249,87,47,203,63,129,204,49,227,252,73,225,149,145,104,131,245,254,116,34,202,82,164,16,153,179,236,108,177,234,7,49,41,237,130,144,167,17,144,15,42,104,239,93,12,35,32,99,68,9,187,24,125,7,244,77,23,36,164,
+        40,56,226,61,12,107,229,130,215,100,105,24,227,89,17,246,211,105,55,140,49,218,43,207,100,245,72,28,195,70,17,230,201,118,8,243,164,139,233,95,88,23,52,152,162,54,104,48,217,237,105,15,111,91,107,253,131,160,118,34,239,69,128,54,232,135,101,121,61,203,
+        110,169,181,147,2,253,159,82,48,180,229,247,167,74,193,41,141,188,35,93,241,116,18,148,113,214,120,207,113,47,19,109,16,51,182,153,193,5,59,2,10,90,69,114,218,135,48,2,50,198,43,171,189,152,81,144,88,108,85,136,78,246,64,54,42,163,35,69,30,3,121,82,38,
+        98,81,98,70,64,70,139,34,111,163,167,49,144,13,202,138,179,58,220,23,52,180,186,54,104,48,79,109,208,96,198,219,19,31,220,187,118,10,6,65,237,100,222,139,5,109,80,191,30,236,151,162,135,147,142,30,68,105,182,58,6,22,84,43,229,124,148,116,97,145,55,231,
+        139,11,76,228,16,37,14,48,205,145,77,134,34,176,55,152,182,200,57,99,93,204,144,145,253,65,97,229,132,72,104,63,62,71,21,140,54,186,41,226,59,84,19,63,130,15,222,235,224,185,59,104,27,226,68,101,153,241,227,177,248,29,20,136,26,8,252,178,183,241,219,
+        131,137,160,209,107,109,92,79,124,16,211,184,104,93,77,130,110,124,2,65,172,67,201,60,157,88,163,2,91,99,92,216,198,55,78,69,75,190,150,119,84,98,200,71,150,109,124,36,204,227,52,8,33,229,223,68,167,173,167,131,248,137,212,226,141,19,233,160,154,248,
+        144,142,195,140,137,185,59,104,15,247,119,40,126,23,69,81,200,242,110,254,123,20,49,94,112,110,245,199,111,241,167,87,36,252,101,138,132,149,22,22,38,65,134,29,182,139,24,230,192,31,144,184,133,130,72,44,131,210,142,111,147,216,30,76,123,30,113,206,242,
+        150,196,157,65,129,130,76,180,194,61,34,225,160,5,228,233,160,118,34,137,26,202,115,212,29,108,72,134,243,223,90,114,226,199,226,119,80,6,245,152,197,122,217,146,184,53,24,140,210,30,21,59,80,79,124,182,202,71,207,218,112,159,72,80,53,140,109,68,2,191,
+        227,217,210,78,36,94,137,88,231,82,157,8,176,61,0,122,191,19,137,3,255,13,39,183,228,20,193,151,144,119,166,79,36,40,253,156,138,72,11,181,19,137,14,46,176,217,27,180,135,251,219,31,255,235,61,148,165,96,72,122,118,23,229,81,52,135,24,250,163,183,216,
+        211,43,17,217,151,136,253,116,137,28,53,188,127,92,188,221,76,47,23,169,59,90,167,144,141,239,197,86,104,141,189,60,157,80,84,142,140,4,31,154,241,122,105,132,41,107,13,201,39,86,120,24,82,114,206,198,6,96,27,227,172,36,232,168,201,36,219,24,113,62,163,
+        154,101,233,143,166,203,102,26,141,206,174,179,252,89,161,39,243,249,197,121,186,38,233,246,146,211,53,1,123,56,194,231,122,143,103,179,217,60,204,167,19,147,110,41,93,173,219,123,72,89,248,35,173,16,220,50,179,111,60,181,24,88,103,156,235,7,78,248,14,
+        4,119,78,162,93,60,112,35,109,16,124,126,12,17,71,67,24,1,165,142,1,181,215,248,56,6,66,235,193,137,167,61,22,30,5,3,27,101,71,64,169,25,112,216,2,63,22,169,110,43,18,200,140,129,208,160,88,44,220,208,125,65,67,171,107,131,6,243,212,6,13,102,188,61,241,
+        225,189,107,165,96,16,212,78,230,189,88,208,6,245,235,214,237,235,150,62,167,110,155,106,170,53,133,192,117,193,20,84,78,74,174,98,39,92,156,8,112,21,46,80,106,12,209,207,225,228,16,113,59,225,126,87,60,133,25,209,34,36,2,99,242,52,197,48,30,75,244,247,
+        212,238,246,182,173,221,185,78,215,127,167,221,162,163,221,250,152,217,146,196,222,145,100,223,235,105,108,28,250,149,212,74,224,86,2,213,118,110,119,204,224,144,208,38,214,131,200,14,214,223,120,189,230,53,1,193,70,133,154,131,56,223,16,229,48,188,14,
+        201,205,213,121,71,233,68,89,15,124,103,37,53,26,11,118,176,127,169,88,166,158,219,178,117,173,83,108,75,95,55,68,186,193,53,246,146,206,127,6,63,53,78,58,228,204,155,224,113,74,91,232,221,195,240,105,215,34,29,138,64,128,183,8,130,233,71,173,56,54,101,
+        99,75,186,111,65,58,28,229,145,82,19,152,12,99,180,81,130,131,75,234,229,220,247,53,231,154,79,205,185,185,155,199,249,172,38,85,253,204,76,68,95,92,204,207,255,221,75,178,227,14,187,224,224,97,202,172,173,219,12,167,130,133,9,54,135,245,92,176,29,134,
+        165,110,139,141,18,16,223,29,188,183,65,207,144,106,144,151,143,128,224,176,168,110,140,32,62,56,110,219,195,54,235,20,68,209,216,34,232,21,6,41,234,157,39,211,201,107,160,230,66,225,56,153,9,101,21,37,237,150,204,14,115,208,22,221,54,216,230,33,116,
+        14,65,14,44,19,8,236,73,71,246,182,110,125,224,75,132,195,214,247,163,36,51,252,84,76,124,37,212,100,88,62,183,179,76,67,217,218,242,244,229,116,243,126,182,185,254,21,105,126,208,220,239,94,229,30,21,203,244,202,117,93,94,47,170,69,185,106,246,60,219,
+        3,29,23,155,250,109,237,29,170,72,175,109,119,129,127,235,9,92,20,85,185,254,72,220,147,162,121,235,219,13,44,144,225,63,241,244,165,51,0,0 };
+
+        documentImage = loadDrawableFromData (drawableData, sizeof (drawableData));
+    }
+
+    return documentImage;
 }
 
 
@@ -2847,59 +2895,6 @@ void LookAndFeel::drawKeymapChangeButton (Graphics& g, int width, int height, Bu
     }
 }
 
-//==============================================================================
-static void createRoundedPath (Path& p,
-                               const float x, const float y,
-                               const float w, const float h,
-                               const float cs,
-                               const bool curveTopLeft, const bool curveTopRight,
-                               const bool curveBottomLeft, const bool curveBottomRight) throw()
-{
-    const float cs2 = 2.0f * cs;
-
-    if (curveTopLeft)
-    {
-        p.startNewSubPath (x, y + cs);
-        p.addArc (x, y, cs2, cs2, float_Pi * 1.5f, float_Pi * 2.0f);
-    }
-    else
-    {
-        p.startNewSubPath (x, y);
-    }
-
-    if (curveTopRight)
-    {
-        p.lineTo (x + w - cs, y);
-        p.addArc (x + w - cs2, y, cs2, cs2, 0.0f, float_Pi * 0.5f);
-    }
-    else
-    {
-        p.lineTo (x + w, y);
-    }
-
-    if (curveBottomRight)
-    {
-        p.lineTo (x + w, y + h - cs);
-        p.addArc (x + w - cs2, y + h - cs2, cs2, cs2, float_Pi * 0.5f, float_Pi);
-    }
-    else
-    {
-        p.lineTo (x + w, y + h);
-    }
-
-    if (curveBottomLeft)
-    {
-        p.lineTo (x + cs, y + h);
-        p.addArc (x, y + h - cs2, cs2, cs2, float_Pi, float_Pi * 1.5f);
-    }
-    else
-    {
-        p.lineTo (x, y + h);
-    }
-
-    p.closeSubPath();
-}
-
 //==============================================================================
 void LookAndFeel::drawShinyButtonShape (Graphics& g,
                                         float x, float y, float w, float h,
@@ -2917,11 +2912,11 @@ void LookAndFeel::drawShinyButtonShape (Graphics& g,
     const float cs = jmin (maxCornerSize, w * 0.5f, h * 0.5f);
 
     Path outline;
-    createRoundedPath (outline, x, y, w, h, cs,
-                        ! (flatOnLeft || flatOnTop),
-                        ! (flatOnRight || flatOnTop),
-                        ! (flatOnLeft || flatOnBottom),
-                        ! (flatOnRight || flatOnBottom));
+    LookAndFeelHelpers::createRoundedPath (outline, x, y, w, h, cs,
+                                            ! (flatOnLeft || flatOnTop),
+                                            ! (flatOnRight || flatOnTop),
+                                            ! (flatOnLeft || flatOnBottom),
+                                            ! (flatOnRight || flatOnBottom));
 
     ColourGradient cg (baseColour, 0.0f, y,
                        baseColour.overlaidWith (Colour (0x070000ff)), 0.0f, y + h,
@@ -3049,11 +3044,11 @@ void LookAndFeel::drawGlassLozenge (Graphics& g,
     const int intEdge = (int) edgeBlurRadius;
 
     Path outline;
-    createRoundedPath (outline, x, y, width, height, cs,
-                        ! (flatOnLeft || flatOnTop),
-                        ! (flatOnRight || flatOnTop),
-                        ! (flatOnLeft || flatOnBottom),
-                        ! (flatOnRight || flatOnBottom));
+    LookAndFeelHelpers::createRoundedPath (outline, x, y, width, height, cs,
+                                            ! (flatOnLeft || flatOnTop),
+                                            ! (flatOnRight || flatOnTop),
+                                            ! (flatOnLeft || flatOnBottom),
+                                            ! (flatOnRight || flatOnBottom));
 
     {
         ColourGradient cg (colour.darker (0.2f), 0, y,
@@ -3099,15 +3094,15 @@ void LookAndFeel::drawGlassLozenge (Graphics& g,
         const float rightIndent = flatOnRight ? 0.0f : cs * 0.4f;
 
         Path highlight;
-        createRoundedPath (highlight,
-                           x + leftIndent,
-                           y + cs * 0.1f,
-                           width - (leftIndent + rightIndent),
-                           height * 0.4f, cs * 0.4f,
-                           ! (flatOnLeft || flatOnTop),
-                           ! (flatOnRight || flatOnTop),
-                           ! (flatOnLeft || flatOnBottom),
-                           ! (flatOnRight || flatOnBottom));
+        LookAndFeelHelpers::createRoundedPath (highlight,
+                                               x + leftIndent,
+                                               y + cs * 0.1f,
+                                               width - (leftIndent + rightIndent),
+                                               height * 0.4f, cs * 0.4f,
+                                               ! (flatOnLeft || flatOnTop),
+                                               ! (flatOnRight || flatOnTop),
+                                               ! (flatOnLeft || flatOnBottom),
+                                               ! (flatOnRight || flatOnBottom));
 
         g.setGradientFill (ColourGradient (colour.brighter (10.0f), 0, y + height * 0.06f,
                                            Colours::transparentWhite, 0, y + height * 0.4f, false));

src/gui/components/lookandfeel/juce_LookAndFeel.h

@@ -58,7 +58,7 @@ class DirectoryContentsDisplayComponent;
 class FilePreviewComponent;
 class ImageButton;
 class CallOutBox;
-
+class Drawable;
 
 //==============================================================================
 /**
@@ -294,9 +294,10 @@ public:
     virtual void drawTextEditorOutline (Graphics& g, int width, int height, TextEditor& textEditor);
 
     //==============================================================================
-    // these return an image from the ImageCache, so use ImageCache::release() to free it
-    virtual const Image getDefaultFolderImage();
-    virtual const Image getDefaultDocumentFileImage();
+    // These return a pointer to an internally cached drawable - make sure you don't keep
+    // a copy of this pointer anywhere, as it may become invalid in the future.
+    virtual const Drawable* getDefaultFolderImage();
+    virtual const Drawable* getDefaultDocumentFileImage();
 
     virtual void createFileChooserHeaderText (const String& title,
                                               const String& instructions,
@@ -650,6 +651,9 @@ private:
     // default typeface names
     String defaultSans, defaultSerif, defaultFixed;
 
+    ScopedPointer<Drawable> folderImage, documentImage;
+
+
     void drawShinyButtonShape (Graphics& g,
                                float x, float y, float w, float h, float maxCornerSize,
                                const Colour& baseColour,
@@ -662,6 +666,8 @@ private:
     // This has been deprecated - see the new parameter list..
     virtual int drawFileBrowserRow (Graphics&, int, int, const String&, Image*, const String&, const String&, bool, bool, int) { return 0; }
 
+    static Drawable* loadDrawableFromData (const void* data, size_t numBytes);
+
     LookAndFeel (const LookAndFeel&);
     LookAndFeel& operator= (const LookAndFeel&);
 };

src/gui/graphics/drawables/juce_SVGParser.cpp

@@ -742,8 +742,12 @@ private:
 
                 if (gradient.isRadial)
                 {
-                    gradient.point1.setXY (dx + getCoordLength (fillXml->getStringAttribute ("cx", "50%"), gradientWidth),
-                                           dy + getCoordLength (fillXml->getStringAttribute ("cy", "50%"), gradientHeight));
+                    if (userSpace)
+                        gradient.point1.setXY (dx + getCoordLength (fillXml->getStringAttribute ("cx", "50%"), gradientWidth),
+                                               dy + getCoordLength (fillXml->getStringAttribute ("cy", "50%"), gradientHeight));
+                    else
+                        gradient.point1.setXY (dx + gradientWidth * getCoordLength (fillXml->getStringAttribute ("cx", "50%"), 1.0f),
+                                               dy + gradientHeight * getCoordLength (fillXml->getStringAttribute ("cy", "50%"), 1.0f));
 
                     const float radius = getCoordLength (fillXml->getStringAttribute ("r", "50%"), gradientWidth);
                     gradient.point2 = gradient.point1 + Point<float> (radius, 0.0f);
@@ -752,11 +756,22 @@ private:
                 }
                 else
                 {
-                    gradient.point1.setXY (dx + getCoordLength (fillXml->getStringAttribute ("x1", "0%"), gradientWidth),
-                                           dy + getCoordLength (fillXml->getStringAttribute ("y1", "0%"), gradientHeight));
+                    if (userSpace)
+                    {
+                        gradient.point1.setXY (dx + getCoordLength (fillXml->getStringAttribute ("x1", "0%"), gradientWidth),
+                                               dy + getCoordLength (fillXml->getStringAttribute ("y1", "0%"), gradientHeight));
 
-                    gradient.point2.setXY (dx + getCoordLength (fillXml->getStringAttribute ("x2", "100%"), gradientWidth),
-                                           dy + getCoordLength (fillXml->getStringAttribute ("y2", "0%"), gradientHeight));
+                        gradient.point2.setXY (dx + getCoordLength (fillXml->getStringAttribute ("x2", "100%"), gradientWidth),
+                                               dy + getCoordLength (fillXml->getStringAttribute ("y2", "0%"), gradientHeight));
+                    }
+                    else
+                    {
+                        gradient.point1.setXY (dx + gradientWidth * getCoordLength (fillXml->getStringAttribute ("x1", "0%"), 1.0f),
+                                               dy + gradientHeight * getCoordLength (fillXml->getStringAttribute ("y1", "0%"), 1.0f));
+
+                        gradient.point2.setXY (dx + gradientWidth * getCoordLength (fillXml->getStringAttribute ("x2", "100%"), 1.0f),
+                                               dy + gradientHeight * getCoordLength (fillXml->getStringAttribute ("y2", "0%"), 1.0f));
+                    }
 
                     if (gradient.point1 == gradient.point2)
                         return Colour (gradient.getColour (gradient.getNumColours() - 1));