Skip to content

Commit

Permalink
Reorganise preferences page
Browse files Browse the repository at this point in the history
  • Loading branch information
@PyvesB
PyvesB committed Jul 16, 2024
1 parent df6c316 commit cef8133
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 15 deletions.
4 changes: 2 additions & 2 deletions ...gin/src/main/java/io/github/pyvesb/eclipse_solargraph/preferences/BooleanPreferences.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

public enum BooleanPreferences implements Preference<Boolean> {

UPDATE_GEM("AutoUpdate", "Automatically update the Solargraph and Readapt gems", true),
SYSTEM_RUBY("SystemRuby", "Use the Ruby installation from the PATH environment variable for \"Run As\" launches", true),
UPDATE_GEM("AutoUpdate", "Automatically update gems", true),
SYSTEM_RUBY("SystemRuby", "Launch files using the Ruby installation from the PATH environment variable", true),
DEBUG_READAPT("DebugReadapt", "Troubleshoot the Readapt debugger by adding an output to the Console view", false);

private final String key;
Expand Down
63 changes: 51 additions & 12 deletions ...-plugin/src/main/java/io/github/pyvesb/eclipse_solargraph/preferences/PreferencePage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.preference.BooleanFieldEditor;
import org.eclipse.jface.preference.DirectoryFieldEditor;
import org.eclipse.jface.preference.FieldEditorPreferencePage;
Expand All @@ -33,11 +32,14 @@
import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.layout.RowLayout;
import org.eclipse.swt.program.Program;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Link;
import org.eclipse.ui.IWorkbench;
Expand All @@ -59,23 +61,61 @@ public class PreferencePage extends FieldEditorPreferencePage implements IWorkbe

@Override
public void createFieldEditors() {
gemPath = new FileFieldEditor(GEM_PATH.getKey(), GEM_PATH.getDesc(), true, getFieldEditorParent());
Composite parent = getFieldEditorParent();
parent.setLayout(new GridLayout(1, false));
Font defaultFont = parent.getFont();

Group pathsGroup = new Group(parent, SWT.NONE);
pathsGroup.setText("Solargraph (language server) and Readapt (debugger) gems");
pathsGroup.setLayout(new GridLayout(3, false)); // 3 columns for label, input field, and browse button.
pathsGroup.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
Composite gemPathComposite = new Composite(pathsGroup, SWT.NONE);
gemPathComposite.setLayout(new GridLayout(3, false));
gemPathComposite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
gemPath = new FileFieldEditor(GEM_PATH.getKey(), GEM_PATH.getDesc(), gemPathComposite);
gemPath.getLabelControl(gemPathComposite).setFont(defaultFont);
addField(gemPath);
readaptPath = new FileFieldEditor(READAPT_PATH.getKey(), READAPT_PATH.getDesc(), true, getFieldEditorParent());
Composite readaptPathComposite = new Composite(pathsGroup, SWT.NONE);
readaptPathComposite.setLayout(new GridLayout(3, false));
readaptPathComposite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
readaptPath = new FileFieldEditor(READAPT_PATH.getKey(), READAPT_PATH.getDesc(), readaptPathComposite);
readaptPath.getLabelControl(readaptPathComposite).setFont(defaultFont);
addField(readaptPath);
addField(new BooleanFieldEditor(UPDATE_GEM.getKey(), UPDATE_GEM.getDesc(), getFieldEditorParent()));
systemRubyFieldEditor = new BooleanFieldEditor(SYSTEM_RUBY.getKey(), SYSTEM_RUBY.getDesc(), getFieldEditorParent());
BooleanFieldEditor updateGemFieldEditor = new BooleanFieldEditor(UPDATE_GEM.getKey(), UPDATE_GEM.getDesc(),
pathsGroup);
updateGemFieldEditor.getDescriptionControl(pathsGroup).setFont(defaultFont);
addField(updateGemFieldEditor);

Group runAsGroup = new Group(parent, SWT.NONE);
runAsGroup.setText("Run *.rb, Gemfile, and *.gemspec files");
runAsGroup.setLayout(new GridLayout(1, false));
runAsGroup.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
systemRubyFieldEditor = new BooleanFieldEditor(SYSTEM_RUBY.getKey(), SYSTEM_RUBY.getDesc(), runAsGroup);
systemRubyFieldEditor.getDescriptionControl(runAsGroup).setFont(defaultFont);
addField(systemRubyFieldEditor);
rubyDirFieldEditorParent = getFieldEditorParent();
GridDataFactory.fillDefaults().indent(30, 0).applyTo(rubyDirFieldEditorParent);
rubyDirFieldEditorParent = new Composite(runAsGroup, SWT.NONE);
rubyDirFieldEditorParent.setLayout(new GridLayout(3, false));
rubyDirFieldEditorParent.setFont(defaultFont);
GridData gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
gridData.horizontalIndent = 30;
rubyDirFieldEditorParent.setLayoutData(gridData);
rubyDirFieldEditor = new DirectoryFieldEditor(RUBY_DIR.getKey(), RUBY_DIR.getDesc(), rubyDirFieldEditorParent);
rubyDirFieldEditor.getLabelControl(rubyDirFieldEditorParent).setFont(defaultFont);
rubyDirFieldEditor.setEnabled(!SYSTEM_RUBY.getValue(), rubyDirFieldEditorParent);
addField(rubyDirFieldEditor);
addField(new BooleanFieldEditor(DEBUG_READAPT.getKey(), DEBUG_READAPT.getDesc(), getFieldEditorParent()));

Composite composite = new Composite(rubyDirFieldEditorParent.getParent(), SWT.NONE);
Group optionsGroup = new Group(parent, SWT.NONE);
optionsGroup.setText("Miscellaneous");
optionsGroup.setLayout(new GridLayout(1, false));
optionsGroup.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
BooleanFieldEditor debugReadaptFieldEditor = new BooleanFieldEditor(DEBUG_READAPT.getKey(),
DEBUG_READAPT.getDesc(), optionsGroup);
debugReadaptFieldEditor.getDescriptionControl(optionsGroup).setFont(defaultFont);
addField(debugReadaptFieldEditor);

Composite composite = new Composite(parent, SWT.NONE);
composite.setLayout(new RowLayout(SWT.HORIZONTAL));
composite.setLayoutData(new GridData(SWT.FILL, SWT.BOTTOM, false, false, 1, 7));
composite.setLayoutData(new GridData(SWT.FILL, SWT.BOTTOM, false, false, 1, 5));
URL url = FileLocator.find(FrameworkUtil.getBundle(getClass()), new Path("/icon/github.png"));
gitHubImage = ImageDescriptor.createFromURL(url).createImage();
new Label(composite, SWT.NONE).setImage(gitHubImage);
Expand Down Expand Up @@ -112,5 +152,4 @@ public void dispose() {
public FileFieldEditor getPathField(String gem) {
return "readapt".equalsIgnoreCase(gem) ? readaptPath : gemPath;
}

}
}
2 changes: 1 addition & 1 deletion ...ugin/src/main/java/io/github/pyvesb/eclipse_solargraph/preferences/StringPreferences.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
public enum StringPreferences implements Preference<String> {

GEM_PATH("GemPath", "Solargraph executable:", CommandHelper.findPath(isWindows() ? "solargraph.bat" : "solargraph")),
RUBY_DIR("RubyDir", "Ruby bin directory for \"Run As\" launches:", CommandHelper.findDirectory("ruby")),
RUBY_DIR("RubyDir", "Override Ruby bin directory:", CommandHelper.findDirectory("ruby")),
READAPT_PATH("ReadaptPath", "Readapt executable:", CommandHelper.findPath(isWindows() ? "readapt.bat" : "readapt"));

private final String key;
Expand Down

0 comments on commit cef8133

Please sign in to comment.