Browse Source

Updated Icon Design and Binary Data

tags/2021-05-28
Felix Faire 10 years ago
parent
commit
02c95c45d4
27 changed files with 1735 additions and 338 deletions
  1. BIN
      examples/Demo/Builds/Android/res/drawable-mdpi/icon.png
  2. +2
    -2
      examples/Demo/Builds/Linux/Makefile
  3. BIN
      examples/Demo/Builds/MacOSX/Icon.icns
  4. BIN
      examples/Demo/Builds/VisualStudio2010/icon.ico
  5. BIN
      examples/Demo/Builds/VisualStudio2012/icon.ico
  6. BIN
      examples/Demo/Builds/VisualStudio2013/icon.ico
  7. BIN
      examples/Demo/Builds/iOS/Icon.icns
  8. +824
    -276
      examples/Demo/JuceLibraryCode/BinaryData.cpp
  9. +1
    -1
      examples/Demo/JuceLibraryCode/BinaryData.h
  10. BIN
      examples/Demo/Resources/juce_icon.png
  11. +1
    -1
      examples/Demo/Source/Demos/AnimationDemo.cpp
  12. +2
    -2
      extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp
  13. +2
    -2
      extras/Introjucer/Builds/Linux/Makefile
  14. BIN
      extras/Introjucer/Builds/MacOSX/Icon.icns
  15. +2
    -5
      extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj
  16. +10
    -1
      extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj
  17. BIN
      extras/Introjucer/Builds/VisualStudio2005/icon.ico
  18. +10
    -1
      extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj
  19. BIN
      extras/Introjucer/Builds/VisualStudio2008/icon.ico
  20. BIN
      extras/Introjucer/Builds/VisualStudio2010/icon.ico
  21. BIN
      extras/Introjucer/Builds/VisualStudio2012/icon.ico
  22. BIN
      extras/Introjucer/Builds/VisualStudio2013/icon.ico
  23. +1
    -1
      extras/Introjucer/Introjucer.jucer
  24. +875
    -44
      extras/Introjucer/JuceLibraryCode/BinaryData.cpp
  25. +5
    -2
      extras/Introjucer/JuceLibraryCode/BinaryData.h
  26. BIN
      extras/Introjucer/Source/BinaryData/juce_icon.png
  27. BIN
      extras/Introjucer/Source/BinaryData/juce_iconOLD.png

BIN
examples/Demo/Builds/Android/res/drawable-mdpi/icon.png View File

Before After
Width: 128  |  Height: 128  |  Size: 17KB Width: 128  |  Height: 128  |  Size: 20KB

+ 2
- 2
examples/Demo/Builds/Linux/Makefile View File

@@ -18,7 +18,7 @@ ifeq ($(CONFIG),Debug)
TARGET_ARCH := -march=native
endif
CPPFLAGS := $(DEPFLAGS) -std=c++11 -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.0.0" -D "JUCE_APP_VERSION_HEX=0x30000" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.0.0" -D "JUCE_APP_VERSION_HEX=0x30000" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0
CXXFLAGS += $(CFLAGS)
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt
@@ -39,7 +39,7 @@ ifeq ($(CONFIG),Release)
TARGET_ARCH := -march=native
endif
CPPFLAGS := $(DEPFLAGS) -std=c++11 -D "LINUX=1" -D "NDEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.0.0" -D "JUCE_APP_VERSION_HEX=0x30000" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.0.0" -D "JUCE_APP_VERSION_HEX=0x30000" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3
CXXFLAGS += $(CFLAGS)
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt


BIN
examples/Demo/Builds/MacOSX/Icon.icns View File


BIN
examples/Demo/Builds/VisualStudio2010/icon.ico View File

Before After

BIN
examples/Demo/Builds/VisualStudio2012/icon.ico View File

Before After

BIN
examples/Demo/Builds/VisualStudio2013/icon.ico View File

Before After

BIN
examples/Demo/Builds/iOS/Icon.icns View File


+ 824
- 276
examples/Demo/JuceLibraryCode/BinaryData.cpp
File diff suppressed because it is too large
View File


+ 1
- 1
examples/Demo/JuceLibraryCode/BinaryData.h View File

@@ -22,7 +22,7 @@ namespace BinaryData
const int icons_zipSize = 83876;
extern const char* juce_icon_png;
const int juce_icon_pngSize = 19826;
const int juce_icon_pngSize = 83091;
extern const char* juce_module_info;
const int juce_module_infoSize = 1404;


BIN
examples/Demo/Resources/juce_icon.png View File

Before After
Width: 128  |  Height: 128  |  Size: 19KB Width: 128  |  Height: 128  |  Size: 81KB

+ 1
- 1
examples/Demo/Source/Demos/AnimationDemo.cpp View File

@@ -243,7 +243,7 @@ private:
ImageButton* b = new ImageButton ("ImageButton");
b->setImages (true, true, true,
juceIcon, 0.7f, Colours::transparentBlack,
juceIcon, 1.0f, Colours::transparentBlack,
juceIcon, 1.0f, Colours::white,
juceIcon, 1.0f, Colours::white,
0.5f);


+ 2
- 2
extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp View File

@@ -16,7 +16,7 @@
<Option compiler="gcc"/>
<Compiler>
<Add option="-O0"/>
<Add option="-std=c++11"/>
<Add option="-std=gnu++0x"/>
<Add option="-mstackrealign"/>
<Add option="-g"/>
<Add option="-D__MINGW__=1"/>
@@ -53,7 +53,7 @@
<Option compiler="gcc"/>
<Compiler>
<Add option="-Os"/>
<Add option="-std=c++11"/>
<Add option="-std=gnu++0x"/>
<Add option="-mstackrealign"/>
<Add option="-D__MINGW__=1"/>
<Add option="-D__MINGW_EXTENSION="/>


+ 2
- 2
extras/Introjucer/Builds/Linux/Makefile View File

@@ -18,7 +18,7 @@ ifeq ($(CONFIG),Debug)
TARGET_ARCH := -march=native
endif
CPPFLAGS := $(DEPFLAGS) -std=c++11 -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.1.0" -D "JUCE_APP_VERSION_HEX=0x30100" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.1.0" -D "JUCE_APP_VERSION_HEX=0x30100" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=gnu++0x
CXXFLAGS += $(CFLAGS)
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt
@@ -39,7 +39,7 @@ ifeq ($(CONFIG),Release)
TARGET_ARCH := -march=native
endif
CPPFLAGS := $(DEPFLAGS) -std=c++11 -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.1.0" -D "JUCE_APP_VERSION_HEX=0x30100" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=3.1.0" -D "JUCE_APP_VERSION_HEX=0x30100" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -std=gnu++0x
CXXFLAGS += $(CFLAGS)
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt


BIN
extras/Introjucer/Builds/MacOSX/Icon.icns View File


+ 2
- 5
extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj View File

