From d06bf16eb5d7983ec57a628b44fc33796b382e5d Mon Sep 17 00:00:00 2001 From: Amos Chepchieng Date: Sun, 20 Dec 2020 10:48:50 +0300 Subject: [PATCH] Fix Mainwindow Bounds not restoring - Replace File Transfer Icon in Preference - Attempt fix for null pointer in preference[to be tested] --- .../java/org/jivesoftware/MainWindow.java | 2 +- .../org/jivesoftware/gui/LoginUIPanel.java | 3 +-- .../preferences/FileTransferPreference.java | 2 +- .../spark/ui/themes/ThemePanel.java | 24 +++++++++---------- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/core/src/main/java/org/jivesoftware/MainWindow.java b/core/src/main/java/org/jivesoftware/MainWindow.java index e18619f66..b049b4a94 100644 --- a/core/src/main/java/org/jivesoftware/MainWindow.java +++ b/core/src/main/java/org/jivesoftware/MainWindow.java @@ -126,7 +126,7 @@ public final class MainWindow extends ChatFrame implements ActionListener { if ( mainWindowBounds == null || mainWindowBounds.width <= 0 || mainWindowBounds.height <= 0 ) { // Use default settings. - setSize(530, 500); + setSize(500, 520); GraphicUtils.centerWindowOnScreen(this); } else diff --git a/core/src/main/java/org/jivesoftware/gui/LoginUIPanel.java b/core/src/main/java/org/jivesoftware/gui/LoginUIPanel.java index d2e65a5bb..e24844e51 100644 --- a/core/src/main/java/org/jivesoftware/gui/LoginUIPanel.java +++ b/core/src/main/java/org/jivesoftware/gui/LoginUIPanel.java @@ -1360,7 +1360,7 @@ public class LoginUIPanel extends javax.swing.JPanel implements KeyListener, Act final Rectangle mainWindowBounds = settings.getMainWindowBounds(); if (mainWindowBounds == null || mainWindowBounds.width <= 0 || mainWindowBounds.height <= 0) { // Use Default size - mainWindow.setSize(530, 520); + mainWindow.setSize(500, 520); // Center Window on Screen GraphicUtils.centerWindowOnScreen(mainWindow); @@ -1370,7 +1370,6 @@ public class LoginUIPanel extends javax.swing.JPanel implements KeyListener, Act if (loginDialog != null) { if (loginDialog.isVisible()) { - mainWindow.setSize(460, 520); mainWindow.setVisible(true); } loginDialog.dispose(); diff --git a/core/src/main/java/org/jivesoftware/spark/filetransfer/preferences/FileTransferPreference.java b/core/src/main/java/org/jivesoftware/spark/filetransfer/preferences/FileTransferPreference.java index 1ca4ead12..5872833df 100644 --- a/core/src/main/java/org/jivesoftware/spark/filetransfer/preferences/FileTransferPreference.java +++ b/core/src/main/java/org/jivesoftware/spark/filetransfer/preferences/FileTransferPreference.java @@ -50,7 +50,7 @@ public class FileTransferPreference implements Preference { @Override public Icon getIcon() { - return SparkRes.getImageIcon(SparkRes.SEND_FILE_24x24); + return SparkRes.getImageIcon(SparkRes.SEND_FILE_ICON); } @Override diff --git a/core/src/main/java/org/jivesoftware/spark/ui/themes/ThemePanel.java b/core/src/main/java/org/jivesoftware/spark/ui/themes/ThemePanel.java index 7b3036c1f..44106c789 100644 --- a/core/src/main/java/org/jivesoftware/spark/ui/themes/ThemePanel.java +++ b/core/src/main/java/org/jivesoftware/spark/ui/themes/ThemePanel.java @@ -115,14 +115,14 @@ public class ThemePanel extends JPanel { } private void setNewLaF() { -// final String selectedName = (String) _lookandfeel.getSelectedItem(); -// try { -// final String className = LookAndFeelManager.getClassName(selectedName); -// // UIManager.setLookAndFeel(className); -// // TODO setJTattooBar( _lookandfeelname.get( _lookandfeel.getSelectedIndex() ) ); -// } catch (Exception e) { -// Log.error("An unexpected exception occurred while trying to update Look and Feel to '" + selectedName + "'.", e); -// } + final String selectedName = (String) _lookandfeel.getSelectedItem(); + try { + final String className = LookAndFeelManager.getClassName(selectedName); + UIManager.setLookAndFeel(className); + // TODO setJTattooBar( _lookandfeelname.get( _lookandfeel.getSelectedIndex() ) ); + } catch (Exception e) { + Log.error("An unexpected exception occurred while trying to update Look and Feel to '" + selectedName + "'.", e); + } } private void updateAllComponentsLaF(final Window window) { @@ -139,8 +139,8 @@ public class ThemePanel extends JPanel { // substance is a PITA! If the current laf is substance, and the new laf is not, we need to // refresh all components, but since substance is very stubborn, we must restart. - final String currentName = UIManager.getLookAndFeel().getName().toLowerCase(); - final String selectedName = ((String) _lookandfeel.getSelectedItem()); + final String currentName = "SparkLighLaf".toLowerCase();//UIManager.getLookAndFeel().getName().toLowerCase(); + final String selectedName = "SparkLighLaf";//((String) _lookandfeel.getSelectedItem()); final String selectedClass = LookAndFeelManager.getClassName(selectedName); if (currentName.contains("substance") && !selectedName.toLowerCase().contains("substance")) { final int selectedOption = JOptionPane.showConfirmDialog(SparkManager.getPreferenceManager().getPreferenceDialog(), @@ -240,7 +240,7 @@ public class ThemePanel extends JPanel { } public String getSelectedLookAndFeelName() { - return (String) this._lookandfeel.getSelectedItem(); + return "SparkLightLaf"; //(String) this._lookandfeel.getSelectedItem(); } public String getSelectedLookAndFeelClassName() { @@ -314,7 +314,7 @@ public class ThemePanel extends JPanel { final String className = pref.getLookAndFeel(); final String name = LookAndFeelManager.getName(className); - _lookandfeel.setSelectedItem(name); + _lookandfeel.setSelectedItem("SparkLighLaf"); showVCards.setSelected(pref.areVCardsVisible());