Skip to content

Centralized branding#23

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

Merged
tonygermano merged 1 commit into from
May 30, 2025
Merged

Centralized branding #23

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
16 changes: 8 additions & 8 deletions client/src/com/mirth/connect/client/ui/AboutMirth.java
View file
Open in desktop
Comment thread
kpalang marked this conversation as resolved.
Comment thread
kpalang marked this conversation as resolved.
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@

import java.awt.Dimension;
import java.awt.Point;
import java.util.Calendar;

import com.mirth.connect.client.ui.util.DisplayUtil;

Expand DownExpand Up@@ -55,21 +54,22 @@ public void loadContent() {
StringBuilder content = new StringBuilder();

if (PlatformUI.SERVER_VERSION != null) {
content.append("Mirth Connect Server " + PlatformUI.SERVER_VERSION + "\n\n");
content.append(String.format("%s Server %s\n\n", BrandingConstants.PRODUCT_NAME, PlatformUI.SERVER_VERSION));
Comment thread
tonygermano marked this conversation as resolved.
}

if (PlatformUI.BUILD_DATE != null) {
content.append("Built on " + PlatformUI.BUILD_DATE + "\n\n");
content.append("Built on ").append(PlatformUI.BUILD_DATE).append("\n\n");
}

if (PlatformUI.SERVER_ID != null) {
content.append("Server ID: " + PlatformUI.SERVER_ID + "\n\n");
content.append("Server ID: ").append(PlatformUI.SERVER_ID).append("\n\n");
}

content.append("Java version: " + System.getProperty("java.version") + "\n\n");
content.append("Java version: ").append(System.getProperty("java.version")).append("\n\n");

content.append("(c) 2005-2024 NextGen Healthcare. All rights reserved. Visit http://www.nextgen.com\n\n");
content.append("The following is a list of acknowledgements for third-party software that is included with Mirth Connect:\n\n");
content.append("(c) 2025 Open Integration Engine contributors. Visit https://openintegrationengine.org\n\n");
content.append("(c) 2005-2024 NextGen Healthcare.\n\n");
content.append("The following is a list of acknowledgements for third-party software that is included with ").append(BrandingConstants.PRODUCT_NAME).append(":\n\n");
content.append("This product includes software developed by the Apache Software Foundation (http://www.apache.org/).\n\n");
content.append("This product includes all or a portion of the HL7 Vocabulary database, or is derived from the HL7 Vocabulary database, subject to a license from Health Level Seven, Inc.\n\n");
content.append("This product includes a portion of images from http://www.famfamfam.com/lab/icons/silk/.\n\n");
Expand DownExpand Up@@ -116,7 +116,7 @@ private void initComponents() {

jLabel2.setFont(new java.awt.Font("Tahoma", 1, 18)); // NOI18N
jLabel2.setForeground(new java.awt.Color(255, 255, 255));
jLabel2.setText("About Mirth Connect");
jLabel2.setText(String.format("About %s", BrandingConstants.PRODUCT_NAME));

javax.swing.GroupLayout mirthHeadingPanel1Layout = new javax.swing.GroupLayout(mirthHeadingPanel1);
mirthHeadingPanel1.setLayout(mirthHeadingPanel1Layout);
Expand Down
43 changes: 43 additions & 0 deletions client/src/com/mirth/connect/client/ui/BrandingConstants.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
package com.mirth.connect.client.ui;

import javax.swing.ImageIcon;

public class BrandingConstants {

public static final String PRODUCT_NAME = "Open Integration Engine";
public static final String COMPANY_NAME = "Open Integration Engine";

/*
Sets the title of the Administrator window
*/
public static final String WINDOW_TITLE = "Open Integration Engine Administrator";

public static final String ISSUE_TRACKER_LOCATION = "https://github.com/openintegrationengine/engine/issues";


// The URL that is opened when clicking the bottom image in Login window
// The one where you're asked for server URL, username, and password
public static final String COMPANY_URL = "https://openintegrationengine.org";
public static final String COMPANY_TOOLTIP = "Open Integration Engine";


// The URL that is opened when clicking the image in the Top right corner of the main administrator window
// The URL that is opened when clicking "Visit + PRODUCT_NAME" button in Administrator
public static final String PRODUCT_URL = "https://github.com/openintegrationengine/engine";
public static final String PRODUCT_TOOLTIP = "Open Integration Engine";


// The URL that is opened when clicking "Help" button in Administrator
public static String HELP_URL_LOCATION = "https://github.com/OpenIntegrationEngine/engine/discussions";

// The "More info" in Server settings "Provide usage statistics"
public static final String PRIVACY_URL = "https://github.com/openintegrationengine";
public static final String PRIVACY_TOOLTIP = "Privacy Information";

// Icons
Comment thread
kpalang marked this conversation as resolved.
// Favicon must be at 32px x 32px scale
public static final ImageIcon FAVICON = new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/branding/oie_logo_only_white_background_32x32.png"));
// These images must be at 215px x 30px scale
public static final ImageIcon LOGO = new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/branding/oie_logo_banner_text_215x30.png"));
public static final ImageIcon LOGO_GRAY = new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/branding/oie_white_logo_banner_text_215x30.png"));
}
6 changes: 3 additions & 3 deletions client/src/com/mirth/connect/client/ui/ChannelPanel.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -217,7 +217,7 @@ public ChannelPanel() {
parent.addTask(TaskConstants.CHANNEL_DEPLOY_DEBUG, "Debug Channel", "Deploys the currently selected channel in debug mode.", "", new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/bug_go.png")), channelTasks, channelPopupMenu, this);
parent.addTask(TaskConstants.CHANNEL_DEPLOY, "Deploy Channel", "Deploys the currently selected channel.", "", new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/arrow_redo.png")), channelTasks, channelPopupMenu, this);
parent.addTask(TaskConstants.CHANNEL_EDIT_GLOBAL_SCRIPTS, "Edit Global Scripts", "Edit scripts that are not channel specific.", "G", new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/script_edit.png")), channelTasks, channelPopupMenu, this);
parent.addTask(TaskConstants.CHANNEL_EDIT_CODE_TEMPLATES, "Edit Code Templates", "Create and manage templates to be used in JavaScript throughout Mirth Connect.", "", new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/page_edit.png")), channelTasks, channelPopupMenu, this);
parent.addTask(TaskConstants.CHANNEL_EDIT_CODE_TEMPLATES, "Edit Code Templates", String.format("Create and manage templates to be used in JavaScript throughout %s.", BrandingConstants.PRODUCT_NAME), "", new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/page_edit.png")), channelTasks, channelPopupMenu, this);
parent.addTask(TaskConstants.CHANNEL_NEW_CHANNEL, "New Channel", "Create a new channel.", "N", new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/application_form_add.png")), channelTasks, channelPopupMenu, this);
parent.addTask(TaskConstants.CHANNEL_IMPORT_CHANNEL, "Import Channel", "Import a channel from an XML file.", "", new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/report_go.png")), channelTasks, channelPopupMenu, this);
parent.addTask(TaskConstants.CHANNEL_EXPORT_ALL_CHANNELS, "Export All Channels", "Export all of the channels to XML files.", "", new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/report_disk.png")), channelTasks, channelPopupMenu, this);
Expand DownExpand Up@@ -2659,7 +2659,7 @@ private String getMissingExtensions(InvalidChannel channel) {
StringBuilder builder = new StringBuilder();

if (!missingConnectors.isEmpty()) {
builder.append("\n\nYour Mirth Connect installation is missing required connectors for this channel:\n ");
builder.append(String.format("\n\nYour %s installation is missing required connectors for this channel:\n ", BrandingConstants.PRODUCT_NAME));
builder.append(StringUtils.join(missingConnectors.toArray(), "\n "));
builder.append("\n\n");
}
Expand All@@ -2668,7 +2668,7 @@ private String getMissingExtensions(InvalidChannel channel) {
if (missingConnectors.isEmpty()) {
builder.append("\n\n");
}
builder.append("Your Mirth Connect installation is missing required data types for this channel:\n ");
builder.append(String.format("Your %s installation is missing required data types for this channel:\n ", BrandingConstants.PRODUCT_NAME));
builder.append(StringUtils.join(missingDataTypes.toArray(), "\n "));
builder.append("\n\n");
}
Expand Down
2 changes: 1 addition & 1 deletion client/src/com/mirth/connect/client/ui/ChannelSetup.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -780,7 +780,7 @@ private void loadChannelInfo() {
encryptAttachmentsCheckBox.setSelected(properties.isEncryptAttachments());
encryptCustomMetaDataCheckBox.setSelected(properties.isEncryptCustomMetaData());

// Fix dataTypes and properties not set by previous versions of Mirth Connect
// Fix dataTypes and properties not set by previous versions
fixNullDataTypesAndProperties();

// load message storage settings
Expand Down
3 changes: 1 addition & 2 deletions client/src/com/mirth/connect/client/ui/CustomBannerPanelDialog.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,6 @@

import javax.swing.AbstractButton;
import javax.swing.BorderFactory;
import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JDialog;
import javax.swing.JFrame;
Expand DownExpand Up@@ -58,7 +57,7 @@ public CustomBannerPanelDialog(JFrame parent, String title, String text) {
private void initComponents() {
setLayout(new MigLayout("insets 12")); // layout sets 12 pixel border
setTitle(title);
setIconImage(UIConstants.MIRTH_FAVICON.getImage());
setIconImage(BrandingConstants.FAVICON.getImage());
getContentPane().setBackground(UIConstants.BACKGROUND_COLOR); // set dialog box to background color
setBackground(UIConstants.BACKGROUND_COLOR); // get all other backgrounds for each piece

Expand Down
2 changes: 1 addition & 1 deletion client/src/com/mirth/connect/client/ui/ErrorDialog.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
question.setBackground(new java.awt.Color(224, 223, 227));
question.setBorder(null);
question.setEditable(false);
question.setText("An unexpected error has occurred. If this is a severe error and you are on NextGen Healthcare Support, please contact the NextGen Healthcare Help Desk.");
question.setText("An unexpected error has occurred. Check the server log and client console output for further details.");
question.setFocusable(false);
questionPane.setViewportView(question);

Expand Down
14 changes: 7 additions & 7 deletions client/src/com/mirth/connect/client/ui/FirstLoginDialog.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,7 +109,7 @@ private void initComponents() {
contentTextPane = new javax.swing.JTextPane();

setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
setTitle("Welcome to Mirth Connect");
setTitle(String.format("Welcome to %s", BrandingConstants.PRODUCT_NAME));

channelOverview.setBackground(new java.awt.Color(255, 255, 255));
channelOverview.setName(""); // NOI18N
Expand All@@ -123,7 +123,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {

jLabel2.setFont(new java.awt.Font("Tahoma", 1, 18)); // NOI18N
jLabel2.setForeground(new java.awt.Color(255, 255, 255));
jLabel2.setText("<html>Welcome to Mirth<sup>&#174;</sup> Connect by NextGen<sup>&#174;</sup> Healthcare</html>");
jLabel2.setText(String.format("<html>Welcome to %s</html>", BrandingConstants.PRODUCT_NAME));

javax.swing.GroupLayout mirthHeadingPanel1Layout = new javax.swing.GroupLayout(mirthHeadingPanel1);
mirthHeadingPanel1.setLayout(mirthHeadingPanel1Layout);
Expand All@@ -144,16 +144,16 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {

jTextPane1.setEditable(false);
jTextPane1.setBackground(new java.awt.Color(250, 250, 210));
jTextPane1.setText("You may now customize your Mirth Connect user account information. You also have the option of changing your account password.");
jTextPane1.setText(String.format("You may now customize your %s user account information. You also have the option of changing your account password.", BrandingConstants.PRODUCT_NAME));
jTextPane1.setAutoscrolls(false);
jTextPane1.setDisabledTextColor(new java.awt.Color(0, 0, 0));
jTextPane1.setEnabled(false);
jScrollPane1.setViewportView(jTextPane1);

registerCheckBox.setBackground(new java.awt.Color(255, 255, 255));
registerCheckBox.setSelected(true);
registerCheckBox.setText("Register user with NextGen Healthcare");
registerCheckBox.setToolTipText("<html>Register your user information with NextGen Healthcare to help us<br>improve the product and provide better service.</html>");
registerCheckBox.setText(String.format("Register user with %s", BrandingConstants.COMPANY_NAME));
registerCheckBox.setToolTipText(String.format("<html>Register your user information with %s to help us<br>improve the product and provide better service.</html>", BrandingConstants.COMPANY_NAME));
registerCheckBox.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
registerCheckBoxActionPerformed(evt);
Expand All@@ -162,11 +162,11 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {

userConsentCheckBox.setBackground(new java.awt.Color(255, 255, 255));
userConsentCheckBox.setSelected(true);
userConsentCheckBox.setText("I consent to receive email updates and marketing messages from NextGen Healthcare.");
userConsentCheckBox.setText(String.format("I consent to receive email updates and marketing messages from %s.", BrandingConstants.COMPANY_NAME));
userConsentCheckBox.setToolTipText("<html></html>");

contentTextPane.setContentType("text/html");
contentTextPane.setText("<html>&nbsp;&nbsp;&nbsp;&nbsp;For more information on the processing of your personal data, click <a href=\"https://www.nextgen.com/privacy-policy\">here to find our Privacy Policy.</a></html>");
contentTextPane.setText(String.format("<html>&nbsp;&nbsp;&nbsp;&nbsp;For more information on the processing of your personal data, click <a href=\"%s\">here to find our Privacy Policy.</a></html>", BrandingConstants.PRIVACY_URL));

MutableAttributeSet set = new SimpleAttributeSet();
StyleConstants.setLineSpacing(set, 1);
Expand Down
Loading