Skip to content

Commit

Permalink
#784 Fix checkboxes selection on RTE preferences pages
Browse files Browse the repository at this point in the history 
Signed-off-by: Faycal ABKA <abka.faycal@gmail.com>
  • Loading branch information
@fabka4t3 @pdulth
fabka4t3 authored and pdulth committed Apr 29, 2024
1 parent 6d4e90c commit 1325518
Show file tree
Hide file tree
Showing 6 changed files with 215 additions and 124 deletions.
80 changes: 68 additions & 12 deletions ...alpha/richtext/widget/configurable/preferences/ui/MDERichTextEditorConfigurationPage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@

package org.polarsys.kitalpha.richtext.widget.configurable.preferences.ui;

import java.util.Optional;

import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.jface.preference.BooleanFieldEditor;
import org.eclipse.jface.preference.FieldEditorPreferencePage;
Expand Down Expand Up @@ -47,10 +49,12 @@
public class MDERichTextEditorConfigurationPage
extends FieldEditorPreferencePage
implements IWorkbenchPreferencePage {

IPreferenceStore preferenceStore = null;

public MDERichTextEditorConfigurationPage() {
super(GRID);
IPreferenceStore preferenceStore = new ScopedPreferenceStore(InstanceScope.INSTANCE, "org.polarsys.kitalpha.richtext.widget.configurable.preferences.core");
preferenceStore = new ScopedPreferenceStore(InstanceScope.INSTANCE, "org.polarsys.kitalpha.richtext.widget.configurable.preferences.core");
setPreferenceStore(preferenceStore);
}

Expand Down Expand Up @@ -133,21 +137,17 @@ protected void initialize() {
super.initialize();

EditorItem globalEnablementItem = EditorModel.INSTANCE.getGlobalEnablementItem();
boolean isEnabled = globalEnablementItem.getPreferenceField().getBooleanValue();
if (EditorModel.INSTANCE.isNodeToBeActivated(globalEnablementItem))
{
for (EditorToolbar toolbar : EditorModel.INSTANCE.getToolbars())
{
boolean toolbarValue = toolbar.getPreferenceField().getBooleanValue();
for (EditorGroup group : toolbar.getGroups())
{
boolean groupValue = group.getPreferenceField().getBooleanValue();
group.getPreferenceField().setEnabled(toolbarValue, group.getParent());
group.getPreferenceField().setEnabled(isEnabled, group.getParent());
for (EditorItem item : group.getItems())
{
if (!toolbarValue || !groupValue)
{
item.getPreferenceField().setEnabled(false, item.getParent());
}
item.getPreferenceField().setEnabled(isEnabled, item.getParent());
}
}
}
Expand Down Expand Up @@ -181,9 +181,14 @@ public void propertyChange(PropertyChangeEvent event) {
{
EditorToolbar toolbar = (EditorToolbar) editorModelNode;
boolean toolbarValue = newValue;

preferenceStore.setValue(toolbar.getId(), toolbarValue);
toolbar.getPreferenceField().load();

for (EditorGroup group : toolbar.getGroups())
{
group.getPreferenceField().setEnabled(toolbarValue, group.getParent());
preferenceStore.setValue(group.getId(), toolbarValue);
group.getPreferenceField().load();
boolean groupValue = group.getPreferenceField().getBooleanValue();
for (EditorItem item : group.getItems())
{
Expand All @@ -196,18 +201,23 @@ public void propertyChange(PropertyChangeEvent event) {
{
isEnabled = true;
}

item.getPreferenceField().setEnabled(isEnabled, item.getParent());
preferenceStore.setValue(item.getId(), isEnabled);
item.getPreferenceField().load();
}
}
}
else if (editorModelNode instanceof EditorGroup)
{
EditorGroup group = (EditorGroup) editorModelNode;
preferenceStore.setValue(group.getId(), newValue);
group.getPreferenceField().load();
for (EditorItem item : group.getItems())
{
item.getPreferenceField().setEnabled(newValue, item.getParent());
preferenceStore.setValue(item.getId(), newValue);
item.getPreferenceField().load();
}
// Update the parent
updateParentToolBar(group);
}
else if (editorModelNode instanceof EditorItem)
{
Expand All @@ -218,16 +228,62 @@ else if (editorModelNode instanceof EditorItem)
{
for (EditorToolbar toolbar : EditorModel.INSTANCE.getToolbars())
{
preferenceStore.setValue(toolbar.getId(), isEnabled);
toolbar.getPreferenceField().load();
toolbar.getPreferenceField().setEnabled(isEnabled, toolbar.getParent());
for (EditorGroup group : toolbar.getGroups())
{
preferenceStore.setValue(group.getId(), isEnabled);
group.getPreferenceField().load();
group.getPreferenceField().setEnabled(isEnabled, group.getParent());
for (EditorItem item : group.getItems())
{
preferenceStore.setValue(item.getId(), isEnabled);
item.getPreferenceField().load();
item.getPreferenceField().setEnabled(isEnabled, item.getParent());
}
}
}
} else {

preferenceStore.setValue(changedItem.getId(), isEnabled);
changedItem.getPreferenceField().load();

// Update the parent
EditorModelNode parentNode = EditorModel.INSTANCE.getNode(changedItem.getParentId());
if (parentNode instanceof EditorGroup) {
EditorGroup parentGroup = (EditorGroup) parentNode;

// @formatter:off
Optional<Boolean> currentParentState = parentGroup.getItems().stream()
.map(EditorItem::getPreferenceField)
.map(BooleanFieldEditor::getBooleanValue)
.reduce((b1, b2) -> b1 || b2);
// @formatter:on
if (currentParentState.isPresent()) {
preferenceStore.setValue(parentGroup.getId(), currentParentState.get());
parentGroup.getPreferenceField().load();
updateParentToolBar(parentGroup);
}
}
}
}
}

private void updateParentToolBar(EditorGroup group) {
EditorModelNode parentNode = EditorModel.INSTANCE.getNode(group.getParentId());
if (parentNode instanceof EditorToolbar) {
EditorToolbar parentToolBar = (EditorToolbar) parentNode;

// @formatter:off
Optional<Boolean> currentParentState = parentToolBar.getGroups().stream()
.map(EditorGroup::getPreferenceField)
.map(BooleanFieldEditor::getBooleanValue)
.reduce((b1, b2) -> b1 || b2);
// @formatter:on
if (currentParentState.isPresent()) {
preferenceStore.setValue(parentToolBar.getId(), currentParentState.get());
parentToolBar.getPreferenceField().load();
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions ...rable/src/org/polarsys/kitalpha/richtext/widget/configurable/editormodel/EditorGroup.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ public class EditorGroup extends EditorModelNode {

private List<EditorItem> items;

public EditorGroup(String groupId, String groupRteId, String groupLabel)
public EditorGroup(String parentId, String groupId, String groupRteId, String groupLabel)
{
super(groupId, groupRteId, groupLabel);
super(parentId, groupId, groupRteId, groupLabel);
}

public EditorGroup(String groupId, String groupRteId, String groupLabel, List<EditorItem> items)
public EditorGroup(String parentId, String groupId, String groupRteId, String groupLabel, List<EditorItem> items)
{
super(groupId, groupRteId, groupLabel);
super(parentId, groupId, groupRteId, groupLabel);
this.items = items;
}

Expand Down
4 changes: 2 additions & 2 deletions ...urable/src/org/polarsys/kitalpha/richtext/widget/configurable/editormodel/EditorItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

public class EditorItem extends EditorModelNode {

public EditorItem(String itemId, String itemRteId, String itemLabel)
public EditorItem(String parentId, String itemId, String itemRteId, String itemLabel)
{
super(itemId, itemRteId, itemLabel);
super(parentId, itemId, itemRteId, itemLabel);
}
}
Loading

0 comments on commit 1325518

Please sign in to comment.