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.

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

Jump to bottom

Option to customize logbook app name reinstated #3174

Merged
merged 1 commit into from
Oct 24, 2024
Merged

Option to customize logbook app name reinstated #3174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogEntryTableApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import org.phoebus.framework.spi.AppResourceDescriptor;
import org.phoebus.logbook.*;
import org.phoebus.ui.javafx.ImageCache;
import org.phoebus.util.text.Strings;

import java.net.URI;
import java.util.logging.Logger;
Expand All @@ -24,6 +25,10 @@ public class LogEntryTableApp implements AppResourceDescriptor {
@Override
public void start() {
logFactory = LogService.getInstance().getLogFactories().get(LogbookPreferences.logbook_factory);
String displayName = LogbookUIPreferences.log_entry_table_display_name;
if(!Strings.isNullOrEmpty(displayName)){
DISPLAY_NAME = displayName;
}
}

@Override
Expand Down
1 change: 1 addition & 0 deletions app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogbookUIPreferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public class LogbookUIPreferences
@Preference public static boolean log_entry_groups_support;
@Preference public static boolean log_entry_update_support;
@Preference public static String[] hidden_properties;
@Preference public static String log_entry_table_display_name;
@Preference public static String log_entry_calendar_display_name;
@Preference public static String log_attribute_desc;
@Preference public static int search_result_page_size;
Expand Down
3 changes: 3 additions & 0 deletions app/logbook/olog/ui/src/main/resources/log_olog_ui_preferences.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ log_entry_update_support=true
# business logic, but should not be rendered in the properties view.
hidden_properties=Log Entry Group

# Log Entry Table display name. If non-empty it overrides default "Log Entry Table"
log_entry_table_display_name=

# Log Entry Calendar display name. If non-empty it overrides default "Log Entry Calendar"
log_entry_calendar_display_name=

Expand Down
Loading