Skip to content

Commit

Permalink
Buttons to buttons in files
Browse files Browse the repository at this point in the history
  • Loading branch information
kockie69 committed Nov 21, 2021
1 parent 702ba02 commit 25898b0
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
16 changes: 8 additions & 8 deletions src/TuxOn.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -325,14 +325,14 @@ ButtonSVG::ButtonSVG() {
sw = new widget::SvgWidget;
fb->addChild(sw);

addFrame(APP->window->loadSvg(asset::plugin(pluginInstance,"res/Buttons/Black_On.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance,"res/Buttons/Pause_On.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance,"res/Buttons/Rwd_On.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance,"res/Buttons/Fwd_On.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance,"res/Buttons/Ejct_On.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance,"res/Buttons/Stop_On.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance,"res/Buttons/Start_On.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance,"res/Buttons/Black_On.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance,"res/buttons/Black_On.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance,"res/buttons/Pause_On.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance,"res/buttons/Rwd_On.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance,"res/buttons/Fwd_On.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance,"res/buttons/Ejct_On.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance,"res/buttons/Stop_On.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance,"res/buttons/Start_On.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance,"res/buttons/Black_On.svg")));
}

void ButtonSVG::addFrame(std::shared_ptr<Svg> svg) {
Expand Down
28 changes: 14 additions & 14 deletions src/ctrl/RPJButtons.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,17 @@ class RedButton : public ToggleButton {
public:
RedButton() {
rack::app::Switch::momentary = true;
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Buttons/oval-button-up-grey.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Buttons/oval-button-down.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/buttons/oval-button-up-grey.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/buttons/oval-button-down.svg")));
}
};

struct StartButton : ToggleButton {

StartButton() {
momentary=true;
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Buttons/Start_line_off.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Buttons/Start_line_on.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/buttons/Start_line_off.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/buttons/Start_line_on.svg")));
}

void drawLayer(const DrawArgs &args, int layer)override {
Expand All @@ -96,8 +96,8 @@ struct StopButton : ToggleButton {

StopButton() {
momentary=true;
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Buttons/Stop_line_off.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Buttons/Stop_line_on.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/buttons/Stop_line_off.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/buttons/Stop_line_on.svg")));
}

void drawLayer(const DrawArgs &args, int layer)override {
Expand All @@ -112,8 +112,8 @@ struct PauseButton : ToggleButton {

PauseButton() {
momentary=true;
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Buttons/Pause_line_off.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Buttons/Pause_line_on.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/buttons/Pause_line_off.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/buttons/Pause_line_on.svg")));
}

void drawLayer(const DrawArgs &args, int layer)override {
Expand All @@ -129,8 +129,8 @@ struct FwdButton : ToggleButton {

FwdButton() {
momentary=true;
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Buttons/Fwd_line_off.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Buttons/Fwd_line_on.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/buttons/Fwd_line_off.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/buttons/Fwd_line_on.svg")));
}

void drawLayer(const DrawArgs &args, int layer)override {
Expand All @@ -145,8 +145,8 @@ struct RwdButton : ToggleButton {

RwdButton() {
momentary=true;
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Buttons/Rwd_line_off.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Buttons/Rwd_line_on.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/buttons/Rwd_line_off.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/buttons/Rwd_line_on.svg")));
}

void drawLayer(const DrawArgs &args, int layer)override {
Expand All @@ -161,8 +161,8 @@ struct EjectButton : ToggleButton {

EjectButton() {
momentary=true;
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Buttons/Ejct_line_off.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/Buttons/Ejct_line_on.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/buttons/Ejct_line_off.svg")));
addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/buttons/Ejct_line_on.svg")));
}

void drawLayer(const DrawArgs &args, int layer)override {
Expand Down

0 comments on commit 25898b0

Please sign in to comment.