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-1516 - Spark should not let open profile edit by clicking the avatar if profile changing is disabled (#258)

Browse Source 
* 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

* SPARK-1516 - Spark should not let open profile edit by clicking the
avatar if profile changing is disabled

* SPARK-1827 - Shouldn't allow broadcast to selected users when it is
disabled in Client Control

* SPARK-1822 - Add additional default properties to control GUI settings

* SPARK-1516 - Spark should not let open profile edit by clicking the
avatar if profile changing is disabled
This commit is contained in:
Michael Klein
2016-11-06 06:33:17 -05:00
committed by wroot
parent 0545b790fc
commit 0ad6d3c554
1 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -152,31 +152,6 @@ public class StatusBar extends JPanel implements VCardListener {
} }
} ); } );
// See if we should disable the option to edit the profile if clicking on the Avatar image
// NOTE: There seems to be a bug where the enterprise VCARD_FEATURE is always returned as boolean 'true'
if (!Default.getBoolean("DISABLE_EDIT_PROFILE") && Enterprise.containsFeature(Enterprise.VCARD_FEATURE)) {
// Show profile when clicking on Avatar image
imageLabel.addMouseListener(new MouseAdapter() {
public void mouseClicked(MouseEvent mouseEvent) {
if (mouseEvent.getClickCount() == 1) {
VCardManager vcardManager = SparkManager.getVCardManager();
VCardEditor editor = new VCardEditor();
editor.editProfile(vcardManager.getVCard(), SparkManager.getWorkspace());
}
}
public void mouseEntered(MouseEvent e) {
imageLabel.setCursor(GraphicUtils.HAND_CURSOR);
}
public void mouseExited(MouseEvent e) {
imageLabel.setCursor(GraphicUtils.DEFAULT_CURSOR);
}
});
}
final TimerTask task = new SwingTimerTask() { final TimerTask task = new SwingTimerTask() {
public void doRun() { public void doRun() {
SparkManager.getVCardManager().addVCardListener(SparkManager.getWorkspace().getStatusBar()); SparkManager.getVCardManager().addVCardListener(SparkManager.getWorkspace().getStatusBar());
@ -198,6 +173,7 @@ public class StatusBar extends JPanel implements VCardListener {
} }
imageLabel.setBorder(null); imageLabel.setBorder(null);
revalidate(); revalidate();
allowProfileEditing();
} }
public CommandPanel getCommandPanel() public CommandPanel getCommandPanel()
@ -715,4 +691,28 @@ public class StatusBar extends JPanel implements VCardListener {
: PresenceManager.getAvailablePresence(); : PresenceManager.getAvailablePresence();
} }
public void allowProfileEditing() {
// Allow profile editing ONLY if both client-side and server-side settings permit it
if (Default.getBoolean("DISABLE_EDIT_PROFILE") || !Enterprise.containsFeature(Enterprise.VCARD_FEATURE)) return;
// Go ahead and show the profile when clicking on the Avatar image
imageLabel.addMouseListener(new MouseAdapter() {
public void mouseClicked(MouseEvent mouseEvent) {
if (mouseEvent.getClickCount() == 1) {
VCardManager vcardManager = SparkManager.getVCardManager();
VCardEditor editor = new VCardEditor();
editor.editProfile(vcardManager.getVCard(), SparkManager.getWorkspace());
}
}
public void mouseEntered(MouseEvent e) {
imageLabel.setCursor(GraphicUtils.HAND_CURSOR);
}
public void mouseExited(MouseEvent e) {
imageLabel.setCursor(GraphicUtils.DEFAULT_CURSOR);
}
});
}
} }