Skip to content

Allow disabling automatic reconstruction of terminals #2563 #2850

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

Open
danthe1st wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow disabling automatic reconstruction of terminals #2563 #2850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions terminal/bundles/org.eclipse.terminal.control/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ Export-Package: org.eclipse.terminal.connector;version="1.0.100";
org.eclipse.terminal.connector,
org.eclipse.terminal.model",
org.eclipse.terminal.internal.connector;x-internal:=true,
org.eclipse.terminal.internal.control.impl;x-internal:=true,
org.eclipse.terminal.internal.control.impl;x-internal:=true;x-friends:="org.eclipse.terminal.view.ui",
org.eclipse.terminal.internal.emulator;x-internal:=true,
org.eclipse.terminal.internal.model;x-internal:=true,
org.eclipse.terminal.internal.preferences;x-internal:=true,
org.eclipse.terminal.internal.preferences;x-internal:=true;x-friends:="org.eclipse.terminal.view.ui",
org.eclipse.terminal.internal.textcanvas;x-internal:=true,
org.eclipse.terminal.model;version="1.0.100";uses:="org.eclipse.swt.graphics"
Automatic-Module-Name: org.eclipse.terminal.control
1 change: 1 addition & 0 deletions ...pse.terminal.control/src/org/eclipse/terminal/internal/control/impl/TerminalMessages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ public class TerminalMessages extends NLS {

//Preference Page
public static String INVERT_COLORS;
public static String RESTORE_TERMINALS;
public static String BUFFERLINES;

}
1 change: 1 addition & 0 deletions ...rminal.control/src/org/eclipse/terminal/internal/control/impl/TerminalMessages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,5 @@ CannotConnectTo = Cannot initialize {0}:\n{1}
NotInitialized = Not Initialized

INVERT_COLORS = Invert terminal colors
RESTORE_TERMINALS = Reopen terminals after restart
BUFFERLINES = Terminal buffer lines:
2 changes: 2 additions & 0 deletions ...se.terminal.control/src/org/eclipse/terminal/internal/preferences/ITerminalConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,14 @@ public interface ITerminalConstants {

public static final String PREF_BUFFERLINES = "TerminalPrefBufferLines"; //$NON-NLS-1$
public static final String PREF_INVERT_COLORS = "TerminalPrefInvertColors"; //$NON-NLS-1$
public static final String PREF_RESTORE_TERMINALS = "TerminalPrefRestoreTerminals"; //$NON-NLS-1$
/**
* @since 5.0
*/
public static final String PREF_FONT_DEFINITION = "TerminalFontDefinition"; //$NON-NLS-1$
public static final int DEFAULT_BUFFERLINES = 1000;
public static final boolean DEFAULT_INVERT_COLORS = false;
public static final boolean DEFAULT_PREF_KEEP_TERMINALS = true;
/**
* @since 5.0
*/
Expand Down
1 change: 1 addition & 0 deletions ....control/src/org/eclipse/terminal/internal/preferences/TerminalPreferenceInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public void initializeDefaultPreferences() {
IEclipsePreferences defaultPrefs = DefaultScope.INSTANCE.getNode(TerminalPlugin.PLUGIN_ID);
defaultPrefs.putBoolean(ITerminalConstants.PREF_INVERT_COLORS, ITerminalConstants.DEFAULT_INVERT_COLORS);
defaultPrefs.putInt(ITerminalConstants.PREF_BUFFERLINES, ITerminalConstants.DEFAULT_BUFFERLINES);
defaultPrefs.putBoolean(ITerminalConstants.PREF_RESTORE_TERMINALS, ITerminalConstants.DEFAULT_PREF_KEEP_TERMINALS);
defaultPrefs.put(ITerminalConstants.PREF_FONT_DEFINITION, ITerminalConstants.DEFAULT_FONT_DEFINITION);

Preset defaultPresets = TerminalColorPresets.INSTANCE.getDefaultPreset();
Expand Down
3 changes: 3 additions & 0 deletions ...erminal.control/src/org/eclipse/terminal/internal/preferences/TerminalPreferencePage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,12 @@ protected void setupEditors() {

addField(new IntegerFieldEditor(ITerminalConstants.PREF_BUFFERLINES, TerminalMessages.BUFFERLINES,
getFieldEditorParent()));
addField(new BooleanFieldEditor(ITerminalConstants.PREF_RESTORE_TERMINALS, TerminalMessages.RESTORE_TERMINALS,
getFieldEditorParent()));

terminalColorsFieldEditor = new TerminalColorsFieldEditor(getFieldEditorParent());
addField(terminalColorsFieldEditor);

}

@Override
Expand Down
3 changes: 2 additions & 1 deletion terminal/bundles/org.eclipse.terminal.view.ui/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.9.0,4.0.0)",
org.eclipse.ui.ide;bundle-version="[3.22.0,4.0.0)";resolution:=optional,
org.eclipse.ui.editors;bundle-version="[3.20.0,4.0.0)";resolution:=optional,
org.eclipse.text;bundle-version="[3.14.0,4.0.0)";resolution:=optional,
org.eclipse.terminal.view.core;bundle-version="[1.0.0,2.0.0)"
org.eclipse.terminal.view.core;bundle-version="[1.0.0,2.0.0)",
org.eclipse.terminal.control;bundle-version="[1.0.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Expand Down
9 changes: 8 additions & 1 deletion ...clipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/view/TerminalsView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.eclipse.core.runtime.ILog;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
Expand All @@ -53,6 +54,8 @@
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.terminal.internal.control.impl.TerminalPlugin;
import org.eclipse.terminal.internal.preferences.ITerminalConstants;
import org.eclipse.terminal.view.ui.ITerminalsView;
import org.eclipse.terminal.view.ui.internal.Messages;
import org.eclipse.terminal.view.ui.internal.tabs.TabFolderManager;
Expand Down Expand Up @@ -91,6 +94,9 @@ public class TerminalsView extends ViewPart implements ITerminalsView, IShowInTa
// The view's memento handler
private final TerminalsViewMementoHandler mementoHandler = new TerminalsViewMementoHandler();

@SuppressWarnings("restriction")
private IPreferenceStore preferenceStore = TerminalPlugin.getDefault().getPreferenceStore();

/**
* "dummy" transfer just to store the information needed for the DnD
*
Expand Down Expand Up @@ -706,8 +712,9 @@ public void saveState(IMemento memento) {
*
* @param memento The memento or <code>null</code>.
*/
@SuppressWarnings("restriction")
public void restoreState(IMemento memento) {
if (memento == null) {
if (memento == null || !preferenceStore.getBoolean(ITerminalConstants.PREF_RESTORE_TERMINALS)) {
return;
}
mementoHandler.restoreState(this, memento);
Expand Down
Loading