Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

scide: adding solarizedLight and solarizedDark themes #3412

Merged

Conversation

redFrik
Copy link
Contributor

@redFrik redFrik commented Jan 12, 2018

i add it here but we can close directly if the dracula theme is preferred. #3410

@gusano
Copy link
Member

gusano commented Jan 12, 2018

@redFrik we should also add both solarized ones as well :)

@patrickdupuis patrickdupuis added this to the 3.9.1 milestone Jan 12, 2018
@mossheim
Copy link
Contributor

I would support adding both :)

@redFrik
Copy link
Contributor Author

redFrik commented Jan 12, 2018

i should've mentioned that this is after https://github.com/helmholtz/sc-solarized

@mossheim
Copy link
Contributor

Same as with #3410, just want to make sure that licensing has been properly considered.

nhthn
nhthn previously requested changes Jan 21, 2018
Copy link
Contributor

@nhthn nhthn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as #3410 -- let's put these in a separate C++ source file with the license.

@patrickdupuis
Copy link
Contributor

As was discussed on slack, adding this and other themes via separate C++ files requires a little more work than expected. It was decided to simply add the license text above the function that contains the theme's colour palette.

I've created a PR against @redFrik's branch which adds the license text.

@patrickdupuis
Copy link
Contributor

Ping @redFrik. We'd like to get this into 3.9.1 if possible.

@redFrik
Copy link
Contributor Author

redFrik commented Jan 26, 2018

thanks for taking care of adding the licence. i'm happy to see this go into 3.9.1. is there something i need to do though? like some button click on github?

@patrickdupuis
Copy link
Contributor

First, you need to merge redFrik#2 so that those changes become part of this PR. There may be some sort of conflict that needs to be resolved before this can be merged into 3.9.

@redFrik
Copy link
Contributor Author

redFrik commented Jan 26, 2018

ok @patrickdupuis merged and resolved. hope it's good now. thanks for your help

@patrickdupuis
Copy link
Contributor

@snappizz Good to go?

@@ -271,6 +355,11 @@ Theme::Theme(const QString & _name, Manager * settings)
mLocked = true;
} else if (mName == "dracula") {
fillDracula();
} else if (mName == "solarizedLight") {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There needs to be a line mLocked = true in the block above.

sorry, must have happened when i resolved conflicts
Copy link
Contributor

@mossheim mossheim left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks!

@mossheim mossheim dismissed nhthn’s stale review January 26, 2018 16:27

Licensing issues have been addressed.

@mossheim mossheim merged commit 216cbc5 into supercollider:develop Jan 26, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants