1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-14 00:14:18 +00:00

Old jucer: eliminated the 'L' string literal prefix.

This commit is contained in:
jules 2012-09-21 12:15:39 +01:00
parent 8c4d4d2577
commit faf92ea026
17 changed files with 172 additions and 153 deletions

View file

@ -3,7 +3,7 @@
This is an automatically generated file created by the Jucer!
Creation date: 20 Sep 2012 1:43:09pm
Creation date: 21 Sep 2012 12:09:45pm
Be careful when adding custom code to these files, as only the code within
the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
@ -289,7 +289,7 @@ AudioDemoLatencyPage::AudioDemoLatencyPage (AudioDeviceManager& deviceManager_)
addAndMakeVisible (liveAudioDisplayComp = new LiveAudioInputDisplayComp());
addAndMakeVisible (startTestButton = new TextButton (String::empty));
startTestButton->setButtonText (L"Test Latency");
startTestButton->setButtonText ("Test Latency");
startTestButton->addListener (this);
addAndMakeVisible (testResultsBox = new TextEditor (String::empty));
@ -302,7 +302,7 @@ AudioDemoLatencyPage::AudioDemoLatencyPage (AudioDeviceManager& deviceManager_)
testResultsBox->setColour (TextEditor::backgroundColourId, Colour (0x32ffffff));
testResultsBox->setColour (TextEditor::outlineColourId, Colour (0x1c000000));
testResultsBox->setColour (TextEditor::shadowColourId, Colour (0x16000000));
testResultsBox->setText (L"Running this test measures the round-trip latency between the audio output and input devices you\'ve got selected.\n\nIt\'ll play a sound, then try to measure the time at which the sound arrives back at the audio input. Obviously for this to work you need to have your microphone somewhere near your speakers...");
testResultsBox->setText ("Running this test measures the round-trip latency between the audio output and input devices you\'ve got selected.\n\nIt\'ll play a sound, then try to measure the time at which the sound arrives back at the audio input. Obviously for this to work you need to have your microphone somewhere near your speakers...");
//[UserPreSize]

View file

@ -3,7 +3,7 @@
This is an automatically generated file created by the Jucer!
Creation date: 20 Sep 2012 1:43:09pm
Creation date: 21 Sep 2012 12:09:45pm
Be careful when adding custom code to these files, as only the code within
the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
@ -19,8 +19,8 @@
==============================================================================
*/
#ifndef __JUCER_HEADER_AUDIODEMOLATENCYPAGE_AUDIODEMOLATENCYPAGE_623CCFC4__
#define __JUCER_HEADER_AUDIODEMOLATENCYPAGE_AUDIODEMOLATENCYPAGE_623CCFC4__
#ifndef __JUCER_HEADER_AUDIODEMOLATENCYPAGE_AUDIODEMOLATENCYPAGE_B3E72FB8__
#define __JUCER_HEADER_AUDIODEMOLATENCYPAGE_AUDIODEMOLATENCYPAGE_B3E72FB8__
//[Headers] -- You can add your own extra header files here --
#include "../jucedemo_headers.h"
@ -73,4 +73,4 @@ private:
};
#endif // __JUCER_HEADER_AUDIODEMOLATENCYPAGE_AUDIODEMOLATENCYPAGE_623CCFC4__
#endif // __JUCER_HEADER_AUDIODEMOLATENCYPAGE_AUDIODEMOLATENCYPAGE_B3E72FB8__

View file

