Skip to content
Snippets Groups Projects
Commit b757c9b2 authored by Sept_en's avatar Sept_en
Browse files

PluginGenerator: some polishing and minor fixes.

parent 5a6d6a2b
Branches
Tags
No related merge requests found
......@@ -703,12 +703,6 @@ static const unsigned char temp_binary_data_7[] =
"SRC := $(foreach sdir,$(SRC_DIR),$(wildcard $(sdir)/*.cpp))\n"
"OBJ := $(addprefix $(OBJDIR)/,$(notdir $(SRC:.cpp=.o)))\n"
"\n"
"#Library paths for OSX, can be removed if no external libraries are needed\n"
"ifeq ($(OS),Darwin)\n"
"CXXFLAGS := $(CXXFLAGS) -I/opt/local/include \n"
"LDFLAGS := $(LDFLAGS) -L/opt/local/lib \n"
"endif\n"
"\n"
"#Extra macros and libraries needed by the plugin\n"
"#CXXFLAGS := $(CXXFLAGS) -D EXAMPLE_MACRO\n"
"#LDFLAGS := $(LDFLAGS) -lExampleLib\n"
......@@ -5596,7 +5590,7 @@ const char* getNamedResource (const char* resourceNameUTF8, int& numBytes) throw
case 0xd768da9a: numBytes = 1434; return openEphys_FileSourcePluginTemplate_cpp;
case 0xdc872b1f: numBytes = 1450; return openEphys_FileSourcePluginTemplate_h;
case 0x354e9a48: numBytes = 4216; return openEphys_OpenEphysLibTemplate_cpp;
case 0xbf9557ba: numBytes = 1112; return openEphys_PluginMakefile_example;
case 0xbf9557ba: numBytes = 923; return openEphys_PluginMakefile_example;
case 0x0d98caa2: numBytes = 2993; return openEphys_ProcessorContentComponentTemplate_cpp;
case 0x20837d27: numBytes = 2348; return openEphys_ProcessorContentComponentTemplate_h;
case 0xc39db71e: numBytes = 3868; return openEphys_ProcessorEditorPluginTemplate_cpp;
......
......@@ -31,7 +31,7 @@ namespace BinaryData
const int openEphys_OpenEphysLibTemplate_cppSize = 4216;
extern const char* openEphys_PluginMakefile_example;
const int openEphys_PluginMakefile_exampleSize = 1112;
const int openEphys_PluginMakefile_exampleSize = 923;
extern const char* openEphys_ProcessorContentComponentTemplate_cpp;
const int openEphys_ProcessorContentComponentTemplate_cppSize = 2993;
......
......@@ -27,6 +27,8 @@
#include "openEphys_ParameterListBox.h"
#include "../jucer_Project.h"
ParameterListBox::ParameterListBox (Project& project)
: m_project (project)
{
......@@ -74,6 +76,7 @@ void ParameterListBox::listBoxItemClicked (int row, const MouseEvent& e)
if (isEmptyRow)
{
PopupMenu menu;
menu.addSectionHeader ("Select parameter type");
menu.addItem (1, "Boolean");
menu.addItem (2, "Continuous");
menu.addItem (3, "Discrete");
......@@ -165,7 +168,7 @@ String ParameterListBox::getItemText (int row) const noexcept
}
else
{
return "---";
return "Right click to add parameter...";
}
}
......
......@@ -333,18 +333,9 @@ private:
pluginSettingsButton->setColour (TextButton::textColourOffId, COLOUR_PRIMARY);
pluginSettingsButton->setColour (TextButton::textColourOnId, COLOUR_ACCENT);
TextButton* editorSettingsButton = new TextButton ("Editor", "Switch to editor settings tab");
editorSettingsButton->setComponentID (EDITOR_SETTINGS_BUTTON_ID);
editorSettingsButton->setClickingTogglesState (true);
editorSettingsButton->setColour (TextButton::buttonColourId, Colour (0x0));
editorSettingsButton->setColour (TextButton::buttonOnColourId, Colour (0x0));
editorSettingsButton->setColour (TextButton::textColourOffId, COLOUR_PRIMARY);
editorSettingsButton->setColour (TextButton::textColourOnId, COLOUR_ACCENT);
// Open Ephys
m_buttonGroupManager.addButton (projectSettingsButton);
m_buttonGroupManager.addButton (pluginSettingsButton);
m_buttonGroupManager.addButton (editorSettingsButton);
m_buttonGroupManager.setRadioButtonMode (true);
m_buttonGroupManager.setButtonListener (this);
m_buttonGroupManager.setButtonsLookAndFeel (m_materialButtonLookAndFeel);
......@@ -410,11 +401,6 @@ private:
group.setVisible (false);
m_parametersEditorComponent.setVisible (true);
}
else if (buttonID == EDITOR_SETTINGS_BUTTON_ID)
{
group.setVisible (false);
m_parametersEditorComponent.setVisible (false);
}
}
void changeListenerCallback (ChangeBroadcaster*) override
......@@ -435,7 +421,6 @@ private:
static constexpr const char* PROJECT_SETTINGS_BUTTON_ID = "projectSettingsTab";
static constexpr const char* PLUGIN_SETTINGS_BUTTON_ID = "pluginSettingsTab";
static constexpr const char* EDITOR_SETTINGS_BUTTON_ID = "editorSettingsTab";
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (SettingsComp)
};
......
......@@ -31,7 +31,7 @@ class TemplateChoicerButtonLookAndFeel : public LookAndFeel_V2
public:
TemplateChoicerButtonLookAndFeel()
{
setColour (TextButton::buttonOnColourId, Colours::green);
setColour (TextButton::buttonOnColourId, Colours::indigo);
setColour (TextButton::buttonColourId, Colours::black);
setColour (TextButton::textColourOnId, Colours::black);
setColour (TextButton::textColourOffId, Colours::black);
......@@ -43,7 +43,9 @@ public:
bool isMouseOverButton, bool isButtonDown) override
{
// Fill all component with orange bg
g.setColour (isMouseOverButton ? Colours::orange.darker() : Colours::orange);
g.setColour (button.getToggleState() || isButtonDown
? Colours::orange
: isMouseOverButton ? Colours::orange.darker (0.1f) : Colours::orange.darker());
g.fillRoundedRectangle (button.getLocalBounds().toFloat(), 5.f);
// Draw black bg for content
......@@ -53,7 +55,7 @@ public:
g.fillRect (contentBounds.toFloat());
g.setColour (backgroundColour);
g.fillEllipse (8, 8, 12, 12);
g.fillEllipse (8, 8, 13, 13);
}
......
......@@ -200,7 +200,6 @@ void PluginTemplatesPageComponent::buttonClicked (Button* buttonThatWasClicked)
}
else if (auto selectedTemplateComponent = dynamic_cast<EditorTemplateComponent*> (buttonThatWasClicked))
{
DBG ("Button clicked!");
m_selectedTemplateName = selectedTemplateComponent->getTemplateName();
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment