Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMazen Faraj2004-05-19 11:36:26 +0000
committerMazen Faraj2004-05-19 11:36:26 +0000
commit0718564412cdbe0c10d276c844704645a1c1f1f6 (patch)
tree9cc8b6d47762a4c8d899ef71f3f2b90fb2f09e97 /org.eclipse.ui.intro
parent0e3f1425ea6d19265e4268172bda6d22eb7f0da3 (diff)
downloadeclipse.platform.ua-0718564412cdbe0c10d276c844704645a1c1f1f6.tar.gz
eclipse.platform.ua-0718564412cdbe0c10d276c844704645a1c1f1f6.tar.xz
eclipse.platform.ua-0718564412cdbe0c10d276c844704645a1c1f1f6.zip
updated Page Style manager
Diffstat (limited to 'org.eclipse.ui.intro')
-rw-r--r--org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageContentForm.java7
-rw-r--r--org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageStyleManager.java31
-rw-r--r--org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageWidgetFactory.java4
-rw-r--r--org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/RootPageForm.java11
4 files changed, 33 insertions, 20 deletions
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageContentForm.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageContentForm.java
index c2080f85a..63b3a3075 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageContentForm.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageContentForm.java
@@ -111,11 +111,14 @@ public class PageContentForm implements IIntroConstants {
layout.rightMargin = 0;
int numColumns = styleManager.getPageNumberOfColumns();
layout.numColumns = numColumns == 0 ? 1 : numColumns;
+ layout.horizontalSpacing = styleManager.getPageHorizantalSpacing();
+ layout.verticalSpacing = styleManager.getPageVerticalSpacing();
client.setLayout(layout);
// parent has TableWrapLayout, and so update layout of this child.
- TableWrapData td = new TableWrapData();
- td.align = TableWrapData.FILL;
+ TableWrapData td = new TableWrapData(TableWrapData.FILL,
+ TableWrapData.FILL);
+ //td.align = TableWrapData.FILL;
td.grabHorizontal = true;
client.setLayoutData(td);
return client;
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageStyleManager.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageStyleManager.java
index 1c6c9209a..214b88b72 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageStyleManager.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageStyleManager.java
@@ -122,8 +122,7 @@ public class PageStyleManager extends SharedStyleManager {
* default is 1.
*/
public int getPageNumberOfColumns() {
- String key = page.getId() + ".layout.ncolumns";
- return getIntProperty(key, 0);
+ return getIntProperty(page, ".layout.ncolumns", 0);
}
@@ -131,6 +130,22 @@ public class PageStyleManager extends SharedStyleManager {
return getIntProperty(group, ".layout.ncolumns", 0);
}
+ public int getPageVerticalSpacing() {
+ return getIntProperty(page, ".layout.vspacing", 5);
+ }
+
+ public int getVerticalSpacing(IntroGroup group) {
+ return getIntProperty(group, ".layout.vspacing", 5);
+ }
+
+ public int getPageHorizantalSpacing() {
+ return getIntProperty(page, ".layout.hspacing", 5);
+ }
+
+ public int getHorizantalSpacing(IntroGroup group) {
+ return getIntProperty(group, ".layout.hspacing", 5);
+ }
+
public int getColSpan(AbstractBaseIntroElement element) {
return getIntProperty(element, ".layout.colspan", 1);
}
@@ -158,18 +173,6 @@ public class PageStyleManager extends SharedStyleManager {
return intValue;
}
- public int getVerticalLinkSpacing() {
- String key = page.getId() + ".layout.link-vspacing"; //$NON-NLS-1$
- int vspacing = 5;
- String value = getProperty(key);
- try {
- vspacing = Integer.parseInt(value);
- } catch (NumberFormatException e) {
- }
- return vspacing;
- }
-
-
/**
* Finds the description text of the given group. Looks for the Text child
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageWidgetFactory.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageWidgetFactory.java
index 2b5457500..69e435961 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageWidgetFactory.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/PageWidgetFactory.java
@@ -174,9 +174,9 @@ public class PageWidgetFactory {
TableWrapLayout layout = new TableWrapLayout();
int numColumns = styleManager.getNumberOfColumns(group);
numColumns = numColumns < 1 ? 1 : numColumns;
- int vspacing = styleManager.getVerticalLinkSpacing();
layout.numColumns = numColumns;
- layout.verticalSpacing = vspacing;
+ layout.verticalSpacing = styleManager.getVerticalSpacing(group);
+ layout.horizontalSpacing = styleManager.getHorizantalSpacing(group);
client.setLayout(layout);
//Util.highlight(client, SWT.COLOR_YELLOW);
return control;
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/RootPageForm.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/RootPageForm.java
index 9a6274eba..5ff20c6a3 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/RootPageForm.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/swt/RootPageForm.java
@@ -189,12 +189,16 @@ public class RootPageForm implements IIntroConstants {
int numChildren = children.length;
GridLayout layout = new GridLayout();
// separate links a bit more.
- layout.horizontalSpacing = 20;
- layout.verticalSpacing = rootPageStyleManager.getVerticalLinkSpacing();
+ layout.horizontalSpacing = rootPageStyleManager
+ .getPageHorizantalSpacing();
+ layout.verticalSpacing = rootPageStyleManager.getPageVerticalSpacing();
// set number of columns.
int numColumns = rootPageStyleManager.getPageNumberOfColumns();
numColumns = numColumns == 0 ? numChildren : numColumns;
layout.numColumns = numColumns;
+ layout.horizontalSpacing = rootPageStyleManager
+ .getPageHorizantalSpacing();
+ layout.verticalSpacing = rootPageStyleManager.getPageVerticalSpacing();
contentComposite.setLayout(layout);
for (int i = 0; i < children.length; i++) {
if (((AbstractBaseIntroElement) children[i]).isFiltered())
@@ -227,6 +231,9 @@ public class RootPageForm implements IIntroConstants {
int numColumns = rootPageStyleManager.getNumberOfColumns(group);
numColumns = numColumns < 1 ? numChildren : numColumns;
layout.numColumns = numColumns;
+ layout.verticalSpacing = rootPageStyleManager.getVerticalSpacing(group);
+ layout.horizontalSpacing = rootPageStyleManager
+ .getHorizantalSpacing(group);
contentComposite.setLayout(layout);
for (int i = 0; i < children.length; i++) {
if (((AbstractBaseIntroElement) children[i]).isFiltered())

Back to the top