@ -3,7 +3,7 @@
This is an automatically generated file created by the Jucer!
Creation date: 20 Sep 2012 1:43:44pm
Creation date: 21 Sep 2012 12:10:00pm
Be careful when adding custom code to these files, as only the code within
the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
@ -184,7 +184,7 @@ AudioDemoPlaybackPage::AudioDemoPlaybackPage (AudioDeviceManager& deviceManager_
fileTreeComp (0)
{
addAndMakeVisible (zoomLabel = new Label (String::empty,
L"zoom:"));
"zoom:"));
zoomLabel->setFont (Font (15.0000f, Font::plain));
zoomLabel->setJustificationType (Justification::centredRight);
zoomLabel->setEditable (false, false, false);
@ -192,7 +192,7 @@ AudioDemoPlaybackPage::AudioDemoPlaybackPage (AudioDeviceManager& deviceManager_
zoomLabel->setColour (TextEditor::backgroundColourId, Colour (0x0));
addAndMakeVisible (explanation = new Label (String::empty,
L"Select an audio file in the treeview above, and this page will display its waveform, and let you play it.."));
"Select an audio file in the treeview above, and this page will display its waveform, and let you play it.."));
explanation->setFont (Font (14.0000f, Font::plain));
explanation->setJustificationType (Justification::bottomRight);
explanation->setEditable (false, false, false);
@ -209,7 +209,7 @@ AudioDemoPlaybackPage::AudioDemoPlaybackPage (AudioDeviceManager& deviceManager_
addAndMakeVisible (thumbnail = new DemoThumbnailComp (formatManager, transportSource, *zoomSlider));
addAndMakeVisible (startStopButton = new TextButton (String::empty));
startStopButton->setButtonText (L"Play/Stop");
startStopButton->setButtonText ("Play/Stop");
startStopButton->addListener (this);
startStopButton->setColour (TextButton::buttonColourId, Colour (0xff79ed7f));

View file

@ -3,7 +3,7 @@
This is an automatically generated file created by the Jucer!
Creation date: 20 Sep 2012 1:43:44pm
Creation date: 21 Sep 2012 12:10:00pm
Be careful when adding custom code to these files, as only the code within
the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
@ -19,8 +19,8 @@
==============================================================================
*/
#ifndef __JUCER_HEADER_AUDIODEMOPLAYBACKPAGE_AUDIODEMOPLAYBACKPAGE_10A391BC__
#define __JUCER_HEADER_AUDIODEMOPLAYBACKPAGE_AUDIODEMOPLAYBACKPAGE_10A391BC__
#ifndef __JUCER_HEADER_AUDIODEMOPLAYBACKPAGE_AUDIODEMOPLAYBACKPAGE_4C42D63__
#define __JUCER_HEADER_AUDIODEMOPLAYBACKPAGE_AUDIODEMOPLAYBACKPAGE_4C42D63__
//[Headers] -- You can add your own extra header files here --
#include "../jucedemo_headers.h"
@ -93,4 +93,4 @@ private:
};
#endif // __JUCER_HEADER_AUDIODEMOPLAYBACKPAGE_AUDIODEMOPLAYBACKPAGE_10A391BC__
#endif // __JUCER_HEADER_AUDIODEMOPLAYBACKPAGE_AUDIODEMOPLAYBACKPAGE_4C42D63__

View file

@ -3,7 +3,7 @@
This is an automatically generated file created by the Jucer!
Creation date: 20 Sep 2012 1:43:57pm
Creation date: 21 Sep 2012 12:10:11pm
Be careful when adding custom code to these files, as only the code within
the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
@ -146,7 +146,7 @@ AudioDemoRecordPage::AudioDemoRecordPage (AudioDeviceManager& deviceManager_)
addAndMakeVisible (liveAudioDisplayComp = new LiveAudioInputDisplayComp());
addAndMakeVisible (explanationLabel = new Label (String::empty,
L"This page demonstrates how to record a wave file from the live audio input..\n\nPressing record will start recording a file in your \"Documents\" folder."));
"This page demonstrates how to record a wave file from the live audio input..\n\nPressing record will start recording a file in your \"Documents\" folder."));
explanationLabel->setFont (Font (15.0000f, Font::plain));
explanationLabel->setJustificationType (Justification::topLeft);
explanationLabel->setEditable (false, false, false);
@ -154,7 +154,7 @@ AudioDemoRecordPage::AudioDemoRecordPage (AudioDeviceManager& deviceManager_)
explanationLabel->setColour (TextEditor::backgroundColourId, Colour (0x0));
addAndMakeVisible (recordButton = new TextButton (String::empty));
recordButton->setButtonText (L"Record");
recordButton->setButtonText ("Record");
recordButton->addListener (this);
recordButton->setColour (TextButton::buttonColourId, Colour (0xffff5c5c));
recordButton->setColour (TextButton::textColourOnId, Colours::black);

View file

@ -3,7 +3,7 @@
This is an automatically generated file created by the Jucer!
Creation date: 20 Sep 2012 1:43:57pm
Creation date: 21 Sep 2012 12:10:11pm
Be careful when adding custom code to these files, as only the code within
the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
@ -19,8 +19,8 @@
==============================================================================
*/
#ifndef __JUCER_HEADER_AUDIODEMORECORDPAGE_AUDIODEMORECORDPAGE_9CE2EC8__
#define __JUCER_HEADER_AUDIODEMORECORDPAGE_AUDIODEMORECORDPAGE_9CE2EC8__
#ifndef __JUCER_HEADER_AUDIODEMORECORDPAGE_AUDIODEMORECORDPAGE_D68BB9E9__
#define __JUCER_HEADER_AUDIODEMORECORDPAGE_AUDIODEMORECORDPAGE_D68BB9E9__
//[Headers] -- You can add your own extra header files here --
#include "../jucedemo_headers.h"
@ -74,4 +74,4 @@ private:
};
#endif // __JUCER_HEADER_AUDIODEMORECORDPAGE_AUDIODEMORECORDPAGE_9CE2EC8__
#endif // __JUCER_HEADER_AUDIODEMORECORDPAGE_AUDIODEMORECORDPAGE_D68BB9E9__

View file

@ -3,7 +3,7 @@
This is an automatically generated file created by the Jucer!
Creation date: 20 Sep 2012 1:44:13pm
Creation date: 21 Sep 2012 12:10:20pm
Be careful when adding custom code to these files, as only the code within
the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
@ -257,13 +257,13 @@ AudioDemoSynthPage::AudioDemoSynthPage (AudioDeviceManager& deviceManager_)
addAndMakeVisible (keyboardComponent = new MidiKeyboardComponent (keyboardState, MidiKeyboardComponent::horizontalKeyboard));
addAndMakeVisible (sineButton = new ToggleButton (String::empty));
sineButton->setButtonText (L"Use sine wave");
sineButton->setButtonText ("Use sine wave");
sineButton->setRadioGroupId (321);
sineButton->addListener (this);
sineButton->setToggleState (true, false);
addAndMakeVisible (sampledButton = new ToggleButton (String::empty));
sampledButton->setButtonText (L"Use sampled sound");
sampledButton->setButtonText ("Use sampled sound");
sampledButton->setRadioGroupId (321);
sampledButton->addListener (this);

View file

@ -3,7 +3,7 @@
This is an automatically generated file created by the Jucer!
Creation date: 20 Sep 2012 1:44:13pm
Creation date: 21 Sep 2012 12:10:20pm
Be careful when adding custom code to these files, as only the code within
the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
@ -19,8 +19,8 @@
==============================================================================
*/
#ifndef __JUCER_HEADER_AUDIODEMOSYNTHPAGE_AUDIODEMOSYNTHPAGE_B0883FF1__
#define __JUCER_HEADER_AUDIODEMOSYNTHPAGE_AUDIODEMOSYNTHPAGE_B0883FF1__
#ifndef __JUCER_HEADER_AUDIODEMOSYNTHPAGE_AUDIODEMOSYNTHPAGE_D17DA22__
#define __JUCER_HEADER_AUDIODEMOSYNTHPAGE_AUDIODEMOSYNTHPAGE_D17DA22__
//[Headers] -- You can add your own extra header files here --
#include "../jucedemo_headers.h"
@ -76,4 +76,4 @@ private:
};
#endif // __JUCER_HEADER_AUDIODEMOSYNTHPAGE_AUDIODEMOSYNTHPAGE_B0883FF1__
#endif // __JUCER_HEADER_AUDIODEMOSYNTHPAGE_AUDIODEMOSYNTHPAGE_D17DA22__

View file

@ -3,7 +3,7 @@
This is an automatically generated file created by the Jucer!
Creation date: 20 Sep 2012 1:44:23pm
Creation date: 21 Sep 2012 12:10:28pm
Be careful when adding custom code to these files, as only the code within
the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
@ -116,11 +116,11 @@ AudioDemoTabComponent::AudioDemoTabComponent ()
{
addAndMakeVisible (tabbedComponent = new TabbedComponent (TabbedButtonBar::TabsAtTop));
tabbedComponent->setTabBarDepth (30);
tabbedComponent->addTab (L"Audio Device Setup", Colours::lightgrey, new AudioDemoSetupPage (deviceManager), true);
tabbedComponent->addTab (L"File Playback", Colours::lightgrey, new AudioDemoPlaybackPage (deviceManager), true);
tabbedComponent->addTab (L"Synth Playback", Colours::lightgrey, new AudioDemoSynthPage (deviceManager), true);
tabbedComponent->addTab (L"Latency Test", Colours::lightgrey, new AudioDemoLatencyPage (deviceManager), true);
tabbedComponent->addTab (L"Recording", Colours::lightgrey, new AudioDemoRecordPage (deviceManager), true);
tabbedComponent->addTab ("Audio Device Setup", Colours::lightgrey, new AudioDemoSetupPage (deviceManager), true);
tabbedComponent->addTab ("File Playback", Colours::lightgrey, new AudioDemoPlaybackPage (deviceManager), true);
tabbedComponent->addTab ("Synth Playback", Colours::lightgrey, new AudioDemoSynthPage (deviceManager), true);
tabbedComponent->addTab ("Latency Test", Colours::lightgrey, new AudioDemoLatencyPage (deviceManager), true);
tabbedComponent->addTab ("Recording", Colours::lightgrey, new AudioDemoRecordPage (deviceManager), true);
tabbedComponent->setCurrentTabIndex (0);

View file

@ -3,7 +3,7 @@
This is an automatically generated file created by the Jucer!
Creation date: 20 Sep 2012 1:44:23pm
Creation date: 21 Sep 2012 12:10:28pm
Be careful when adding custom code to these files, as only the code within
the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
@ -19,8 +19,8 @@
==============================================================================
*/
#ifndef __JUCER_HEADER_AUDIODEMOTABCOMPONENT_AUDIODEMOTABCOMPONENT_E13E3004__
#define __JUCER_HEADER_AUDIODEMOTABCOMPONENT_AUDIODEMOTABCOMPONENT_E13E3004__
#ifndef __JUCER_HEADER_AUDIODEMOTABCOMPONENT_AUDIODEMOTABCOMPONENT_3A306AC8__
#define __JUCER_HEADER_AUDIODEMOTABCOMPONENT_AUDIODEMOTABCOMPONENT_3A306AC8__
//[Headers] -- You can add your own extra header files here --
#include "../jucedemo_headers.h"
@ -96,4 +96,4 @@ private:
};
#endif // __JUCER_HEADER_AUDIODEMOTABCOMPONENT_AUDIODEMOTABCOMPONENT_E13E3004__
#endif // __JUCER_HEADER_AUDIODEMOTABCOMPONENT_AUDIODEMOTABCOMPONENT_3A306AC8__

