Commit 69456e07 authored by Romain Bioteau's avatar Romain Bioteau Committed by GitHub
Browse files

fix(app) macOs defect (#397)

* Try to fix installer deadlock on MacOs
* Remove Group widget and use a Section for Look N Feel
* Do not use small font option
parent 6370a04f
......@@ -13,7 +13,7 @@
</vmArgs>
<vmArgsLin>-Djava.endorsed.dirs=endorsed
</vmArgsLin>
<vmArgsMac>-Xdock:name=BonitaBPM -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -Djava.endorsed.dirs=../../../endorsed
<vmArgsMac>-Xdock:name=BonitaBPM -XstartOnFirstThread -Djava.endorsed.dirs=../../../endorsed
</vmArgsMac>
<vmArgsWin>-Dgreclipse.nonlocking=true -Djava.endorsed.dirs=endorsed
</vmArgsWin>
......
......@@ -525,7 +525,7 @@
<actionList>
<runProgram>
<program>${java_executable}</program>
<programArguments>-Xmx512m -XX:MaxPermSize=512m -jar "${installdir}/plugins/org.eclipse.equinox.launcher_1.3.0.v20140415-2008.jar" -product org.bonitasoft.studio.initializer -application org.bonitasoft.studio.application.InitializerApplication -data "${installdir}/workspace" -noSplash</programArguments>
<programArguments>-Xmx512m -jar "${installdir}/plugins/org.eclipse.equinox.launcher_1.3.0.v20140415-2008.jar" -product org.bonitasoft.studio.initializer -application org.bonitasoft.studio.application.InitializerApplication -data "${installdir}/workspace" -noSplash</programArguments>
<progressText>${msg(initializing.progressMessage)} ${product_fullname}...</progressText>
<ruleList>
<isFalse>
......@@ -537,19 +537,6 @@
</platformTest>
</ruleList>
</runProgram>
<runProgram>
<program>${java_executable}</program>
<programArguments>-Xmx512m -XX:MaxPermSize=512m -XstartOnFirstThread -jar "${installdir}/plugins/org.eclipse.equinox.launcher_1.3.0.v20140415-2008.jar" -product org.bonitasoft.studio.initializer -application org.bonitasoft.studio.application.InitializerApplication -data "${installdir}/workspace" -noSplash</programArguments>
<progressText>${msg(initializing.progressMessage)} ${product_fullname}...</progressText>
<ruleList>
<isFalse>
<value>${retrieveWorksapce}</value>
</isFalse>
<platformTest>
<type>osx</type>
</platformTest>
</ruleList>
</runProgram>
</actionList>
<ruleList>
<isFalse>
......@@ -602,7 +589,7 @@
<actionList>
<runProgram>
<program>${java_executable}</program>
<programArguments>-Xmx512m -XX:MaxPermSize=512m -jar "${installdir}/plugins/org.eclipse.equinox.launcher_1.3.0.v20140415-2008.jar" -product org.bonitasoft.studio.workspaceRecovery -application org.bonitasoft.studio.application.WorkspaceRecovery -data "${Oldworkspace}/workspace/" -newWorkspaceLocation "${installdir}/workspace" -noSplash</programArguments>
<programArguments>-Xmx512m -jar "${installdir}/plugins/org.eclipse.equinox.launcher_1.3.0.v20140415-2008.jar" -product org.bonitasoft.studio.workspaceRecovery -application org.bonitasoft.studio.application.WorkspaceRecovery -data "${Oldworkspace}/workspace/" -newWorkspaceLocation "${installdir}/workspace" -noSplash</programArguments>
<progressText>${msg(workspace.recovery.progressMessage)}</progressText>
<ruleList>
<platformTest>
......@@ -616,7 +603,7 @@
</runProgram>
<runProgram>
<program>${java_executable}</program>
<programArguments>-Xmx512m -XX:MaxPermSize=512m -jar "${installdir}/plugins/org.eclipse.equinox.launcher_1.3.0.v20140415-2008.jar" -product org.bonitasoft.studio.initializer -application org.bonitasoft.studio.application.InitializerApplication -data "${installdir}/workspace" -noSplash</programArguments>
<programArguments>-Xmx512m -jar "${installdir}/plugins/org.eclipse.equinox.launcher_1.3.0.v20140415-2008.jar" -product org.bonitasoft.studio.initializer -application org.bonitasoft.studio.application.InitializerApplication -data "${installdir}/workspace" -noSplash</programArguments>
<progressText>${msg(initializing.progressMessage)} ${product_fullname}...</progressText>
<ruleList>
<platformTest>
......@@ -627,7 +614,7 @@
</runProgram>
<runProgram>
<program>${java_executable}</program>
<programArguments>-Xmx512m -XX:MaxPermSize=512m -XstartOnFirstThread -jar "${installdir}/plugins/org.eclipse.equinox.launcher_1.3.0.v20140415-2008.jar" -product org.bonitasoft.studio.workspaceRecovery -application org.bonitasoft.studio.application.WorkspaceRecovery -data "${Oldworkspace}/workspace/" -newWorkspaceLocation "${installdir}/workspace" -noSplash</programArguments>
<programArguments>-Xmx512m -XstartOnFirstThread -jar "${installdir}/plugins/org.eclipse.equinox.launcher_1.3.0.v20140415-2008.jar" -product org.bonitasoft.studio.workspaceRecovery -application org.bonitasoft.studio.application.WorkspaceRecovery -data "${Oldworkspace}/workspace/" -newWorkspaceLocation "${installdir}/workspace" -noSplash</programArguments>
<progressText>${msg(workspace.recovery.progressMessage)}</progressText>
<ruleList>
<platformTest>
......@@ -641,7 +628,7 @@
<runProgram>
<program>${java_executable}</program>
<!-- Change bundle version when Equinox version change -->
<programArguments>-Xmx512m -XX:MaxPermSize=512m -XstartOnFirstThread -jar "${installdir}/plugins/org.eclipse.equinox.launcher_1.3.0.v20140415-2008.jar" -product org.bonitasoft.studio.initializer -application org.bonitasoft.studio.application.InitializerApplication -data "${installdir}/workspace" -noSplash</programArguments>
<programArguments>-Xmx512m -XstartOnFirstThread -jar "${installdir}/plugins/org.eclipse.equinox.launcher_1.3.0.v20140415-2008.jar" -product org.bonitasoft.studio.initializer -application org.bonitasoft.studio.application.InitializerApplication -data "${installdir}/workspace" -noSplash</programArguments>
<progressText>${msg(initializing.progressMessage)} ${product_fullname}...</progressText>
<ruleList>
<platformTest>
......
......@@ -63,7 +63,7 @@ public class WidgetMessageDecorator extends ExpandableComposite {
return fontRegistry.get(WidgetMessageDecorator.class.getName());
}
fontRegistry.put(WidgetMessageDecorator.class.getName(),
new FontData[] { new FontData(WidgetMessageDecorator.class.getName(), 8, SWT.NORMAL) });
new FontData[] { new FontData(WidgetMessageDecorator.class.getName(), 10, SWT.NORMAL) });
return fontRegistry.get(WidgetMessageDecorator.class.getName());
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment