mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Projucer: Updated some font use and removed the EULA if running without the live-coding DLL

Browse source
This commit is contained in:
jules 2016-04-14 18:18:10 +01:00
parent 025d04cbd1
commit effb421be1
18 changed files with 71 additions and 1496 deletions
Download patch file Download diff file Expand all files Collapse all files

2
examples/NetworkGraphicsDemo/Source/Demos.h
View file

@ -405,7 +405,7 @@ struct FlockWithText : public FlockDemo
String text = String (messages[currentMessage]).replace ("NUMDEVICES", String (canvas.clients.size()));
AttributedString as;
as.append (text, Font ("Contax Pro 65 Med", String(), textSize * scale), Colour (0x80ffffff).withMultipliedAlpha (alpha));
as.append (text, Font(), String(), textSize * scale), Colour (0x80ffffff).withMultipliedAlpha (alpha));
as.setJustification (Justification::centred);
auto centre = canvas.clients[clientIndex % canvas.clients.size()].centre * scale;

8
extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj
View file

@ -435,7 +435,6 @@
54747E887C1021F05F172B89 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ApplicationCommandManager.cpp"; path = "../../../../modules/juce_gui_basics/commands/juce_ApplicationCommandManager.cpp"; sourceTree = "SOURCE_ROOT"; };
54DAB21828DE5EEDABE2F5D4 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = transupp.h; path = "../../../../modules/juce_graphics/image_formats/jpglib/transupp.h"; sourceTree = "SOURCE_ROOT"; };
553725A0E3A391651ED1731E = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_FileHelpers.h"; path = "../../Source/Utility/jucer_FileHelpers.h"; sourceTree = "SOURCE_ROOT"; };
558D6BDDD9452E6F359D713A = {isa = PBXFileReference; lastKnownFileType = file.otf; name = ContaxPro65Med.otf; path = ../../Source/BinaryData/ContaxPro65Med.otf; sourceTree = "SOURCE_ROOT"; };
55F7CE15FA02A9F599A83A58 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DynamicObject.h"; path = "../../../../modules/juce_core/containers/juce_DynamicObject.h"; sourceTree = "SOURCE_ROOT"; };
563091B0916AD9AAA36C7DC5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_OpenDocumentManager.h"; path = "../../Source/Application/jucer_OpenDocumentManager.h"; sourceTree = "SOURCE_ROOT"; };
5644F0AFA78E8AC7501978DE = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MenuBarComponent.cpp"; path = "../../../../modules/juce_gui_basics/menus/juce_MenuBarComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
@ -591,7 +590,6 @@
7FDC4820A86DBA34E62B241E = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AsyncUpdater.cpp"; path = "../../../../modules/juce_events/broadcasters/juce_AsyncUpdater.cpp"; sourceTree = "SOURCE_ROOT"; };
7FF7EFDC3CF13673541E332D = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_RelativePointPath.cpp"; path = "../../../../modules/juce_gui_basics/positioning/juce_RelativePointPath.cpp"; sourceTree = "SOURCE_ROOT"; };
80131CEDAA488DC654996A55 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_RelativeParallelogram.h"; path = "../../../../modules/juce_gui_basics/positioning/juce_RelativeParallelogram.h"; sourceTree = "SOURCE_ROOT"; };
8022F586EC72D9503F490267 = {isa = PBXFileReference; lastKnownFileType = file.otf; name = ContaxPro45Lig.otf; path = ../../Source/BinaryData/ContaxPro45Lig.otf; sourceTree = "SOURCE_ROOT"; };
80805CC243709AF2F72B4CD1 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = inflate.h; path = "../../../../modules/juce_core/zip/zlib/inflate.h"; sourceTree = "SOURCE_ROOT"; };
808503667FBB423F81780796 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DirectoryContentsDisplayComponent.h"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_DirectoryContentsDisplayComponent.h"; sourceTree = "SOURCE_ROOT"; };
8090981F07A76E465DAAADF4 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ValueSourceHelpers.h"; path = "../../Source/Utility/jucer_ValueSourceHelpers.h"; sourceTree = "SOURCE_ROOT"; };
@ -626,7 +624,6 @@
8803733D62CD6DE90727BCA0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_cryptography.h"; path = "../../../../modules/juce_cryptography/juce_cryptography.h"; sourceTree = "SOURCE_ROOT"; };
882E28FED1A99E73B0035FC8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ResizableWindow.h"; path = "../../../../modules/juce_gui_basics/windows/juce_ResizableWindow.h"; sourceTree = "SOURCE_ROOT"; };
88EA32274CBB5C3A4ECB9ECA = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_KeyboardFocusTraverser.cpp"; path = "../../../../modules/juce_gui_basics/keyboard/juce_KeyboardFocusTraverser.cpp"; sourceTree = "SOURCE_ROOT"; };
89C92F903E2F6CE56F73FA6D = {isa = PBXFileReference; lastKnownFileType = file.otf; name = ContaxPro55RmSC.otf; path = ../../Source/BinaryData/ContaxPro55RmSC.otf; sourceTree = "SOURCE_ROOT"; };
8A0E175187B06CE9C368A73B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ProgressBar.cpp"; path = "../../../../modules/juce_gui_basics/widgets/juce_ProgressBar.cpp"; sourceTree = "SOURCE_ROOT"; };
8A5D40E78966BA8B0F8B542A = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_PathIterator.h"; path = "../../../../modules/juce_graphics/geometry/juce_PathIterator.h"; sourceTree = "SOURCE_ROOT"; };
8A825FDDC00DD253F44D2C3A = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectWizard_AudioApp.h"; path = "../../Source/Wizards/jucer_ProjectWizard_AudioApp.h"; sourceTree = "SOURCE_ROOT"; };
@ -910,7 +907,6 @@
CB147AFB52BD5FC0816C0EEE = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "projucer_LiveCodeBuilderDLL.h"; path = "../../Source/LiveBuildEngine/projucer_LiveCodeBuilderDLL.h"; sourceTree = "SOURCE_ROOT"; };
CB36CD7F57D0F4231DC98686 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Message.h"; path = "../../../../modules/juce_events/messages/juce_Message.h"; sourceTree = "SOURCE_ROOT"; };
CB48495010366C2E371BEFDB = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_SystemStats.cpp"; path = "../../../../modules/juce_core/system/juce_SystemStats.cpp"; sourceTree = "SOURCE_ROOT"; };
CBB97680B21DE1EDBA84A3EB = {isa = PBXFileReference; lastKnownFileType = file.otf; name = ContaxPro55Rm.otf; path = ../../Source/BinaryData/ContaxPro55Rm.otf; sourceTree = "SOURCE_ROOT"; };
CBE0B96838EE76C9CB8E1230 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ColourGradient.cpp"; path = "../../../../modules/juce_graphics/colour/juce_ColourGradient.cpp"; sourceTree = "SOURCE_ROOT"; };
CC3F5263B16932FF4E74B9D8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CodeEditorComponent.h"; path = "../../../../modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.h"; sourceTree = "SOURCE_ROOT"; };
CC63B9EC2E95FD4AF7608D8E = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CharacterFunctions.h"; path = "../../../../modules/juce_core/text/juce_CharacterFunctions.h"; sourceTree = "SOURCE_ROOT"; };
@ -1372,10 +1368,6 @@
301592EBAC0FFF6F5B268E99,
41105E536155E394E54BDD35,
5F6584B675E30761521A9F42,
8022F586EC72D9503F490267,
CBB97680B21DE1EDBA84A3EB,
89C92F903E2F6CE56F73FA6D,
558D6BDDD9452E6F359D713A,
B483D960309FAFC193F9CDA2,
1A8E24245E48C7C4DB0164E6,
353E622BE257074B5589199D,

4
extras/Projucer/Builds/VisualStudio2013/Projucer.vcxproj
View file

@ -1840,10 +1840,6 @@
<None Include="..\..\Source\BinaryData\background_tile.png"/>
<None Include="..\..\Source\BinaryData\colourscheme_dark.xml"/>
<None Include="..\..\Source\BinaryData\colourscheme_light.xml"/>
<None Include="..\..\Source\BinaryData\ContaxPro45Lig.otf"/>
<None Include="..\..\Source\BinaryData\ContaxPro55Rm.otf"/>
<None Include="..\..\Source\BinaryData\ContaxPro55RmSC.otf"/>
<None Include="..\..\Source\BinaryData\ContaxPro65Med.otf"/>
<None Include="..\..\Source\BinaryData\juce_icon.png"/>
<None Include="..\..\Source\BinaryData\projectIconAndroid.png"/>
<None Include="..\..\Source\BinaryData\projectIconCodeblocks.png"/>

12
extras/Projucer/Builds/VisualStudio2013/Projucer.vcxproj.filters
View file

@ -3239,18 +3239,6 @@
<None Include="..\..\Source\BinaryData\colourscheme_light.xml">
<Filter>Projucer\BinaryData</Filter>
</None>
<None Include="..\..\Source\BinaryData\ContaxPro45Lig.otf">
<Filter>Projucer\BinaryData</Filter>
</None>
<None Include="..\..\Source\BinaryData\ContaxPro55Rm.otf">
<Filter>Projucer\BinaryData</Filter>
</None>
<None Include="..\..\Source\BinaryData\ContaxPro55RmSC.otf">
<Filter>Projucer\BinaryData</Filter>
</None>
<None Include="..\..\Source\BinaryData\ContaxPro65Med.otf">
<Filter>Projucer\BinaryData</Filter>
</None>
<None Include="..\..\Source\BinaryData\juce_icon.png">
<Filter>Projucer\BinaryData</Filter>
</None>

