Skip to content

Commit 724c7ba

Browse files
authored
Merge pull request #2876 from ControlSystemStudio/CSSTUDIO-2038
CSSTUDIO-2038 When org.phoebus.ui/home_display="", map home button to the Welcome screen
2 parents 1e8715f + 5953d7d commit 724c7ba

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

core/ui/src/main/java/org/phoebus/ui/application/PhoebusApplication.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -794,9 +794,15 @@ private ToolBar createToolbar() {
794794
home_display_button.setTooltip(new Tooltip(Messages.HomeTT));
795795
toolBar.getItems().add(home_display_button);
796796

797-
final TopResources homeResource = TopResources.parse(Preferences.home_display);
798797

799-
home_display_button.setOnAction(event -> openResource(homeResource.getResource(0), false));
798+
if (!Preferences.home_display.isEmpty()) {
799+
final TopResources homeResource = TopResources.parse(Preferences.home_display);
800+
home_display_button.setOnAction(event -> openResource(homeResource.getResource(0), false));
801+
}
802+
else {
803+
Welcome welcome = new Welcome();
804+
home_display_button.setOnAction(event -> welcome.create());
805+
}
800806

801807
top_resources_button = new MenuButton(null, ImageCache.getImageView(getClass(), "/icons/fldr_obj.png"));
802808
top_resources_button.setTooltip(new Tooltip(Messages.TopResources));

0 commit comments

Comments
 (0)