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

Sanity-checked places where introjucer GUI editor added TRANS macros.

Browse source
This commit is contained in:
jules 2013-12-19 18:31:32 +00:00
parent d3b92ab447
commit 64a38ea6ee
13 changed files with 20 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
extras/Introjucer/Source/ComponentEditor/components/jucer_ButtonHandler.h
View file

@ -80,9 +80,9 @@ public:
return true;
}
String getCreationParameters (GeneratedCode& code, Component* component)
String getCreationParameters (GeneratedCode&, Component* component)
{
return quotedString (component->getName(), code.shouldUseTransMacro());
return quotedString (component->getName(), false);
}
void fillInCreationCode (GeneratedCode& code, Component* component, const String& memberVariableName)

4
extras/Introjucer/Source/ComponentEditor/components/jucer_ComboBoxHandler.h
View file

@ -85,9 +85,9 @@ public:
props.add (new ComboTextWhenNoItemsProperty (c, document));
}
String getCreationParameters (GeneratedCode& code, Component* component)
String getCreationParameters (GeneratedCode&, Component* component)
{
return quotedString (component->getName(), code.shouldUseTransMacro());
return quotedString (component->getName(), false);
}
void fillInCreationCode (GeneratedCode& code, Component* component, const String& memberVariableName)

2
extras/Introjucer/Source/ComponentEditor/components/jucer_GenericComponentHandler.h
View file

@ -122,7 +122,7 @@ public:
if (component->getName().isNotEmpty())
code.constructorCode
<< memberVariableName << "->setName ("
<< quotedString (component->getName(), code.shouldUseTransMacro())
<< quotedString (component->getName(), false)
<< ");\n\n";
else
code.constructorCode << "\n";

4
extras/Introjucer/Source/ComponentEditor/components/jucer_GroupComponentHandler.h
View file

@ -67,9 +67,9 @@ public:
String getCreationParameters (GeneratedCode& code, Component* component)
{
GroupComponent* g = dynamic_cast <GroupComponent*> (component);
GroupComponent* g = dynamic_cast<GroupComponent*> (component);
return quotedString (component->getName(), code.shouldUseTransMacro())
return quotedString (component->getName(), false)
+ ",\n"
+ quotedString (g->getText(), code.shouldUseTransMacro());
}

4
extras/Introjucer/Source/ComponentEditor/components/jucer_HyperlinkButtonHandler.h
View file

@ -69,11 +69,11 @@ public:
String getCreationParameters (GeneratedCode& code, Component* comp)
{
HyperlinkButton* const hb = dynamic_cast <HyperlinkButton*> (comp);
HyperlinkButton* const hb = dynamic_cast<HyperlinkButton*> (comp);
return quotedString (hb->getButtonText(), code.shouldUseTransMacro())
+ ",\nURL ("
+ quotedString (hb->getURL().toString (false), code.shouldUseTransMacro())
+ quotedString (hb->getURL().toString (false), false)
+ ")";
}

2
extras/Introjucer/Source/ComponentEditor/components/jucer_LabelHandler.h
View file

@ -101,7 +101,7 @@ public:
{
Label* const l = dynamic_cast <Label*> (component);
return quotedString (component->getName(), code.shouldUseTransMacro())
return quotedString (component->getName(), false)
+ ",\n"
+ quotedString (l->getText(), code.shouldUseTransMacro());
}

4
extras/Introjucer/Source/ComponentEditor/components/jucer_SliderHandler.h
View file

@ -85,9 +85,9 @@ public:
return true;
}
String getCreationParameters (GeneratedCode& code, Component* component)
String getCreationParameters (GeneratedCode&, Component* component)
{
return quotedString (component->getName(), code.shouldUseTransMacro());
return quotedString (component->getName(), false);
}
void fillInCreationCode (GeneratedCode& code, Component* component, const String& memberVariableName)

4
extras/Introjucer/Source/ComponentEditor/components/jucer_TextEditorHandler.h
View file

@ -96,9 +96,9 @@ public:
addColourProperties (t, document, props);
}
String getCreationParameters (GeneratedCode& code, Component* component)
String getCreationParameters (GeneratedCode&, Component* component)
{
return quotedString (component->getName(), code.shouldUseTransMacro());
return quotedString (component->getName(), false);
}
void fillInCreationCode (GeneratedCode& code, Component* component, const String& memberVariableName)

4
extras/Introjucer/Source/ComponentEditor/components/jucer_TreeViewHandler.h
View file

@ -73,9 +73,9 @@ public:
addColourProperties (t, document, props);
}
String getCreationParameters (GeneratedCode& code, Component* comp)
String getCreationParameters (GeneratedCode&, Component* comp)
{
return quotedString (comp->getName(), code.shouldUseTransMacro());
return quotedString (comp->getName(), false);
}
void fillInCreationCode (GeneratedCode& code, Component* component, const String& memberVariableName)

4
extras/Introjucer/Source/ComponentEditor/components/jucer_ViewportHandler.h
View file

@ -97,9 +97,9 @@ public:
}
}
String getCreationParameters (GeneratedCode& code, Component* comp)
String getCreationParameters (GeneratedCode&, Component* comp)
{
return quotedString (comp->getName(), code.shouldUseTransMacro());
return quotedString (comp->getName(), false);
}
void fillInCreationCode (GeneratedCode& code, Component* component, const String& memberVariableName)

2
extras/Introjucer/Source/ComponentEditor/documents/jucer_ButtonDocument.cpp
View file

@ -318,7 +318,7 @@ void ButtonDocument::fillInGeneratedCode (GeneratedCode& code) const
{
JucerDocument::fillInGeneratedCode (code);
code.parentClassInitialiser = "Button (" + quotedString (code.componentName, shouldUseTransMacro()) + ")";
code.parentClassInitialiser = "Button (" + quotedString (code.componentName, false) + ")";
code.removeCallback ("void", "paint (Graphics& g)");
}

2
extras/Introjucer/Source/ComponentEditor/jucer_JucerDocument.cpp
View file

@ -426,7 +426,7 @@ void JucerDocument::fillInGeneratedCode (GeneratedCode& code) const
code.initialisers.addLines (variableInitialisers);
if (! componentName.isEmpty())
code.constructorCode << "setName (" + quotedString (componentName, shouldUseTransMacro()) + ");\n";
code.constructorCode << "setName (" + quotedString (componentName, false) + ");\n";
// call these now, just to make sure they're the first two methods in the list.
code.getCallbackCode (String::empty, "void", "paint (Graphics& g)", false)

1
modules/juce_graphics/native/juce_win32_Fonts.cpp
View file

@ -330,7 +330,6 @@ public:
defaultGlyph (-1)
{
DWORD numInstalled = 0;
memoryFont = AddFontMemResourceEx (const_cast<void*> (data), (DWORD) dataSize,
nullptr, &numInstalled);