Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Schindl2011-03-10 23:15:53 +0000
committerThomas Schindl2011-03-10 23:15:53 +0000
commit29c232cf6a4054570599f1f7d87f8b6d06969a2a (patch)
treefdaf56ab88e80a281eb63b58e4476c8138dee310
parent1b54148ba98709c33d36f593c6ee648304c2f8f3 (diff)
downloadorg.eclipse.e4.tools-29c232cf6a4054570599f1f7d87f8b6d06969a2a.tar.gz
org.eclipse.e4.tools-29c232cf6a4054570599f1f7d87f8b6d06969a2a.tar.xz
org.eclipse.e4.tools-29c232cf6a4054570599f1f7d87f8b6d06969a2a.zip
Bug 339598 - [ModelTooling] Add UI-Widget-Tree inspectorv20110310-1900
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java15
1 files changed, 12 insertions, 3 deletions
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java
index b7cd68a3..0318e46c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java
@@ -10,6 +10,7 @@ import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.custom.CLabel;
import org.eclipse.swt.custom.CTabFolder;
import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.SashForm;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
@@ -140,6 +141,9 @@ public class WidgetLabelProvider extends StyledCellLabelProvider {
cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_text_obj));
} else if (element instanceof Sash) {
cell.setText("Sash"); //$NON-NLS-1$
+ cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_separator_obj));
+ } else if (element instanceof SashForm) {
+ cell.setText("Sash Form"); //$NON-NLS-1$
cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_sashform_obj));
} else if (element instanceof Label) {
Label l = (Label) element;
@@ -149,23 +153,28 @@ public class WidgetLabelProvider extends StyledCellLabelProvider {
} else {
StyledString s = new StyledString("Label"); //$NON-NLS-1$
s.append(" - " + l.getText(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+ cell.setStyleRanges(s.getStyleRanges());
+ cell.setText(s.getString());
cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_label_obj));
}
} else if (element instanceof TabItem) {
- cell.setText("TabItem"); //$NON-NLS-1$
+ StyledString s = new StyledString("TabItem"); //$NON-NLS-1$
+ s.append(" - " + ((TabItem) element).getText(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
+ cell.setStyleRanges(s.getStyleRanges());
+ cell.setText(s.getString());
} else if (element instanceof CTabItem) {
StyledString s = new StyledString("CTabItem"); //$NON-NLS-1$
s.append(" - " + ((CTabItem) element).getText(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
cell.setStyleRanges(s.getStyleRanges());
cell.setText(s.getString());
- cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_clabel_obj));
+ // cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_clabel_obj));
} else if (element instanceof org.eclipse.e4.ui.widgets.CTabItem) {
StyledString s = new StyledString("CTabItem"); //$NON-NLS-1$
s.append(" - " + ((org.eclipse.e4.ui.widgets.CTabItem) element).getText(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
cell.setStyleRanges(s.getStyleRanges());
cell.setText(s.getString());
- cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_clabel_obj));
+ // cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_clabel_obj));
} else if (element instanceof Button) {
Button b = (Button) element;
if ((b.getStyle() & SWT.PUSH) == SWT.PUSH) {

Back to the top