View file

@ -3,7 +3,7 @@
This is an automatically generated file created by the Jucer!
Creation date: 20 Sep 2012 1:44:35pm
Creation date: 21 Sep 2012 12:12:19pm
Be careful when adding custom code to these files, as only the code within
the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
@ -400,22 +400,22 @@ RenderingTestComponent::RenderingTestComponent ()
testTypeComboBox->setEditableText (false);
testTypeComboBox->setJustificationType (Justification::centredLeft);
testTypeComboBox->setTextWhenNothingSelected (String::empty);
testTypeComboBox->setTextWhenNoChoicesAvailable (L"(no choices)");
testTypeComboBox->addItem (L"Paths - Solid", 1);
testTypeComboBox->addItem (L"Paths - Linear gradient", 2);
testTypeComboBox->addItem (L"Paths - Radial gradient", 3);
testTypeComboBox->addItem (L"Paths - Stroked", 4);
testTypeComboBox->addItem (L"Images - RGB", 5);
testTypeComboBox->addItem (L"Images - ARGB", 6);
testTypeComboBox->addItem (L"Tiled Images - RGB", 7);
testTypeComboBox->addItem (L"Tiled Images - ARGB", 8);
testTypeComboBox->addItem (L"Glyphs", 9);
testTypeComboBox->addItem (L"SVG", 10);
testTypeComboBox->addItem (L"Lines", 11);
testTypeComboBox->setTextWhenNoChoicesAvailable ("(no choices)");
testTypeComboBox->addItem ("Paths - Solid", 1);
testTypeComboBox->addItem ("Paths - Linear gradient", 2);
testTypeComboBox->addItem ("Paths - Radial gradient", 3);
testTypeComboBox->addItem ("Paths - Stroked", 4);
testTypeComboBox->addItem ("Images - RGB", 5);
testTypeComboBox->addItem ("Images - ARGB", 6);
testTypeComboBox->addItem ("Tiled Images - RGB", 7);
testTypeComboBox->addItem ("Tiled Images - ARGB", 8);
testTypeComboBox->addItem ("Glyphs", 9);
testTypeComboBox->addItem ("SVG", 10);
testTypeComboBox->addItem ("Lines", 11);
testTypeComboBox->addListener (this);
addAndMakeVisible (testTypeLabel = new Label (String::empty,
L"Test type:"));
"Test type:"));
testTypeLabel->setFont (Font (15.0000f, Font::plain));
testTypeLabel->setJustificationType (Justification::centredRight);
testTypeLabel->setEditable (false, false, false);
@ -423,7 +423,7 @@ RenderingTestComponent::RenderingTestComponent ()
testTypeLabel->setColour (TextEditor::backgroundColourId, Colour (0x0));
addAndMakeVisible (speedLabel = new Label (String::empty,
L"speed"));
"speed"));
speedLabel->setFont (Font (15.0000f, Font::plain));
speedLabel->setJustificationType (Justification::centredLeft);
speedLabel->setEditable (false, false, false);
@ -439,22 +439,22 @@ RenderingTestComponent::RenderingTestComponent ()
opacitySlider->addListener (this);
addAndMakeVisible (highQualityToggle = new ToggleButton (String::empty));
highQualityToggle->setButtonText (L"Higher quality image interpolation");
highQualityToggle->setButtonText ("Higher quality image interpolation");
addAndMakeVisible (animateSizeToggle = new ToggleButton (String::empty));
animateSizeToggle->setButtonText (L"Animate size");
animateSizeToggle->setButtonText ("Animate size");
addAndMakeVisible (animateRotationToggle = new ToggleButton (String::empty));
animateRotationToggle->setButtonText (L"Animate rotation");
animateRotationToggle->setButtonText ("Animate rotation");
addAndMakeVisible (animatePositionToggle = new ToggleButton (String::empty));
animatePositionToggle->setButtonText (L"Animate position");
animatePositionToggle->setButtonText ("Animate position");
addAndMakeVisible (animateFillToggle = new ToggleButton (String::empty));
animateFillToggle->setButtonText (L"Animate gradient");
animateFillToggle->setButtonText ("Animate gradient");
addAndMakeVisible (opacityLabel = new Label (String::empty,
L"Opacity:"));
"Opacity:"));
opacityLabel->setFont (Font (15.0000f, Font::plain));
opacityLabel->setJustificationType (Justification::centredRight);
opacityLabel->setEditable (false, false, false);
@ -487,7 +487,7 @@ RenderingTestComponent::RenderingTestComponent ()
angleSlider->addListener (this);
addAndMakeVisible (xSliderLabel = new Label (String::empty,
L"X offset:"));
"X offset:"));
xSliderLabel->setFont (Font (15.0000f, Font::plain));
xSliderLabel->setJustificationType (Justification::centredRight);
xSliderLabel->setEditable (false, false, false);
@ -495,7 +495,7 @@ RenderingTestComponent::RenderingTestComponent ()
xSliderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0));
addAndMakeVisible (ySliderLabel = new Label (String::empty,
L"Y offset:"));
"Y offset:"));
ySliderLabel->setFont (Font (15.0000f, Font::plain));
ySliderLabel->setJustificationType (Justification::centredRight);
ySliderLabel->setEditable (false, false, false);
@ -503,7 +503,7 @@ RenderingTestComponent::RenderingTestComponent ()
ySliderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0));
addAndMakeVisible (sizeSliderLabel = new Label (String::empty,
L"Size:"));
"Size:"));
sizeSliderLabel->setFont (Font (15.0000f, Font::plain));
sizeSliderLabel->setJustificationType (Justification::centredRight);
sizeSliderLabel->setEditable (false, false, false);
@ -511,7 +511,7 @@ RenderingTestComponent::RenderingTestComponent ()
sizeSliderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0));
addAndMakeVisible (angleSliderLabel = new Label (String::empty,
L"Angle:"));
"Angle:"));
angleSliderLabel->setFont (Font (15.0000f, Font::plain));
angleSliderLabel->setJustificationType (Justification::centredRight);
angleSliderLabel->setEditable (false, false, false);
@ -519,13 +519,13 @@ RenderingTestComponent::RenderingTestComponent ()
angleSliderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0));
addAndMakeVisible (clipToRectangleToggle = new ToggleButton (String::empty));
clipToRectangleToggle->setButtonText (L"Clip to rectangle");
clipToRectangleToggle->setButtonText ("Clip to rectangle");
addAndMakeVisible (clipToPathToggle = new ToggleButton (String::empty));
clipToPathToggle->setButtonText (L"Clip to path");
clipToPathToggle->setButtonText ("Clip to path");
addAndMakeVisible (clipToImageToggle = new ToggleButton (String::empty));
clipToImageToggle->setButtonText (L"Clip to image");
clipToImageToggle->setButtonText ("Clip to image");
//[UserPreSize]
@ -589,28 +589,28 @@ void RenderingTestComponent::paint (Graphics& g)
void RenderingTestComponent::resized()
{
testTypeComboBox->setBounds (proportionOfWidth (0.1652f), 16, proportionOfWidth (0.3429f), 24);
testTypeLabel->setBounds (proportionOfWidth (0.0269f), 16, proportionOfWidth (0.1293f), 24);
speedLabel->setBounds (proportionOfWidth (0.5368f), 16, proportionOfWidth (0.4309f), 24);
testTypeComboBox->setBounds (proportionOfWidth (0.1658f), 16, proportionOfWidth (0.3436f), 24);
testTypeLabel->setBounds (proportionOfWidth (0.0273f), 16, proportionOfWidth (0.1299f), 24);
speedLabel->setBounds (proportionOfWidth (0.5368f), 16, proportionOfWidth (0.4308f), 24);
testCanvas->setBounds (20, 56, getWidth() - 40, getHeight() - 215);
opacitySlider->setBounds (proportionOfWidth (0.5996f), getHeight() - 141, proportionOfWidth (0.3788f), 24);
highQualityToggle->setBounds (proportionOfWidth (0.0215f), getHeight() - 141, proportionOfWidth (0.4452f), 24);
animateSizeToggle->setBounds (proportionOfWidth (0.7576f), getHeight() - 85, proportionOfWidth (0.2244f), 24);
animateRotationToggle->setBounds (proportionOfWidth (0.7576f), getHeight() - 61, proportionOfWidth (0.2244f), 24);
animatePositionToggle->setBounds (proportionOfWidth (0.7576f), getHeight() - 109, proportionOfWidth (0.2244f), 24);
animateFillToggle->setBounds (proportionOfWidth (0.7576f), getHeight() - 37, proportionOfWidth (0.2352f), 24);
opacityLabel->setBounds ((proportionOfWidth (0.5996f)) + -66, getHeight() - 141, 64, 24);
xSlider->setBounds (proportionOfWidth (0.3609f), getHeight() - 109, proportionOfWidth (0.3788f), 24);
ySlider->setBounds (proportionOfWidth (0.3609f), getHeight() - 85, proportionOfWidth (0.3788f), 24);
sizeSlider->setBounds (proportionOfWidth (0.3609f), getHeight() - 61, proportionOfWidth (0.3788f), 24);
angleSlider->setBounds (proportionOfWidth (0.3609f), getHeight() - 37, proportionOfWidth (0.3788f), 24);
xSliderLabel->setBounds (proportionOfWidth (0.2495f), getHeight() - 109, proportionOfWidth (0.1059f), 24);
ySliderLabel->setBounds (proportionOfWidth (0.2495f), getHeight() - 85, proportionOfWidth (0.1059f), 24);
sizeSliderLabel->setBounds (proportionOfWidth (0.2495f), getHeight() - 61, proportionOfWidth (0.1059f), 24);
angleSliderLabel->setBounds (proportionOfWidth (0.2495f), getHeight() - 37, proportionOfWidth (0.1059f), 24);
clipToRectangleToggle->setBounds (proportionOfWidth (0.0215f), getHeight() - 109, 144, 24);
clipToPathToggle->setBounds (proportionOfWidth (0.0215f), getHeight() - 85, 144, 24);
clipToImageToggle->setBounds (proportionOfWidth (0.0215f), getHeight() - 61, 144, 24);
opacitySlider->setBounds (proportionOfWidth (0.6000f), getHeight() - 141, proportionOfWidth (0.3795f), 24);
highQualityToggle->setBounds (proportionOfWidth (0.0222f), getHeight() - 141, proportionOfWidth (0.4444f), 24);
animateSizeToggle->setBounds (proportionOfWidth (0.7573f), getHeight() - 85, proportionOfWidth (0.2239f), 24);
animateRotationToggle->setBounds (proportionOfWidth (0.7573f), getHeight() - 61, proportionOfWidth (0.2239f), 24);
animatePositionToggle->setBounds (proportionOfWidth (0.7573f), getHeight() - 109, proportionOfWidth (0.2239f), 24);
animateFillToggle->setBounds (proportionOfWidth (0.7573f), getHeight() - 37, proportionOfWidth (0.2359f), 24);
opacityLabel->setBounds ((proportionOfWidth (0.6000f)) + -66, getHeight() - 141, 64, 24);
xSlider->setBounds (proportionOfWidth (0.3607f), getHeight() - 109, proportionOfWidth (0.3795f), 24);
ySlider->setBounds (proportionOfWidth (0.3607f), getHeight() - 85, proportionOfWidth (0.3795f), 24);
sizeSlider->setBounds (proportionOfWidth (0.3607f), getHeight() - 61, proportionOfWidth (0.3795f), 24);
angleSlider->setBounds (proportionOfWidth (0.3607f), getHeight() - 37, proportionOfWidth (0.3795f), 24);
xSliderLabel->setBounds (proportionOfWidth (0.2496f), getHeight() - 109, proportionOfWidth (0.1060f), 24);
ySliderLabel->setBounds (proportionOfWidth (0.2496f), getHeight() - 85, proportionOfWidth (0.1060f), 24);
sizeSliderLabel->setBounds (proportionOfWidth (0.2496f), getHeight() - 61, proportionOfWidth (0.1060f), 24);
angleSliderLabel->setBounds (proportionOfWidth (0.2496f), getHeight() - 37, proportionOfWidth (0.1060f), 24);
clipToRectangleToggle->setBounds (proportionOfWidth (0.0222f), getHeight() - 109, 144, 24);
clipToPathToggle->setBounds (proportionOfWidth (0.0222f), getHeight() - 85, 144, 24);
clipToImageToggle->setBounds (proportionOfWidth (0.0222f), getHeight() - 61, 144, 24);
//[UserResized] Add your own custom resize handling here..
//[/UserResized]
}

