diff options
author | Dani Megert | 2017-10-12 10:28:28 +0000 |
---|---|---|
committer | Dani Megert | 2017-10-12 10:28:28 +0000 |
commit | d68d32713fb03a70ceee0a998d00d9b516725a56 (patch) | |
tree | 9615c0938297a563c3449cb4dbf4cdce517ee598 | |
parent | cad2430f8bed0e044087f833f076c35823905634 (diff) | |
download | eclipse.platform.team-d68d32713fb03a70ceee0a998d00d9b516725a56.tar.gz eclipse.platform.team-d68d32713fb03a70ceee0a998d00d9b516725a56.tar.xz eclipse.platform.team-d68d32713fb03a70ceee0a998d00d9b516725a56.zip |
Revert "Bug 525895 - [Dark Theme] Preference page for Compare should use CTab folder to looks also good in the dark theme"
This reverts commit cad2430f8bed0e044087f833f076c35823905634.
-rw-r--r-- | bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java index 4481c8a7e..f192ad980 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java @@ -14,26 +14,40 @@ package org.eclipse.compare.internal; import java.io.ByteArrayInputStream; import java.io.InputStream; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; import java.util.List; +import java.util.Map; -import org.eclipse.compare.*; +import org.eclipse.compare.CompareConfiguration; +import org.eclipse.compare.IEncodedStreamContentAccessor; +import org.eclipse.compare.ITypedElement; import org.eclipse.compare.contentmergeviewer.TextMergeViewer; import org.eclipse.compare.internal.core.ComparePlugin; import org.eclipse.compare.structuremergeviewer.DiffNode; import org.eclipse.compare.structuremergeviewer.Differencer; import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.preference.*; +import org.eclipse.jface.preference.FieldEditor; +import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.jface.preference.PreferencePage; +import org.eclipse.jface.preference.RadioGroupFieldEditor; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.swt.SWT; -import org.eclipse.swt.custom.CTabFolder; -import org.eclipse.swt.custom.CTabItem; import org.eclipse.swt.events.*; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.*; -import org.eclipse.ui.*; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.TabFolder; +import org.eclipse.swt.widgets.TabItem; +import org.eclipse.swt.widgets.Text; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchPreferencePage; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.PreferenceLinkArea; import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer; @@ -121,7 +135,7 @@ public class ComparePreferencePage extends PreferencePage implements IWorkbenchP new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, SWAPPED), }; private List<FieldEditor> editors = new ArrayList<>(); - private CTabItem fTextCompareTab; + private TabItem fTextCompareTab; private Button fDisableCappingCheckBox; @@ -226,26 +240,23 @@ public class ComparePreferencePage extends PreferencePage implements IWorkbenchP fOverlayStore.load(); fOverlayStore.start(); - CTabFolder folder= new CTabFolder(parent, SWT.BORDER); + TabFolder folder= new TabFolder(parent, SWT.NONE); folder.setLayout(new TabFolderLayout()); folder.setLayoutData(new GridData(GridData.FILL_BOTH)); - CTabItem item= new CTabItem(folder, SWT.NONE); + TabItem item= new TabItem(folder, SWT.NONE); item.setText(Utilities.getString("ComparePreferencePage.generalTab.label")); //$NON-NLS-1$ //item.setImage(JavaPluginImages.get(JavaPluginImages.IMG_OBJS_CFILE)); item.setControl(createGeneralPage(folder)); - item= new CTabItem(folder, SWT.NONE); + item= new TabItem(folder, SWT.NONE); item.setText(Utilities.getString("ComparePreferencePage.textCompareTab.label")); //$NON-NLS-1$ //item.setImage(JavaPluginImages.get(JavaPluginImages.IMG_OBJS_CFILE)); item.setControl(createTextComparePage(folder)); fTextCompareTab = item; initializeFields(); - Dialog.applyDialogFont(folder); - folder.setSelection(0); - folder.requestLayout(); return folder; } |