X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=core%2Forg.argeo.suite.ui%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fui%2FSuiteUi.java;h=469e36f466ba770ff081f331a1d1c086076e789a;hb=752a7b2614895002a3d184be166ef4162caf0d05;hp=816c65818605761c73d4713d3fda98471ba48806;hpb=91a19e7f23eac8f073b833e2886bcb7771ff7469;p=gpl%2Fargeo-suite.git diff --git a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUi.java b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUi.java index 816c658..469e36f 100644 --- a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUi.java +++ b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUi.java @@ -29,10 +29,11 @@ class SuiteUi extends Composite { private Composite footer; private Composite belowHeader; private Composite leadPane; + private Composite sidePane; private Composite dynamicArea; private Session sysSession; -// private Session homeSession; + private Session homeSession; private Node userDir; private Map layers = new HashMap<>(); @@ -64,14 +65,20 @@ class SuiteUi extends Composite { CmsUiUtils.clear(belowHeader); int style = getStyle(); if (initApp) { - belowHeader.setLayout(CmsUiUtils.noSpaceGridLayout(2)); + belowHeader.setLayout(CmsUiUtils.noSpaceGridLayout(3)); if (SWT.RIGHT_TO_LEFT == (style & SWT.RIGHT_TO_LEFT)) {// arabic, hebrew, etc. + sidePane = new Composite(belowHeader, SWT.NONE); + sidePane.setLayout(CmsUiUtils.noSpaceGridLayout()); + sidePane.setLayoutData(CmsUiUtils.fillHeight()); dynamicArea = new Composite(belowHeader, SWT.NONE); leadPane = new Composite(belowHeader, SWT.NONE); } else { leadPane = new Composite(belowHeader, SWT.NONE); dynamicArea = new Composite(belowHeader, SWT.NONE); + sidePane = new Composite(belowHeader, SWT.NONE); + sidePane.setLayout(CmsUiUtils.noSpaceGridLayout()); + sidePane.setLayoutData(CmsUiUtils.fillHeight()); } leadPane.setLayoutData(CmsUiUtils.fillHeight()); leadPane.setLayout(CmsUiUtils.noSpaceGridLayout()); @@ -174,7 +181,7 @@ class SuiteUi extends Composite { synchronized void logout() { userDir = null; Jcr.logout(sysSession); -// Jcr.logout(homeSession); + Jcr.logout(homeSession); currentLayerId = null; workAreas.clear(); } @@ -195,6 +202,10 @@ class SuiteUi extends Composite { return leadPane; } + Composite getSidePane() { + return sidePane; + } + Composite getBelowHeader() { return belowHeader; } @@ -205,11 +216,11 @@ class SuiteUi extends Composite { // synchronized void initSessions(Repository repository, String userDirPath) throws RepositoryException { this.sysSession = repository.login(); -// this.homeSession = repository.login(NodeConstants.HOME_WORKSPACE); + this.homeSession = repository.login(NodeConstants.HOME_WORKSPACE); userDir = sysSession.getNode(userDirPath); addDisposeListener((e) -> { Jcr.logout(sysSession); -// Jcr.logout(homeSession); + Jcr.logout(homeSession); }); } @@ -226,8 +237,8 @@ class SuiteUi extends Composite { return sysSession; if (NodeConstants.SYS_WORKSPACE.equals(workspaceName)) return sysSession; -// else if (NodeConstants.HOME_WORKSPACE.equals(workspaceName)) -// return homeSession; + else if (NodeConstants.HOME_WORKSPACE.equals(workspaceName)) + return homeSession; else throw new IllegalArgumentException("Unknown workspace " + workspaceName); }