4
extras/Projucer/Builds/VisualStudio2015/Projucer.vcxproj
View file

@ -1840,10 +1840,6 @@
<None Include="..\..\Source\BinaryData\background_tile.png"/>
<None Include="..\..\Source\BinaryData\colourscheme_dark.xml"/>
<None Include="..\..\Source\BinaryData\colourscheme_light.xml"/>
<None Include="..\..\Source\BinaryData\ContaxPro45Lig.otf"/>
<None Include="..\..\Source\BinaryData\ContaxPro55Rm.otf"/>
<None Include="..\..\Source\BinaryData\ContaxPro55RmSC.otf"/>
<None Include="..\..\Source\BinaryData\ContaxPro65Med.otf"/>
<None Include="..\..\Source\BinaryData\juce_icon.png"/>
<None Include="..\..\Source\BinaryData\projectIconAndroid.png"/>
<None Include="..\..\Source\BinaryData\projectIconCodeblocks.png"/>

12
extras/Projucer/Builds/VisualStudio2015/Projucer.vcxproj.filters
View file

@ -3239,18 +3239,6 @@
<None Include="..\..\Source\BinaryData\colourscheme_light.xml">
<Filter>Projucer\BinaryData</Filter>
</None>
<None Include="..\..\Source\BinaryData\ContaxPro45Lig.otf">
<Filter>Projucer\BinaryData</Filter>
</None>
<None Include="..\..\Source\BinaryData\ContaxPro55Rm.otf">
<Filter>Projucer\BinaryData</Filter>
</None>
<None Include="..\..\Source\BinaryData\ContaxPro55RmSC.otf">
<Filter>Projucer\BinaryData</Filter>
</None>
<None Include="..\..\Source\BinaryData\ContaxPro65Med.otf">
<Filter>Projucer\BinaryData</Filter>
</None>
<None Include="..\..\Source\BinaryData\juce_icon.png">
<Filter>Projucer\BinaryData</Filter>
</None>

1438
extras/Projucer/JuceLibraryCode/BinaryData.cpp
View file

File diff suppressed because it is too large Load diff

14
extras/Projucer/JuceLibraryCode/BinaryData.h
View file

@ -84,18 +84,6 @@ namespace BinaryData
extern const char* colourscheme_light_xml;
const int colourscheme_light_xmlSize = 1050;
extern const char* ContaxPro45Lig_otf;
const int ContaxPro45Lig_otfSize = 24660;
extern const char* ContaxPro55Rm_otf;
const int ContaxPro55Rm_otfSize = 30772;
extern const char* ContaxPro55RmSC_otf;
const int ContaxPro55RmSC_otfSize = 25312;
extern const char* ContaxPro65Med_otf;
const int ContaxPro65Med_otfSize = 24964;
extern const char* juce_icon_png;
const int juce_icon_pngSize = 45854;
@ -160,7 +148,7 @@ namespace BinaryData
extern const char* namedResourceList[];
// Number of elements in the namedResourceList array.
const int namedResourceListSize = 49;
const int namedResourceListSize = 45;
// 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).

8
extras/Projucer/Projucer.jucer
View file

@ -569,14 +569,6 @@
file="Source/BinaryData/colourscheme_dark.xml"/>
<FILE id="cVh68s" name="colourscheme_light.xml" compile="0" resource="1"
file="Source/BinaryData/colourscheme_light.xml"/>
<FILE id="h8midx" name="ContaxPro45Lig.otf" compile="0" resource="1"
file="Source/BinaryData/ContaxPro45Lig.otf"/>
<FILE id="TJYKhn" name="ContaxPro55Rm.otf" compile="0" resource="1"
file="Source/BinaryData/ContaxPro55Rm.otf"/>
<FILE id="VNy40Q" name="ContaxPro55RmSC.otf" compile="0" resource="1"
file="Source/BinaryData/ContaxPro55RmSC.otf"/>
<FILE id="noDr2N" name="ContaxPro65Med.otf" compile="0" resource="1"
file="Source/BinaryData/ContaxPro65Med.otf"/>
<FILE id="OCyr5F" name="juce_icon.png" compile="0" resource="1" file="Source/BinaryData/juce_icon.png"/>
<FILE id="pBWoUz" name="projectIconAndroid.png" compile="0" resource="1"
file="Source/BinaryData/projectIconAndroid.png"/>

33
extras/Projucer/Source/Application/jucer_Application.cpp
View file

@ -102,7 +102,9 @@ void ProjucerApplication::initialise (const String& commandLine)
return;
}
if (! initialiseLog())
openDocumentManager.registerType (new ProjucerAppClasses::LiveBuildCodeEditorDocument::Type(), 2);
if (! checkEULA())
{
quit();
return;
@ -128,23 +130,6 @@ void ProjucerApplication::initialiseBasics()
icons = new Icons();
}
bool ProjucerApplication::initialiseLog()
{
openDocumentManager.registerType (new ProjucerAppClasses::LiveBuildCodeEditorDocument::Type(), 2);
if (currentEULAHasBeenAcceptedPreviously())
return true;
ScopedPointer<AlertWindow> eulaDialogue (new EULADialogue());
bool hasBeenAccepted = (eulaDialogue->runModalLoop() == EULADialogue::accepted);
setCurrentEULAAccepted (hasBeenAccepted);
if (hasBeenAccepted)
return initialiseLogger ("log_");
return false;
}
bool ProjucerApplication::initialiseLogger (const char* filePrefix)
{
if (logger == nullptr)
@ -795,6 +780,18 @@ void ProjucerApplication::loginOrLogout()
updateAllBuildTabs();
}
bool ProjucerApplication::checkEULA()
{
if (currentEULAHasBeenAcceptedPreviously()
|| ! ProjucerLicences::getInstance()->isDLLPresent())
return true;
ScopedPointer<AlertWindow> eulaDialogue (new EULADialogue());
bool hasBeenAccepted = (eulaDialogue->runModalLoop() == EULADialogue::accepted);
setCurrentEULAAccepted (hasBeenAccepted);
return hasBeenAccepted;
}
bool ProjucerApplication::currentEULAHasBeenAcceptedPreviously() const
{
return getGlobalProperties().getValue (getEULAChecksumProperty()).getIntValue() != 0;

3
extras/Projucer/Source/Application/jucer_Application.h
View file

@ -46,7 +46,6 @@ public:
//==============================================================================
void initialise (const String& commandLine) override;
void initialiseBasics();
bool initialiseLog();
bool initialiseLogger (const char* filePrefix);
void initialiseWindows (const String& commandLine);
@ -129,6 +128,8 @@ private:
ScopedPointer<LatestVersionChecker> versionChecker;
void loginOrLogout();
bool checkEULA();
bool currentEULAHasBeenAcceptedPreviously() const;
String getEULAChecksumProperty() const;
void setCurrentEULAAccepted (bool hasBeenAccepted) const;

4
extras/Projucer/Source/Application/jucer_LoginForm.h
View file

@ -71,7 +71,7 @@ public:
rememberLoginCheckbox.addListener (this);
forgotPasswordButton.setColour (HyperlinkButton::textColourId, Colours::white);
forgotPasswordButton.setFont (lookAndFeel.getContaxProFont().withHeight (lookAndFeel.labelFontSize), false, Justification::topLeft);
forgotPasswordButton.setFont (ProjucerDialogLookAndFeel::getDialogFont().withHeight (lookAndFeel.labelFontSize), false, Justification::topLeft);
addAndMakeVisible (forgotPasswordButton);
initialiseButton (loginButton, KeyPress::returnKey);
@ -168,7 +168,7 @@ private:
{
textField.setColour (TextEditor::focusedOutlineColourId, Colours::transparentWhite);
textField.setColour (TextEditor::highlightColourId, ProjucerDialogLookAndFeel::getErrorTextColour());
textField.setFont (lookAndFeel.getContaxProFont().withHeight (17));
textField.setFont (ProjucerDialogLookAndFeel::getDialogFont().withHeight (17));
textField.addListener (this);
associatedLabel.setColour (Label::textColourId, Colours::white);
addAndMakeVisible (associatedLabel);

BIN
extras/Projucer/Source/BinaryData/ContaxPro45Lig.otf
View file

Binary file not shown.

BIN
extras/Projucer/Source/BinaryData/ContaxPro55Rm.otf
View file

Binary file not shown.

BIN
extras/Projucer/Source/BinaryData/ContaxPro55RmSC.otf
View file

Binary file not shown.

BIN
extras/Projucer/Source/BinaryData/ContaxPro65Med.otf
View file

Binary file not shown.

5
extras/Projucer/Source/Project Saving/jucer_ProjectExport_XCode.h
View file

@ -319,9 +319,8 @@ public:
if (AlertWindow::showOkCancelBox (AlertWindow::WarningIcon,
"Project settings: " + project.getDocumentTitle(),
alertWindowText, "Update", "Cancel",
nullptr, nullptr))
getPostBuildScriptValue() = Value();
alertWindowText, "Update", "Cancel", nullptr, nullptr))
getPostBuildScriptValue() = var();
}
}

20
extras/Projucer/Source/Utility/jucer_DialogLookAndFeel.h
View file

@ -46,7 +46,7 @@ public:
}
g.setColour (button.findColour (ToggleButton::textColourId));
g.setFont (getContaxProFont().withHeight (labelFontSize));
g.setFont (getDialogFont().withHeight (labelFontSize));
g.drawFittedText (button.getButtonText(), 24, 1,
button.getWidth() - 24, button.getHeight(),
@ -83,26 +83,22 @@ public:
//==============================================================================
Font getTextButtonFont (TextButton&, int /*buttonHeight*/) override
{
return getContaxProFont().withHeight (buttonFontSize);
return getDialogFont().withHeight (buttonFontSize);
}
Font getLabelFont (Label&) override
{
return getContaxProFont().withHeight (labelFontSize);
}
static const Font& getContaxProFont()
{
static Font font (Typeface::createSystemTypefaceFor (BinaryData::ContaxPro55Rm_otf, BinaryData::ContaxPro55Rm_otfSize));
return font;
return getDialogFont().withHeight (labelFontSize);
}
//==============================================================================
int getAlertWindowButtonHeight() override { return 40; }
Font getAlertWindowTitleFont() override { return getContaxProFont().withHeight (18); }
Font getAlertWindowMessageFont() override { return getContaxProFont().withHeight (12); }
Font getAlertWindowFont() override { return getContaxProFont().withHeight (12); }
static Font getDialogFont() { return Font(); }
Font getAlertWindowTitleFont() override { return getDialogFont().withHeight (18); }
Font getAlertWindowMessageFont() override { return getDialogFont().withHeight (12); }
Font getAlertWindowFont() override { return getDialogFont().withHeight (12); }
//==============================================================================
static Colour getBackgroundColour() { return Colour (0xff4d4d4d); }