Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 5e9fa9c

Browse files
author
Akos Kitta
committed
feat: pull/push cloud sketch from the tab toolbar
Closes #1899 Signed-off-by: Akos Kitta <a.kitta@arduino.cc>
1 parent a64cdff commit 5e9fa9c

20 files changed

+316
-212
lines changed

‎arduino-ide-extension/arduino-icons.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎arduino-ide-extension/src/browser/arduino-ide-frontend-module.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -740,6 +740,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
740740
Contribution.configure(bind, ValidateSketch);
741741
Contribution.configure(bind, RenameCloudSketch);
742742
Contribution.configure(bind, Account);
743+
Contribution.configure(bind, CloudSketchbookContribution);
743744

744745
bindContributionProvider(bind, StartupTaskProvider);
745746
bind(StartupTaskProvider).toService(BoardsServiceProvider); // to reuse the boards config in another window
@@ -918,8 +919,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
918919
bind(CreateFsProvider).toSelf().inSingletonScope();
919920
bind(FrontendApplicationContribution).toService(CreateFsProvider);
920921
bind(FileServiceContribution).toService(CreateFsProvider);
921-
bind(CloudSketchbookContribution).toSelf().inSingletonScope();
922-
bind(CommandContribution).toService(CloudSketchbookContribution);
923922
bind(LocalCacheFsProvider).toSelf().inSingletonScope();
924923
bind(FileServiceContribution).toService(LocalCacheFsProvider);
925924
bind(CloudSketchbookCompositeWidget).toSelf();

‎arduino-ide-extension/src/browser/create/create-features.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,10 @@ export class CreateFeatures implements FrontendApplicationContribution {
8383
);
8484
return undefined;
8585
}
86-
return dataDirUri.isEqualOrParent(new URI(sketch.uri));
86+
return dataDirUri
87+
.resolve('RemoteSketchbook')
88+
.resolve('ArduinoCloud')
89+
.isEqualOrParent(new URI(sketch.uri));
8790
}
8891

8992
cloudUri(sketch: Sketch): URI | undefined {
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

‎arduino-ide-extension/src/browser/style/cloud-sketchbook.css‎

Lines changed: 7 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
.p-TabBar-tabIcon.cloud-sketchbook-tree-icon {
1717
background-color: var(--theia-foreground);
18-
-webkit-mask: url(../icons/cloud.svg);
18+
-webkit-mask: url(../icons/arduino-cloud.svg);
1919
-webkit-mask-position: center;
2020
-webkit-mask-repeat: no-repeat;
2121
width: 19px !important;
@@ -26,7 +26,7 @@
2626
.p-mod-current
2727
.cloud-sketchbook-tree-icon {
2828
background-color: var(--theia-foreground);
29-
-webkit-mask: url(../icons/cloud-filled.svg);
29+
-webkit-mask: url(../icons/arduino-cloud-filled.svg);
3030
-webkit-mask-position: center;
3131
-webkit-mask-repeat: no-repeat;
3232
-webkit-mask-size: 100%;
@@ -99,24 +99,6 @@
9999
color: var(--theia-textLink-foreground);
100100
}
101101

102-
.pull-sketch-icon {
103-
background-color: var(--theia-foreground);
104-
-webkit-mask: url(./pull-sketch-icon.svg);
105-
-webkit-mask-position: center;
106-
-webkit-mask-repeat: no-repeat;
107-
width: var(--theia-icon-size);
108-
height: var(--theia-icon-size);
109-
}
110-
111-
.push-sketch-icon {
112-
background-color: var(--theia-foreground);
113-
-webkit-mask: url(./push-sketch-icon.svg);
114-
-webkit-mask-position: center;
115-
-webkit-mask-repeat: no-repeat;
116-
width: var(--theia-icon-size);
117-
height: var(--theia-icon-size);
118-
}
119-
120102
.account-icon {
121103
width: var(--theia-private-sidebar-icon-size);
122104
height: var(--theia-private-sidebar-icon-size);
@@ -199,38 +181,11 @@
199181
width: 100%;
200182
}
201183

202-
.theia-file-icons-js.file-icon > .sketch-folder-icon {
203-
-webkit-mask-position: center;
204-
-webkit-mask-repeat: no-repeat;
205-
-webkit-mask-size: 100%;
206-
width: var(--theia-icon-size);
207-
height: var(--theia-icon-size);
208-
background-color: var(--theia-foreground);
209-
}
210-
211-
.theia-file-icons-js.file-icon > .sketch-folder-icon.cloud {
212-
-webkit-mask: url('../icons/cloud.svg');
213-
}
214-
215-
.theia-file-icons-js.file-icon > .sketch-folder-icon.cloud.offline {
216-
-webkit-mask: url('../icons/cloud-offline.svg');
217-
background-color: var(--theia-activityBar-inactiveForeground);
218-
}
219-
220-
.theia-file-icons-js.file-icon > .sketch-folder-icon.cloud.synced {
221-
-webkit-mask: url('../icons/cloud-filled.svg');
184+
.actions.item.flex-line .fa,
185+
.theia-file-icons-js.file-icon .fa {
186+
font-size: var(--theia-icon-size);
222187
}
223188

224-
.theia-TreeNodeContent > .theia-file-icons-js.file-icon > .sketch-folder-icon.cloud.synced.offline {
225-
-webkit-mask: url('../icons/cloud-filled-offline.svg');
226-
}
227-
228-
.sketch-folder-icon.cloud.offline.action {
229-
-webkit-mask: url('../icons/cloud-offline.svg');
230-
-webkit-mask-position: center;
231-
-webkit-mask-repeat: no-repeat;
232-
-webkit-mask-size: 100%;
233-
width: var(--theia-icon-size);
234-
height: var(--theia-icon-size);
235-
background-color: var(--theia-foreground);
189+
.theia-file-icons-js.file-icon.not-in-sync-offline .fa {
190+
color: var(--theia-activityBar-inactiveForeground);
236191
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /