add support for font icons

bsi-software · Mar 4, 2015 · 7141fb3 · 7141fb3
1 parent b76df7a
commit 7141fb3
Show file tree

Hide file tree

Showing 13 changed files with 1,806 additions and 11 deletions.
diff --git a/....client.old/src/org/eclipsescout/demo/widgets/client/old/ui/desktop/DesktopExtension.java b/....client.old/src/org/eclipsescout/demo/widgets/client/old/ui/desktop/DesktopExtension.java
@@ -24,7 +24,6 @@
 import org.eclipsescout.demo.widgets.client.old.ui.desktop.outlines.WidgetsOutline;
 import org.eclipsescout.demo.widgets.client.old.ui.forms.ToolButton1Form;
 import org.eclipsescout.demo.widgets.client.old.ui.forms.ToolButton2Form;
-import org.eclipsescout.demo.widgets.shared.Icons;
 
 public class DesktopExtension extends AbstractDesktopExtension {
   public DesktopExtension() {
@@ -62,7 +61,8 @@ protected String getConfiguredText() {
 
     @Override
     protected String getConfiguredIconId() {
-      return Icons.StarYellow;
+//      return Icons.StarYellow;
+      return "font:search!16";
     }
 
     @Override
@@ -79,7 +79,8 @@ public class ToolButton2Tool extends AbstractFormToolButton<ToolButton2Form> {
 
     @Override
     protected String getConfiguredIconId() {
-      return Icons.StarRed;
+//      return Icons.StarRed;
+      return "font:gear!16";
     }
 
     @Override

diff --git a/code/widgets/org.eclipsescout.demo.widgets.client/plugin.xml b/code/widgets/org.eclipsescout.demo.widgets.client/plugin.xml
@@ -18,6 +18,12 @@
             class="org.eclipsescout.demo.widgets.client.services.LocalAccessControlService"
             session="org.eclipsescout.demo.widgets.client.ClientSession">
       </service>
+      <service
+            factory="org.eclipse.scout.rt.client.services.ClientServiceFactory"
+            class="org.eclipsescout.demo.widgets.client.services.FontIconProviderService"
+            session="org.eclipsescout.demo.widgets.client.ClientSession">
+      </service>
+
    </extension>
 
 </plugin>
diff --git a/code/widgets/org.eclipsescout.demo.widgets.client/resources/fonts/cour.ttf b/code/widgets/org.eclipsescout.demo.widgets.client/resources/fonts/cour.ttf
diff --git a/code/widgets/org.eclipsescout.demo.widgets.client/resources/fonts/fontawesome-webfont.ttf b/code/widgets/org.eclipsescout.demo.widgets.client/resources/fonts/fontawesome-webfont.ttf