Skip to content

Allow install Theme from Preferences dialog #10202

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.

Sign up for GitHub

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

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Allow install Theme from Preferences dialog #10202

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6cd2e7c
Allow install Theme from Preferences dialog
ricardojlrufino May 13, 2020
4007b84
handle invalid themes
ricardojlrufino May 13, 2020
c906806
Avoid error on save, if canceled theme instalation
ricardojlrufino May 14, 2020
0ec01c3
(Codacy fix) Avoid unused imports
ricardojlrufino May 14, 2020
459d7a3
(Codacy fix) Avoid unused imports
ricardojlrufino May 14, 2020
703c176
Merge branch 'pr-install-theme' of https://github.com/ricardojlrufino…
ricardojlrufino May 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
handle invalid themes
  • Loading branch information
@ricardojlrufino
ricardojlrufino committed May 13, 2020
commit 4007b8470d14b009954ee85ff1dabbc97bda3fcd
7 changes: 6 additions & 1 deletion app/src/cc/arduino/view/preferences/Preferences.java
View file
Original file line number Diff line number Diff line change
@@ -1020,7 +1020,12 @@ public void handleInstallTheme() {
if (!sourceFile.isDirectory()) {
try {

Theme.install(sourceFile);
ZippedTheme theme = Theme.install(sourceFile);

if(theme != null) {
comboTheme.addItem(theme);
comboTheme.setSelectedItem(theme);
}

} catch (IOException e) {
base.getActiveEditor().statusError(e);
5 changes: 2 additions & 3 deletions app/src/processing/app/Theme.java
View file
Original file line number Diff line number Diff line change
@@ -734,7 +734,7 @@ static URL getUrl(ZipEntry entry) {
* Intalll theme in skecthboot
* @param zipTheme
*/
static public void install(File zipTheme) throws IOException{
static public ZippedTheme install(File zipTheme) throws IOException{

// Validate...
ZippedTheme theme = ZippedTheme.load(NAMESPACE_USER, zipTheme);
@@ -753,7 +753,6 @@ static public void install(File zipTheme) throws IOException{
File dest = new File(themesFolder, zipTheme.getName());
Files.copy(zipTheme.toPath(), dest.toPath(),StandardCopyOption.REPLACE_EXISTING);

System.out.println("COPY done: " + dest.getAbsolutePath());

return theme;
}
}