diff --git a/Source/UI/ControlPanel.cpp b/Source/UI/ControlPanel.cpp index 1329b2ea90f49f1a79920c8b618d2d65cfef98cc..af7589df141d83891b66e5294f42c187111e137d 100755 --- a/Source/UI/ControlPanel.cpp +++ b/Source/UI/ControlPanel.cpp @@ -90,10 +90,13 @@ RecordButton::~RecordButton() CPUMeter::CPUMeter() : Label("CPU Meter","0.0"), cpu(0.0f), lastCpu(0.0f) { - MemoryInputStream mis(BinaryData::silkscreenserialized, BinaryData::silkscreenserializedSize, false); - Typeface::Ptr typeface = new CustomTypeface(mis); - font = Font(typeface); - font.setHeight(12); + + font = Font("Small Text", 12, Font::plain); + + // MemoryInputStream mis(BinaryData::silkscreenserialized, BinaryData::silkscreenserializedSize, false); + // Typeface::Ptr typeface = new CustomTypeface(mis); + // font = Font(typeface); + // font.setHeight(12); } CPUMeter::~CPUMeter() @@ -125,10 +128,13 @@ void CPUMeter::paint(Graphics& g) DiskSpaceMeter::DiskSpaceMeter() { - MemoryInputStream mis(BinaryData::silkscreenserialized, BinaryData::silkscreenserializedSize, false); - Typeface::Ptr typeface = new CustomTypeface(mis); - font = Font(typeface); - font.setHeight(12); + + font = Font("Small Text", 12, Font::plain); + + // MemoryInputStream mis(BinaryData::silkscreenserialized, BinaryData::silkscreenserializedSize, false); + // Typeface::Ptr typeface = new CustomTypeface(mis); + // font = Font(typeface); + // font.setHeight(12); } @@ -161,10 +167,12 @@ void DiskSpaceMeter::paint(Graphics& g) Clock::Clock() : isRunning(false), isRecording(false) { - MemoryInputStream mis(BinaryData::cpmonolightserialized, BinaryData::cpmonolightserializedSize, false); - Typeface::Ptr typeface = new CustomTypeface(mis); - clockFont = Font(typeface); - clockFont.setHeight(30); + clockFont = Font("Default Light", 30, Font::plain); + + // MemoryInputStream mis(BinaryData::cpmonolightserialized, BinaryData::cpmonolightserializedSize, false); + // Typeface::Ptr typeface = new CustomTypeface(mis); + // clockFont = Font(typeface); + // clockFont.setHeight(30); totalTime = 0; totalRecordTime = 0; @@ -339,10 +347,13 @@ ControlPanel::ControlPanel(ProcessorGraph* graph_, AudioComponent* audio_) if (1) { - MemoryInputStream mis(BinaryData::misoserialized, BinaryData::misoserializedSize, false); - Typeface::Ptr typeface = new CustomTypeface(mis); - font = Font(typeface); - font.setHeight(15); + + font = Font("Paragraph", 13, Font::plain); + + // MemoryInputStream mis(BinaryData::misoserialized, BinaryData::misoserializedSize, false); + // Typeface::Ptr typeface = new CustomTypeface(mis); + // font = Font(typeface); + // font.setHeight(15); } audioEditor = (AudioEditor*) graph->getAudioNode()->createEditor(); diff --git a/Source/UI/ProcessorList.cpp b/Source/UI/ProcessorList.cpp index bb0051f87f52972b5b4cc1699bd790acad7f9b38..404ffdc09ee4734a3390bff5a0b6380b566c750d 100755 --- a/Source/UI/ProcessorList.cpp +++ b/Source/UI/ProcessorList.cpp @@ -41,19 +41,22 @@ ProcessorList::ProcessorList() xBuffer(1), yBuffer(1) { - MemoryInputStream mis1(BinaryData::cpmonolightserialized, - BinaryData::cpmonolightserializedSize, - false); - Typeface::Ptr tp1 = new CustomTypeface(mis1); - listFontLight = Font(tp1); - listFontLight.setHeight(25); - - MemoryInputStream mis2(BinaryData::cpmonoplainserialized, - BinaryData::cpmonoplainserializedSize, - false); - Typeface::Ptr tp2 = new CustomTypeface(mis2); - listFontPlain = Font(tp2); - listFontPlain.setHeight(20); + listFontLight = Font("Default Light", 25, Font::plain); + listFontPlain = Font("Default", 20, Font::plain); + + // MemoryInputStream mis1(BinaryData::cpmonolightserialized, + // BinaryData::cpmonolightserializedSize, + // false); + // Typeface::Ptr tp1 = new CustomTypeface(mis1); + // listFontLight = Font(tp1); + // listFontLight.setHeight(25); + + // MemoryInputStream mis2(BinaryData::cpmonoplainserialized, + // BinaryData::cpmonoplainserializedSize, + // false); + // Typeface::Ptr tp2 = new CustomTypeface(mis2); + // listFontPlain = Font(tp2); + // listFontPlain.setHeight(20); setColour(PROCESSOR_COLOR, Colour(59, 59, 59)); setColour(FILTER_COLOR, Colour(41, 76, 158));//Colour(255, 89, 0)); diff --git a/Source/UI/UIComponent.cpp b/Source/UI/UIComponent.cpp index fb7c2a17f81c1ca471f42ded0dd93b10cdc95ec8..527856816ebe12fd317f092c453c34a0703fa5cc 100755 --- a/Source/UI/UIComponent.cpp +++ b/Source/UI/UIComponent.cpp @@ -424,12 +424,14 @@ EditorViewportButton::EditorViewportButton(UIComponent* ui) : UI(ui) { open = true; - MemoryInputStream mis1(BinaryData::cpmonolightserialized, - BinaryData::cpmonolightserializedSize, - false); - Typeface::Ptr tp1 = new CustomTypeface(mis1); - buttonFont = Font(tp1); - buttonFont.setHeight(25); + buttonFont = Font("Default Light", 25, Font::plain); + + // MemoryInputStream mis1(BinaryData::cpmonolightserialized, + // BinaryData::cpmonolightserializedSize, + // false); + // Typeface::Ptr tp1 = new CustomTypeface(mis1); + // buttonFont = Font(tp1); + // buttonFont.setHeight(25); }