View file

@ -3,7 +3,7 @@
This is an automatically generated file created by the Jucer!
Creation date: 20 Sep 2012 1:44:35pm
Creation date: 21 Sep 2012 12:12:19pm
Be careful when adding custom code to these files, as only the code within
the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
@ -19,8 +19,8 @@
==============================================================================
*/
#ifndef __JUCER_HEADER_RENDERINGTESTCOMPONENT_RENDERINGTESTCOMPONENT_51E39D0E__
#define __JUCER_HEADER_RENDERINGTESTCOMPONENT_RENDERINGTESTCOMPONENT_51E39D0E__
#ifndef __JUCER_HEADER_RENDERINGTESTCOMPONENT_RENDERINGTESTCOMPONENT_1C802450__
#define __JUCER_HEADER_RENDERINGTESTCOMPONENT_RENDERINGTESTCOMPONENT_1C802450__
//[Headers] -- You can add your own extra header files here --
#include "../jucedemo_headers.h"
@ -97,4 +97,4 @@ private:
};
#endif // __JUCER_HEADER_RENDERINGTESTCOMPONENT_RENDERINGTESTCOMPONENT_51E39D0E__
#endif // __JUCER_HEADER_RENDERINGTESTCOMPONENT_RENDERINGTESTCOMPONENT_1C802450__

