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

ResourceInfoPage: wrap "location" #1895 #1929

Merged
merged 2 commits into from
Jun 6, 2024
Merged

ResourceInfoPage: wrap "location" #1895 #1929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1e826f
ResourceInfoPage: wrap "location" #1895
EcljpseB0T Jun 5, 2024
a5f600d
Revert "Store properties dialog bounds. (#1282)" fixes #1895
EcljpseB0T Jun 5, 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 bundles/org.eclipse.ui.ide/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.ui.ide; singleton:=true
Bundle-Version: 3.22.200.qualifier
Bundle-Version: 3.22.300.qualifier
Bundle-Activator: org.eclipse.ui.internal.ide.IDEWorkbenchPlugin
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Plugin.providerName
Expand Down
4 changes: 4 additions & 0 deletions bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ResourceInfoPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,7 @@ public void widgetSelected(SelectionEvent e) {
Label locationTitle = new Label(basicInfoComposite, SWT.LEFT);
locationTitle.setText(LOCATION_TITLE);
gd = new GridData();
gd.verticalAlignment = SWT.TOP;
locationTitle.setLayoutData(gd);

locationValue = new Text(basicInfoComposite, SWT.WRAP
Expand All @@ -325,6 +326,8 @@ public void widgetSelected(SelectionEvent e) {
locationValue.setText(locationStr);
gd = new GridData();
gd.horizontalAlignment = GridData.FILL;
gd.widthHint = convertWidthInCharsToPixels(MAX_VALUE_WIDTH);
gd.grabExcessHorizontalSpace = true;
locationValue.setLayoutData(gd);
locationValue.setBackground(locationValue.getDisplay()
.getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
Expand Down Expand Up @@ -360,6 +363,7 @@ public void widgetSelected(SelectionEvent e) {
});

Button pathCopy = new Button(basicInfoComposite, SWT.PUSH);
pathCopy.setLayoutData(gd);
pathCopy.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_TOOL_COPY));
pathCopy.setToolTipText(PATH_BUTTON_TOOLTIP);
pathCopy.addSelectionListener(new SelectionAdapter() {
Expand Down
11 changes: 0 additions & 11 deletions ...s/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PropertyDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@

import java.util.Iterator;
import org.eclipse.core.runtime.Adapters;
import org.eclipse.jface.dialogs.DialogSettings;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.preference.IPreferenceNode;
import org.eclipse.jface.preference.PreferenceManager;
Expand All @@ -31,10 +29,8 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.internal.IWorkbenchHelpContextIds;
import org.eclipse.ui.internal.WorkbenchMessages;
import org.eclipse.ui.internal.WorkbenchPlugin;
import org.eclipse.ui.model.IContributionService;
import org.eclipse.ui.model.IWorkbenchAdapter;
import org.osgi.framework.Bundle;

/**
* This dialog is created and shown when 'Properties' action is performed while
Expand Down Expand Up @@ -184,11 +180,4 @@ protected String getContributionType() {
return IContributionService.TYPE_PROPERTY;
}

@Override
protected IDialogSettings getDialogBoundsSettings() {
Bundle bundle = WorkbenchPlugin.getDefault().getBundle();
IDialogSettings settings = PlatformUI.getDialogSettingsProvider(bundle).getDialogSettings();
String name = getClass().getSimpleName() + ".dialogBounds"; //$NON-NLS-1$
return DialogSettings.getOrCreateSection(settings, name);
}
}
2 changes: 1 addition & 1 deletion bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.ui.workbench; singleton:=true
Bundle-Version: 3.132.0.qualifier
Bundle-Version: 3.132.100.qualifier
Bundle-Activator: org.eclipse.ui.internal.WorkbenchPlugin
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
Expand Down
Loading