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

Add an option to hide auto login checkbox along with the save password

Browse Source 
box
https://igniterealtime.org/issues/browse/SPARK-1644
This commit is contained in:
wroot
2015-10-28 20:32:31 +02:00
parent b9709456a0
commit a85f09364d
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -424,14 +424,14 @@ public class LoginDialog {
add(headerLabel, add(headerLabel,
new GridBagConstraints(0, 5, 2, 1, 1.0, 0.0, new GridBagConstraints(0, 5, 2, 1, 1.0, 0.0,
GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 5), 0, 0)); GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 5), 0, 0));
if(!Default.getBoolean("HIDE_SAVE_PASSWORD")) { if(!Default.getBoolean("HIDE_SAVE_PASSWORD_AND_AUTOLOGIN")) {
add(savePasswordBox, add(savePasswordBox,
new GridBagConstraints(1, 5, 2, 1, 1.0, 0.0, new GridBagConstraints(1, 5, 2, 1, 1.0, 0.0,
GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 0, 5), 0, 0)); GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 0, 5), 0, 0));
}
add(autoLoginBox, add(autoLoginBox,
new GridBagConstraints(1, 6, 2, 1, 1.0, 0.0, new GridBagConstraints(1, 6, 2, 1, 1.0, 0.0,
GridBagConstraints.EAST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 0, 5), 0, 0)); GridBagConstraints.EAST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 0, 5), 0, 0));
}
add(loginAsInvisibleBox, add(loginAsInvisibleBox,
new GridBagConstraints(1, 7, 2, 1, 1.0, 0.0, new GridBagConstraints(1, 7, 2, 1, 1.0, 0.0,
GridBagConstraints.EAST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 0, 5), 0, 0)); GridBagConstraints.EAST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 0, 5), 0, 0));

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

@ -103,7 +103,7 @@ public class Default {
public static final String VERSION_AS_RESOURCE = "VERSION_AS_RESOURCE"; public static final String VERSION_AS_RESOURCE = "VERSION_AS_RESOURCE";
public static final String HISTORY_DISABLED = "HISTORY_DISABLED"; public static final String HISTORY_DISABLED = "HISTORY_DISABLED";
public static final String HIDE_HISTORY_SETTINGS = "HIDE_HISTORY_SETTINGS"; public static final String HIDE_HISTORY_SETTINGS = "HIDE_HISTORY_SETTINGS";
public static final String HIDE_SAVE_PASSWORD = "HIDE_SAVE_PASSWORD"; public static final String HIDE_SAVE_PASSWORD_AND_AUTOLOGIN = "HIDE_SAVE_PASSWORD_AND_AUTOLOGIN";
static ClassLoader cl = SparkRes.class.getClassLoader(); static ClassLoader cl = SparkRes.class.getClassLoader();

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

@ -8,7 +8,7 @@ APPLICATION_NAME = Spark
SHORT_NAME = Spark SHORT_NAME = Spark
############# Auto Set During Build ############# ############# Auto Set During Build #############
APPLICATION_VERSION = 2.7.2 APPLICATION_VERSION = 2.7.3
# Passed into ant via cmd line argument: # Passed into ant via cmd line argument:
# -Dbuild.number=<build number> # -Dbuild.number=<build number>
# If not passed in, this field is ignored. # If not passed in, this field is ignored.
@ -66,8 +66,8 @@ PROXY_DISABLED = false
PASSWORD_RESET_ENABLED = false PASSWORD_RESET_ENABLED = false
# URL to your password reset html # URL to your password reset html
PASSWORD_RESET_URL = PASSWORD_RESET_URL =
# Hides Save Password checkbox on the Login screen and in the Preferences # Hides Save Password and Auto Login checkboxes on the Login screen and in the Preferences
HIDE_SAVE_PASSWORD = false HIDE_SAVE_PASSWORD_AND_AUTOLOGIN = false
# Branding only # Branding only
# Branded images appear in the Top-Right corner, and must be included in the classpath # Branded images appear in the Top-Right corner, and must be included in the classpath

4
src/java/org/jivesoftware/sparkimpl/settings/local/LocalPreferencePanel.java
View File

@ -144,10 +144,10 @@ public class LocalPreferencePanel extends JPanel {
inputPanel.add(_idleStatusText, new GridBagConstraints(1, 3, 1, 1, 1.0, 0.0, GridBagConstraints.NORTHWEST,GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 5), 50, 0)); inputPanel.add(_idleStatusText, new GridBagConstraints(1, 3, 1, 1, 1.0, 0.0, GridBagConstraints.NORTHWEST,GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 5), 50, 0));
inputPanel.add(_idleBox, new GridBagConstraints(0, 4, 2, 1, 1.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL,new Insets(5, 5, 5, 5), 50, 0)); inputPanel.add(_idleBox, new GridBagConstraints(0, 4, 2, 1, 1.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL,new Insets(5, 5, 5, 5), 50, 0));
if(!Default.getBoolean(Default.HIDE_SAVE_PASSWORD)) { if(!Default.getBoolean(Default.HIDE_SAVE_PASSWORD_AND_AUTOLOGIN)) {
inputPanel.add(_savePasswordBox, new GridBagConstraints(0, 5, 2, 1, 0.0, 0.0, GridBagConstraints.NORTHWEST,GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 5), 50, 0)); inputPanel.add(_savePasswordBox, new GridBagConstraints(0, 5, 2, 1, 0.0, 0.0, GridBagConstraints.NORTHWEST,GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 5), 50, 0));
}
inputPanel.add(_autoLoginBox, new GridBagConstraints(0, 6, 2, 1, 0.0, 0.0, GridBagConstraints.NORTHWEST,GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 5), 50, 0)); inputPanel.add(_autoLoginBox, new GridBagConstraints(0, 6, 2, 1, 0.0, 0.0, GridBagConstraints.NORTHWEST,GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 5), 50, 0));
}
if (Spark.isWindows()) { if (Spark.isWindows()) {
inputPanel.add(_launchOnStartupBox, new GridBagConstraints(0, 7, 2, 1, 0.0, 0.0, GridBagConstraints.NORTHWEST,GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 5), 50,0)); inputPanel.add(_launchOnStartupBox, new GridBagConstraints(0, 7, 2, 1, 0.0, 0.0, GridBagConstraints.NORTHWEST,GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 5), 50,0));