mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-12-01 12:27:58 +00:00
Code Issues Projects Releases Wiki Activity

SPARK-1822 - Added new settings to disable certain GUI menu items (#233)

Browse Source 
* Added new settings to disable certain GUI menu items.

* SPARK-1822 - Added new settings to disable certain GUI menu items
This commit is contained in:
Michael Klein
2016-10-22 07:28:09 -04:00
committed by wroot
parent e6d9518540
commit 4c4d47ec45
9 changed files with 107 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/org/jivesoftware/LoginDialog.java
View File

@ -460,9 +460,13 @@ public class LoginDialog {
new GridBagConstraints(1, 6, 2, 1, 1.0, 0.0,
GridBagConstraints.EAST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 0, 5), 0, 0));
}
add(loginAsInvisibleBox,
// Add option to hide "Login as invisible" selection on the login screen
if(!Default.getBoolean("HIDE_LOGIN_AS_INVISIBLE")) {
add(loginAsInvisibleBox,
new GridBagConstraints(1, 7, 2, 1, 1.0, 0.0,
GridBagConstraints.EAST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 0, 5), 0, 0));
}
// Add button but disable the login button initially
savePasswordBox.addActionListener(this);

14
src/java/org/jivesoftware/MainWindow.java
View File

@ -461,8 +461,20 @@ public final class MainWindow extends ChatFrame implements ActionListener {
preferenceMenuItem = new JMenuItem(SparkRes.getImageIcon(SparkRes.PREFERENCES_IMAGE));
preferenceMenuItem.setText(Res.getString("title.spark.preferences"));
preferenceMenuItem.addActionListener(this);
connectMenu.add(preferenceMenuItem);
/******************************************************************************************************/
/* Show the "Preferences" menu item ONLY under the following conditions: */
/* */
/* 1) We're currently in Maintenance Mode */
/* OR */
/* 2) DISABLE_PREFERENCES_MENU_ITEM = false */
/******************************************************************************************************/
File myMaintFile = new File(Default.getString(Default.MAINT_FILESPEC));
final boolean maintMode = (myMaintFile.exists() && !myMaintFile.isDirectory())? true:false;
if (!Default.getBoolean("DISABLE_PREFERENCES_MENU_ITEM") || maintMode) connectMenu.add(preferenceMenuItem);
alwaysOnTopItem = new JCheckBoxMenuItem();
ResourceUtils.resButton(alwaysOnTopItem, Res.getString("menuitem.always.on.top"));

2
src/java/org/jivesoftware/resource/Default.java
View File

@ -104,6 +104,8 @@ public class Default {
public static final String HISTORY_DISABLED = "HISTORY_DISABLED";
public static final String HIDE_HISTORY_SETTINGS = "HIDE_HISTORY_SETTINGS";
public static final String HIDE_SAVE_PASSWORD_AND_AUTOLOGIN = "HIDE_SAVE_PASSWORD_AND_AUTOLOGIN";
public static final String MAINT_FILESPEC = "MAINT_FILESPEC";
public static final String HIDE_LOGIN_AS_INVISIBLE = "HIDE_LOGIN_AS_INVISIBLE";
static ClassLoader cl = SparkRes.class.getClassLoader();

28
src/java/org/jivesoftware/resource/default.properties
View File

@ -8,7 +8,7 @@ APPLICATION_NAME = Spark
SHORT_NAME = Spark
############# Auto Set During Build #############
APPLICATION_VERSION = 2.7.7
APPLICATION_VERSION = 2.8.1
# Passed into ant via cmd line argument:
# -Dbuild.number=<build number>
# If not passed in, this field is ignored.
@ -85,6 +85,32 @@ DISABLE_UPDATES =
# users wont be able to shut down Spark
DISABLE_EXIT =
# If true, hides "Login as invisible" checkbox on the login screen
HIDE_LOGIN_AS_INVISIBLE = false
# If true, the "Preferences" menu item will be disabled
DISABLE_PREFERENCES_MENU_ITEM = false
# This allows an administrator to override the DISABLE_PREFERENCES_MENU_ITEM setting
# The "Preferences" menu item will be enabled when the specified file exists
# Specify the maintenance path/file here (i.e. \\\\server\\share\\filename.ext)
MAINT_FILESPEC =
# If true, don't allow user to manually change presence status
DISABLE_PRESENCE_STATUS_BAR = false
# If true, disable the "Status" option in the system tray
DISABLE_STATUS_IN_SYSTRAY = false
# If true, disable the "Broadcast message" menu item
DISABLE_BROADCAST_MENU_ITEM = false
# If true, remove the AVATAR tab in profile dialog
DISABLE_AVATAR_TAB = false
# If true, disable the "Plugins" menu item
DISABLE_PLUGINS_MENU_ITEM = false
#################################################
################## File Transfer ################
#################################################

45
src/java/org/jivesoftware/spark/ui/status/StatusBar.java
View File

@ -568,7 +568,10 @@ public class StatusBar extends JPanel implements VCardListener {
add(statusLabel, new GridBagConstraints(1, 0, 1, 1, 1.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 2, 0, 0), 0, 0));
statusLabel.setFont(new Font(Font.DIALOG, Font.PLAIN, 11));
statusLabel.setIcon(SparkRes.getImageIcon(SparkRes.DOWN_ARROW_IMAGE));
// Add option to disable the presence status bar
if(!Default.getBoolean("DISABLE_PRESENCE_STATUS_BAR")) statusLabel.setIcon(SparkRes.getImageIcon(SparkRes.DOWN_ARROW_IMAGE));
statusLabel.setHorizontalTextPosition(JLabel.LEFT);
setOpaque(false);
@ -576,27 +579,29 @@ public class StatusBar extends JPanel implements VCardListener {
final Border border = BorderFactory.createEmptyBorder(2, 2, 2, 2);
setBorder(border);
// Add option to disable the presence status bar
if(!Default.getBoolean("DISABLE_PRESENCE_STATUS_BAR")) {
statusLabel.addMouseListener(new MouseAdapter() {
public void mouseReleased(MouseEvent e) {
showPopup(e);
}
public void mouseEntered(MouseEvent e) {
setCursor(GraphicUtils.HAND_CURSOR);
setBorder(BorderFactory.createBevelBorder(0));
}
statusLabel.addMouseListener(new MouseAdapter() {
public void mouseReleased(MouseEvent e) {
showPopup(e);
}
public void mouseExited(MouseEvent e) {
setCursor(GraphicUtils.DEFAULT_CURSOR);
setBorder(border);
}
public void mouseEntered(MouseEvent e) {
setCursor(GraphicUtils.HAND_CURSOR);
setBorder(BorderFactory.createBevelBorder(0));
}
public void mouseExited(MouseEvent e) {
setCursor(GraphicUtils.DEFAULT_CURSOR);
setBorder(border);
}
public void mousePressed(MouseEvent e) {
setBorder(BorderFactory.createBevelBorder(1));
}
});
public void mousePressed(MouseEvent e) {
setBorder(BorderFactory.createBevelBorder(1));
}
});
}
}

4
src/java/org/jivesoftware/sparkimpl/plugin/alerts/BroadcastPlugin.java
View File

@ -118,7 +118,9 @@ public class BroadcastPlugin extends SparkTabHandler implements Plugin, StanzaLi
final JMenu actionsMenu = SparkManager.getMainWindow().getMenuByName(Res.getString("menuitem.actions"));
JMenuItem broadcastMenu = new JMenuItem(Res.getString("title.broadcast.message"), SparkRes.getImageIcon(SparkRes.MEGAPHONE_16x16));
ResourceUtils.resButton(broadcastMenu, Res.getString("title.broadcast.message"));
actionsMenu.add(broadcastMenu);
// See if we should disable the "Broadcast" menu item
if (!Default.getBoolean("DISABLE_BROADCAST_MENU_ITEM")) actionsMenu.add(broadcastMenu);
broadcastMenu.addActionListener( e -> broadcastToRoster() );
// Register with action menu

16
src/java/org/jivesoftware/sparkimpl/plugin/systray/SysTrayPlugin.java
View File

@ -132,8 +132,9 @@ public class SysTrayPlugin implements Plugin, NativeHandler, ChatManagerListener
connectingIcon = SparkRes
.getImageIcon(SparkRes.TRAY_CONNECTING);
}
popupMenu.add( openMenu );
openMenu.addActionListener( new AbstractAction() {
private static final long serialVersionUID = 1L;
@ -145,7 +146,9 @@ public class SysTrayPlugin implements Plugin, NativeHandler, ChatManagerListener
}
});
popupMenu.add( minimizeMenu );
minimizeMenu.addActionListener( new AbstractAction() {
private static final long serialVersionUID = 1L;
@ -154,9 +157,14 @@ public class SysTrayPlugin implements Plugin, NativeHandler, ChatManagerListener
SparkManager.getMainWindow().setVisible(false);
}
});
popupMenu.addSeparator();
addStatusMessages();
popupMenu.add(statusMenu);
// Check if we should disable the "Status" option in the system tray icon
if (!Default.getBoolean("DISABLE_STATUS_IN_SYSTRAY")) {
popupMenu.addSeparator();
addStatusMessages();
popupMenu.add(statusMenu);
}
statusMenu.addActionListener(new AbstractAction() {
private static final long serialVersionUID = 1L;

5
src/java/org/jivesoftware/sparkimpl/plugin/viewer/PluginViewer.java
View File

@ -202,8 +202,9 @@ public class PluginViewer extends JPanel implements Plugin {
viewAction.putValue(Action.NAME, Res.getString("menuitem.plugins"));
viewAction.putValue(Action.SMALL_ICON, SparkRes.getImageIcon(SparkRes.PLUGIN_IMAGE));
viewPluginsMenu.setAction(viewAction);
sparkMenu.insert(viewPluginsMenu, 2);
// See if we should disable the "Plugins" menu item
if (!Default.getBoolean("DISABLE_PLUGINS_MENU_ITEM")) sparkMenu.insert(viewPluginsMenu, 2);
}
private boolean uninstall(final PublicPlugin plugin) {

24
src/java/org/jivesoftware/sparkimpl/profile/VCardEditor.java
View File

@ -54,6 +54,7 @@ import org.jivesoftware.spark.ui.status.StatusBar;
import org.jivesoftware.spark.util.GraphicUtils;
import org.jivesoftware.spark.util.ModelUtil;
import org.jivesoftware.spark.util.log.Log;
import org.jivesoftware.resource.Default;
/**
* Handles the UI for viewing and editing of VCard information.
@ -92,8 +93,11 @@ public class VCardEditor {
homePanel = new HomePanel();
tabbedPane.addTab(Res.getString("tab.home"), homePanel);
avatarPanel = new AvatarPanel();
tabbedPane.addTab(Res.getString("tab.avatar"), avatarPanel);
// See if we should remove the Avatar tab in profile dialog
if (!Default.getBoolean("DISABLE_AVATAR_TAB")) {
avatarPanel = new AvatarPanel();
tabbedPane.addTab(Res.getString("tab.avatar"), avatarPanel);
}
// Build the UI
buildUI(vCard);
@ -149,7 +153,10 @@ public class VCardEditor {
};
pane.addPropertyChangeListener(changeListener);
avatarPanel.setParentDialog(dlg);
// See if we should remove the Avatar tab in profile dialog
if (!Default.getBoolean("DISABLE_AVATAR_TAB")) avatarPanel.setParentDialog(dlg);
dlg.setVisible(true);
dlg.toFront();
dlg.requestFocus();
@ -183,10 +190,13 @@ public class VCardEditor {
homePanel.allowEditing(false);
tabbedPane.addTab(Res.getString("tab.home"), homePanel);
avatarPanel = new AvatarPanel();
avatarPanel.allowEditing(false);
tabbedPane.addTab(Res.getString("tab.avatar"), avatarPanel);
// See if we should remove the Avatar tab in profile dialog
if (!Default.getBoolean("DISABLE_AVATAR_TAB")) {
avatarPanel = new AvatarPanel();
avatarPanel.allowEditing(false);
tabbedPane.addTab(Res.getString("tab.avatar"), avatarPanel);
}
// Build the UI
buildUI(vCard);