[258614] Usability
diff --git a/plugins/org.eclipse.actf.visualization.blind.odfbyhtml/fragment.xml b/plugins/org.eclipse.actf.visualization.blind.odfbyhtml/fragment.xml
index 3bedc7e..cb3259e 100644
--- a/plugins/org.eclipse.actf.visualization.blind.odfbyhtml/fragment.xml
+++ b/plugins/org.eclipse.actf.visualization.blind.odfbyhtml/fragment.xml
@@ -70,6 +70,7 @@
</view>
<actionSet id="org.eclipse.actf.visualization.blind.actionSet"/>
<actionSet id="org.eclipse.actf.visualization.lowvision.actionSet"/>
+ <actionSet id="org.eclipse.actf.visualization.presentation.actionSet"/>
</perspectiveExtension>
</extension>
<extension
diff --git a/plugins/org.eclipse.actf.visualization.presentation/META-INF/MANIFEST.MF b/plugins/org.eclipse.actf.visualization.presentation/META-INF/MANIFEST.MF
index 34d7e55..68feae0 100644
--- a/plugins/org.eclipse.actf.visualization.presentation/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.actf.visualization.presentation/META-INF/MANIFEST.MF
@@ -11,7 +11,8 @@
org.eclipse.actf.visualization,
org.eclipse.actf.visualization.engines.lowvision,
org.eclipse.actf.visualization.eval,
- org.eclipse.actf.visualization.ui.report
+ org.eclipse.actf.visualization.ui.report,
+ org.eclipse.actf.ui
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.actf.visualization.presentation
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.actf.visualization.presentation/icons/ButtonLarge.gif b/plugins/org.eclipse.actf.visualization.presentation/icons/ButtonLarge.gif
deleted file mode 100644
index 4c0acb0..0000000
--- a/plugins/org.eclipse.actf.visualization.presentation/icons/ButtonLarge.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.actf.visualization.presentation/icons/ButtonMiddle.gif b/plugins/org.eclipse.actf.visualization.presentation/icons/ButtonMiddle.gif
deleted file mode 100644
index c1f24a6..0000000
--- a/plugins/org.eclipse.actf.visualization.presentation/icons/ButtonMiddle.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.actf.visualization.presentation/icons/ButtonSmall.gif b/plugins/org.eclipse.actf.visualization.presentation/icons/ButtonSmall.gif
deleted file mode 100644
index 662a9fb..0000000
--- a/plugins/org.eclipse.actf.visualization.presentation/icons/ButtonSmall.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.actf.visualization.presentation/icons/etool16/Auditorium.gif b/plugins/org.eclipse.actf.visualization.presentation/icons/etool16/Auditorium.gif
new file mode 100644
index 0000000..e3e915b
--- /dev/null
+++ b/plugins/org.eclipse.actf.visualization.presentation/icons/etool16/Auditorium.gif
Binary files differ
diff --git a/plugins/org.eclipse.actf.visualization.presentation/icons/etool16/LargeRoom.gif b/plugins/org.eclipse.actf.visualization.presentation/icons/etool16/LargeRoom.gif
new file mode 100644
index 0000000..b62d476
--- /dev/null
+++ b/plugins/org.eclipse.actf.visualization.presentation/icons/etool16/LargeRoom.gif
Binary files differ
diff --git a/plugins/org.eclipse.actf.visualization.presentation/icons/etool16/SmallRoom.gif b/plugins/org.eclipse.actf.visualization.presentation/icons/etool16/SmallRoom.gif
new file mode 100644
index 0000000..64b0908
--- /dev/null
+++ b/plugins/org.eclipse.actf.visualization.presentation/icons/etool16/SmallRoom.gif
Binary files differ
diff --git a/plugins/org.eclipse.actf.visualization.presentation/icons/etool16/presen.gif b/plugins/org.eclipse.actf.visualization.presentation/icons/etool16/presen.gif
new file mode 100644
index 0000000..27c49a5
--- /dev/null
+++ b/plugins/org.eclipse.actf.visualization.presentation/icons/etool16/presen.gif
Binary files differ
diff --git a/plugins/org.eclipse.actf.visualization.presentation/plugin.properties b/plugins/org.eclipse.actf.visualization.presentation/plugin.properties
index 28fa868..b04a05f 100644
--- a/plugins/org.eclipse.actf.visualization.presentation/plugin.properties
+++ b/plugins/org.eclipse.actf.visualization.presentation/plugin.properties
@@ -8,4 +8,7 @@
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
-presentation.tab.title=Presentation
\ No newline at end of file
+presentation.tab.title=Presentation
+actf.action.visualize=Presentation simulation
+actf.visualization.actionset=ACTF Visualization
+actf.visualization.menu=Visualize
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.visualization.presentation/plugin.xml b/plugins/org.eclipse.actf.visualization.presentation/plugin.xml
index 6296518..a7196c0 100644
--- a/plugins/org.eclipse.actf.visualization.presentation/plugin.xml
+++ b/plugins/org.eclipse.actf.visualization.presentation/plugin.xml
@@ -12,5 +12,25 @@
name="%presentation.tab.title">
</view>
</extension>
+ <extension
+ point="org.eclipse.ui.actionSets">
+ <actionSet
+ id="org.eclipse.actf.visualization.presentation.actionSet"
+ label="%actf.action.visualize">
+ <menu
+ id="org.eclipse.actf.visualization.menu"
+ label="%actf.visualization.menu">
+ </menu>
+ <action
+ class="org.eclipse.actf.visualization.presentation.ui.actions.PresentationSimulationAction"
+ id="org.eclipse.actf.visualization.presentation.ui.actions.PresentationSimulationAction"
+ definitionId="org.eclipse.actf.visualization.presentation.ui.actions.PresentationSimulationAction"
+ label="%actf.action.visualize"
+ menubarPath="org.eclipse.actf.visualization.menu/"
+ toolbarPath="org.eclipse.actf.visualization.ui.actionSet/ACTFvisualization"
+ icon="icons/etool16/presen.gif"
+ style="pulldown"/>
+ </actionSet>
+ </extension>
</plugin>
diff --git a/plugins/org.eclipse.actf.visualization.presentation/plugin_ja.properties b/plugins/org.eclipse.actf.visualization.presentation/plugin_ja.properties
index de31137..e24f77d 100644
--- a/plugins/org.eclipse.actf.visualization.presentation/plugin_ja.properties
+++ b/plugins/org.eclipse.actf.visualization.presentation/plugin_ja.properties
@@ -8,4 +8,7 @@
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
-presentation.tab.title=\u30d7\u30ec\u30bc\u30f3\u30c6\u30fc\u30b7\u30e7\u30f3
\ No newline at end of file
+presentation.tab.title=\u30d7\u30ec\u30bc\u30f3\u30c6\u30fc\u30b7\u30e7\u30f3
+actf.action.visualize=\u30d7\u30ec\u30bc\u30f3\u30c6\u30fc\u30b7\u30e7\u30f3 \u30b7\u30df\u30e5\u30ec\u30fc\u30b7\u30e7\u30f3
+actf.visualization.actionset=ACTF\u8996\u899a\u5316
+actf.visualization.menu=\u8996\u899a\u5316
\ No newline at end of file
diff --git a/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/actions/LargeRoomSimulateAction.java b/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/actions/LargeRoomSimulateAction.java
index 71704b0..7ed6a16 100644
--- a/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/actions/LargeRoomSimulateAction.java
+++ b/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/actions/LargeRoomSimulateAction.java
@@ -10,22 +10,25 @@
*******************************************************************************/
package org.eclipse.actf.visualization.presentation.ui.actions;
+import org.eclipse.actf.ui.util.PlatformUIUtil;
import org.eclipse.actf.visualization.presentation.internal.Messages;
import org.eclipse.actf.visualization.presentation.internal.RoomPlugin;
import org.eclipse.actf.visualization.presentation.ui.internal.PartControlRoom;
import org.eclipse.actf.visualization.presentation.util.ParamRoom;
+import org.eclipse.actf.visualization.ui.IVisualizationView;
import org.eclipse.jface.action.Action;
public class LargeRoomSimulateAction extends Action {
public LargeRoomSimulateAction() {
- setToolTipText(Messages.RoomSimulationAction_Large);
+ setToolTipText(Messages.RoomSimulationAction_Large);
setImageDescriptor(RoomPlugin
- .getImageDescriptor("icons/ButtonLarge.gif")); //$NON-NLS-1$
- setText(Messages.RoomSimulationAction_Large);
+ .getImageDescriptor("icons/etool16/Auditorium.gif")); //$NON-NLS-1$
+ setText(Messages.RoomSimulationAction_Large);
}
public void run() {
+ PlatformUIUtil.showView(IVisualizationView.ID_PRESENTATIONVIEW);
// TODO
PartControlRoom.getDefaultInstance().getParamLowVision().setType(
ParamRoom.ROOM_LARGE);
diff --git a/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/actions/MiddleRoomSimulateAction.java b/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/actions/MiddleRoomSimulateAction.java
index f7967da..ff8fa1d 100644
--- a/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/actions/MiddleRoomSimulateAction.java
+++ b/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/actions/MiddleRoomSimulateAction.java
@@ -10,10 +10,12 @@
*******************************************************************************/
package org.eclipse.actf.visualization.presentation.ui.actions;
+import org.eclipse.actf.ui.util.PlatformUIUtil;
import org.eclipse.actf.visualization.presentation.internal.Messages;
import org.eclipse.actf.visualization.presentation.internal.RoomPlugin;
import org.eclipse.actf.visualization.presentation.ui.internal.PartControlRoom;
import org.eclipse.actf.visualization.presentation.util.ParamRoom;
+import org.eclipse.actf.visualization.ui.IVisualizationView;
import org.eclipse.jface.action.Action;
public class MiddleRoomSimulateAction extends Action {
@@ -21,11 +23,12 @@
public MiddleRoomSimulateAction() {
setToolTipText(Messages.RoomSimulationAction_Middle);
setImageDescriptor(RoomPlugin
- .getImageDescriptor("icons/ButtonMiddle.gif")); //$NON-NLS-1$
+ .getImageDescriptor("icons/etool16/LargeRoom.gif")); //$NON-NLS-1$
setText(Messages.RoomSimulationAction_Middle);
}
public void run() {
+ PlatformUIUtil.showView(IVisualizationView.ID_PRESENTATIONVIEW);
// TODO
PartControlRoom.getDefaultInstance().getParamLowVision().setType(
ParamRoom.ROOM_MIDDLE);
diff --git a/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/actions/PresentationSimulationAction.java b/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/actions/PresentationSimulationAction.java
new file mode 100644
index 0000000..e85b576
--- /dev/null
+++ b/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/actions/PresentationSimulationAction.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2009 IBM Corporation and Others
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Kentarou FUKUDA - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.actf.visualization.presentation.ui.actions;
+
+import org.eclipse.actf.ui.util.PlatformUIUtil;
+import org.eclipse.actf.visualization.presentation.ui.internal.PartControlRoom;
+import org.eclipse.actf.visualization.presentation.util.ParamRoom;
+import org.eclipse.actf.visualization.ui.IVisualizationView;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowPulldownDelegate;
+
+public class PresentationSimulationAction implements
+ IWorkbenchWindowPulldownDelegate {
+
+ Menu menu;
+
+ public void dispose() {
+ }
+
+ public Menu getMenu(Control arg0) {
+ menu = new Menu(arg0);
+ ActionContributionItem itemL = new ActionContributionItem(
+ new LargeRoomSimulateAction());
+ itemL.fill(menu, -1);
+ ActionContributionItem itemM = new ActionContributionItem(
+ new MiddleRoomSimulateAction());
+ itemM.fill(menu, -1);
+ ActionContributionItem itemS = new ActionContributionItem(
+ new SmallRoomSimulateAction());
+ itemS.fill(menu, -1);
+ return menu;
+ }
+
+ public void run(IAction arg0) {
+ // TODO
+ PlatformUIUtil.showView(IVisualizationView.ID_PRESENTATIONVIEW);
+ PartControlRoom.getDefaultInstance().getParamLowVision().setType(
+ ParamRoom.ROOM_LARGE);
+ PartControlRoom.getDefaultInstance().doSimulate();
+ }
+
+ public void init(IWorkbenchWindow arg0) {
+ }
+
+ public void selectionChanged(IAction arg0, ISelection arg1) {
+ }
+}
diff --git a/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/actions/SmallRoomSimulateAction.java b/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/actions/SmallRoomSimulateAction.java
index f8ae8c6..70dfcc6 100644
--- a/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/actions/SmallRoomSimulateAction.java
+++ b/plugins/org.eclipse.actf.visualization.presentation/src/org/eclipse/actf/visualization/presentation/ui/actions/SmallRoomSimulateAction.java
@@ -11,10 +11,12 @@
package org.eclipse.actf.visualization.presentation.ui.actions;
+import org.eclipse.actf.ui.util.PlatformUIUtil;
import org.eclipse.actf.visualization.presentation.internal.Messages;
import org.eclipse.actf.visualization.presentation.internal.RoomPlugin;
import org.eclipse.actf.visualization.presentation.ui.internal.PartControlRoom;
import org.eclipse.actf.visualization.presentation.util.ParamRoom;
+import org.eclipse.actf.visualization.ui.IVisualizationView;
import org.eclipse.jface.action.Action;
public class SmallRoomSimulateAction extends Action {
@@ -22,11 +24,12 @@
public SmallRoomSimulateAction() {
setToolTipText(Messages.RoomSimulationAction_Small);
setImageDescriptor(RoomPlugin
- .getImageDescriptor("icons/ButtonSmall.gif")); //$NON-NLS-1$
+ .getImageDescriptor("icons/etool16/SmallRoom.gif")); //$NON-NLS-1$
setText(Messages.RoomSimulationAction_Small);
}
public void run() {
+ PlatformUIUtil.showView(IVisualizationView.ID_PRESENTATIONVIEW);
// TODO
PartControlRoom.getDefaultInstance().getParamLowVision().setType(
ParamRoom.ROOM_SMALL);
