Fix homeopathics UI Bugs

Add a link to the wiki

git-svn-id: https://svn.argeo.org/slc/trunk@6625 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/plugins/org.argeo.slc.akb.ui/plugin.xml b/plugins/org.argeo.slc.akb.ui/plugin.xml
index 15465cb26da92041ff44827c939b498c725a7252..bc64576e2fa9c061578055e8037cc90448202a82 100644 (file)
--- a/plugins/org.argeo.slc.akb.ui/plugin.xml
+++ b/plugins/org.argeo.slc.akb.ui/plugin.xml
@@ -133,9 +133,13 @@
                        name="Force refresh of the current active part if such an action is possible">
                </command>
                <command
-                       defaultHandler="org.argeo.slc.akb.ui.commands.OpenTracker"
-                       id="org.argeo.slc.akb.ui.openTracker"
-                       name="Report a bug in Argeo's tracker">
+                       defaultHandler="org.argeo.slc.akb.ui.commands.OpenUrl"
+                       id="org.argeo.slc.akb.ui.openUrl"
+                       name="Open an URL in the end user browser">
+                       <commandParameter
+                       id="param.urlType"
+                       name="The type of the url">
+                       </commandParameter>
                </command>
        </extension>            
        <!-- Menus -->
@@ -155,7 +159,7 @@
             <command
                commandId="org.argeo.slc.akb.ui.forceRefresh"
                 icon="icons/refresh.png"
-                       label="Refresh"
+                   label="Refresh"
                 tooltip="Refresh the whole browser">
             </command>
         </menuContribution>
@@ -166,15 +170,31 @@
                                id="help"
                                label="Help">
                                <command
-                                       commandId="org.argeo.slc.akb.ui.openTracker"
+                                       commandId="org.argeo.slc.akb.ui.openUrl"
                                        label="Report a bug..."
-                                       style="push">
+                                       icon="icons/refresh.png"
+                       style="push"
+                       tooltip="Report a bug or an enhancement to Argeos tracker system">
+                                       <parameter 
+                                               name="param.urlType" 
+                                               value="tracker" />
                                </command>
+                               
+       <!--                    <command
+                                       commandId="org.argeo.slc.akb.ui.openUrl"
+                                       label="AKB's wiki
+                                       style="push">
+                                       <parameter name="param.urlType" value="wiki" />
+                               </command>-->
                                <command
-                                       commandId="org.eclipse.ui.help.aboutAction"
-                                       label="About"
+                                       commandId="org.argeo.slc.akb.ui.openUrl"
+                                       label="AKB wiki"
                                        style="push">
-                               </command>              </menu>
+                                       <parameter 
+                                               name="param.urlType" 
+                                               value="wiki" />
+                               </command> 
+                       </menu>
       </menuContribution>      
        </extension>
 </plugin>

diff --git a/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/commands/OpenTracker.java b/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/commands/OpenTracker.java
deleted file mode 100644 (file)
index a8d0e68..0000000
--- a/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/commands/OpenTracker.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.argeo.slc.akb.ui.commands;
-
-import java.net.URL;
-
-import org.argeo.slc.akb.AkbException;
-import org.argeo.slc.akb.ui.AkbUiPlugin;
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Open a browser with bugzilla
- */
-public class OpenTracker extends AbstractHandler {
-
-       public final static String ID = AkbUiPlugin.PLUGIN_ID + ".forceRefresh";
-
-       private final static String TRACKER_URL = "https://www.argeo.org/bugzilla/enter_bug.cgi?product=slc";
-
-       public Object execute(ExecutionEvent event) throws ExecutionException {
-
-               try {
-                       PlatformUI.getWorkbench().getBrowserSupport().getExternalBrowser()
-                                       .openURL(new URL(TRACKER_URL));
-               } catch (Exception e) {
-                       throw new AkbException("Unable to open browser page", e);
-               }
-               return null;
-       }
-}
\ No newline at end of file

diff --git a/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/commands/OpenUrl.java b/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/commands/OpenUrl.java
new file mode 100644 (file)
index 0000000..8227668
--- /dev/null
+++ b/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/commands/OpenUrl.java
@@ -0,0 +1,44 @@
+package org.argeo.slc.akb.ui.commands;
+
+import java.net.URL;
+
+import org.argeo.slc.akb.AkbException;
+import org.argeo.slc.akb.ui.AkbUiPlugin;
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * Open various predefine URL on the web to ease end user understanding of the
+ * app.
+ */
+public class OpenUrl extends AbstractHandler {
+
+       public final static String ID = AkbUiPlugin.PLUGIN_ID + ".openUrl";
+       public final static String PARAM_URL_TYPE = "param.urlType";
+
+       public final static String PARAM_VALUE_TRACKER = "tracker";
+       public final static String PARAM_VALUE_WIKI = "wiki";
+
+       private final static String TRACKER_URL = "https://www.argeo.org/bugzilla/enter_bug.cgi?product=slc&component=akb";
+       private final static String WIKI_URL = "https://www.argeo.org/wiki/SLC_Active_Knowledge_Base";
+
+       public Object execute(ExecutionEvent event) throws ExecutionException {
+               String urlType = event.getParameter(PARAM_URL_TYPE);
+               try {
+                       URL url = null;
+                       if (PARAM_VALUE_TRACKER.equals(urlType))
+                               url = new URL(TRACKER_URL);
+                       else if (PARAM_VALUE_WIKI.equals(urlType))
+                               url = new URL(WIKI_URL);
+                       else
+                               return null;
+                       PlatformUI.getWorkbench().getBrowserSupport().getExternalBrowser()
+                                       .openURL(url);
+               } catch (Exception e) {
+                       throw new AkbException("Unable to open browser page", e);
+               }
+               return null;
+       }
+}
\ No newline at end of file

diff --git a/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/composites/AliasListItemComposite.java b/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/composites/AliasListItemComposite.java
index b58c642898c00f40825c7e2a9b3593f7dd5092eb..9fc72a5aa1396361985299ca67fedcbd8a3e2566 100644 (file)
--- a/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/composites/AliasListItemComposite.java
+++ b/plugins/org.argeo.slc.akb.ui/src/main/java/org/argeo/slc/akb/ui/composites/AliasListItemComposite.java
@@ -98,11 +98,13 @@ public class AliasListItemComposite extends Composite {
                // Name
                final Text titleTxt = toolkit.createText(firstLine, "", SWT.NONE);
                gd = new GridData(SWT.LEFT, SWT.CENTER, false, false);
-               gd.widthHint = 100;
+               gd.widthHint = 150;
                titleTxt.setLayoutData(gd);
 
                // Description
                final Text descTxt = toolkit.createText(firstLine, "", SWT.NONE);
+               gd = new GridData(SWT.LEFT, SWT.CENTER, false, false);
+               gd.widthHint = 220;
                descTxt.setLayoutData(gd);
 
                final Link testBtn = new Link(firstLine, SWT.NONE);