[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 <yongsung1.kim@samsung.com>

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 (file)
--- 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 {
                }\r
 \r
                if (!Config.isOldPackageServer) {\r
-                       addExtraButton.setBounds(0, 76, 134, 34);\r
+                       addExtraButton.setBounds(10, 76, 124, 34);\r
                        addExtraButton.setVisible(false);\r
                } else {\r
-                       addExtraButton.setBounds(0, 38, 134, 34);\r
+                       addExtraButton.setBounds(10, 38, 124, 34);\r
                        addExtraButton.setVisible(true);\r
                }\r
 \r

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 (file)
--- 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) {\r
                if (Config.status == Config.Status.INSTALL || Config.status == Config.Status.UPDATE) {\r
                        lblRequiredSize = new Label(getCustomComposite(), SWT.NONE);\r
-                       lblRequiredSize.setBounds(300, 6, 170, 23);\r
+                       lblRequiredSize.setBounds(260, 6, 170, 23);\r
                        lblRequiredSize.setBackground(InstallManagerWindow.getBackgroundColor());\r
                        \r
                        lblUncompressedSize = new Label(getCustomComposite(), SWT.NONE);\r
-                       lblUncompressedSize.setBounds(475, 6, 170, 23);\r
+                       lblUncompressedSize.setBounds(435, 6, 170, 23);\r
                        lblUncompressedSize.setBackground(InstallManagerWindow.getBackgroundColor());\r
                }\r
        }\r
@@ -268,7 +268,6 @@ public abstract class PackageListPage extends PageTemplate {
                checkboxTreeViewer = new CheckboxTreeViewer(customComposite, SWT.BORDER | SWT.H_SCROLL | SWT.LEFT);\r
                tree = checkboxTreeViewer.getTree();\r
                tree.setBounds(150, 31, 468, 213);\r
-//             tree.setBounds(150, 130, 468, 165);\r
                tree.setHeaderVisible(true);\r
                tree.setLayoutData(new GridData(GridData.FILL_BOTH));\r
                \r
@@ -303,7 +302,7 @@ public abstract class PackageListPage extends PageTemplate {
 \r
                if (installType != Type.INSTALL) {\r
                        TreeColumn trclmnA = new TreeColumn(tree, SWT.LEFT);\r
-                       trclmnA.setWidth(270);\r
+                       trclmnA.setWidth(350);\r
                        trclmnA.setText("Name");\r
 \r
                        TreeColumn trclmnB = new TreeColumn(tree, SWT.CENTER);\r
@@ -311,13 +310,9 @@ public abstract class PackageListPage extends PageTemplate {
                        trclmnB.setText("Status");\r
                } else {\r
                        TreeColumn trclmnA = new TreeColumn(tree, SWT.LEFT);\r
-                       trclmnA.setWidth(350);\r
+                       trclmnA.setWidth(450);\r
                        trclmnA.setText("Name");\r
                }\r
-               \r
-               TreeColumn trclmnC = new TreeColumn(tree, SWT.CENTER);\r
-               trclmnC.setWidth(80);\r
-               trclmnC.setText("Install size");\r
        }\r
        \r
        private void setCheckboxTreeViewer(final Type type) {\r
@@ -723,10 +718,6 @@ public abstract class PackageListPage extends PageTemplate {
                        customTreeItems.addAll(treeItems);\r
                }\r
                \r
-//             items.addAll(treeItems);\r
-//             \r
-////           make relation for item tree.\r
-//             makeRelation(items);\r
                makeState();\r
        }\r
        \r
@@ -1041,7 +1032,7 @@ public abstract class PackageListPage extends PageTemplate {
                \r
                lblRequiredSize.setText("Download size : "\r
                                + convertToVolumeSize(getCheckedPackageSize(false)));\r
-               lblUncompressedSize.setText("Install size : "\r
+               lblUncompressedSize.setText("Total install size : "\r
                                + convertToVolumeSize(getCheckedPackageSize(true)));\r
                setNextBtnEnabledAboutCheckedPackageCount();\r
        }\r

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 (file)
--- 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;
        }
 }