From c1f3e273571cc1e85891540011429b4df11f407a Mon Sep 17 00:00:00 2001 From: "yongsung1.kim" Date: Thu, 15 May 2014 16:18:23 +0900 Subject: [PATCH] [INST] Modified UI. Adjusted extra repository button size when custom button was pushed. Removed install size column in custom tree table. Changeed text from 'Install size' to 'Total install size'. Change-Id: Iffb6c69533b19cb411f941b1c695c0343054da56 Signed-off-by: yongsung1.kim --- .../installmanager/ui/page/InstallableListPage.java | 4 ++-- .../tizen/installmanager/ui/page/PackageListPage.java | 19 +++++-------------- .../installmanager/ui/page/UpdatableListPage.java | 2 +- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/InstallManager_java/src/org/tizen/installmanager/ui/page/InstallableListPage.java b/InstallManager_java/src/org/tizen/installmanager/ui/page/InstallableListPage.java index 2775958..c0e1192 100644 --- a/InstallManager_java/src/org/tizen/installmanager/ui/page/InstallableListPage.java +++ b/InstallManager_java/src/org/tizen/installmanager/ui/page/InstallableListPage.java @@ -161,10 +161,10 @@ public class InstallableListPage extends PackageListPage { } if (!Config.isOldPackageServer) { - addExtraButton.setBounds(0, 76, 134, 34); + addExtraButton.setBounds(10, 76, 124, 34); addExtraButton.setVisible(false); } else { - addExtraButton.setBounds(0, 38, 134, 34); + addExtraButton.setBounds(10, 38, 124, 34); addExtraButton.setVisible(true); } diff --git a/InstallManager_java/src/org/tizen/installmanager/ui/page/PackageListPage.java b/InstallManager_java/src/org/tizen/installmanager/ui/page/PackageListPage.java index a9b31d2..ffe2704 100644 --- a/InstallManager_java/src/org/tizen/installmanager/ui/page/PackageListPage.java +++ b/InstallManager_java/src/org/tizen/installmanager/ui/page/PackageListPage.java @@ -163,11 +163,11 @@ public abstract class PackageListPage extends PageTemplate { private void setSizeLabel(Composite composite) { if (Config.status == Config.Status.INSTALL || Config.status == Config.Status.UPDATE) { lblRequiredSize = new Label(getCustomComposite(), SWT.NONE); - lblRequiredSize.setBounds(300, 6, 170, 23); + lblRequiredSize.setBounds(260, 6, 170, 23); lblRequiredSize.setBackground(InstallManagerWindow.getBackgroundColor()); lblUncompressedSize = new Label(getCustomComposite(), SWT.NONE); - lblUncompressedSize.setBounds(475, 6, 170, 23); + lblUncompressedSize.setBounds(435, 6, 170, 23); lblUncompressedSize.setBackground(InstallManagerWindow.getBackgroundColor()); } } @@ -268,7 +268,6 @@ public abstract class PackageListPage extends PageTemplate { checkboxTreeViewer = new CheckboxTreeViewer(customComposite, SWT.BORDER | SWT.H_SCROLL | SWT.LEFT); tree = checkboxTreeViewer.getTree(); tree.setBounds(150, 31, 468, 213); -// tree.setBounds(150, 130, 468, 165); tree.setHeaderVisible(true); tree.setLayoutData(new GridData(GridData.FILL_BOTH)); @@ -303,7 +302,7 @@ public abstract class PackageListPage extends PageTemplate { if (installType != Type.INSTALL) { TreeColumn trclmnA = new TreeColumn(tree, SWT.LEFT); - trclmnA.setWidth(270); + trclmnA.setWidth(350); trclmnA.setText("Name"); TreeColumn trclmnB = new TreeColumn(tree, SWT.CENTER); @@ -311,13 +310,9 @@ public abstract class PackageListPage extends PageTemplate { trclmnB.setText("Status"); } else { TreeColumn trclmnA = new TreeColumn(tree, SWT.LEFT); - trclmnA.setWidth(350); + trclmnA.setWidth(450); trclmnA.setText("Name"); } - - TreeColumn trclmnC = new TreeColumn(tree, SWT.CENTER); - trclmnC.setWidth(80); - trclmnC.setText("Install size"); } private void setCheckboxTreeViewer(final Type type) { @@ -723,10 +718,6 @@ public abstract class PackageListPage extends PageTemplate { customTreeItems.addAll(treeItems); } -// items.addAll(treeItems); -// -//// make relation for item tree. -// makeRelation(items); makeState(); } @@ -1041,7 +1032,7 @@ public abstract class PackageListPage extends PageTemplate { lblRequiredSize.setText("Download size : " + convertToVolumeSize(getCheckedPackageSize(false))); - lblUncompressedSize.setText("Install size : " + lblUncompressedSize.setText("Total install size : " + convertToVolumeSize(getCheckedPackageSize(true))); setNextBtnEnabledAboutCheckedPackageCount(); } diff --git a/InstallManager_java/src/org/tizen/installmanager/ui/page/UpdatableListPage.java b/InstallManager_java/src/org/tizen/installmanager/ui/page/UpdatableListPage.java index 4f8014d..d42191f 100644 --- a/InstallManager_java/src/org/tizen/installmanager/ui/page/UpdatableListPage.java +++ b/InstallManager_java/src/org/tizen/installmanager/ui/page/UpdatableListPage.java @@ -134,7 +134,7 @@ public class UpdatableListPage extends PackageListPage { setNextBtnEnabledAboutCheckedPackageCount(); lblRequiredSize.setText("Download size : " + convertToVolumeSize(getCheckedPackageSize(false))); - lblUncompressedSize.setText("Install size : " + convertToVolumeSize(getCheckedPackageSize(true))); + lblUncompressedSize.setText("Total install size : " + convertToVolumeSize(getCheckedPackageSize(true))); return true; } } -- 2.7.4