From 89307c32f7e2b77dc6b66e532f71f15cd72b75c5 Mon Sep 17 00:00:00 2001 From: Michael Klein Date: Tue, 1 Nov 2016 10:08:48 -0400 Subject: [PATCH] SPARK-1822 - Add additional default properties to control GUI settings (#250) * SPARK-1758 - Do not show UNFILED group if it's empty * SPARK-1822 - Add additional default properties to control GUI settings * SPARK-1822 - Add additional default properties to control GUI settings --- .../org/jivesoftware/resource/default.properties | 3 +++ .../filetransfer/ChatRoomTransferDecorator.java | 12 ++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/java/org/jivesoftware/resource/default.properties b/src/java/org/jivesoftware/resource/default.properties index d435f500..697af606 100644 --- a/src/java/org/jivesoftware/resource/default.properties +++ b/src/java/org/jivesoftware/resource/default.properties @@ -112,6 +112,9 @@ DISABLE_PLUGINS_MENU_ITEM = false # If true, disable the option to transfer files DISABLE_FILE_XFER = false +# If true, disable the option to take screenshots +DISABLE_SCREENSHOTS = false + # If true, disable the option to remove contacts and groups in roster DISABLE_REMOVALS = false diff --git a/src/java/org/jivesoftware/spark/filetransfer/ChatRoomTransferDecorator.java b/src/java/org/jivesoftware/spark/filetransfer/ChatRoomTransferDecorator.java index cc8d43fe..6d42c829 100644 --- a/src/java/org/jivesoftware/spark/filetransfer/ChatRoomTransferDecorator.java +++ b/src/java/org/jivesoftware/spark/filetransfer/ChatRoomTransferDecorator.java @@ -70,10 +70,14 @@ public class ChatRoomTransferDecorator implements KeyListener, FileDropListener, sendFileButton.addActionListener(this); } - sendScreenShotButton = UIComponentRegistry.getButtonFactory().createScreenshotButton(); - sendScreenShotButton.setToolTipText(Res.getString("message.send.picture")); - chatRoom.addChatRoomButton(sendScreenShotButton); - sendScreenShotButton.addActionListener(this); + // See if we should disable the ability to take screenshots + if (!Default.getBoolean("DISABLE_SCREENSHOTS")) { + sendScreenShotButton = UIComponentRegistry.getButtonFactory().createScreenshotButton(); + sendScreenShotButton.setToolTipText(Res.getString("message.send.picture")); + + chatRoom.addChatRoomButton(sendScreenShotButton); + sendScreenShotButton.addActionListener(this); + } } public void keyTyped(KeyEvent e) {