Bug 565945: [CharacterView] improve badges area
Change-Id: Ib68763cdf3b73d21387d9af1c6c91a72bbb5f002
diff --git a/plugins/org.eclipse.skills.ui.questeditor/src-gen/org/eclipse/skills/model/provider/SkillItemProvider.java b/plugins/org.eclipse.skills.ui.questeditor/src-gen/org/eclipse/skills/model/provider/SkillItemProvider.java
index 8d988e7..9d277e8 100644
--- a/plugins/org.eclipse.skills.ui.questeditor/src-gen/org/eclipse/skills/model/provider/SkillItemProvider.java
+++ b/plugins/org.eclipse.skills.ui.questeditor/src-gen/org/eclipse/skills/model/provider/SkillItemProvider.java
@@ -66,6 +66,7 @@
addDescriptionPropertyDescriptor(object);
addExperiencePropertyDescriptor(object);
addBaseSkillPropertyDescriptor(object);
+ addImageURIPropertyDescriptor(object);
}
return itemPropertyDescriptors;
}
@@ -159,6 +160,28 @@
}
/**
+ * This adds a property descriptor for the Image URI feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void addImageURIPropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_Skill_imageURI_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_Skill_imageURI_feature", "_UI_Skill_type"),
+ ISkillsPackage.Literals.SKILL__IMAGE_URI,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
+ null));
+ }
+
+ /**
* This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
* {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
@@ -230,6 +253,7 @@
case ISkillsPackage.SKILL__NAME:
case ISkillsPackage.SKILL__EXPERIENCE:
case ISkillsPackage.SKILL__BASE_SKILL:
+ case ISkillsPackage.SKILL__IMAGE_URI:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
case ISkillsPackage.SKILL__DESCRIPTION:
diff --git a/plugins/org.eclipse.skills/src/org/eclipse/skills/ui/views/character/BadgesComposite.java b/plugins/org.eclipse.skills/src/org/eclipse/skills/ui/views/character/BadgesComposite.java
index 48febc1..a888b3e 100644
--- a/plugins/org.eclipse.skills/src/org/eclipse/skills/ui/views/character/BadgesComposite.java
+++ b/plugins/org.eclipse.skills/src/org/eclipse/skills/ui/views/character/BadgesComposite.java
@@ -23,12 +23,16 @@
public class BadgesComposite extends Composite {
public BadgesComposite(Composite parent, int style, ResourceManager resourceManager) {
- super(parent, style | SWT.H_SCROLL);
- setLayout(new FillLayout(SWT.HORIZONTAL));
+ super(parent, style);
+
+ final FillLayout fillLayout = new FillLayout(SWT.HORIZONTAL);
+ fillLayout.spacing = 20;
+ setLayout(fillLayout);
for (final IBadge badge : CharacterView.getUser().getBadges()) {
final Label badgeLabel = new Label(this, SWT.NONE);
badgeLabel.setImage(resourceManager.createImage(badge.getImageDescriptor()));
+ badgeLabel.setToolTipText(badge.getTitle());
}
}
}
diff --git a/plugins/org.eclipse.skills/src/org/eclipse/skills/ui/views/character/StatsComposite.java b/plugins/org.eclipse.skills/src/org/eclipse/skills/ui/views/character/StatsComposite.java
index 0e2d3ea..f42b7d1 100644
--- a/plugins/org.eclipse.skills/src/org/eclipse/skills/ui/views/character/StatsComposite.java
+++ b/plugins/org.eclipse.skills/src/org/eclipse/skills/ui/views/character/StatsComposite.java
@@ -75,7 +75,7 @@
final SkillsComposite secondary = new SkillsComposite(this, SWT.NONE, resourceManager, secondarySkills);
secondary.setLayoutData(GridDataFactory.fillDefaults().grab(true, false).indent(INDENTATION, 0).create());
- final BadgesComposite badgesComposite = new BadgesComposite(this, SWT.H_SCROLL, resourceManager);
+ final BadgesComposite badgesComposite = new BadgesComposite(this, SWT.NONE, resourceManager);
badgesComposite.setLayoutData(GridDataFactory.fillDefaults().align(SWT.CENTER, SWT.BOTTOM).grab(true, true).create());
}
