Skip to content

Commit 0dcf3e6

Browse files
committed
all icons in place
1 parent 1d8697b commit 0dcf3e6

File tree

4 files changed

+11
-12
lines changed

4 files changed

+11
-12
lines changed

services/static-webserver/client/source/class/osparc/dashboard/NewPlusMenu.js

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@ qx.Class.define("osparc.dashboard.NewPlusMenu", {
9191
},
9292

9393
statics: {
94+
MORE_ICON: "https://raw.githubusercontent.com/ZurichMedTech/s4l-assets/refs/heads/main/app/icons/arrows.png",
95+
FOLDER_ICON: "https://raw.githubusercontent.com/ZurichMedTech/s4l-assets/refs/heads/main/app/icons/folder.png",
96+
9497
createMenuButton: function(icon, title, infoText) {
9598
title = osparc.utils.Utils.replaceTokens(
9699
title,
@@ -153,10 +156,8 @@ qx.Class.define("osparc.dashboard.NewPlusMenu", {
153156
switch (id) {
154157
case "new-folder":
155158
this.addSeparator();
156-
control = this.self().createMenuButton(
157-
"@FontAwesome5Solid/folder/16",
158-
this.tr("New Folder"),
159-
);
159+
control = this.self().createMenuButton(null, this.tr("New Folder"));
160+
this.self().setIcon(control, this.self().FOLDER_ICON);
160161
osparc.utils.Utils.setIdToWidget(control, "newFolderButton");
161162
control.addListener("tap", () => this.__createNewFolder());
162163
this.add(control);
@@ -206,7 +207,7 @@ qx.Class.define("osparc.dashboard.NewPlusMenu", {
206207
appearance: "menu-wider",
207208
});
208209
hypertoolsMenuButton.setMenu(hypertoolsMenu);
209-
this.self().setIcon(hypertoolsMenuButton, osparc.data.model.StudyUI.HYPERTOOL_ICON(16));
210+
this.self().setIcon(hypertoolsMenuButton, osparc.data.model.StudyUI.HYPERTOOL_ICON);
210211

211212
hypertools.forEach(templateData => {
212213
const hypertoolButton = this.self().createMenuButton(null, templateData["name"]);
@@ -231,17 +232,15 @@ qx.Class.define("osparc.dashboard.NewPlusMenu", {
231232
},
232233

233234
__addMoreMenu: function() {
234-
const moreMenuButton = this.self().createMenuButton("@FontAwesome5Solid/angle-double-right/16", this.tr("More"));
235-
moreMenuButton.getChildControl("icon").set({
236-
marginLeft: 6, // center it
237-
});
235+
const moreMenuButton = this.self().createMenuButton(null, this.tr("More"));
238236
this.addAt(moreMenuButton, this.__itemIdx);
239237
this.__itemIdx++;
240238

241239
const moreMenu = new qx.ui.menu.Menu().set({
242240
appearance: "menu-wider",
243241
});
244242
moreMenuButton.setMenu(moreMenu);
243+
this.self().setIcon(moreMenuButton, this.self().MORE_ICON);
245244

246245
const permissions = osparc.data.Permissions.getInstance();
247246
if (permissions.canDo("dashboard.templates.read")) {

services/static-webserver/client/source/class/osparc/dashboard/ResourceBrowserFilter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ qx.Class.define("osparc.dashboard.ResourceBrowserFilter", {
421421

422422
// hypertools filter
423423
const button = new qx.ui.toolbar.RadioButton("Hypertools", null);
424-
osparc.utils.Utils.replaceIconWithThumbnail(button, osparc.data.model.StudyUI.HYPERTOOL_ICON(18), 20);
424+
osparc.utils.Utils.replaceIconWithThumbnail(button, osparc.data.model.StudyUI.HYPERTOOL_ICON, 20);
425425
button.appType = "hypertool";
426426
this.__appTypeButtons.push(button);
427427

services/static-webserver/client/source/class/osparc/dashboard/SearchBarFilter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ qx.Class.define("osparc.dashboard.SearchBarFilter", {
275275

276276
// hypertools filter
277277
const hypertoolTypeButton = new qx.ui.menu.Button("Hypertools", null);
278-
osparc.utils.Utils.replaceIconWithThumbnail(hypertoolTypeButton, osparc.data.model.StudyUI.HYPERTOOL_ICON(iconSize), iconSize);
278+
osparc.utils.Utils.replaceIconWithThumbnail(hypertoolTypeButton, osparc.data.model.StudyUI.HYPERTOOL_ICON, iconSize);
279279
serviceTypeMenu.add(hypertoolTypeButton);
280280
hypertoolTypeButton.addListener("execute", () => this.__addChip("app-type", "hypertool", "Hypertools"), this);
281281
},

services/static-webserver/client/source/class/osparc/data/model/StudyUI.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ qx.Class.define("osparc.data.model.StudyUI", {
9494
TEMPLATE_TYPE: "TEMPLATE",
9595
TUTORIAL_TYPE: "TUTORIAL",
9696
HYPERTOOL_TYPE: "HYPERTOOL",
97-
HYPERTOOL_ICON: (iconSize = 22) => "https://raw.githubusercontent.com/ZurichMedTech/s4l-assets/refs/heads/main/app/icons/hypertool.png",
97+
HYPERTOOL_ICON: "https://raw.githubusercontent.com/ZurichMedTech/s4l-assets/refs/heads/main/app/icons/hypertool.png",
9898
PIPELINE_ICON: "https://raw.githubusercontent.com/ZurichMedTech/s4l-assets/refs/heads/main/app/icons/diagram.png",
9999
},
100100

0 commit comments

Comments
 (0)