@@ -55,7 +55,6 @@
F6635694A01FFBF5EF0968DB = {isa = PBXBuildFile; fileRef = 631983AA62673015F8D7453B; };
518DD443B6F17A5AFD707263 = {isa = PBXBuildFile; fileRef = A69024A225F2AC31F17B1314; };
B7EBA1A83575F48CD08140B9 = {isa = PBXBuildFile; fileRef = 4B083E951ECB62217C46CB01; };
6FC19EBA7A51423C3D22F77B = {isa = PBXBuildFile; fileRef = B483D960309FAFC193F9CDA2; };
3C5267E06A897B0DC0F7EA50 = {isa = PBXBuildFile; fileRef = 472F9A90F685220D730EBF6C; };
7E72CB84146E1B4B168356CA = {isa = PBXBuildFile; fileRef = 38F29C2049566C47993A6D92; };
24AE6B973834AF7E0DE1F228 = {isa = PBXBuildFile; fileRef = D53B54D1786A1FFC024BF064; };
@@ -1971,8 +1970,7 @@
8180B5894A78501084B8F133 = {isa = PBXGroup; children = (
4CA1C3E6585D7694AA9C309F,
6678E9B3EEACAD47F438B264,
951128CA33CCDEF570436B1C,
B483D960309FAFC193F9CDA2, ); name = Resources; sourceTree = "<group>"; };
951128CA33CCDEF570436B1C, ); name = Resources; sourceTree = "<group>"; };
0FFEF043CA89142B18C79ABE = {isa = PBXGroup; children = (
D00F311BFC3C2625C457CB9B,
D1F9B0E9F5D54FE48BEB46EA,
@@ -2072,8 +2070,7 @@
B159CF4275B8A90122629FF4, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; };
C009859650B4628FDD068941 = {isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = (
2610F357881240ACBF612F48,
1321E6C1C6170B6C898AD09D,
6FC19EBA7A51423C3D22F77B, ); runOnlyForDeploymentPostprocessing = 0; };
1321E6C1C6170B6C898AD09D, ); runOnlyForDeploymentPostprocessing = 0; };
84449D044096A03F2582904B = {isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = (
357A6AA6960EF95D92929BEE,
954A036F5DDB375DB23FFB3E,


+ 10
- 1
extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj View File

@@ -570,7 +570,16 @@
<Tool Name="VCCLCompilerTool"/>
</FileConfiguration>
</File>
<File RelativePath="..\..\Source\BinaryData\juce_icon.png"/>
<File RelativePath="..\..\Source\BinaryData\juce_icon.png">
<FileConfiguration Name="Debug|Win32"
ExcludedFromBuild="true">
<Tool Name="VCCLCompilerTool"/>
</FileConfiguration>
<FileConfiguration Name="Release|Win32"
ExcludedFromBuild="true">
<Tool Name="VCCLCompilerTool"/>
</FileConfiguration>
</File>
<File RelativePath="..\..\Source\BinaryData\projectIconAndroid.png">
<FileConfiguration Name="Debug|Win32"
ExcludedFromBuild="true">


BIN
extras/Introjucer/Builds/VisualStudio2005/icon.ico View File

Before After

+ 10
- 1
extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj View File

@@ -570,7 +570,16 @@
<Tool Name="VCCLCompilerTool"/>
</FileConfiguration>
</File>
<File RelativePath="..\..\Source\BinaryData\juce_icon.png"/>
<File RelativePath="..\..\Source\BinaryData\juce_icon.png">
<FileConfiguration Name="Debug|Win32"
ExcludedFromBuild="true">
<Tool Name="VCCLCompilerTool"/>
</FileConfiguration>
<FileConfiguration Name="Release|Win32"
ExcludedFromBuild="true">
<Tool Name="VCCLCompilerTool"/>
</FileConfiguration>
</File>
<File RelativePath="..\..\Source\BinaryData\projectIconAndroid.png">
<FileConfiguration Name="Debug|Win32"
ExcludedFromBuild="true">


BIN
extras/Introjucer/Builds/VisualStudio2008/icon.ico View File

Before After

BIN
extras/Introjucer/Builds/VisualStudio2010/icon.ico View File

Before After

BIN
extras/Introjucer/Builds/VisualStudio2012/icon.ico View File

Before After

BIN
extras/Introjucer/Builds/VisualStudio2013/icon.ico View File

Before After

+ 1
- 1
extras/Introjucer/Introjucer.jucer View File

@@ -560,7 +560,7 @@
file="Source/BinaryData/colourscheme_dark.xml"/>
<FILE id="Rm5UQS" name="colourscheme_light.xml" compile="0" resource="1"
file="Source/BinaryData/colourscheme_light.xml"/>
<FILE id="rVgowdy" name="juce_icon.png" compile="0" resource="0" file="Source/BinaryData/juce_icon.png"/>
<FILE id="rVgowdy" name="juce_icon.png" compile="0" resource="1" file="Source/BinaryData/juce_icon.png"/>
<FILE id="b8Brir" name="projectIconAndroid.png" compile="0" resource="1"
file="Source/BinaryData/projectIconAndroid.png"/>
<FILE id="wdeicV" name="projectIconCodeblocks.png" compile="0" resource="1"


+ 875
- 44
extras/Introjucer/JuceLibraryCode/BinaryData.cpp
File diff suppressed because it is too large
View File


+ 5
- 2
extras/Introjucer/JuceLibraryCode/BinaryData.h View File

@@ -70,7 +70,7 @@ namespace BinaryData
const int jucer_NewInlineComponentTemplate_hSize = 1626;
extern const char* jucer_OpenGLComponentTemplate_cpp;
const int jucer_OpenGLComponentTemplate_cppSize = 1835;
const int jucer_OpenGLComponentTemplate_cppSize = 1827;
extern const char* AudioPluginXCodeScript_txt;
const int AudioPluginXCodeScript_txtSize = 2922;
@@ -84,6 +84,9 @@ namespace BinaryData
extern const char* colourscheme_light_xml;
const int colourscheme_light_xmlSize = 1050;
extern const char* juce_icon_png;
const int juce_icon_pngSize = 83091;
extern const char* projectIconAndroid_png;
const int projectIconAndroid_pngSize = 8150;
@@ -151,7 +154,7 @@ namespace BinaryData
extern const char* namedResourceList[];
// Number of elements in the namedResourceList array.
const int namedResourceListSize = 46;
const int namedResourceListSize = 47;
// If you provide the name of one of the binary resource variables above, this function will
// return the corresponding data and its size (or a null pointer if the name isn't found).


BIN
extras/Introjucer/Source/BinaryData/juce_icon.png View File

Before After
Width: 128  |  Height: 128  |  Size: 19KB Width: 128  |  Height: 128  |  Size: 81KB

BIN
extras/Introjucer/Source/BinaryData/juce_iconOLD.png View File

Before After
Width: 128  |  Height: 128  |  Size: 19KB

Loading…
Cancel
Save