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: Fixed some namespace issues in the GUI editor

Browse source
This commit is contained in:
ed 2020-07-02 08:54:57 +01:00
parent 0d26cf8e46
commit baa5400672
9 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
extras/Projucer/Source/ComponentEditor/Components/jucer_GroupComponentHandler.h
View file

@ -33,8 +33,8 @@ public:
GroupComponentHandler()
: ComponentTypeHandler ("Group Box", "juce::GroupComponent", typeid (GroupComponent), 200, 150)
{
registerColour (GroupComponent::outlineColourId, "outline", "outlinecol");
registerColour (GroupComponent::textColourId, "text", "textcol");
registerColour (juce::GroupComponent::outlineColourId, "outline", "outlinecol");
registerColour (juce::GroupComponent::textColourId, "text", "textcol");
}
Component* createNewComponent (JucerDocument*) override

2
extras/Projucer/Source/ComponentEditor/Components/jucer_HyperlinkButtonHandler.h
View file

@ -33,7 +33,7 @@ public:
HyperlinkButtonHandler()
: ButtonHandler ("Hyperlink Button", "juce::HyperlinkButton", typeid (HyperlinkButton), 150, 24)
{
registerColour (HyperlinkButton::textColourId, "text", "textCol");
registerColour (juce::HyperlinkButton::textColourId, "text", "textCol");
}
Component* createNewComponent (JucerDocument*) override

12
extras/Projucer/Source/ComponentEditor/Components/jucer_LabelHandler.h
View file

@ -33,12 +33,12 @@ public:
LabelHandler()
: ComponentTypeHandler ("Label", "juce::Label", typeid (Label), 150, 24)
{
registerColour (Label::backgroundColourId, "background", "bkgCol");
registerColour (Label::textColourId, "text", "textCol");
registerColour (Label::outlineColourId, "outline", "outlineCol");
registerColour (TextEditor::textColourId, "editor text", "edTextCol");
registerColour (TextEditor::backgroundColourId, "editor bkg", "edBkgCol");
registerColour (TextEditor::highlightColourId, "highlight", "hiliteCol");
registerColour (juce::Label::backgroundColourId, "background", "bkgCol");
registerColour (juce::Label::textColourId, "text", "textCol");
registerColour (juce::Label::outlineColourId, "outline", "outlineCol");
registerColour (juce::TextEditor::textColourId, "editor text", "edTextCol");
registerColour (juce::TextEditor::backgroundColourId, "editor bkg", "edBkgCol");
registerColour (juce::TextEditor::highlightColourId, "highlight", "hiliteCol");
}
Component* createNewComponent (JucerDocument*) override

18
extras/Projucer/Source/ComponentEditor/Components/jucer_SliderHandler.h
View file

@ -59,15 +59,15 @@ struct SliderHandler : public ComponentTypeHandler
SliderHandler()
: ComponentTypeHandler ("Slider", "juce::Slider", typeid (Slider), 150, 24)
{
registerColour (Slider::backgroundColourId, "background", "bkgcol");
registerColour (Slider::thumbColourId, "thumb", "thumbcol");
registerColour (Slider::trackColourId, "track", "trackcol");
registerColour (Slider::rotarySliderFillColourId, "rotary fill", "rotarysliderfill");
registerColour (Slider::rotarySliderOutlineColourId, "rotary outln", "rotaryslideroutline");
registerColour (Slider::textBoxTextColourId, "textbox text", "textboxtext");
registerColour (Slider::textBoxBackgroundColourId, "textbox bkgd", "textboxbkgd");
registerColour (Slider::textBoxHighlightColourId, "textbox highlt", "textboxhighlight");
registerColour (Slider::textBoxOutlineColourId, "textbox outln", "textboxoutline");
registerColour (juce::Slider::backgroundColourId, "background", "bkgcol");
registerColour (juce::Slider::thumbColourId, "thumb", "thumbcol");
registerColour (juce::Slider::trackColourId, "track", "trackcol");
registerColour (juce::Slider::rotarySliderFillColourId, "rotary fill", "rotarysliderfill");
registerColour (juce::Slider::rotarySliderOutlineColourId, "rotary outln", "rotaryslideroutline");
registerColour (juce::Slider::textBoxTextColourId, "textbox text", "textboxtext");
registerColour (juce::Slider::textBoxBackgroundColourId, "textbox bkgd", "textboxbkgd");
registerColour (juce::Slider::textBoxHighlightColourId, "textbox highlt", "textboxhighlight");
registerColour (juce::Slider::textBoxOutlineColourId, "textbox outln", "textboxoutline");
}
Component* createNewComponent (JucerDocument*) override

8
extras/Projucer/Source/ComponentEditor/Components/jucer_TextButtonHandler.h
View file

@ -33,10 +33,10 @@ public:
TextButtonHandler()
: ButtonHandler ("Text Button", "juce::TextButton", typeid (TextButton), 150, 24)
{
registerColour (TextButton::buttonColourId, "background (normal)", "bgColOff");
registerColour (TextButton::buttonOnColourId, "background (on)", "bgColOn");
registerColour (TextButton::textColourOffId, "text colour (normal)", "textCol");
registerColour (TextButton::textColourOnId, "text colour (on)", "textColOn");
registerColour (juce::TextButton::buttonColourId, "background (normal)", "bgColOff");
registerColour (juce::TextButton::buttonOnColourId, "background (on)", "bgColOn");
registerColour (juce::TextButton::textColourOffId, "text colour (normal)", "textCol");
registerColour (juce::TextButton::textColourOnId, "text colour (on)", "textColOn");
}
Component* createNewComponent (JucerDocument*) override

12
extras/Projucer/Source/ComponentEditor/Components/jucer_TextEditorHandler.h
View file

@ -33,12 +33,12 @@ public:
TextEditorHandler()
: ComponentTypeHandler ("Text Editor", "juce::TextEditor", typeid (TextEditor), 150, 24)
{
registerColour (TextEditor::textColourId, "text", "textcol");
registerColour (TextEditor::backgroundColourId, "background", "bkgcol");
registerColour (TextEditor::highlightColourId, "highlight", "hilitecol");
registerColour (TextEditor::outlineColourId, "outline", "outlinecol");
registerColour (TextEditor::shadowColourId, "shadow", "shadowcol");
registerColour (CaretComponent::caretColourId, "caret", "caretcol");
registerColour (juce::TextEditor::textColourId, "text", "textcol");
registerColour (juce::TextEditor::backgroundColourId, "background", "bkgcol");
registerColour (juce::TextEditor::highlightColourId, "highlight", "hilitecol");
registerColour (juce::TextEditor::outlineColourId, "outline", "outlinecol");
registerColour (juce::TextEditor::shadowColourId, "shadow", "shadowcol");
registerColour (juce::CaretComponent::caretColourId, "caret", "caretcol");
}
Component* createNewComponent (JucerDocument*) override

2
extras/Projucer/Source/ComponentEditor/Components/jucer_ToggleButtonHandler.h
View file

@ -33,7 +33,7 @@ public:
ToggleButtonHandler()
: ButtonHandler ("Toggle Button", "juce::ToggleButton", typeid (ToggleButton), 150, 24)
{
registerColour (ToggleButton::textColourId, "text colour", "txtcol");
registerColour (juce::ToggleButton::textColourId, "text colour", "txtcol");
}
Component* createNewComponent (JucerDocument*) override

4
extras/Projucer/Source/ComponentEditor/Components/jucer_TreeViewHandler.h
View file

@ -33,8 +33,8 @@ public:
TreeViewHandler()
: ComponentTypeHandler ("TreeView", "juce::TreeView", typeid (DemoTreeView), 150, 150)
{
registerColour (TreeView::backgroundColourId, "background", "backgroundColour");
registerColour (TreeView::linesColourId, "lines", "linecol");
registerColour (juce::TreeView::backgroundColourId, "background", "backgroundColour");
registerColour (juce::TreeView::linesColourId, "lines", "linecol");
}
Component* createNewComponent (JucerDocument*) override

6
extras/Projucer/Source/ComponentEditor/jucer_JucerDocument.cpp
View file

@ -292,9 +292,9 @@ void JucerDocument::getOptionalMethods (StringArray& baseClasses,
addMethod ("juce::Component", "bool", "keyStateChanged (bool isKeyDown)", "return false; // Return true if your handler uses this key event, or false to allow it to be passed-on.", baseClasses, returnValues, methods, initialContents);
addMethod ("juce::Component", "void", "modifierKeysChanged (const juce::ModifierKeys& modifiers)", "", baseClasses, returnValues, methods, initialContents);
addMethod ("juce::Component", "void", "focusGained (juce::FocusChangeType cause)", "", baseClasses, returnValues, methods, initialContents);
addMethod ("juce::Component", "void", "focusLost (juce::FocusChangeType cause)", "", baseClasses, returnValues, methods, initialContents);
addMethod ("juce::Component", "void", "focusOfChildComponentChanged (juce::FocusChangeType cause)", "", baseClasses, returnValues, methods, initialContents);
addMethod ("juce::Component", "void", "focusGained (FocusChangeType cause)", "", baseClasses, returnValues, methods, initialContents);
addMethod ("juce::Component", "void", "focusLost (FocusChangeType cause)", "", baseClasses, returnValues, methods, initialContents);
addMethod ("juce::Component", "void", "focusOfChildComponentChanged (FocusChangeType cause)", "", baseClasses, returnValues, methods, initialContents);
addMethod ("juce::Component", "void", "modifierKeysChanged (const juce::ModifierKeys& modifiers)", "", baseClasses, returnValues, methods, initialContents);
addMethod ("juce::Component", "void", "inputAttemptWhenModal()", "", baseClasses, returnValues, methods, initialContents);
}