From 2a2e33204ffb7cd06231e5a0e43b8384bd9f55c5 Mon Sep 17 00:00:00 2001 From: Sergey Ponomarev Date: Thu, 16 Jul 2026 22:54:53 +0300 Subject: [PATCH] Rename LocalPreferences.isTabOnTop() --- .../jivesoftware/spark/ui/ChatContainer.java | 2 +- .../spark/ui/themes/ThemePanel.java | 12 ++---- .../preference/chat/ChatPreference.java | 38 ++++++------------- .../settings/local/LocalPreferences.java | 2 +- 4 files changed, 17 insertions(+), 37 deletions(-) diff --git a/core/src/main/java/org/jivesoftware/spark/ui/ChatContainer.java b/core/src/main/java/org/jivesoftware/spark/ui/ChatContainer.java index 6357e4d97..d91188c81 100644 --- a/core/src/main/java/org/jivesoftware/spark/ui/ChatContainer.java +++ b/core/src/main/java/org/jivesoftware/spark/ui/ChatContainer.java @@ -71,7 +71,7 @@ public class ChatContainer extends SparkTabbedPane implements MessageListener, C public ChatContainer() { // Assign location - super(SettingsManager.getLocalPreferences().isTabTopPosition() ? JTabbedPane.TOP : JTabbedPane.BOTTOM); + super(SettingsManager.getLocalPreferences().isTabOnTop() ? JTabbedPane.TOP : JTabbedPane.BOTTOM); // Set minimum size setMinimumSize(new Dimension(400, 200)); // Don't allow tabs to shrink and allow scrolling. 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 22583389c..5f08995d1 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 @@ -99,15 +99,13 @@ public class ThemePanel extends JPanel { private final JCheckBox _useTabsForTransports = new JCheckBox(); private final JCheckBox _useTabsForConference = new JCheckBox(); private final JCheckBox useSingleWindowDocking = new JCheckBox(); - private final JComboBox _showReconnectBox; - private final LocalPreferences pref = SettingsManager.getLocalPreferences(); - private final JScrollPane emoticonScrollPane; - private JPanel emoticonsPanel; + private final LocalPreferences pref = SettingsManager.getLocalPreferences(); + public ThemePanel() { setLayout(new GridBagLayout()); _lookAndFeel = new JComboBox<>(LookAndFeelManager.getLookAndFeelNames()); @@ -223,6 +221,7 @@ public class ThemePanel extends JPanel { _useTabsForTransports.setText(Res.getString("checkbox.transport.tab.setting")); _useTabsForConference.setText(Res.getString("checkbox.conference.tab.setting")); useSingleWindowDocking.setText(Res.getString("checkbox.singleWindowDocking")); + hideInTaskbar.setText(Res.getString("checkbox.hideInTaskbar")); // Build UI buildUI(); @@ -265,7 +264,7 @@ public class ThemePanel extends JPanel { add(disableGrayingIdleContacts, new GridBagConstraints(0, 11, 2, 1, 1, 0, WEST, NONE, insets, 50, 0)); add(_useTabsForTransports, new GridBagConstraints(0, 12, 3, 1, 1, 0, WEST, NONE, insets, 50, 0)); add(_useTabsForConference, new GridBagConstraints(0, 13, 3, 1, 1, 0, WEST, NONE, insets, 50, 0)); - add(useSingleWindowDocking, new GridBagConstraints(0, 14, 3, 1, 1.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 50, 0)); + add(useSingleWindowDocking, new GridBagConstraints(0, 14, 3, 1, 1, 0, WEST, NONE, insets, 50, 0)); JLabel reconnectionLabel = new JLabel(Res.getString("checkbox.reconnect.info")); add(reconnectionLabel, new GridBagConstraints(0, 15, 1, 1, 0, 0, NORTHWEST, HORIZONTAL, insets, 50, 0)); @@ -470,9 +469,6 @@ public class ThemePanel extends JPanel { return _showReconnectBox.getSelectedIndex(); } - /** - * set 0,1,2 - */ public void setShowReconnectPanel(int reconnect) { _showReconnectBox.setSelectedIndex(reconnect); } diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/preference/chat/ChatPreference.java b/core/src/main/java/org/jivesoftware/sparkimpl/preference/chat/ChatPreference.java index 0f9adc87a..282b03fbf 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/preference/chat/ChatPreference.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/preference/chat/ChatPreference.java @@ -19,13 +19,7 @@ import javax.swing.*; import org.jivesoftware.resource.Res; import org.jivesoftware.resource.SparkRes; -import org.jivesoftware.smack.SmackException; -import org.jivesoftware.smack.XMPPException; -import org.jivesoftware.smackx.iqregister.AccountManager; -import org.jivesoftware.spark.SparkManager; import org.jivesoftware.spark.preference.Preference; -import org.jivesoftware.spark.util.ModelUtil; -import org.jivesoftware.spark.util.log.Log; import org.jivesoftware.sparkimpl.settings.local.LocalPreferences; import org.jivesoftware.sparkimpl.settings.local.SettingsManager; @@ -99,27 +93,17 @@ public class ChatPreference implements Preference { @Override public JComponent getGUI() { panel = new ChatPreferencePanel(); - LocalPreferences localPreferences; - localPreferences = SettingsManager.getLocalPreferences(); - boolean showTime = localPreferences.isTimeDisplayedInChat(); - boolean notificationsOn = localPreferences.isChatRoomNotificationsOn(); - boolean chatHistoryHidden = !localPreferences.isChatHistoryEnabled(); - boolean prevChatHistoryHidden = !localPreferences.isPrevChatHistoryEnabled(); - boolean tabsOnTop = localPreferences.isTabTopPosition(); - boolean buzzAllowed = localPreferences.isBuzzEnabled(); - boolean closeUnreadMessage = localPreferences.isCloseUnreadMessage(); - boolean isChatHistoryAscending = localPreferences.isChatHistoryAscending(); - boolean tabsScroll = localPreferences.isTabsScroll(); - panel.setShowTime(showTime); - panel.setGroupChatNotificationsOn(notificationsOn); - panel.setChatHistoryHidden(chatHistoryHidden); - panel.setPrevChatHistoryHidden(prevChatHistoryHidden); - panel.setChatTimeoutTime(localPreferences.getChatLengthDefaultTimeout()); - panel.setTabsOnTop(tabsOnTop); - panel.setTabsScrollBox(tabsScroll); - panel.setBuzzEnabled(buzzAllowed); - panel.setCloseUnreadMessageEnabled(closeUnreadMessage); - panel.setSortChatHistoryAscending(isChatHistoryAscending); + LocalPreferences pref = SettingsManager.getLocalPreferences(); + panel.setShowTime(pref.isTimeDisplayedInChat()); + panel.setGroupChatNotificationsOn(pref.isChatRoomNotificationsOn()); + panel.setChatHistoryHidden(!pref.isChatHistoryEnabled()); + panel.setPrevChatHistoryHidden(!pref.isPrevChatHistoryEnabled()); + panel.setChatTimeoutTime(pref.getChatLengthDefaultTimeout()); + panel.setTabsOnTop(pref.isTabOnTop()); + panel.setTabsScrollBox(pref.isTabsScroll()); + panel.setBuzzEnabled(pref.isBuzzEnabled()); + panel.setCloseUnreadMessageEnabled(pref.isCloseUnreadMessage()); + panel.setSortChatHistoryAscending(pref.isChatHistoryAscending()); return panel; } diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/settings/local/LocalPreferences.java b/core/src/main/java/org/jivesoftware/sparkimpl/settings/local/LocalPreferences.java index c4b60685c..d7b731f62 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/settings/local/LocalPreferences.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/settings/local/LocalPreferences.java @@ -653,7 +653,7 @@ public class LocalPreferences { setBoolean("tabsOnTop", onTop); } - public boolean isTabTopPosition() { + public boolean isTabOnTop() { return getBoolean("tabsOnTop", true); }