View file

@ -3,7 +3,7 @@
This is an automatically generated file created by the Jucer!
Creation date: 1 May 2011 12:12:59pm
Creation date: 21 Sep 2012 12:11:41pm
Be careful when adding custom code to these files, as only the code within
the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
@ -34,7 +34,7 @@ MainComponent::MainComponent ()
quitButton (0)
{
addAndMakeVisible (helloWorldLabel = new Label (String::empty,
L"Hello World!"));
"Hello World!"));
helloWorldLabel->setFont (Font (40.0000f, Font::bold));
helloWorldLabel->setJustificationType (Justification::centred);
helloWorldLabel->setEditable (false, false, false);
@ -43,7 +43,7 @@ MainComponent::MainComponent ()
helloWorldLabel->setColour (TextEditor::backgroundColourId, Colour (0x0));
addAndMakeVisible (quitButton = new TextButton (String::empty));
quitButton->setButtonText (L"Quit");
quitButton->setButtonText ("Quit");
quitButton->addListener (this);

View file

@ -3,7 +3,7 @@
This is an automatically generated file created by the Jucer!
Creation date: 1 May 2011 12:12:59pm
Creation date: 21 Sep 2012 12:11:41pm
Be careful when adding custom code to these files, as only the code within
the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
@ -19,8 +19,8 @@
==============================================================================
*/
#ifndef __JUCER_HEADER_MAINCOMPONENT_MAINCOMPONENT_5ACBBA44__
#define __JUCER_HEADER_MAINCOMPONENT_MAINCOMPONENT_5ACBBA44__
#ifndef __JUCER_HEADER_MAINCOMPONENT_MAINCOMPONENT_2983595F__
#define __JUCER_HEADER_MAINCOMPONENT_MAINCOMPONENT_2983595F__
//[Headers] -- You can add your own extra header files here --
#include "../JuceLibraryCode/JuceHeader.h"
@ -54,9 +54,6 @@ public:
//==============================================================================
juce_UseDebuggingNewOperator
private:
//[UserVariables] -- You can add your own custom variables in this section.
//[/UserVariables]
@ -68,10 +65,8 @@ private:
//==============================================================================
// (prevent copy constructor and operator= being generated..)
MainComponent (const MainComponent&);
const MainComponent& operator= (const MainComponent&);
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MainComponent);
};
#endif // __JUCER_HEADER_MAINCOMPONENT_MAINCOMPONENT_5ACBBA44__
#endif // __JUCER_HEADER_MAINCOMPONENT_MAINCOMPONENT_2983595F__

