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

feat: allow manual setting of default dark/light theme #686

Merged
merged 3 commits into from
Feb 6, 2024
Merged

feat: allow manual setting of default dark/light theme #686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce10afc
refact: add reusable tm4e.ui.internal.widgets.TableWidget
sebthom Feb 6, 2024
6b3e3e2
refact: minor code cleanup
sebthom Feb 6, 2024
a9b8aba
feat: allow manual setting of default dark/light theme
sebthom Feb 6, 2024
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
2 changes: 1 addition & 1 deletion ...ain/java/org/eclipse/tm4e/languageconfiguration/internal/model/LanguageConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
* "https://github.com/microsoft/vscode/blob/ba2cf46e20df3edf77bdd905acde3e175d985f70/src/vs/editor/common/languages/languageConfiguration.ts#L28">
* github.com/microsoft/vscode/blob/main/src/vs/editor/common/languages/languageConfiguration.ts</a>
*/
public class LanguageConfiguration {
public final class LanguageConfiguration {

private static String removeTrailingCommas(final String jsonString) {
/* matches:
Expand Down
42 changes: 0 additions & 42 deletions ...tm4e/languageconfiguration/internal/preferences/LanguageConfigurationContentProvider.java
View file
Open in desktop

This file was deleted.

50 changes: 0 additions & 50 deletions ...e/tm4e/languageconfiguration/internal/preferences/LanguageConfigurationLabelProvider.java
View file
Open in desktop

This file was deleted.

104 changes: 37 additions & 67 deletions .../tm4e/languageconfiguration/internal/preferences/LanguageConfigurationPreferencePage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,14 @@

import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.layout.TableColumnLayout;
import org.eclipse.jface.preference.PreferencePage;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.util.BidiUtils;
import org.eclipse.jface.viewers.ColumnWeightData;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.window.Window;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
Expand All @@ -41,18 +36,14 @@
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.tm4e.languageconfiguration.LanguageConfigurationPlugin;
import org.eclipse.tm4e.languageconfiguration.internal.registry.ILanguageConfigurationDefinition;
import org.eclipse.tm4e.languageconfiguration.internal.registry.ILanguageConfigurationRegistryManager;
import org.eclipse.tm4e.languageconfiguration.internal.registry.LanguageConfigurationRegistryManager;
import org.eclipse.tm4e.languageconfiguration.internal.registry.WorkingCopyLanguageConfigurationRegistryManager;
import org.eclipse.tm4e.languageconfiguration.internal.widgets.LanguageConfigurationPreferencesWidget;
import org.eclipse.tm4e.languageconfiguration.internal.wizards.LanguageConfigurationImportWizard;
import org.eclipse.tm4e.ui.internal.utils.UI;
import org.eclipse.tm4e.ui.internal.widgets.ColumnSelectionAdapter;
import org.eclipse.tm4e.ui.internal.widgets.ColumnViewerComparator;
import org.eclipse.tm4e.ui.internal.widgets.TableWidget;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
import org.osgi.service.prefs.BackingStoreException;
Expand All @@ -69,7 +60,7 @@ public final class LanguageConfigurationPreferencePage extends PreferencePage im
private final ILanguageConfigurationRegistryManager manager = new WorkingCopyLanguageConfigurationRegistryManager(
LanguageConfigurationRegistryManager.getInstance());

private TableViewer definitionViewer = lazyNonNull();
private TableWidget<ILanguageConfigurationDefinition> definitionsTable = lazyNonNull();
private LanguageConfigurationPreferencesWidget infoWidget = lazyNonNull();

public LanguageConfigurationPreferencePage() {
Expand Down Expand Up @@ -105,8 +96,8 @@ protected Control createContents(@Nullable final Composite ancestor) {
Dialog.applyDialogFont(parent);
innerParent.layout();

definitionViewer.setInput(manager);
UI.selectFirstElement(definitionViewer);
definitionsTable.setInput(manager);
definitionsTable.selectFirstRow();

return parent;
}
Expand All @@ -119,55 +110,40 @@ private void createDefinitionsListContent(final Composite parent) {
description.setText(LanguageConfigurationPreferencePage_description2);
description.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 2, 1));
final var tableComposite = new Composite(parent, SWT.NONE);
tableComposite.setLayout(new FillLayout());
final var data = new GridData(GridData.FILL_BOTH);
data.widthHint = 360;
data.heightHint = convertHeightInCharsToPixels(10);
tableComposite.setLayoutData(data);

final var columnLayout = new TableColumnLayout();
tableComposite.setLayout(columnLayout);
final var table = new Table(tableComposite,
SWT.BORDER | SWT.MULTI | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL);
definitionsTable = new TableWidget<>(tableComposite) {

table.setHeaderVisible(true);
table.setLinesVisible(true);

final GC gc = new GC(getShell());
gc.setFont(JFaceResources.getDialogFont());

final var viewerComparator = new ColumnViewerComparator();

this.definitionViewer = new TableViewer(table);

for (int i = 0; i < 4; i++) {
final var column = new TableColumn(table, SWT.NONE);
final String label = switch (i) {
case 0 -> LanguageConfigurationPreferencePage_contentTypeName;
case 1 -> LanguageConfigurationPreferencePage_contentTypeId;
case 2 -> LanguageConfigurationPreferencePage_pluginId;
case 3 -> LanguageConfigurationPreferencePage_path;
default -> throw new IllegalArgumentException("Unexpected value: " + i);
};

column.setText(label);
final int minWidth = computeMinimumColumnWidth(gc, label);
columnLayout.setColumnData(column, new ColumnWeightData(2, minWidth, true));
column.addSelectionListener(new ColumnSelectionAdapter(definitionViewer, viewerComparator, 0));

if (i == 0) {
// Specify default sorting
table.setSortColumn(column);
table.setSortDirection(viewerComparator.getDirection());
@Override
protected void createColumns() {
createAutoResizeColumn(LanguageConfigurationPreferencePage_contentTypeName);
createAutoResizeColumn(LanguageConfigurationPreferencePage_contentTypeId);
createAutoResizeColumn(LanguageConfigurationPreferencePage_pluginId, 0);
createAutoResizeColumn(LanguageConfigurationPreferencePage_path, 0);
}
}

gc.dispose();

definitionViewer.setLabelProvider(new LanguageConfigurationLabelProvider());
definitionViewer.setContentProvider(new LanguageConfigurationContentProvider());
definitionViewer.setComparator(viewerComparator);
@Override
protected @Nullable String getColumnText(ILanguageConfigurationDefinition definition, int columnIndex) {
return switch (columnIndex) {
case 0 -> definition.getContentType().getName();
case 1 -> definition.getContentType().getId();
case 2 -> definition.getPluginId();
case 3 -> definition.getPath();
default -> null;
};
}

BidiUtils.applyTextDirection(definitionViewer.getControl(), BidiUtils.BTD_DEFAULT);
@Override
protected Object[] getElements(@Nullable Object input) {
if (input instanceof ILanguageConfigurationRegistryManager manager)
return manager.getDefinitions();
return super.getElements(input);
}
};

final var buttons = new Composite(parent, SWT.NONE);
buttons.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
Expand All @@ -192,8 +168,8 @@ private void add() {
final var dialog = new WizardDialog(getShell(), wizard);
if (dialog.open() == Window.OK) {
final var created = wizard.getCreatedDefinition();
definitionViewer.refresh();
definitionViewer.setSelection(new StructuredSelection(created));
definitionsTable.refresh();
definitionsTable.setSelection(created);
}
}
});
Expand All @@ -208,25 +184,24 @@ public void handleEvent(@Nullable final Event e) {
}

private void remove() {
final var definitions = getSelectedUserDefinitions(definitionViewer);
final var definitions = getSelectedUserDefinitions(definitionsTable);
if (!definitions.isEmpty()) {
for (final var definition : definitions) {
manager.unregisterLanguageConfigurationDefinition(definition);
}
definitionViewer.refresh();
definitionsTable.refresh();
}
}
});

definitionViewer.addSelectionChangedListener(new ISelectionChangedListener() {
definitionsTable.addSelectionChangedListener(new ISelectionChangedListener() {
@Override
public void selectionChanged(@Nullable final SelectionChangedEvent e) {
final var selection = definitionViewer.getStructuredSelection();
final var definition = definitionsTable.getFirstSelectedElement();
infoWidget.refresh(null, manager);
if (selection.isEmpty()) {
if (definition == null) {
return;
}
final var definition = (ILanguageConfigurationDefinition) selection.getFirstElement();
// Update button
assert definitionRemoveButton != null;
definitionRemoveButton.setEnabled(definition.getPluginId() == null);
Expand All @@ -239,10 +214,6 @@ private void selectDefinition(final ILanguageConfigurationDefinition definition)
});
}

private int computeMinimumColumnWidth(final GC gc, final String string) {
return gc.stringExtent(string).x + 10; // pad 10 to accommodate table header trimmings
}

/**
* Returns list of selected definitions which was created by the user.
*
Expand Down Expand Up @@ -278,6 +249,5 @@ public boolean performOk() {

@Override
public void init(@Nullable final IWorkbench workbench) {

}
}
3 changes: 1 addition & 2 deletions ...java/org/eclipse/tm4e/languageconfiguration/internal/preferences/PreferenceConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@

/**
* Preferences constants for language configurations.
*
*/
public final class PreferenceConstants {

public static final String LANGUAGE_CONFIGURATIONS = "org.eclipse.tm4e.languageConfigurations"; //$NON-NLS-1$
public static final String LANGUAGE_CONFIGURATIONS = "org.eclipse.tm4e.languageConfigurations";

private PreferenceConstants() {
}
Expand Down
Loading