mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-23 14:42:11 +02:00
small refactor to internal
This commit is contained in:
David Inglis
parent
4c82ed5537
commit
b8b3ffdfed
6 changed files with 6 additions and 186 deletions
|
|
@ -21,7 +21,7 @@ ActionMakeUpdate.label=Update Old Make Project...
|
|||
CommandMakeBuildCreate.name=Build/Create Make Target
|
||||
CommandMakeBuildCreate.description=Build or create a new make build target
|
||||
|
||||
PreferenceMake.name=New Make Projects
|
||||
PreferenceMakeProject.name=New Make Projects
|
||||
PropertyMakeProject.name= C/C++ Make Project
|
||||
|
||||
ViewCatagoryMake.name=Make
|
||||
|
|
|
|||
|
|
@ -180,9 +180,9 @@
|
|||
<extension
|
||||
point="org.eclipse.ui.preferencePages">
|
||||
<page
|
||||
name="%PreferenceMake.name"
|
||||
name="%PreferenceMakeProject.name"
|
||||
category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
|
||||
class="org.eclipse.cdt.make.ui.preferences.MakePreferencePage"
|
||||
class="org.eclipse.cdt.make.internal.ui.preferences.MakePreferencePage"
|
||||
id="org.eclipse.cdt.make.ui.preferences.MakePreferencePage">
|
||||
</page>
|
||||
</extension>
|
||||
|
|
@ -192,7 +192,7 @@
|
|||
objectClass="org.eclipse.core.resources.IProject"
|
||||
adaptable="true"
|
||||
name="%PropertyMakeProject.name"
|
||||
class="org.eclipse.cdt.make.ui.properties.MakePropertyPage"
|
||||
class="org.eclipse.cdt.make.internal.ui.properties.MakePropertyPage"
|
||||
id="org.eclipse.cdt.make.ui.properties.MakePropertyPage">
|
||||
<filter
|
||||
name="nature"
|
||||
|
|
|
|||
|
|
@ -1,58 +0,0 @@
|
|||
/*******************************************************************************
|
||||
* Copyright (c) 2001 Rational Software Corp. and others.
|
||||
* All rights reserved. This program and the accompanying materials
|
||||
* are made available under the terms of the Common Public License v0.5
|
||||
* which accompanies this distribution, and is available at
|
||||
* http://www.eclipse.org/legal/cpl-v05.html
|
||||
*
|
||||
* Contributors:
|
||||
* Rational Software - initial implementation
|
||||
******************************************************************************/
|
||||
package org.eclipse.cdt.make.internal.ui;
|
||||
|
||||
import org.eclipse.swt.graphics.FontMetrics;
|
||||
import org.eclipse.swt.graphics.GC;
|
||||
import org.eclipse.swt.widgets.Control;
|
||||
|
||||
import org.eclipse.jface.dialogs.Dialog;
|
||||
|
||||
public class PixelConverter {
|
||||
|
||||
private FontMetrics fFontMetrics;
|
||||
|
||||
public PixelConverter(Control control) {
|
||||
GC gc = new GC(control);
|
||||
gc.setFont(control.getFont());
|
||||
fFontMetrics= gc.getFontMetrics();
|
||||
gc.dispose();
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.eclipse.jface.dialogs.DialogPage#convertHeightInCharsToPixels(int)
|
||||
*/
|
||||
public int convertHeightInCharsToPixels(int chars) {
|
||||
return Dialog.convertHeightInCharsToPixels(fFontMetrics, chars);
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.eclipse.jface.dialogs.DialogPage#convertHorizontalDLUsToPixels(int)
|
||||
*/
|
||||
public int convertHorizontalDLUsToPixels(int dlus) {
|
||||
return Dialog.convertHorizontalDLUsToPixels(fFontMetrics, dlus);
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.eclipse.jface.dialogs.DialogPage#convertVerticalDLUsToPixels(int)
|
||||
*/
|
||||
public int convertVerticalDLUsToPixels(int dlus) {
|
||||
return Dialog.convertVerticalDLUsToPixels(fFontMetrics, dlus);
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.eclipse.jface.dialogs.DialogPage#convertWidthInCharsToPixels(int)
|
||||
*/
|
||||
public int convertWidthInCharsToPixels(int chars) {
|
||||
return Dialog.convertWidthInCharsToPixels(fFontMetrics, chars);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,122 +0,0 @@
|
|||
/*******************************************************************************
|
||||
* Copyright (c) 2000, 2003 IBM Corporation and others.
|
||||
* All rights reserved. This program and the accompanying materials
|
||||
* are made available under the terms of the Common Public License v1.0
|
||||
* which accompanies this distribution, and is available at
|
||||
* http://www.eclipse.org/legal/cpl-v10.html
|
||||
*
|
||||
* Contributors:
|
||||
* IBM Corporation - initial API and implementation
|
||||
*******************************************************************************/
|
||||
package org.eclipse.cdt.make.internal.ui;
|
||||
|
||||
|
||||
import org.eclipse.swt.SWT;
|
||||
import org.eclipse.swt.dnd.DragSource;
|
||||
import org.eclipse.swt.dnd.DropTarget;
|
||||
import org.eclipse.swt.layout.GridData;
|
||||
import org.eclipse.swt.widgets.Button;
|
||||
import org.eclipse.swt.widgets.Caret;
|
||||
import org.eclipse.swt.widgets.Control;
|
||||
import org.eclipse.swt.widgets.Display;
|
||||
import org.eclipse.swt.widgets.Menu;
|
||||
import org.eclipse.swt.widgets.ScrollBar;
|
||||
import org.eclipse.swt.widgets.Shell;
|
||||
import org.eclipse.swt.widgets.Table;
|
||||
import org.eclipse.swt.widgets.Widget;
|
||||
|
||||
import org.eclipse.jface.dialogs.IDialogConstants;
|
||||
import org.eclipse.jface.resource.JFaceResources;
|
||||
import org.eclipse.jface.util.Assert;
|
||||
|
||||
/**
|
||||
* Utility class to simplify access to some SWT resources.
|
||||
*/
|
||||
public class SWTUtil {
|
||||
|
||||
/**
|
||||
* Returns the standard display to be used. The method first checks, if
|
||||
* the thread calling this method has an associated disaply. If so, this
|
||||
* display is returned. Otherwise the method returns the default display.
|
||||
*/
|
||||
public static Display getStandardDisplay() {
|
||||
Display display;
|
||||
display= Display.getCurrent();
|
||||
if (display == null)
|
||||
display= Display.getDefault();
|
||||
return display;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the shell for the given widget. If the widget doesn't represent
|
||||
* a SWT object that manage a shell, <code>null</code> is returned.
|
||||
*
|
||||
* @return the shell for the given widget
|
||||
*/
|
||||
public static Shell getShell(Widget widget) {
|
||||
if (widget instanceof Control)
|
||||
return ((Control)widget).getShell();
|
||||
if (widget instanceof Caret)
|
||||
return ((Caret)widget).getParent().getShell();
|
||||
if (widget instanceof DragSource)
|
||||
return ((DragSource)widget).getControl().getShell();
|
||||
if (widget instanceof DropTarget)
|
||||
return ((DropTarget)widget).getControl().getShell();
|
||||
if (widget instanceof Menu)
|
||||
return ((Menu)widget).getParent().getShell();
|
||||
if (widget instanceof ScrollBar)
|
||||
return ((ScrollBar)widget).getParent().getShell();
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Returns a width hint for a button control.
|
||||
*/
|
||||
public static int getButtonWidthHint(Button button) {
|
||||
if (button.getFont().equals(JFaceResources.getDefaultFont()))
|
||||
button.setFont(JFaceResources.getDialogFont());
|
||||
PixelConverter converter= new PixelConverter(button);
|
||||
int widthHint= converter.convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
|
||||
return Math.max(widthHint, button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a height hint for a button control.
|
||||
*/
|
||||
public static int getButtonHeigthHint(Button button) {
|
||||
if (button.getFont().equals(JFaceResources.getDefaultFont()))
|
||||
button.setFont(JFaceResources.getDialogFont());
|
||||
PixelConverter converter= new PixelConverter(button);
|
||||
return converter.convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Sets width and height hint for the button control.
|
||||
* <b>Note:</b> This is a NOP if the button's layout data is not
|
||||
* an instance of <code>GridData</code>.
|
||||
*
|
||||
* @param the button for which to set the dimension hint
|
||||
*/
|
||||
public static void setButtonDimensionHint(Button button) {
|
||||
Assert.isNotNull(button);
|
||||
Object gd= button.getLayoutData();
|
||||
if (gd instanceof GridData) {
|
||||
((GridData)gd).heightHint= getButtonHeigthHint(button);
|
||||
((GridData)gd).widthHint= getButtonWidthHint(button);
|
||||
}
|
||||
}
|
||||
|
||||
public static int getTableHeightHint(Table table, int rows) {
|
||||
if (table.getFont().equals(JFaceResources.getDefaultFont()))
|
||||
table.setFont(JFaceResources.getDialogFont());
|
||||
int result= table.getItemHeight() * rows + table.getHeaderHeight();
|
||||
if (table.getLinesVisible())
|
||||
result+= table.getGridLineWidth() * (rows - 1);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
* Contributors:
|
||||
* IBM Corporation - initial API and implementation
|
||||
*******************************************************************************/
|
||||
package org.eclipse.cdt.make.ui.preferences;
|
||||
package org.eclipse.cdt.make.internal.ui.preferences;
|
||||
|
||||
import org.eclipse.cdt.make.internal.ui.MakeProjectOptionBlock;
|
||||
import org.eclipse.cdt.make.internal.ui.MakeUIPlugin;
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
* Contributors:
|
||||
* IBM Corporation - initial API and implementation
|
||||
*******************************************************************************/
|
||||
package org.eclipse.cdt.make.ui.properties;
|
||||
package org.eclipse.cdt.make.internal.ui.properties;
|
||||
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
|
||||
Loading…
Add table
Reference in a new issue