View file

@ -153,7 +153,7 @@ public:
{
if (resourceName.isNotEmpty())
{
const String imageVariable (L"drawable" + String (code.getUniqueSuffix()));
const String imageVariable ("drawable" + String (code.getUniqueSuffix()));
code.privateMemberDeclarations
<< "Drawable* " << imageVariable << ";\n";

View file

@ -121,7 +121,7 @@ const String FontPropertyComponent::getTypefaceNameCode (const String& typefaceN
else if (typefaceName == defaultMono)
return "Font::getDefaultMonospacedFontName(), ";
return "L\"" + typefaceName + "\", ";
return "\"" + typefaceName + "\", ";
}
const String FontPropertyComponent::getFontStyleCode (const Font& font)

View file

@ -28,64 +28,85 @@
//==============================================================================
const String replaceCEscapeChars (const String& s)
static void writeEscapeChars (OutputStream& out, const char* utf8, const int numBytes,
const int maxCharsOnLine, const bool breakAtNewLines,
const bool replaceSingleQuotes, const bool allowStringBreaks)
{
const int len = s.length();
String r;
r.preallocateBytes (4 * len + 4);
int charsOnLine = 0;
bool lastWasHexEscapeCode = false;
for (int i = 0; i < len; ++i)
for (int i = 0; i < numBytes || numBytes < 0; ++i)
{
const juce_wchar c = s[i];
const unsigned char c = (unsigned char) utf8[i];
bool startNewLine = false;
switch (c)
{
case '\t':
r << "\\t";
lastWasHexEscapeCode = false;
break;
case '\r':
r << "\\r";
lastWasHexEscapeCode = false;
break;
case '\n':
r << "\\n";
lastWasHexEscapeCode = false;
break;
case '\\':
r << "\\\\";
lastWasHexEscapeCode = false;
break;
case '\'':
r << "\\\'";
lastWasHexEscapeCode = false;
break;
case '\"':
r << "\\\"";
lastWasHexEscapeCode = false;
break;
case '\t': out << "\\t"; lastWasHexEscapeCode = false; charsOnLine += 2; break;
case '\r': out << "\\r"; lastWasHexEscapeCode = false; charsOnLine += 2; break;
case '\n': out << "\\n"; lastWasHexEscapeCode = false; charsOnLine += 2; startNewLine = breakAtNewLines; break;
case '\\': out << "\\\\"; lastWasHexEscapeCode = false; charsOnLine += 2; break;
case '\"': out << "\\\""; lastWasHexEscapeCode = false; charsOnLine += 2; break;
default:
if (c < 128 &&
! (lastWasHexEscapeCode
&& String ("0123456789abcdefABCDEF").containsChar (c))) // (have to avoid following a hex escape sequence with a valid hex digit)
{
r << c;
lastWasHexEscapeCode = false;
}
else
{
case 0:
if (numBytes < 0)
return;
out << "\\0";
lastWasHexEscapeCode = true;
r << "\\x" << String::toHexString ((int) c);
}
charsOnLine += 2;
break;
break;
case '\'':
if (replaceSingleQuotes)
{
out << "\\\'";
lastWasHexEscapeCode = false;
charsOnLine += 2;
break;
}
// deliberate fall-through...
default:
if (c >= 32 && c < 127 && ! (lastWasHexEscapeCode // (have to avoid following a hex escape sequence with a valid hex digit)
&& CharacterFunctions::getHexDigitValue (c) >= 0))
{
out << (char) c;
lastWasHexEscapeCode = false;
++charsOnLine;
}
else if (allowStringBreaks && lastWasHexEscapeCode && c >= 32 && c < 127)
{
out << "\"\"" << (char) c;
lastWasHexEscapeCode = false;
charsOnLine += 3;
}
else
{
out << (c < 16 ? "\\x0" : "\\x") << String::toHexString ((int) c);
lastWasHexEscapeCode = true;
charsOnLine += 4;
}
break;
}
if ((startNewLine || (maxCharsOnLine > 0 && charsOnLine >= maxCharsOnLine))
&& (numBytes < 0 || i < numBytes - 1))
{
charsOnLine = 0;
out << "\"" << newLine << "\"";
lastWasHexEscapeCode = false;
}
}
}
return r;
static String addEscapeChars (const String& s)
{
MemoryOutputStream out;
writeEscapeChars (out, s.toUTF8().getAddress(), -1, -1, false, true, true);
return out.toUTF8();
}
const String quotedString (const String& s)
@ -125,7 +146,10 @@ const String quotedString (const String& s)
}
}
return "L\"" + replaceCEscapeChars (s) + "\"";
if (CharPointer_ASCII::isValidString (s.toUTF8(), std::numeric_limits<int>::max()))
return addEscapeChars (s).quoted();
else
return "CharPointer_UTF8 (" + addEscapeChars (s).quoted() + ")";
}
const String replaceStringTranslations (String s, JucerDocument* document)