Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Spark update and correction #844

Open
wants to merge 37 commits into
base: master
Choose a base branch
from
Open

Spark update and correction #844

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
ac5d1ae
Update Default.java
Will-LWE Jul 17, 2023
be4d4a2
Update Enterprise.java
Will-LWE Jul 17, 2023
913c5ef
Update default.properties
Will-LWE Jul 17, 2023
d9d2fd4
Update ContactList.java
Will-LWE Jul 17, 2023
daf10d4
Update BookmarkPlugin.java
Will-LWE Jul 17, 2023
d14f7ae
Update PluginViewer.java
Will-LWE Jul 17, 2023
7340e4d
Update PreferenceDialog.java
Will-LWE Jul 17, 2023
7f661b7
Update VCardEditor.java
Will-LWE Jul 17, 2023
eff6d58
Update BroadcastHistoryFrame.java
Will-LWE Jul 17, 2023
8f2defc
Update ChatFrame.java
Will-LWE Jul 17, 2023
50f86c9
Update MainWindow.java
Will-LWE Jul 17, 2023
aa4a6a8
Update BroadcastDialog.java
Will-LWE Jul 17, 2023
3b3c396
Update ConferenceRoomBrowser.java
Will-LWE Jul 17, 2023
4016632
Update VCardEditor.java
Will-LWE Jul 17, 2023
0516a1d
Update InvitationDialog.java
Will-LWE Jul 17, 2023
fe43f60
Update RoomCreationDialog.java
Will-LWE Jul 17, 2023
9097187
Update GroupChatParticipantList.java
Will-LWE Jul 17, 2023
9a6b6d0
Update GroupChatRoom.java
Will-LWE Jul 17, 2023
f4dee50
Update DataFormDialog.java
Will-LWE Jul 17, 2023
650d4fb
Update HistoryTranscript.java
Will-LWE Jul 17, 2023
39e67d4
Update ScratchPadPlugin.java
Will-LWE Jul 17, 2023
a0b125c
Update UserSearchService.java
Will-LWE Jul 17, 2023
19ddc1e
Update ContactInfoWindow.java
Will-LWE Jul 17, 2023
1bb8727
Update VCardEditor.java
Will-LWE Jul 17, 2023
9bc975b
Update VCardManager.java
Will-LWE Jul 17, 2023
0f93ac6
Add files via upload
Will-LWE Jul 17, 2023
19db49a
Add files via upload
Will-LWE Jul 17, 2023
7019c03
Add files via upload
Will-LWE Jul 17, 2023
d8e411a
Add files via upload
Will-LWE Jul 17, 2023
4c56efd
Update otrplugin_i18n_fr.properties
Will-LWE Jul 17, 2023
ec20485
Update roar_i18n_fr.properties
Will-LWE Jul 17, 2023
85952f4
Update sip_spark_i18n_fr.properties
Will-LWE Jul 17, 2023
66e7d2c
Update spellchecker_i18n_fr.properties
Will-LWE Jul 17, 2023
0b4f9b4
Add files via upload
Will-LWE Jul 17, 2023
4ef9788
Update transferguard_i18n_fr.properties
Will-LWE Jul 17, 2023
fc63fe1
Update spark_i18n_fr.properties
Will-LWE Jul 17, 2023
1976cf9
Update tictactoe_i18n_fr.properties
Will-LWE Jul 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions core/src/main/java/org/jivesoftware/resource/Default.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,13 @@ public class Default {
public static final String PROXY_PROTOCOL = "PROXY_PROTOCOL";
public static final String IDLE_LOCK = "IDLE_LOCK";
public static final String IDLE_TIME = "IDLE_TIME";
public static final String UNFILEDGROUP_DISABLED = "UNFILEDGROUP_DISABLED";
public static final String ALLOW_NICKNAME_CHANGE_DISABLED = "ALLOW_NICKNAME_CHANGE_DISABLED";
public static final String CONFERENCE_BUTTON_SETTINGS_DISABLED = "CONFERENCE_BUTTON_SETTINGS_DISABLED";
public static final String CONFERENCE_BUTTON_REGISTER_DISABLED = "CONFERENCE_BUTTON_REGISTER_DISABLED";
public static final String SHOW_FULL_JID_ADDRESS = "SHOW_FULL_JID_ADDRESS";
public static final String EDIT_AVATAR_ONLY = "EDIT_AVATAR_ONLY";
public static final String DISABLE_LOOKUP_PROFILE = "DISABLE_LOOKUP_PROFILE";

private static final ClassLoader cl = SparkRes.class.getClassLoader();

Expand Down
4 changes: 3 additions & 1 deletion core/src/main/java/org/jivesoftware/spark/ui/ContactList.java
View file
Open in desktop
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code relate to : Unfiled Group can be disabled from default.properties

Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,9 @@ public ContactList() {
}

// Add ActionListener(s) to menus
addContactGroup(unfiledGroup);
//addContactGroup(unfiledGroup);
//if (!Default.getBoolean(Default.UNFILEDGROUP_DISABLED) && Enterprise.containsFeature(Enterprise.UNFILEDGROUP_FEATURE)) addContactGroup(unfiledGroup);
if (!Default.getBoolean(Default.UNFILEDGROUP_DISABLED)) addContactGroup(unfiledGroup);
addContactGroup(offlineGroup);

showHideMenu.setSelected(false);
Expand Down
6 changes: 6 additions & 0 deletions core/src/main/java/org/jivesoftware/sparkimpl/plugin/bookmarks/BookmarkPlugin.java
View file
Open in desktop
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code relate to : Bookmarks menu is visible only if a bookmark is present.

Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ public void initialize() {

if (bookmarkMenu.getMenuComponentCount() > 0) {
SparkManager.getMainWindow().getMenu().add(bookmarkMenu, 3);
bookmarkMenu.setVisible(false);
int numberOfBookmark = bookmarkMenu.getItemCount();
if (numberOfBookmark > 1 ) bookmarkMenu.setVisible(true);
}

BookmarksUI bookmarksUi = ConferenceServices.getBookmarkedConferences();
Expand Down Expand Up @@ -123,6 +126,9 @@ public void rescan(JMenu bookmarkMenu) {
SparkManager.getMainWindow().getMenu().invalidate();
SparkManager.getMainWindow().getMenu().validate();
SparkManager.getMainWindow().getMenu().repaint();
bookmarkMenu.setVisible(false);
int numberOfBookmark = bookmarkMenu.getItemCount();
if (numberOfBookmark > 1 ) bookmarkMenu.setVisible(true);
} catch (XMPPException | SmackException | InterruptedException ex) {
Log.error(ex);
}
Expand Down
7 changes: 7 additions & 0 deletions core/src/main/java/org/jivesoftware/sparkimpl/plugin/manager/Enterprise.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,13 @@ public class Enterprise {
public static final String VERSION_AS_RESOURCE_FEATURE = "version-as-resource";
public static final String PLUGINS_BLACKLIST_NODE = "spark-plugins-blacklist";
public static final String IDLE_FEATURE = "idle";
public static final String UNFILEDGROUP_FEATURE = "unfiledGroup";
public static final String ALLOW_NICKNAME_CHANGE_FEATURE = "nickname-change";
public static final String CONFERENCE_BUTTON_SETTINGS_FEATURE = "conference-settings-button";
public static final String CONFERENCE_BUTTON_REGISTER_FEATURE = "conference-register-button";
public static final String SHOW_FULL_JID_ADDRESS_FEATURE = "full-jid-address";
public static final String EDIT_AVATAR_FEATURE = "edit-avatar-only";
public static final String DISABLE_LOOKUP_PROFILE_FEATURE = "disable-lookup-profile";

public static final String IBB_FEATURE = "ibb-only";

Expand Down
2 changes: 2 additions & 0 deletions core/src/main/java/org/jivesoftware/sparkimpl/plugin/viewer/PluginViewer.java
View file
Open in desktop
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code relate to : Real time save settings of window size and position.

Original file line number Diff line number Diff line change
Expand Up @@ -259,12 +259,14 @@ private void invokeViewer()
public void componentResized( ComponentEvent e )
{
LayoutSettingsManager.getLayoutSettings().setPluginViewerBounds( dialog.getBounds() );
LayoutSettingsManager.saveLayoutSettings();
}

@Override
public void componentMoved( ComponentEvent e )
{
LayoutSettingsManager.getLayoutSettings().setPluginViewerBounds( dialog.getBounds() );
LayoutSettingsManager.saveLayoutSettings();
}
} );

Expand Down
2 changes: 2 additions & 0 deletions core/src/main/java/org/jivesoftware/sparkimpl/preference/PreferenceDialog.java
View file
Open in desktop
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code relate to : Real time save settings of window size and position.

Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,14 @@ public void invoke( JFrame parentFrame, PreferencesPanel contentPane )
public void componentResized( ComponentEvent e )
{
LayoutSettingsManager.getLayoutSettings().setPreferencesBounds( preferenceDialog.getBounds() );
LayoutSettingsManager.saveLayoutSettings();
}

@Override
public void componentMoved( ComponentEvent e )
{
LayoutSettingsManager.getLayoutSettings().setPreferencesBounds( preferenceDialog.getBounds() );
LayoutSettingsManager.saveLayoutSettings();
}
} );
}
Expand Down
2 changes: 2 additions & 0 deletions core/src/main/java/org/jivesoftware/sparkimpl/profile/VCardEditor.java
View file
Open in desktop
Copy link
Author

@Will-LWE Will-LWE Jul 19, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code relate to : The window of VCardEditor is now centered to the screen.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This other code relate to : Prohibit modification of user profile but only allow the avatar change that can be very useful in case of use of LDAP / Active Directory from default.properties .

Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,14 @@ public void editProfile(final VCard vCard, JComponent parent) {
public void componentResized( ComponentEvent e )
{
LayoutSettingsManager.getLayoutSettings().setVCardEditorBounds( dlg.getBounds() );
LayoutSettingsManager.saveLayoutSettings();
}

@Override
public void componentMoved( ComponentEvent e )
{
LayoutSettingsManager.getLayoutSettings().setVCardEditorBounds( dlg.getBounds() );
LayoutSettingsManager.saveLayoutSettings();
}
} );

Expand Down
21 changes: 21 additions & 0 deletions core/src/main/resources/default.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,27 @@ IDLE_LOCK = false
# Idle time, default value = 5min
IDLE_TIME = 5

# If true, disable Unfiled Group in the contacts list
UNFILEDGROUP_DISABLED = false

# If true, disable Nickname change in conference
ALLOW_NICKNAME_CHANGE_DISABLED = false

# If true, disable Room Settings button in conference
CONFERENCE_BUTTON_SETTINGS_DISABLED = false

# If true, disable Register button in conference
CONFERENCE_BUTTON_REGISTER_DISABLED = false

# If true, show the full JID address in the Contact Information Window from the Contacts List
SHOW_FULL_JID_ADDRESS = false

# If true, disable Personal, Business and Home Edit from Edit Profile and enable only the Avatar modification
EDIT_AVATAR_ONLY = false

# If true, Lookup Profile is desabled from Contacts Menu
DISABLE_LOOKUP_PROFILE = false

#################################################
################## File Transfer ################
#################################################
Expand Down