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

Use APP_NAME from spark.properties #881

Merged
merged 1 commit into from
Sep 9, 2024
Merged

Use APP_NAME from spark.properties #881

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
2 changes: 1 addition & 1 deletion core/src/main/java/org/jivesoftware/LoginDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ public void invoke(final JFrame parentFrame) {

// Construct Dialog
EventQueue.invokeLater(() -> {
loginDialog = new JFrame(Default.getString(Default.APPLICATION_NAME));
loginDialog = new JFrame(JiveInfo.getName());
loginDialog.setIconImage(SparkManager.getApplicationImage().getImage());
LoginPanel loginPanel = new LoginPanel();
final JPanel mainPanel = new LoginBackgroundPanel();
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/org/jivesoftware/MainWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public final class MainWindow extends ChatFrame implements ActionListener {
*/
public static synchronized MainWindow getInstance() {
if (null == singleton) {
singleton = new MainWindow(Default.getString(Default.APPLICATION_NAME), SparkManager.getApplicationImage());
singleton = new MainWindow(JiveInfo.getName(), SparkManager.getApplicationImage());
}
return singleton;
}
Expand Down Expand Up @@ -713,7 +713,7 @@ private void setAboutBoxPane() {

// Construct About Box text
StringBuilder aboutBoxText = new StringBuilder();
aboutBoxText.append(Default.getString(Default.APPLICATION_NAME)).append(" ").append(JiveInfo.getVersion());
aboutBoxText.append(JiveInfo.getName()).append(" ").append(JiveInfo.getVersion());

// Add APPLICATION_INFO1 if not empty
if (!("".equals(APPLICATION_INFO1))) {
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/jivesoftware/gui/LoginUIPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,7 @@ public void invoke(final JFrame parentFrame) {
} catch (Exception e) {
Log.error(e);
}
loginDialog = new JFrame(Default.getString(Default.APPLICATION_NAME));
loginDialog = new JFrame(JiveInfo.getName());

// Construct Dialog
EventQueue.invokeLater(() -> {
Expand Down
1 change: 0 additions & 1 deletion core/src/main/java/org/jivesoftware/resource/Default.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ public class Default {
private static final Map<String,ImageIcon> cache = new HashMap<>();

public static final String MAIN_IMAGE = "MAIN_IMAGE";
public static final String APPLICATION_NAME = "APPLICATION_NAME";
public static final String APPLICATION_INFO1 = "APPLICATION_INFO1";
public static final String APPLICATION_INFO2 = "APPLICATION_INFO2";
public static final String APPLICATION_INFO3 = "APPLICATION_INFO3";
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/jivesoftware/spark/ui/login/GeneralLoginSettingsPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ private void updateResourceVersion()
boolean isSelected = useVersionAsResourceBox.isSelected();
if ( isSelected )
{
String resource = Default.getString( Default.APPLICATION_NAME ) + " " + JiveInfo.getVersion();
String resource = JiveInfo.getName() + " " + JiveInfo.getVersion();
resourceField.setText( resource );
useHostnameAsResourceBox.setSelected( false );
}
Expand Down
3 changes: 2 additions & 1 deletion core/src/main/java/org/jivesoftware/sparkimpl/plugin/systray/SysTrayPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
import org.jivesoftware.spark.ui.status.StatusItem;
import org.jivesoftware.spark.util.log.Log;
import org.jivesoftware.sparkimpl.plugin.manager.Enterprise;
import org.jivesoftware.sparkimpl.settings.JiveInfo;
import org.jivesoftware.sparkimpl.settings.local.LocalPreferences;
import org.jivesoftware.sparkimpl.settings.local.SettingsManager;
import org.jivesoftware.smackx.chatstates.ChatStateListener;
Expand Down Expand Up @@ -253,7 +254,7 @@ public void connectionClosedOnError(Exception arg0) {


trayIcon = new TrayIcon(availableIcon.getImage(),
Default.getString(Default.APPLICATION_NAME), null);
JiveInfo.getName(), null);
trayIcon.setImageAutoSize(true);

trayIcon.addMouseListener(new MouseListener() {
Expand Down
1 change: 0 additions & 1 deletion core/src/main/resources/default.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
# The Login image
# suggested image dimensions 244 x 188 pixels
MAIN_IMAGE = images/spark.gif
APPLICATION_NAME = Spark
SHORT_NAME = Spark

USER_DIRECTORY_WINDOWS = Spark
Expand Down
Loading