[INST] Installmanager can support multiprofile. 56/20656/1
authoryongsung1.kim <yongsung1.kim@samsung.com>
Sun, 11 May 2014 14:07:12 +0000 (23:07 +0900)
committeryongsung1.kim <yongsung1.kim@samsung.com>
Sun, 11 May 2014 14:07:12 +0000 (23:07 +0900)
Change-Id: I325981018b3ae84f03d7c41d68758b43070f6f20
Signed-off-by: yongsung1.kim <yongsung1.kim@samsung.com>
70 files changed:
InstallManager_java/src/org/tizen/installmanager/core/InstallManager.java
InstallManager_java/src/org/tizen/installmanager/lib/Registry.java
InstallManager_java/src/org/tizen/installmanager/lib/mac/MacFileSystemInfo.java
InstallManager_java/src/org/tizen/installmanager/pkg/lib/PackageManager.java
InstallManager_java/src/org/tizen/installmanager/pkg/model/Version.java
InstallManager_java/src/org/tizen/installmanager/ui/InstallManagerWindow.java
InstallManager_java/src/org/tizen/installmanager/ui/dialog/UnzipImageDialog.java
InstallManager_java/src/org/tizen/installmanager/ui/model/Item.java
InstallManager_java/src/org/tizen/installmanager/ui/model/ItemLabelProvider.java
InstallManager_java/src/org/tizen/installmanager/ui/page/CompletePage.java
InstallManager_java/src/org/tizen/installmanager/ui/page/InstallPage.java
InstallManager_java/src/org/tizen/installmanager/ui/page/InstallableListPage.java
InstallManager_java/src/org/tizen/installmanager/ui/page/InstallingPage.java
InstallManager_java/src/org/tizen/installmanager/ui/page/LicensePage.java
InstallManager_java/src/org/tizen/installmanager/ui/page/PackageListPage.java
InstallManager_java/src/org/tizen/installmanager/ui/page/PageTemplate.java
InstallManager_java/src/org/tizen/installmanager/ui/page/SetInstallDirectoryPage.java
InstallManager_java/src/org/tizen/installmanager/ui/page/UninstallableListPage.java
InstallManager_java/src/org/tizen/installmanager/ui/page/UpdatableListPage.java
InstallManager_java/src/org/tizen/installmanager/ui/page/WelcomePage.java
InstallManager_java/src/res/images/01_welcome_page_bg.png [moved from InstallManager_java/src/res/new_images/01_welcome_page_bg.png with 100% similarity]
InstallManager_java/src/res/images/01_welcome_page_text_area.png [moved from InstallManager_java/src/res/new_images/01_welcome_page_text_area.png with 100% similarity]
InstallManager_java/src/res/images/02_installation_option_bg.png [moved from InstallManager_java/src/res/new_images/02_installation_option_bg.png with 100% similarity]
InstallManager_java/src/res/images/03_software_license_agreement_bg.png [moved from InstallManager_java/src/res/new_images/03_software_license_agreement_bg.png with 100% similarity]
InstallManager_java/src/res/images/05_ready_to_install_bg.png [moved from InstallManager_java/src/res/new_images/05_ready_to_install_bg.png with 100% similarity]
InstallManager_java/src/res/images/07_error_bg.png [moved from InstallManager_java/src/res/new_images/07_error_bg.png with 100% similarity]
InstallManager_java/src/res/images/08_complete_installation_bg.png [moved from InstallManager_java/src/res/new_images/08_complete_installation_bg.png with 100% similarity]
InstallManager_java/src/res/images/09_complete_uninstallation_bg.png [moved from InstallManager_java/src/res/new_images/09_complete_uninstallation_bg.png with 100% similarity]
InstallManager_java/src/res/images/09_uninstallation_bg.png [moved from InstallManager_java/src/res/new_images/09_uninstallation_bg.png with 100% similarity]
InstallManager_java/src/res/images/arrow_right_combo.png [moved from InstallManager_java/src/res/new_images/arrow_right_combo.png with 100% similarity]
InstallManager_java/src/res/images/btn_01_hover.png [moved from InstallManager_java/src/res/new_images/btn_01_hover.png with 100% similarity]
InstallManager_java/src/res/images/btn_01_normal.png [moved from InstallManager_java/src/res/new_images/btn_01_normal.png with 100% similarity]
InstallManager_java/src/res/images/btn_01_pushed.png [moved from InstallManager_java/src/res/new_images/btn_01_pushed.png with 100% similarity]
InstallManager_java/src/res/images/btn_01_selected.png [moved from InstallManager_java/src/res/new_images/btn_01_selected.png with 100% similarity]
InstallManager_java/src/res/images/btn_02_disable.png [moved from InstallManager_java/src/res/new_images/btn_02_disable.png with 100% similarity]
InstallManager_java/src/res/images/btn_02_hover.png [moved from InstallManager_java/src/res/new_images/btn_02_hover.png with 100% similarity]
InstallManager_java/src/res/images/btn_02_normal.png [moved from InstallManager_java/src/res/new_images/btn_02_normal.png with 100% similarity]
InstallManager_java/src/res/images/btn_02_pushed.png [moved from InstallManager_java/src/res/new_images/btn_02_pushed.png with 100% similarity]
InstallManager_java/src/res/images/btn_03_hover.png [moved from InstallManager_java/src/res/new_images/btn_03_hover.png with 100% similarity]
InstallManager_java/src/res/images/btn_03_normal.png [moved from InstallManager_java/src/res/new_images/btn_03_normal.png with 100% similarity]
InstallManager_java/src/res/images/btn_03_pushed.png [moved from InstallManager_java/src/res/new_images/btn_03_pushed.png with 100% similarity]
InstallManager_java/src/res/images/btn_advanced_hover.png [moved from InstallManager_java/src/res/new_images/btn_advanced_hover.png with 100% similarity]
InstallManager_java/src/res/images/btn_advanced_normal.png [moved from InstallManager_java/src/res/new_images/btn_advanced_normal.png with 100% similarity]
InstallManager_java/src/res/images/btn_proxy_hover.png [moved from InstallManager_java/src/res/new_images/btn_proxy_hover.png with 100% similarity]
InstallManager_java/src/res/images/btn_proxy_normal.png [moved from InstallManager_java/src/res/new_images/btn_proxy_normal.png with 100% similarity]
InstallManager_java/src/res/images/btn_welcome_page_install_hover.png [moved from InstallManager_java/src/res/new_images/btn_welcome_page_install_hover.png with 100% similarity]
InstallManager_java/src/res/images/btn_welcome_page_install_hover_background.png [moved from InstallManager_java/src/res/new_images/btn_welcome_page_install_hover_background.png with 100% similarity]
InstallManager_java/src/res/images/btn_welcome_page_install_icon.png [moved from InstallManager_java/src/res/new_images/btn_welcome_page_install_icon.png with 100% similarity]
InstallManager_java/src/res/images/btn_welcome_page_install_normal.png [moved from InstallManager_java/src/res/new_images/btn_welcome_page_install_normal.png with 100% similarity]
InstallManager_java/src/res/images/btn_welcome_page_install_normal_background.png [moved from InstallManager_java/src/res/new_images/btn_welcome_page_install_normal_background.png with 100% similarity]
InstallManager_java/src/res/images/btn_welcome_page_uninstall_disable.png [moved from InstallManager_java/src/res/new_images/btn_welcome_page_uninstall_disable.png with 100% similarity]
InstallManager_java/src/res/images/btn_welcome_page_uninstall_hover.png [moved from InstallManager_java/src/res/new_images/btn_welcome_page_uninstall_hover.png with 100% similarity]
InstallManager_java/src/res/images/btn_welcome_page_uninstall_hover_background.png [moved from InstallManager_java/src/res/new_images/btn_welcome_page_uninstall_hover_background.png with 100% similarity]
InstallManager_java/src/res/images/btn_welcome_page_uninstall_icon.png [moved from InstallManager_java/src/res/new_images/btn_welcome_page_uninstall_icon.png with 100% similarity]
InstallManager_java/src/res/images/btn_welcome_page_uninstall_icon_disable.png [moved from InstallManager_java/src/res/new_images/btn_welcome_page_uninstall_icon_disable.png with 100% similarity]
InstallManager_java/src/res/images/btn_welcome_page_uninstall_normal.png [moved from InstallManager_java/src/res/new_images/btn_welcome_page_uninstall_normal.png with 100% similarity]
InstallManager_java/src/res/images/btn_welcome_page_uninstall_normal_background.png [moved from InstallManager_java/src/res/new_images/btn_welcome_page_uninstall_normal_background.png with 100% similarity]
InstallManager_java/src/res/images/btn_welcome_page_update_hover.png [moved from InstallManager_java/src/res/new_images/btn_welcome_page_update_hover.png with 100% similarity]
InstallManager_java/src/res/images/btn_welcome_page_update_normal.png [moved from InstallManager_java/src/res/new_images/btn_welcome_page_update_normal.png with 100% similarity]
InstallManager_java/src/res/images/install_manager_graphicmotif_001.png [deleted file]
InstallManager_java/src/res/images/install_manager_graphicmotif_002.png [deleted file]
InstallManager_java/src/res/images/install_manager_graphicmotif_003.png [deleted file]
InstallManager_java/src/res/images/install_manager_graphicmotif_004.png [deleted file]
InstallManager_java/src/res/images/install_manager_graphicmotif_welcome.png [deleted file]
InstallManager_java/src/res/images/progress_center.png [moved from InstallManager_java/src/res/new_images/progress_center.png with 100% similarity]
InstallManager_java/src/res/images/progress_center_bg.png [moved from InstallManager_java/src/res/new_images/progress_center_bg.png with 100% similarity]
InstallManager_java/src/res/images/progress_start.png [moved from InstallManager_java/src/res/new_images/progress_start.png with 100% similarity]
InstallManager_java/src/res/images/uninstaller_graphicmotif_001.png [deleted file]
InstallManager_java/src/res/images/uninstaller_graphicmotif_002.png [deleted file]
InstallManager_java/src/res/images/uninstaller_graphicmotif_003.png [deleted file]

index f99b337..eb45444 100644 (file)
@@ -89,7 +89,6 @@ public class InstallManager {
        private File removeShortCutFile = null;\r
        private File tSudoFile = null;\r
 \r
-       private static String REMOVE_ALL_PACKAGES = "Remove all packages...";\r
        private static String REMOVE_ALL_SDK_FILES = "Remove all SDK files...";\r
 \r
        private Thread installThread = null;\r
index 1b966f9..04a22fb 100644 (file)
@@ -37,7 +37,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
-import java.util.Collections;
 
 import org.tizen.installmanager.core.Config;
 import org.tizen.installmanager.core.IMFatalException;
index f37d063..6c10334 100644 (file)
@@ -30,7 +30,6 @@ package org.tizen.installmanager.lib.mac;
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
index bdad5c3..6fd4b26 100644 (file)
@@ -834,6 +834,11 @@ public abstract class PackageManager {
         * @param pkgs installable packages.\r
         * @return\r
         */\r
+       public PackageSet getDependsPackagesFromRepository(Collection<String> pkgNames) {\r
+               PackageSet pkgs = getPackagesByNames(pkgNames);\r
+               return dep(pkgs, State.INSTALL);\r
+       }\r
+       \r
        public PackageSet getDependsPackagesFromRepository(PackageSet pkgs) {\r
                return dep(pkgs, State.INSTALL);\r
        }\r
index d81141b..eb3471c 100644 (file)
 
 package org.tizen.installmanager.pkg.model;
 
-import org.tizen.installmanager.core.IMFatalException;
 import org.tizen.installmanager.core.Options;
 import org.tizen.installmanager.lib.Log;
-import org.tizen.installmanager.lib.ErrorController.ErrorCode;
 
 
 /**
index 88cdf57..3c56d37 100644 (file)
@@ -56,10 +56,6 @@ import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.swt.widgets.Control;\r
 import org.eclipse.swt.widgets.Display;\r
-import org.eclipse.swt.widgets.Event;\r
-import org.eclipse.swt.widgets.Label;\r
-import org.eclipse.swt.widgets.Layout;\r
-import org.eclipse.swt.widgets.Listener;\r
 import org.eclipse.swt.widgets.Shell;\r
 import org.tizen.installmanager.cli.InstallManagerNoUI;\r
 import org.tizen.installmanager.core.Config;\r
@@ -78,16 +74,12 @@ import org.tizen.installmanager.lib.Registry;
 import org.tizen.installmanager.lib.exception.IMNetworkException;\r
 import org.tizen.installmanager.lib.mac.CocoaUtil;\r
 import org.tizen.installmanager.pkg.lib.PackageManager;\r
-import org.tizen.installmanager.pkg.model.ConfigFile;\r
 import org.tizen.installmanager.pkg.model.PackageSet;\r
-import org.tizen.installmanager.ui.dialog.AddExtraRepositoryDialog;\r
 import org.tizen.installmanager.ui.dialog.IndeterminateProgressDialog;\r
 import org.tizen.installmanager.ui.dialog.MessageBoxDlg;\r
 import org.tizen.installmanager.ui.dialog.MessageBoxDlg.DialogType;\r
-import org.tizen.installmanager.ui.dialog.ProxySettingsDialog;\r
 import org.tizen.installmanager.ui.model.Item;\r
 import org.tizen.installmanager.ui.page.CompletePage;\r
-import org.tizen.installmanager.ui.page.InstallPage;\r
 import org.tizen.installmanager.ui.page.InstallableListPage;\r
 import org.tizen.installmanager.ui.page.InstallingPage;\r
 import org.tizen.installmanager.ui.page.LicensePage;\r
@@ -110,7 +102,7 @@ import org.tizen.installmanager.pkg.model.Package;
 public class InstallManagerWindow extends ApplicationWindow {\r
        private static final RGB RGB_BACKGROUND = new RGB(242, 242, 242);\r
 \r
-       private static final Point POINT_MAIN_WINDOW = new Point(628, 478);\r
+       private static Point POINT_MAIN_WINDOW = null;\r
        private static Image IMAGE_WINDOW_ICON;\r
        private static Color COLOR_BACKGROUND;\r
 \r
@@ -134,6 +126,7 @@ public class InstallManagerWindow extends ApplicationWindow {
        public UpdatableListPage compositeUpdatableListPage;\r
 \r
        protected static ViewController controller;\r
+       private SelectionAdapter nextBtnSelectionAdapter = null;\r
        private SelectionAdapter cancelBtnSelectionAdapter = null;\r
        private SelectionAdapter closeBtnSelectionAdapter = null;\r
 \r
@@ -142,8 +135,8 @@ public class InstallManagerWindow extends ApplicationWindow {
         */\r
        public InstallManagerWindow() {\r
                super(null);\r
-               //setShellStyle(SWT.SHELL_TRIM);\r
-               setShellStyle(SWT.BORDER | SWT.TITLE | SWT.SHELL_TRIM);\r
+               setShellStyle(SWT.SHELL_TRIM);\r
+               setShellStyle(SWT.BORDER | SWT.TITLE);\r
        }\r
 \r
        /**\r
@@ -272,9 +265,6 @@ public class InstallManagerWindow extends ApplicationWindow {
                compositeSetInstallDirectoryPage = new SetInstallDirectoryPage(pageComposite, SWT.NONE);\r
                compositeUpdatableListPage = new UpdatableListPage(pageComposite, SWT.NONE);\r
 \r
-//             registLicensePageListener();\r
-//             registCompletePageListener();\r
-\r
                initWelcomePage();\r
                \r
                return container;\r
@@ -342,7 +332,8 @@ public class InstallManagerWindow extends ApplicationWindow {
        private void setButtonNext(Composite composite) {\r
                btnNext = new Button(composite, SWT.NONE);\r
                btnNext.setText("Next");\r
-               btnNext.addSelectionListener(new SelectionAdapter() {\r
+               nextBtnSelectionAdapter = new SelectionAdapter() {\r
+//             btnNext.addSelectionListener(new SelectionAdapter() {\r
                        @Override\r
                        public void widgetSelected(SelectionEvent e) {\r
                                if (sl_composite.topControl == compositeWelcomePage) {\r
@@ -456,7 +447,6 @@ public class InstallManagerWindow extends ApplicationWindow {
                                        }\r
                                } else if (sl_composite.topControl == compositeLicensePage) {\r
                                        List<Item> items = compositeInstallableListPage.getCustomTreeItems();\r
-                                       List<String> tmp = compositeInstallableListPage.getSelectedPackagesFromProfile();\r
                                        if (getSelectedPackageNames(items).size() <= 0) {\r
                                                return;\r
                                        }\r
@@ -464,7 +454,6 @@ public class InstallManagerWindow extends ApplicationWindow {
                                                showComposite(compositeSetInstallDirectoryPage);\r
                                                compositeSetInstallDirectoryPage.loadPage(\r
                                                                        controller, compositeInstallableListPage.getCheckedPackageSize(false));\r
-//                                             btnNext.setText("Install");\r
                                        } else {\r
                                                if (controller.existRemovablePackage()) { // update case\r
                                                        btnBack.setVisible(false);\r
@@ -566,7 +555,8 @@ public class InstallManagerWindow extends ApplicationWindow {
                                        }\r
                                }\r
                        }\r
-               });\r
+               };\r
+               btnNext.addSelectionListener(nextBtnSelectionAdapter);\r
                btnNext.setBounds(447, 10, 78, 29);\r
        }\r
        \r
@@ -579,12 +569,6 @@ public class InstallManagerWindow extends ApplicationWindow {
                                                || sl_composite.topControl == compositeUpdatableListPage) {\r
                                        compositeInstallableListPage.getCustomTreeItems().clear();\r
                                        showComposite(compositeWelcomePage);\r
-//                                     if (controller.existRemovablePackage()) {\r
-//                                             btnBack.setVisible(false);\r
-//                                             showComposite(compositeWelcomePage);\r
-//                                     } else {\r
-//                                             showComposite(compositeLicensePage);\r
-//                                     }\r
                                        btnNext.setVisible(false);\r
                                        btnBack.setVisible(false);\r
                                } else if (sl_composite.topControl == compositeLicensePage) {\r
@@ -621,42 +605,31 @@ public class InstallManagerWindow extends ApplicationWindow {
        private void initWelcomePage() {\r
                compositeWelcomePage.setViewController(controller);\r
                \r
-//             if (ErrorController.checkInstallationSuccess()) {\r
-//                     compositeWelcomePage.setTitle(WelcomePage.STRING_TITLE);\r
-//                     compositeWelcomePage.setSubTitleBounds(20, 190, 600, 40);\r
-//                     compositeWelcomePage.setSubTitle(WelcomePage.STRING_SUBTITLE1);\r
-//                     \r
-//                     compositeWelcomePage.setVisibleRadioButton(true);\r
-//                     btnNext.setEnabled(true);\r
+               if (ErrorController.checkInstallationSuccess()) {\r
                        btnNext.setVisible(false);\r
                        btnClose.setText("Cancel");\r
                        \r
                        btnClose.removeSelectionListener(closeBtnSelectionAdapter);\r
                        btnClose.removeSelectionListener(cancelBtnSelectionAdapter);\r
                        btnClose.addSelectionListener(cancelBtnSelectionAdapter);\r
-                       \r
+                       btnNext.addSelectionListener(nextBtnSelectionAdapter);\r
+\r
+                       compositeWelcomePage.setWelcomeNormalMsg();\r
                        compositeWelcomePage.setButtonStatus();\r
-//             } else {\r
-//                     compositeWelcomePage.setVisibleRadioButton(false);\r
-//                     btnNext.setVisible(false);\r
-//                     \r
-//                     compositeWelcomePage.setTitle("Cannot start Tizen SDK Install Manager.");\r
-//                     \r
-//                     String errMsg = ErrorController.getErrorMessage();\r
-//                     String repository = Config.getInstance().getConfigFile().getRepository();\r
-//                     \r
-//                     if (repository != null && !repository.isEmpty()) {\r
-//                             errMsg = errMsg + "\n(" + repository + ")";\r
-//                     }\r
-//                     compositeWelcomePage.setSubTitleBounds(20, 190, 600, 100);\r
-//                     compositeWelcomePage.setErrorSubTitle(errMsg);\r
-//\r
-//                     btnClose.setText("Close");\r
-//                     \r
-//                     btnClose.removeSelectionListener(closeBtnSelectionAdapter);\r
-//                     btnClose.removeSelectionListener(cancelBtnSelectionAdapter);\r
-//                     btnClose.addSelectionListener(closeBtnSelectionAdapter);\r
-//             }\r
+               } else {\r
+                       btnNext.setVisible(false);\r
+                       String errMsg = ErrorController.getErrorMessage();\r
+                       String repository = Config.getInstance().getConfigFile().getRepository();\r
+                       if (repository != null && !repository.isEmpty()) {\r
+                               errMsg = errMsg + "\n(" + repository + ")";\r
+                       }\r
+\r
+                       btnClose.removeSelectionListener(closeBtnSelectionAdapter);\r
+                       btnClose.removeSelectionListener(cancelBtnSelectionAdapter);\r
+                       btnClose.addSelectionListener(closeBtnSelectionAdapter);\r
+                       btnNext.removeSelectionListener(nextBtnSelectionAdapter);\r
+                       compositeWelcomePage.setWelcomeErrorMsg("Initializing error", errMsg);\r
+               }\r
                btnNext.setFocus();\r
                sl_composite.topControl = compositeWelcomePage;\r
        }\r
@@ -1004,6 +977,11 @@ public class InstallManagerWindow extends ApplicationWindow {
         */\r
        @Override\r
        protected Point getInitialSize() {\r
+               if (Platform.isWindows()) {\r
+                       POINT_MAIN_WINDOW = new Point(644, 499);\r
+               } else {\r
+                       POINT_MAIN_WINDOW = new Point(628, 478);\r
+               }\r
                return POINT_MAIN_WINDOW;\r
        }\r
 \r
@@ -1019,28 +997,6 @@ public class InstallManagerWindow extends ApplicationWindow {
                }\r
                composite.getParent().layout();\r
        }\r
-\r
-//     private void registLicensePageListener() {\r
-//             compositeLicensePage.getAcceptButton()\r
-//                                                     .addSelectionListener(new SelectionAdapter() {\r
-//\r
-//                                                             @Override\r
-//                                                             public void widgetSelected(SelectionEvent e) {\r
-//                                                                     btnNext.setEnabled(compositeLicensePage.getAcceptButton()\r
-//                                                                                                                                                     .getSelection());\r
-//                                                             }\r
-//                                                     });\r
-//     }\r
-\r
-       private void registCompletePageListener() {\r
-               compositeCompletePage.addPaintListener(new PaintListener() {\r
-\r
-                       @Override\r
-                       public void paintControl(PaintEvent arg0) {\r
-                               btnClose.setText("Close");\r
-                       }\r
-               });\r
-       }\r
        \r
        public void setNameOfCancelButton(String name) {\r
                btnClose.setText("Close");\r
index 8391e49..ba7c73c 100644 (file)
@@ -32,8 +32,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.zip.ZipEntry;
-import java.util.zip.ZipException;
-import java.util.zip.ZipFile;
 import java.util.zip.ZipInputStream;
 
 import org.eclipse.jface.dialogs.Dialog;
index 62da759..67f109d 100644 (file)
@@ -231,6 +231,13 @@ public class Item implements Comparable<Item> {
        }\r
        \r
        /**\r
+        * add child item on current item.\r
+        */\r
+       public void addChildItems(List<Item> items) {\r
+               this.children.addAll(items);\r
+       }\r
+       \r
+       /**\r
         * Clear children items on current item.\r
         */\r
        public void clearChildrenItems() {\r
index f54a4aa..c585321 100644 (file)
@@ -45,6 +45,14 @@ import org.tizen.installmanager.ui.model.Item.InstallState;
  * @author Taeyoung Son <taeyoung2.son@samsung.com>
  */
 public class ItemLabelProvider extends ColumnLabelProvider {
+       int type = 0; // 0 is Install, 1 is update, 2 is uninstall.
+       private final int INSTALL = 0;
+       private final int UPDATE = 1;
+       private final int UNINSTALL = 2;
+       
+       public ItemLabelProvider(int processingType) {
+               type = processingType;
+       }
 
        @Override
        public void addListener(ILabelProviderListener listener) {
@@ -86,29 +94,46 @@ public class ItemLabelProvider extends ColumnLabelProvider {
                int columnIndex = cell.getColumnIndex();
                Object element = cell.getElement();
                String result = null;
-               switch (columnIndex) {
-               case 0:
-                       if (element instanceof Item) {
-                               result = ((Item) element).getDisplayName();
-                       }
-                       break;
-               case 1:
-                       if (element instanceof Item) {                          
-                               result = ((Item) element).getInstallStateMessage();
+               if (type == INSTALL) {
+                       switch (columnIndex) {
+                       case 0:
+                               if (element instanceof Item) {
+                                       result = ((Item) element).getDisplayName();
+                               }
+                               break;
+                       case 1:
+                               if (element instanceof Item) {                          
+                                       result = displaySize(element);
+                               }
+                               break;
+                       default:
+                               break;
                        }
-                       break;
-               case 2:
-                       if (element instanceof Item) {
-                               result = displaySize(element);
-                       }
-                       break;
-               case 3:
-                       if (element instanceof Item) {
-                               result = ((Item) element).getInstalledVersion();
+               } else {
+                       switch (columnIndex) {
+                       case 0:
+                               if (element instanceof Item) {
+                                       result = ((Item) element).getDisplayName();
+                               }
+                               break;
+                       case 1:
+                               if (element instanceof Item) {                          
+                                       result = ((Item) element).getInstallStateMessage();
+                               }
+                               break;
+                       case 2:
+                               if (element instanceof Item) {
+                                       result = displaySize(element);
+                               }
+                               break;
+                       case 3:
+                               if (element instanceof Item) {
+                                       result = ((Item) element).getInstalledVersion();
+                               }
+                               break;
+                       default:
+                               break;
                        }
-                       break;
-               default:
-                       break;
                }
 
                if (result != null) {
index 03343d8..21cef77 100644 (file)
@@ -33,10 +33,8 @@ import java.io.File;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
@@ -46,7 +44,6 @@ import org.tizen.installmanager.lib.Platform;
 import org.tizen.installmanager.ui.InstallManagerWindow;
 import org.tizen.installmanager.ui.dialog.MessageBoxDlg;
 import org.tizen.installmanager.ui.dialog.MessageBoxDlg.DialogType;
-import org.tizen.installmanager.ui.page.InstallPage.CIRCULAR_TYPE;
 import org.tizen.installmanager.util.PathUtil;
 
 /**
@@ -54,9 +51,7 @@ import org.tizen.installmanager.util.PathUtil;
  * @author Taeyoung Son <taeyoung2.son@samsung.com>
  */
 public class CompletePage extends InstallPage {
-//     public static final String RSC_PATH_INSTALL_IMAGE = RESOURCE_PATH + "/install_manager_graphicmotif_004.png";
-//     public static final String RSC_PATH_UNINSTALL_IMAGE = RESOURCE_PATH + "/uninstaller_graphicmotif_003.png";
-       public static final String RSC_PATH_IMAGE_NEW = RESOURCE_PATH_NEW + "/08_complete_installation_bg.png";
+       public static final String RSC_PATH_IMAGE = RESOURCE_PATH + "/08_complete_installation_bg.png";
        public static final String STRING_TITLE = "Completed installation.";
        private Label completeMessageLabel;
        private Label informationLabel;
@@ -72,7 +67,7 @@ public class CompletePage extends InstallPage {
         */
        public CompletePage(Composite parent, int style) {
                super(parent, style, true);
-               setLeftImageFromResource(RSC_PATH_IMAGE_NEW);
+               setLeftImageFromResource(RSC_PATH_IMAGE);
                
                disableTitleBounds();
                disableSubtitleBounds();
index 98e89e6..7a63727 100644 (file)
@@ -16,10 +16,10 @@ import org.tizen.installmanager.ui.lib.IMCircularGraph;
 import org.tizen.installmanager.util.PathUtil;
 
 public class InstallPage extends PageTemplate {
-       static final String RSC_PATH_IMAGE_NEW = RESOURCE_PATH_NEW + "/05_ready_to_install_bg.png";
-       static final String RSC_PROGRESS_IMAGE_START = RESOURCE_PATH_NEW + "/progress_start.png";
-       static final String RSC_PROGRESS_IMAGE_CENTER = RESOURCE_PATH_NEW + "/progress_center.png";
-       static final String RSC_PROGRESS_IMAGE_BACKGROUND = RESOURCE_PATH_NEW + "/progress_center_bg.png";
+       static final String RSC_PATH_IMAGE_NEW = RESOURCE_PATH + "/05_ready_to_install_bg.png";
+       static final String RSC_PROGRESS_IMAGE_START = RESOURCE_PATH + "/progress_start.png";
+       static final String RSC_PROGRESS_IMAGE_CENTER = RESOURCE_PATH + "/progress_center.png";
+       static final String RSC_PROGRESS_IMAGE_BACKGROUND = RESOURCE_PATH + "/progress_center_bg.png";
        static final Color PROGRESS_CIRCLE_BACKGROUND_COLOR = new Color(null, new RGB(189, 189, 189)); // light gray
        static final Color PROGRESS_CIRCLE_COLOR = new Color(null, new RGB(131, 196, 218)); // light blue
        static final Color PROGRESS_CIRCLE_CENTER_COLOR = new Color(null, new RGB(255, 255, 255)); // white
index b278058..15dff5e 100644 (file)
 \r
 package org.tizen.installmanager.ui.page;\r
 \r
-import java.util.ArrayList;\r
-import java.util.Collection;\r
-\r
 import org.eclipse.jface.viewers.CheckboxTreeViewer;\r
 import org.eclipse.swt.SWT;\r
 import org.eclipse.swt.events.SelectionAdapter;\r
 import org.eclipse.swt.events.SelectionEvent;\r
-import org.eclipse.swt.graphics.Color;\r
-import org.eclipse.swt.graphics.RGB;\r
 import org.eclipse.swt.widgets.Button;\r
 import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.swt.widgets.Label;\r
 import org.tizen.installmanager.core.Config;\r
 import org.tizen.installmanager.core.IMFatalException;\r
-import org.tizen.installmanager.core.InstallManager;\r
 import org.tizen.installmanager.lib.ErrorController;\r
 import org.tizen.installmanager.lib.IMError;\r
 import org.tizen.installmanager.lib.Log;\r
 import org.tizen.installmanager.ui.InstallManagerWindow;\r
 import org.tizen.installmanager.ui.dialog.AddExtraRepositoryDialog;\r
-import org.tizen.installmanager.ui.model.Item;\r
+import org.tizen.installmanager.ui.page.PackageListPage.InstallType;\r
 import org.tizen.installmanager.util.PathUtil;\r
-import org.tizen.installmanager.pkg.lib.PackageManager;\r
-import org.tizen.installmanager.pkg.model.Package;\r
 \r
 /**\r
  * This class displays installable package list on page.\r
@@ -59,8 +50,8 @@ import org.tizen.installmanager.pkg.model.Package;
  * @author Yongsung Kim <yongsung1.kim@samsung.com>\r
  */\r
 public class InstallableListPage extends PackageListPage {\r
-       private static final String RSC_PATH_IMAGE_NEW = RESOURCE_PATH_NEW + "/02_installation_option_bg.png";\r
-       private static final String RSC_PATH_BUTTON_NORMAL = RESOURCE_PATH_NEW + "/btn_01_normal.png";\r
+       private static final String RSC_PATH_IMAGE_NEW = RESOURCE_PATH + "/02_installation_option_bg.png";\r
+       private static final String RSC_PATH_BUTTON_NORMAL = RESOURCE_PATH + "/btn_01_normal.png";\r
        \r
        private static final String STRING_TITLE = "Select installation type";\r
        \r
@@ -92,11 +83,8 @@ public class InstallableListPage extends PackageListPage {
                setTitleLabelText(STRING_TITLE);\r
                \r
                buttonComposite = new Composite(getCustomComposite(), SWT.NONE);\r
-//             buttonComposite.setSize(10, 60);\r
-//             buttonComposite.setLocation(160, 27);\r
                buttonComposite.setBounds(10, 31, 134, 268);\r
                buttonComposite.setBackground(InstallManagerWindow.getBackgroundColor());\r
-//             buttonComposite.setBackground(new Color(null, new RGB(159, 201, 60)));\r
                \r
                setButtons();\r
        }\r
@@ -151,7 +139,6 @@ public class InstallableListPage extends PackageListPage {
                        public void widgetSelected(SelectionEvent e) {\r
                                changeTableVisibleStatus(InstallType.CUSTOM);\r
                                addExtraButton.setVisible(true);\r
-//                             checkboxTreeViewer.getTree().setEnabled(true);\r
                        }\r
                });\r
        }\r
@@ -178,65 +165,6 @@ public class InstallableListPage extends PackageListPage {
                \r
                addExtraButton.setVisible(false);\r
        }\r
-       \r
-       /**\r
-        * When a install type is changed, components size and tree checked status are should be changed.\r
-        * @param installType\r
-        */\r
-//     private void refreshByType(String profile) {\r
-//             setCheckedByProfile(profile);\r
-//\r
-//             checkboxTreeViewer.getTree().setEnabled(false);\r
-//             checkboxTreeViewer.refresh();\r
-//             \r
-//             lblRequiredSize.setText("Download size : "\r
-//                             + convertToVolumeSize(getCheckedPackageSize(false)));\r
-//             lblUncompressedSize.setText("Install size : "\r
-//                             + convertToVolumeSize(getCheckedPackageSize(true)));\r
-//             setNextBtnEnabledAboutCheckedPackageCount();\r
-//     }\r
-\r
-       /**\r
-        * Check tree item by each install type.\r
-        */\r
-//     private void setCheckedByProfile(String profile) {\r
-//             if (profile == null || profile.isEmpty()) {\r
-//                     Log.err("Install type is empty. check install type or package server is old.");\r
-//             }\r
-//\r
-//             Package pkg = InstallManager.getInstance().getPackageManager().getPackageByName(profile);\r
-//\r
-//             if (pkg == null) {\r
-//                     Log.err(profile + " do not exist in package list.");\r
-//                     return;\r
-//             }\r
-//\r
-//             Collection<Item> checkedItems = new ArrayList<Item>();\r
-//\r
-//             for (String pkgName : pkg.getDependentPackageNames()) {\r
-//                     Item item = findItem(pkgName, customTreeItems);\r
-//\r
-//                     if (item != null) {\r
-//                             checkedItems.add(item);\r
-//                     }\r
-//             }\r
-//\r
-//             setCheckedItem(checkedItems);\r
-//     }\r
-\r
-//     private void setCheckedItem(Collection<Item> itemList) {\r
-//             checkboxTreeViewer.setCheckedElements(itemList.toArray());\r
-//\r
-//             // refresh tree item. All of items are unchecked.\r
-//             setAllChecked(false);\r
-//\r
-//             // check selected item.\r
-//             for (Item item : itemList) {\r
-//                     setCheckbox(item, true);\r
-//             }\r
-//     }\r
-       \r
-\r
 \r
        /**\r
         * Initialize minimal selection when installable page is re-loaded.\r
@@ -255,8 +183,8 @@ public class InstallableListPage extends PackageListPage {
                if (extra) {\r
                        changeTableVisibleStatus(InstallType.CUSTOM);\r
                } else {\r
-                       tree.setVisible(false);\r
-                       mDescriptionText.setVisible(false);\r
+                       changeTableVisibleStatus(InstallType.TYPICAL);\r
+                       addExtraButton.setVisible(false);\r
                }\r
                \r
                // back to next on component selection page case.\r
@@ -288,61 +216,17 @@ public class InstallableListPage extends PackageListPage {
                        return false;\r
                }\r
                \r
-               refreshByType(defaultSelectionProfile.getPackageName());\r
-\r
-//             initDescriptionToInstallType();\r
-\r
-               return true;\r
-       }\r
-       \r
-       private void initDescriptionToInstallType() {\r
-               PackageManager pm = PackageManager.getInstance();\r
-               \r
-               //set typical description\r
-               String typicalExplain = "";\r
-               Package typicalPackage = pm.getPackageByName(TYPICAL_PACKAGE_NAME);\r
-               if (typicalPackage != null) {\r
-                       typicalExplain = typicalPackage.getDescription();\r
-               }\r
+               setProfileList(InstallType.TYPICAL.name());\r
+               setProfileButton(getCustomComposite(), InstallType.TYPICAL.name());\r
                \r
-               //set minimal description               \r
-               String minimalExplain = "";\r
-               Package minimalPackage = pm.getPackageByName(MINIMAL_PACKAGE_NAME);\r
-               if (minimalPackage != null) {\r
-                       minimalExplain = minimalPackage.getDescription();\r
+               if (getSelectedProfile() == null) { // The first displaying component selection page.\r
+                       refreshByType(defaultSelectionProfile.getPackageName());\r
+               } else {\r
+                       refreshByType(getSelectedProfile().getPackageName());                   \r
                }\r
-               \r
-               String description = viewController.getDescription(TYPICAL_PACKAGE_NAME);\r
-//             setComponentDescriptionText(description);\r
-       }\r
 \r
-       /**\r
-        * Find item which should be checked in component tree.\r
-        * \r
-        * @param name\r
-        *            the name of item which should be checked.\r
-        * @param itemList\r
-        * @return item which should be checked in component tree.\r
-        */\r
-//     private Item findItem(String name, Collection<Item> itemList) {\r
-//             Item retItem = null;\r
-//             for (Item item : itemList) {\r
-//                     if (name.equalsIgnoreCase(item.getPackageName())) {\r
-//                             return item;\r
-//                     } else {\r
-//                             Collection<Item> childItemList = item.getChildren();\r
-//\r
-//                             if (childItemList.size() > 0) {\r
-//                                     retItem = findItem(name, childItemList);\r
-//\r
-//                                     if (retItem != null) {\r
-//                                             break;\r
-//                                     }\r
-//                             }\r
-//                     }\r
-//             }\r
-//             return retItem;\r
-//     }\r
+               return true;\r
+       }\r
        \r
        public CheckboxTreeViewer getCheckboxTreeViewer() {\r
                return checkboxTreeViewer;\r
index eeb9fb7..2ba58e0 100644 (file)
@@ -35,11 +35,9 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;\r
 import org.eclipse.swt.events.SelectionEvent;\r
 import org.eclipse.swt.graphics.Color;\r
-import org.eclipse.swt.graphics.RGB;\r
 import org.eclipse.swt.widgets.Button;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.swt.widgets.Display;\r
-import org.eclipse.swt.widgets.Event;\r
 import org.eclipse.swt.widgets.Label;\r
 import org.eclipse.swt.widgets.Text;\r
 import org.tizen.installmanager.core.Config;\r
@@ -65,6 +63,7 @@ import org.tizen.installmanager.ui.lib.IMCircularGraph;
  */\r
 public class InstallingPage extends InstallPage {\r
        static final String STRING_TITLE = "Installing...";\r
+       public static final String RSC_PATH_IMAGE_ERROR = RESOURCE_PATH + "/07_error_bg.png";\r
 \r
        static final double KB_SIZE = 1;\r
        static final double MB_SIZE = KB_SIZE * 1024;\r
@@ -123,28 +122,24 @@ public class InstallingPage extends InstallPage {
        private void setDownloadCurrentSizeLabel() {\r
                downloadCurrentSizeLabel = new Label(customComposite, SWT.NONE);\r
                downloadCurrentSizeLabel.setAlignment(SWT.RIGHT);\r
-               downloadCurrentSizeLabel.setBounds(100, 133, 90, 20);\r
+               downloadCurrentSizeLabel.setBounds(90, 133, 90, 20);\r
                downloadCurrentSizeLabel.setBackground(InstallManagerWindow.getBackgroundColor());\r
-//             downloadCurrentSizeLabel.setBackground(new Color(null, new RGB(34, 76, 48)));\r
        }\r
        \r
        private void setDownloadTotalSizeLabel() {\r
                downloadTotalSizeLabel = new Label(customComposite, SWT.NONE);\r
                downloadTotalSizeLabel.setAlignment(SWT.LEFT);\r
-               downloadTotalSizeLabel.setBounds(190, 133, 60, 20);\r
+               downloadTotalSizeLabel.setBounds(180, 133, 70, 20);\r
                downloadTotalSizeLabel.setBackground(InstallManagerWindow.getBackgroundColor());\r
-//             downloadTotalSizeLabel.setBackground(new Color(null, new RGB(67, 32, 48)));\r
                downloadTotalSizeLabel.setForeground(PROGRESS_CIRCLE_BACKGROUND_COLOR);\r
        }\r
        \r
        private void setDownloadSpeedLabel() {\r
                downloadSpeedLabel = new Label(customComposite, SWT.NONE);\r
-               downloadSpeedLabel.setAlignment(SWT.LEFT);\r
+               downloadSpeedLabel.setAlignment(SWT.CENTER);\r
                downloadSpeedLabel.setBounds(250, 133, 80, 20);\r
                downloadSpeedLabel.setBackground(InstallManagerWindow.getBackgroundColor());\r
-//             downloadSpeedLabel.setBackground(new Color(null, new RGB(34, 76, 48)));\r
                downloadSpeedLabel.setForeground(PROGRESS_CIRCLE_BACKGROUND_COLOR);\r
-//             downloadSpeedLabel.setText("Download speed");\r
        }\r
        \r
        private void setRemainingTimeTitleLabel() {\r
@@ -152,7 +147,6 @@ public class InstallingPage extends InstallPage {
                remainingTimeTitleLabel.setAlignment(SWT.RIGHT);\r
                remainingTimeTitleLabel.setBounds(330, 133, 120, 20);\r
                remainingTimeTitleLabel.setBackground(InstallManagerWindow.getBackgroundColor());\r
-//             remainingTimeTitleLabel.setBackground(new Color(null, new RGB(17, 136, 128)));\r
                remainingTimeTitleLabel.setText("Remaining time");\r
        }\r
        \r
@@ -161,7 +155,6 @@ public class InstallingPage extends InstallPage {
                remainingTimeLabel.setAlignment(SWT.RIGHT);\r
                remainingTimeLabel.setBounds(450, 133, 100, 20);\r
                remainingTimeLabel.setBackground(InstallManagerWindow.getBackgroundColor());\r
-//             remainingTimeLabel.setBackground(new Color(null, new RGB(97, 16, 128)));\r
                remainingTimeLabel.setForeground(PROGRESS_CIRCLE_BACKGROUND_COLOR);\r
                remainingTimeLabel.setText("time estimating...");\r
        }\r
@@ -492,6 +485,7 @@ public class InstallingPage extends InstallPage {
                                                Log.log("(un)installation failed");\r
                                                completePage.setTitleLabelText("(Un)Installation failed");\r
                                                completePage.setCustomErrorMessage(ErrorController.getErrorMessage() + "\n");\r
+                                               completePage.setLeftImageFromResource(RSC_PATH_IMAGE_ERROR);\r
                                                mainWindow.getCompletePage().showCheckButton(false);\r
                                        }\r
 \r
index 40084c5..5fc1fbf 100644 (file)
@@ -46,7 +46,7 @@ import org.tizen.installmanager.util.PathUtil;
  * \r
  */\r
 public class LicensePage extends PageTemplate {\r
-       private static final String RSC_PATH_IMAGE_NEW = RESOURCE_PATH_NEW\r
+       private static final String RSC_PATH_IMAGE = RESOURCE_PATH\r
                        + "/03_software_license_agreement_bg.png";\r
 \r
        private StyledText txtLicense;\r
@@ -65,7 +65,7 @@ public class LicensePage extends PageTemplate {
        public LicensePage(Composite parent, int style) {\r
                super(parent, style, true);\r
 \r
-               setLeftImageFromResource(RSC_PATH_IMAGE_NEW);\r
+               setLeftImageFromResource(RSC_PATH_IMAGE);\r
                disableTitleBounds();\r
                disableSubtitleBounds();\r
 \r
index d12fe14..afd2699 100644 (file)
@@ -32,6 +32,8 @@ import java.text.DecimalFormat;
 import java.util.ArrayList;\r
 import java.util.Collection;\r
 import java.util.Collections;\r
+import java.util.HashMap;\r
+import java.util.HashSet;\r
 import java.util.List;\r
 import java.util.Set;\r
 \r
@@ -79,6 +81,8 @@ import org.tizen.installmanager.ui.model.ItemTreeContentProvider;
 import org.tizen.installmanager.ui.model.Item.CheckState;\r
 import org.tizen.installmanager.ui.model.Item.InstallState;\r
 \r
+import sun.net.www.protocol.http.AuthCacheValue.Type;\r
+\r
 /**\r
  * Display install or uninstall package lists via tree view.\r
  * \r
@@ -95,16 +99,15 @@ public abstract class PackageListPage extends PageTemplate {
        protected List<Item> profileItems;\r
        protected List<Item> devModuleItems;\r
        \r
-       \r
        protected Label lblDescriptions;\r
        CheckboxTreeViewer checkboxTreeViewer;\r
 \r
        protected Label profileLabel;\r
-//     protected Table profileTable;\r
-//     protected Label devModuleLabel;\r
-//     protected Table devModuleTable;\r
-//     protected Label presetLabel;\r
-//     protected Table presetTable;\r
+       protected Table profileTable;\r
+       protected Label devModuleLabel;\r
+       protected Table devModuleTable;\r
+       protected Label presetLabel;\r
+       protected Table presetTable;\r
 \r
        private Composite profileComposite;\r
        protected Button profileButton;\r
@@ -112,8 +115,10 @@ public abstract class PackageListPage extends PageTemplate {
 \r
        ViewController viewController = InstallManagerWindow.getInstallManagerWindow().getViewController();;\r
        \r
+       private ArrayList<String> profileList = null;\r
        private ArrayList<String> profileLabelList = null;\r
        protected Package defaultSelectionProfile = null;\r
+       private HashMap<Package, String> profileSet = new HashMap<Package, String>();\r
 \r
        // Web, Native minimal packages name.\r
        protected static final String TYPICAL_PACKAGE_NAME = "TYPICAL";\r
@@ -128,12 +133,12 @@ public abstract class PackageListPage extends PageTemplate {
                TYPICAL, CUSTOM\r
        }\r
        \r
-//     protected enum InstallTypeStatus {\r
-//             TYPICAL, MINIMAL, CUSTOM\r
-//     }\r
+       protected enum InstallTypeStatus {\r
+               TYPICAL, MINIMAL, CUSTOM\r
+       }\r
        \r
-//     protected InstallTypeStatus installTypeStatus = null;\r
-//     private ArrayList<String> currentProfile= new ArrayList<String>();\r
+       protected InstallTypeStatus installTypeStatus = null;\r
+       private ArrayList<String> currentProfile= new ArrayList<String>();\r
        \r
        /**\r
         * Set environments for packagelist page, such as style, adding listener.\r
@@ -144,22 +149,16 @@ public abstract class PackageListPage extends PageTemplate {
        public PackageListPage(Composite parent, int style, final Type type) {\r
                super(parent, style, true);\r
 \r
+               profileList = new ArrayList<String>();\r
                profileLabelList = new ArrayList<String>();\r
                customTreeItems = new ArrayList<Item>();\r
                \r
-               setProfileList(InstallType.TYPICAL.name());\r
                setTitleLabel(getCustomComposite());\r
                setDescriptionText(getCustomComposite());\r
                setProfileLabel(getCustomComposite());\r
                setProfileButton(getCustomComposite(), InstallType.TYPICAL.name());\r
                \r
-//             setProfileTable(getCustomComposite());\r
-//             setDevModuleLabel(getCustomComposite());\r
-//             setDevModuleTable(getCustomComposite());\r
-//             setPresetLabel(getCustomComposite());\r
-//             setPresetTable(getCustomComposite());\r
-               \r
-               setTree(getCustomComposite());\r
+               setTree(getCustomComposite(), type);\r
                setCheckboxTreeViewer(type);\r
        }\r
        \r
@@ -187,7 +186,7 @@ public abstract class PackageListPage extends PageTemplate {
                profileLabel.setBackground(InstallManagerWindow.getBackgroundColor());\r
        }\r
        \r
-       private void setProfileButton(Composite composite, String installType) {\r
+       protected void setProfileButton(Composite composite, String installType) {\r
                // contain default license\r
                int height = 25;\r
                int width = 250;\r
@@ -202,15 +201,14 @@ public abstract class PackageListPage extends PageTemplate {
                profileComposite.setBounds(150, defaultHeight, 468, 280);\r
                profileComposite.setBackground(InstallManagerWindow.getBackgroundColor());\r
                \r
-               PackageSet profilePkgs = viewController.getProfileMetaPackages();\r
-               \r
                // add license of items\r
                int yCoordinate = 0;\r
-//             for (Package profile : profilePkgs) {\r
-               for (String profileName : profileLabelList) {\r
-                       Button profileButton = new Button(profileComposite, SWT.RADIO);\r
+               for (String profileName : profileList) {\r
+                       profileButton = new Button(profileComposite, SWT.RADIO);                                \r
                        profileButton.setBounds(0, yCoordinate, width, height);\r
-                       profileButton.setText(profileName);\r
+                       Package profile = InstallManager.getInstance().getPackageManager().getPackageByName(profileName);\r
+                       String label = profileSet.get(profile);\r
+                       profileButton.setText(label);\r
                        profileButton.setBackground(InstallManagerWindow.getBackgroundColor());\r
 \r
                        if (profileName.equalsIgnoreCase(defaultSelectionProfile.getPackageName())) {\r
@@ -221,24 +219,41 @@ public abstract class PackageListPage extends PageTemplate {
                                @Override\r
                                public void widgetSelected(SelectionEvent e) {\r
                                        Button button = (Button) e.widget;\r
-                                       setSelectedProfile(button.getText());\r
-                                       refreshByType(button.getText());\r
+                                       for (Package pkg : profileSet.keySet()) {\r
+                                               if (pkg.getLabel().equalsIgnoreCase(button.getText())) {\r
+                                                       refreshByType(pkg.getPackageName());\r
+                                                       setSelectedProfile(pkg);\r
+                                               }\r
+                                       }\r
                                }\r
                        });\r
 \r
                        yCoordinate = yCoordinate + height + defaultGap;\r
                }\r
        }\r
-       \r
-       private void setSelectedProfile(String profile) {\r
-               PackageSet profilePkgs = viewController.getProfileMetaPackages();\r
-               for (Package pkg : profilePkgs) {\r
-                       if (pkg.getPackageName().equalsIgnoreCase(profile)) {\r
-                               selectedProfile = pkg;          \r
+\r
+       protected void setProfileList(String pkgName) {\r
+               for (Package pkg : viewController.getInstallTypeMetaPackages()) {\r
+                       if (pkgName.equalsIgnoreCase(pkg.getPackageName())) {\r
+                               PackageSet pkgs = InstallManager.getInstance().getPackageManager()\r
+                                               .getPackagesByNames(pkg.getDependentPackageNames());\r
+                               for (Package profilePkg : pkgs) {\r
+                                       profileSet.put(profilePkg, profilePkg.getLabel());\r
+                               }\r
+                               profileList.clear();\r
+                               profileList.addAll(pkg.getDependentPackageNames());\r
+                               for (String defaultPkg : pkg.getDefaultDependentPackageNames()) {\r
+                                       defaultSelectionProfile = InstallManager.getInstance()\r
+                                                       .getPackageManager().getPackageByName(defaultPkg);\r
+                               }\r
                        }\r
                }\r
        }\r
        \r
+       private void setSelectedProfile(Package profile) {\r
+               selectedProfile = profile;\r
+       }\r
+       \r
        public Package getSelectedProfile() {\r
                return selectedProfile;\r
        }\r
@@ -248,18 +263,7 @@ public abstract class PackageListPage extends PageTemplate {
                return null;\r
        }\r
        \r
-       private void setProfileList(String pkgName) {\r
-               for (Package pkg : viewController.getInstallTypeMetaPackages()) {\r
-                       if (pkgName.equalsIgnoreCase(pkg.getPackageName())) {\r
-                               profileLabelList.addAll(pkg.getDependentPackageNames());\r
-                               for (String defaultPkg : pkg.getDefaultDependentPackageNames()) {\r
-                                       defaultSelectionProfile = InstallManager.getInstance().getPackageManager().getPackageByName(defaultPkg);\r
-                               }\r
-                       }\r
-               }\r
-       }\r
-       \r
-       private void setTree(Composite composite) {\r
+       private void setTree(Composite composite, Type installType) {\r
                checkboxTreeViewer = new CheckboxTreeViewer(customComposite, SWT.BORDER | SWT.H_SCROLL | SWT.LEFT);\r
                tree = checkboxTreeViewer.getTree();\r
                tree.setBounds(150, 31, 468, 213);\r
@@ -295,17 +299,23 @@ public abstract class PackageListPage extends PageTemplate {
                                }\r
                        }\r
                });\r
-               \r
-               TreeColumn trclmnA = new TreeColumn(tree, SWT.LEFT);\r
-               trclmnA.setWidth(240);\r
-               trclmnA.setText("Name");\r
 \r
-               TreeColumn trclmnB = new TreeColumn(tree, SWT.CENTER);\r
-               trclmnB.setWidth(110);\r
-               trclmnB.setText("Status");\r
+               if (installType != Type.INSTALL) {\r
+                       TreeColumn trclmnA = new TreeColumn(tree, SWT.LEFT);\r
+                       trclmnA.setWidth(270);\r
+                       trclmnA.setText("Name");\r
+\r
+                       TreeColumn trclmnB = new TreeColumn(tree, SWT.CENTER);\r
+                       trclmnB.setWidth(110);\r
+                       trclmnB.setText("Status");\r
+               } else {\r
+                       TreeColumn trclmnA = new TreeColumn(tree, SWT.LEFT);\r
+                       trclmnA.setWidth(350);\r
+                       trclmnA.setText("Name");\r
+               }\r
                \r
                TreeColumn trclmnC = new TreeColumn(tree, SWT.CENTER);\r
-               trclmnC.setWidth(70);\r
+               trclmnC.setWidth(40);\r
                trclmnC.setText("Install size");\r
        }\r
        \r
@@ -317,7 +327,15 @@ public abstract class PackageListPage extends PageTemplate {
                setSizeLabel(getCustomComposite());\r
 \r
                checkboxTreeViewer.setContentProvider(new ItemTreeContentProvider());\r
-               checkboxTreeViewer.setLabelProvider(new ItemLabelProvider());\r
+               if (type == Type.INSTALL) {\r
+                       checkboxTreeViewer.setLabelProvider(new ItemLabelProvider(0));                  \r
+               } else if (type == Type.UPDATE) {\r
+                       checkboxTreeViewer.setLabelProvider(new ItemLabelProvider(1));\r
+               } else if (type == Type.UNINSTALL) {\r
+                       checkboxTreeViewer.setLabelProvider(new ItemLabelProvider(2));\r
+               } else {\r
+                       // not support installmanager processing type.\r
+               }\r
 \r
                checkboxTreeViewer.setInput(getCustomTreeItems());\r
 \r
@@ -501,13 +519,11 @@ public abstract class PackageListPage extends PageTemplate {
 \r
        // set next button to be enabled by checked item count condition.\r
        protected void setNextBtnEnabledAboutCheckedPackageCount() {\r
-//             if (getCheckedPackageNumber() > 0) {\r
-//                     InstallManagerWindow.setNextBtnEnabled(true);\r
-//             } else {\r
-//                     InstallManagerWindow.setNextBtnEnabled(false);\r
-//             }\r
-               \r
-               InstallManagerWindow.setNextBtnEnabled(true);\r
+               if (getCheckedPackageNumber() > 0) {\r
+                       InstallManagerWindow.setNextBtnEnabled(true);\r
+               } else {\r
+                       InstallManagerWindow.setNextBtnEnabled(false);\r
+               }\r
        }\r
        \r
        protected void setConflictCheckbox(Package pkg, boolean checked) {\r
@@ -821,10 +837,9 @@ public abstract class PackageListPage extends PageTemplate {
                for (Item item : treeItems) {\r
                        setRelationOfItem(item, treeItems, addedItems);\r
                }\r
-               treeItems.addAll(addedItems);\r
                \r
+               treeItems.addAll(addedItems);\r
                Collections.sort(treeItems);\r
-               System.out.println("asdfasdf");\r
        }\r
 \r
        private void makeState() {\r
@@ -844,18 +859,18 @@ public abstract class PackageListPage extends PageTemplate {
                                if (packageNameOfTreeItem.equalsIgnoreCase(childPackage)) {                                     \r
                                        if (treeItem.getParent() != null) {\r
                                                Item childItem = new Item(treeItem.getLatestPackage(), treeItem.getInstalledPackage(), treeItem.getInstallState());\r
-                                               \r
-                                               parentItem.addChildItem(childItem);\r
                                                childItem.setParent(parentItem);\r
-                                               \r
                                                addedList.add(childItem);\r
                                        } else {\r
-                                               parentItem.addChildItem(treeItem);\r
                                                treeItem.setParent(parentItem);\r
+                                               addedList.add(treeItem);\r
                                        }\r
                                }\r
                        }\r
                }\r
+               Collections.sort(addedList); // sort sub tree items.\r
+               parentItem.addChildItems(addedList); // add sorted tree items to root item.\r
+               addedList.clear();\r
        }\r
 \r
        protected void setAllChecked(boolean checked) {\r
@@ -923,7 +938,7 @@ public abstract class PackageListPage extends PageTemplate {
                                        }\r
                                }\r
                                \r
-                               result = leafCnt - installedCnt;\r
+                               result = leafCnt - installedCnt + 1;\r
                        }                       \r
                } else {\r
                        result = items.length;\r
index a3c9b01..37314e3 100644 (file)
 
 package org.tizen.installmanager.ui.page;
 
-
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.FontData;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
@@ -50,14 +47,11 @@ import org.tizen.installmanager.util.PathUtil;
 public class PageTemplate extends Composite {
 
        public static final String RESOURCE_PATH = "/res/images";
-       public static final String RESOURCE_PATH_NEW = "/res/new_images";
 
        private Label imgLabel;
        private Label titleLabel;
        private Label subtitleLabel;
        public Composite customComposite;
-       
-       private boolean usePageTemplate = true;
 
        /**
         * Set basic environment of child pages.
@@ -73,8 +67,6 @@ public class PageTemplate extends Composite {
                        imgLabel = new Label(this, SWT.NONE);
                        imgLabel.setBounds(0, 0, 628, 108);
                        imgLabel.setBackground(InstallManagerWindow.getBackgroundColor());
-//                     imgLabel.setBackground(new Color(null, new RGB(80, 80, 80)));
-
                        titleLabel = new Label(this, SWT.NONE);
 
                        if (Platform.isUbuntu()) {
@@ -86,28 +78,22 @@ public class PageTemplate extends Composite {
                        titleLabel.setBounds(0, 114, 300, 25);
                        titleLabel.setText("New Label");
                        titleLabel.setBackground(InstallManagerWindow.getBackgroundColor());
-//                     titleLabel.setBackground(new Color(null, new RGB(180, 180, 180)));
 
                        subtitleLabel = new Label(this, SWT.WRAP);
                        subtitleLabel.setBounds(305, 114, 451, 40);
                        subtitleLabel.setText("");
                        subtitleLabel.setBackground(InstallManagerWindow.getBackgroundColor());
-//                     subtitleLabel.setBackground(new Color(null, new RGB(140, 140, 140)));
                        
                        customComposite = new Composite(this, SWT.NONE);
                        
-//                     customComposite.setSize(468, 304);
-//                     customComposite.setLocation(160, 90);
                        customComposite.setBounds(0, 108, 628, 297);
                        customComposite.setBackground(InstallManagerWindow.getBackgroundColor());
-//                     customComposite.setBackground(new Color(null, new RGB(100, 100, 100)));
                } else {
                        customComposite = new Composite(this, SWT.NONE);
                        
                        customComposite.setSize(468, 304);
                        customComposite.setLocation(160, 90);
                        customComposite.setBackground(InstallManagerWindow.getBackgroundColor());
-//                     customComposite.setBackground(new Color(null, new RGB(100, 100, 100)));
                }
        }
 
index 5313b01..f95e556 100644 (file)
@@ -72,7 +72,7 @@ import org.tizen.installmanager.util.PathUtil;
  *
  */
 public class SetInstallDirectoryPage extends InstallPage {
-       private static final String RSC_PROGRESS_IMAGE_START = RESOURCE_PATH_NEW + "/progress_start.png";
+       private static final String RSC_PROGRESS_IMAGE_START = RESOURCE_PATH + "/progress_start.png";
        private static final String STRING_TITLE = "Ready to install?";
        private static final String STRING_INSTALL_DIR = "Installation Location";
        private static final String STRING_SDK_DATA_DIR = "Data Location";
index 8849316..26d09b4 100644 (file)
@@ -45,8 +45,7 @@ import org.tizen.installmanager.pkg.model.PackageSet;
  * @author Taeyoung Son <taeyoung2.son@samsung.com>\r
  */\r
 public class UninstallableListPage extends PackageListPage {\r
-       private static final String RSC_PATH_IMAGE_NEW = RESOURCE_PATH_NEW + "/02_installation_option_bg.png";\r
-       static final String RSC_PATH_IMAGE = RESOURCE_PATH + "/uninstaller_graphicmotif_001.png";\r
+       private static final String RSC_PATH_IMAGE = RESOURCE_PATH + "/02_installation_option_bg.png";\r
        static final String STRING_TITLE = "Select uninstall components";\r
        static final String STRING_SUBTITLE = "You can see the items to uninstall.";\r
 \r
@@ -59,7 +58,7 @@ public class UninstallableListPage extends PackageListPage {
        public UninstallableListPage(Composite parent, int style) {\r
                super(parent, style, Type.UNINSTALL);\r
 \r
-               setLeftImageFromResource(RSC_PATH_IMAGE_NEW);\r
+               setLeftImageFromResource(RSC_PATH_IMAGE);\r
 //             setTitle(STRING_TITLE);\r
 //             setSubTitle(STRING_SUBTITLE);\r
                \r
index 26eb522..4f8014d 100644 (file)
 
 package org.tizen.installmanager.ui.page;
 
-
-
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.FontData;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.tizen.installmanager.core.IMFatalException;
@@ -42,18 +39,14 @@ import org.tizen.installmanager.lib.IMError;
 import org.tizen.installmanager.lib.Log;
 import org.tizen.installmanager.ui.InstallManagerWindow;
 import org.tizen.installmanager.ui.dialog.AddExtraRepositoryDialog;
-import org.tizen.installmanager.ui.page.PackageListPage.InstallType;
-import org.tizen.installmanager.util.PathUtil;
 
 /**
  * This class displays installable package list on page.
  * @author Yongsung Kim <yongsung1.kim@samsung.com>
  */
 public class UpdatableListPage extends PackageListPage {
-       private static final String RSC_PATH_IMAGE_NEW = RESOURCE_PATH_NEW + "/02_installation_option_bg.png";
-       private static final String RSC_PATH_BUTTON_NORMAL = RESOURCE_PATH_NEW + "/btn_01_normal.png";
+       private static final String RSC_PATH_IMAGE = RESOURCE_PATH + "/02_installation_option_bg.png";
        
-       static final String RSC_PATH_IMAGE = RESOURCE_PATH + "/install_manager_graphicmotif_002.png";
        static final String STRING_TITLE = "Update";
        static final String STRING_SUBTITLE = "Updated components are installed.\n" +
                                                                                "You can select additional components for installation as well.";
@@ -61,12 +54,8 @@ public class UpdatableListPage extends PackageListPage {
        
        private AddExtraRepositoryDialog extraDialog;
        
-       private static final String TYPICAL_BUTTON_NAME = "Typical";
-       private static final String CUSTOM_BUTTON_NAME = "Custom";
        private static final String EXTRA_BUTTON_NAME = "Extra repository";
        
-       private Button typicalButton;
-       private Button customButton;
        private Button addExtraButton;
        
        /**
@@ -76,7 +65,7 @@ public class UpdatableListPage extends PackageListPage {
        public UpdatableListPage(Composite parent, int style) {
                super(parent, style, Type.UPDATE);
 
-               setLeftImageFromResource(RSC_PATH_IMAGE_NEW);
+               setLeftImageFromResource(RSC_PATH_IMAGE);
                disableTitleBounds();
                disableSubtitleBounds();
 
@@ -86,59 +75,10 @@ public class UpdatableListPage extends PackageListPage {
                buttonComposite.setBounds(10, 31, 134, 268);
                buttonComposite.setBackground(InstallManagerWindow.getBackgroundColor());
                
-               setButton();
-       }
-       
-       private void setButton() {
-               setTypicalButton();
-               setCustomButton();
                setAddRepositoryButton();
        }
        
        /**
-        * Set Typical Type radio button.
-        */
-       private void setTypicalButton() {
-               if (typicalButton == null) {
-                       typicalButton = new Button(buttonComposite, SWT.PUSH | SWT.LEFT);
-               }
-
-               typicalButton.setSelection(true);
-
-               typicalButton.addSelectionListener(new SelectionAdapter() {
-                       @Override
-                       public void widgetSelected(SelectionEvent e) {
-                               changeTableVisibleStatus(InstallType.TYPICAL);
-                       }
-               });
-
-               typicalButton.setBounds(0, 0, 134, 34);
-               typicalButton.setText(TYPICAL_BUTTON_NAME);
-               typicalButton.setBackground(InstallManagerWindow.getBackgroundColor());
-               typicalButton.setBackgroundImage(PathUtil.getImageFromResource(RSC_PATH_BUTTON_NORMAL));
-       }
-       
-       /**
-        * Set Custom Type radio button.
-        */
-       private void setCustomButton() {
-               if (customButton == null) {
-                       customButton = new Button(buttonComposite, SWT.PUSH | SWT.LEFT);
-               }
-
-               customButton.setBounds(0, 38, 134, 34);
-               customButton.setText(CUSTOM_BUTTON_NAME);
-               customButton.setBackground(InstallManagerWindow.getBackgroundColor());
-
-               customButton.addSelectionListener(new SelectionAdapter() {
-                       @Override
-                       public void widgetSelected(SelectionEvent e) {
-                               changeTableVisibleStatus(InstallType.CUSTOM);
-                       }
-               });
-       }
-       
-       /**
         * Set add Repository button. 
         */
        private void setAddRepositoryButton() {
@@ -146,7 +86,7 @@ public class UpdatableListPage extends PackageListPage {
                        addExtraButton = new Button(buttonComposite ,SWT.NONE | SWT.LEFT);                      
                }
                
-               addExtraButton.setBounds(0, 76, 134, 34);
+               addExtraButton.setBounds(0, 0, 134, 34);
                addExtraButton.setText(EXTRA_BUTTON_NAME);
                addExtraButton.setBackground(InstallManagerWindow.getBackgroundColor());
                
@@ -171,8 +111,7 @@ public class UpdatableListPage extends PackageListPage {
                        tree.setEnabled(true);
                        mDescriptionText.setVisible(true);
                } else {
-                       tree.setVisible(false);
-                       mDescriptionText.setVisible(false);
+                       changeTableVisibleStatus(InstallType.CUSTOM);
                }
 
                try {
index d1cb15e..8b0ad25 100644 (file)
@@ -72,29 +72,29 @@ import org.tizen.installmanager.util.PathUtil;
  */\r
 public class WelcomePage extends PageTemplate {\r
        // Welcome page images\r
-       static final String RSC_PATH_IMAGE_NEW = RESOURCE_PATH_NEW + "/01_welcome_page_bg.png";\r
-       static final String RSC_PATH_LABEL_BACKGROUND_IMAGE = RESOURCE_PATH_NEW + "/01_welcome_page_text_area.png";\r
+       static final String RSC_PATH_IMAGE = RESOURCE_PATH + "/01_welcome_page_bg.png";\r
+       static final String RSC_PATH_LABEL_BACKGROUND_IMAGE = RESOURCE_PATH + "/01_welcome_page_text_area.png";\r
        \r
        // Install button images\r
-       static final String RSC_INSTALL_BUTTON_NORMAL = RESOURCE_PATH_NEW + "/btn_welcome_page_install_normal.png";\r
-       static final String RSC_INSTALL_BUTTON_HOVER = RESOURCE_PATH_NEW + "/btn_welcome_page_install_hover.png";\r
+       static final String RSC_INSTALL_BUTTON_NORMAL = RESOURCE_PATH + "/btn_welcome_page_install_normal.png";\r
+       static final String RSC_INSTALL_BUTTON_HOVER = RESOURCE_PATH + "/btn_welcome_page_install_hover.png";\r
        \r
        // Advanced button images\r
-       static final String RSC_ADVANCED_BUTTON_NORMAL = RESOURCE_PATH_NEW + "/btn_advanced_normal.png";\r
-       static final String RSC_ADVANCED_BUTTON_HOVER = RESOURCE_PATH_NEW + "/btn_advanced_hover.png";\r
+       static final String RSC_ADVANCED_BUTTON_NORMAL = RESOURCE_PATH + "/btn_advanced_normal.png";\r
+       static final String RSC_ADVANCED_BUTTON_HOVER = RESOURCE_PATH + "/btn_advanced_hover.png";\r
        \r
        // Proxy setting button images\r
-       static final String RSC_PROXY_BUTTON_NORMAL = RESOURCE_PATH_NEW + "/btn_proxy_normal.png";\r
-       static final String RSC_PROXY_BUTTON_HOVER = RESOURCE_PATH_NEW + "/btn_proxy_hover.png";\r
+       static final String RSC_PROXY_BUTTON_NORMAL = RESOURCE_PATH + "/btn_proxy_normal.png";\r
+       static final String RSC_PROXY_BUTTON_HOVER = RESOURCE_PATH + "/btn_proxy_hover.png";\r
        \r
        // Uninstall button images\r
-       static final String RSC_UNINSTALL_BUTTON_NORMAL = RESOURCE_PATH_NEW + "/btn_welcome_page_uninstall_normal.png";\r
-       static final String RSC_UNINSTALL_BUTTON_HOVER = RESOURCE_PATH_NEW + "/btn_welcome_page_uninstall_hover.png";\r
-       static final String RSC_UNINSTALL_BUTTON_DISABLE = RESOURCE_PATH_NEW + "/btn_welcome_page_uninstall_disable.png";\r
+       static final String RSC_UNINSTALL_BUTTON_NORMAL = RESOURCE_PATH + "/btn_welcome_page_uninstall_normal.png";\r
+       static final String RSC_UNINSTALL_BUTTON_HOVER = RESOURCE_PATH + "/btn_welcome_page_uninstall_hover.png";\r
+       static final String RSC_UNINSTALL_BUTTON_DISABLE = RESOURCE_PATH + "/btn_welcome_page_uninstall_disable.png";\r
        \r
        // Update button images\r
-       static final String RSC_UPDATE_BUTTON_NORMAL = RESOURCE_PATH_NEW + "/btn_welcome_page_update_normal.png";\r
-       static final String RSC_UPDATE_BUTTON_HOVER = RESOURCE_PATH_NEW + "/btn_welcome_page_update_hover.png";\r
+       static final String RSC_UPDATE_BUTTON_NORMAL = RESOURCE_PATH + "/btn_welcome_page_update_normal.png";\r
+       static final String RSC_UPDATE_BUTTON_HOVER = RESOURCE_PATH + "/btn_welcome_page_update_hover.png";\r
        \r
        \r
        public static final String STRING_TITLE = "Welcome to Tizen SDK";\r
@@ -107,6 +107,9 @@ public class WelcomePage extends PageTemplate {
        Button buttonUpdate = null;\r
        Button configurationButton = null;\r
        \r
+       Label subLabel1 = null;\r
+       Label subLabel2 = null;\r
+       \r
        Label installIconLabel = null;\r
        Label installTextLabel = null;\r
        Label installSubTextLabel = null;\r
@@ -171,7 +174,7 @@ public class WelcomePage extends PageTemplate {
 //             setButton();\r
                \r
                setCustomCompositeBounds(0, 0, 628, 405);               \r
-               Image welcomeImg = PathUtil.getImageFromResource(RSC_PATH_IMAGE_NEW);\r
+               Image welcomeImg = PathUtil.getImageFromResource(RSC_PATH_IMAGE);\r
                customComposite.setBackgroundImage(welcomeImg);\r
 \r
 //             Shell shell = parent.getShell();\r
@@ -199,26 +202,26 @@ public class WelcomePage extends PageTemplate {
        }\r
        \r
        private void setWelcomeInfoLabel(Composite composite) {\r
-               Label label_1 = new Label(composite, SWT.TRANSPARENT);\r
-               label_1.setBounds(18, 109, 400, 22);\r
-               label_1.setText(STRING_SUBTITLE1);\r
-               label_1.setForeground(new Color(null, new RGB(255, 255, 255)));\r
-               label_1.setBackgroundImage(\r
+               subLabel1 = new Label(composite, SWT.TRANSPARENT);\r
+               subLabel1.setBounds(18, 109, 400, 22);\r
+               subLabel1.setText(STRING_SUBTITLE1);\r
+               subLabel1.setForeground(new Color(null, new RGB(255, 255, 255)));\r
+               subLabel1.setBackgroundImage(\r
                                PathUtil.getImageFromResource(RSC_PATH_LABEL_BACKGROUND_IMAGE));\r
                \r
-               Label label_2 = new Label(composite, SWT.NONE);\r
-               label_2.setBounds(18, 131, 400, 22);\r
-               label_2.setText(STRING_SUBTITLE2);\r
-               label_2.setForeground(new Color(null, new RGB(255, 255, 255)));\r
-               label_2.setBackgroundImage(\r
+               subLabel2 = new Label(composite, SWT.NONE);\r
+               subLabel2.setBounds(18, 131, 400, 22);\r
+               subLabel2.setText(STRING_SUBTITLE2);\r
+               subLabel2.setForeground(new Color(null, new RGB(255, 255, 255)));\r
+               subLabel2.setBackgroundImage(\r
                                PathUtil.getImageFromResource(RSC_PATH_LABEL_BACKGROUND_IMAGE));\r
                \r
                if (Platform.isUbuntu()) {\r
-                       label_1.setFont((new Font(Display.getCurrent(), new FontData("Dejavu Sans", 9, SWT.BOLD))));\r
-                       label_2.setFont((new Font(Display.getCurrent(), new FontData("Dejavu Sans", 9, SWT.BOLD))));\r
+                       subLabel1.setFont((new Font(Display.getCurrent(), new FontData("Dejavu Sans", 9, SWT.BOLD))));\r
+                       subLabel2.setFont((new Font(Display.getCurrent(), new FontData("Dejavu Sans", 9, SWT.BOLD))));\r
                } else if (Platform.isWindows()) {\r
-                       label_1.setFont((new Font(Display.getCurrent(), new FontData("Verdana", 9, SWT.BOLD))));\r
-                       label_2.setFont((new Font(Display.getCurrent(), new FontData("Verdana", 9, SWT.BOLD))));\r
+                       subLabel1.setFont((new Font(Display.getCurrent(), new FontData("Verdana", 9, SWT.BOLD))));\r
+                       subLabel2.setFont((new Font(Display.getCurrent(), new FontData("Verdana", 9, SWT.BOLD))));\r
                }\r
        }\r
        \r
@@ -542,24 +545,16 @@ public class WelcomePage extends PageTemplate {
                }\r
                \r
                if (!viewController.existRemovablePackage()) { // SDK was not installed yet.\r
-//                     buttonInstall.setText("Install the new " + Config.SDK_NAME + " version.");\r
-//                     buttonInstall.setBounds(26, 40, 500, 22);\r
-\r
-//                     buttonInstall.setSelection(true);\r
-//                     buttonUninstall.setSelection(false);\r
-                       \r
                        buttonInstall.setEnabled(true);\r
                        buttonUninstall.setEnabledFlag(false);\r
                        \r
-                       if (isMultiSdk) {\r
-                               buttonUpdate.setSelection(false);\r
-                               buttonUpdate.setEnabled(false);\r
-                       }\r
-                       \r
-//                     selectedRadioBtn = RADIO_ACTION.INSTALL;\r
+//                     if (isMultiSdk) {\r
+//                             buttonUpdate.setSelection(false);\r
+//                             buttonUpdate.setEnabled(false);\r
+//                     }\r
                        \r
                        Config.status = Config.Status.INSTALL;\r
-               }/* else if (!viewController.existInstallableOrUpdatablePackages()) {\r
+               }/* else if (!viewController.existInstallableOrUpdatablePackages()) { // Uninstall case\r
                        buttonInstall.setSelection(false);\r
                        buttonUninstall.setSelection(true);\r
                        \r
@@ -570,16 +565,19 @@ public class WelcomePage extends PageTemplate {
                        \r
                        Config.status = Config.Status.UNINSTALL;\r
                }*/ else {\r
-                       if (isMultiSdk) {\r
-//                             buttonInstall.setText("Install the new " + Config.SDK_NAME + " version.");\r
-                               buttonUpdate.setSelection(false);\r
-                               buttonUpdate.setEnabled(true);\r
-\r
-                       } else {\r
-//                             buttonInstall.setText("Install or update the " + Config.SDK_NAME);\r
-                               buttonUninstall.setEnabledFlag(true);\r
-                               Config.status = Config.Status.UNINSTALL;\r
-                       }\r
+//                     if (isMultiSdk) {\r
+////                           buttonInstall.setText("Install the new " + Config.SDK_NAME + " version.");\r
+//                             buttonUpdate.setSelection(false);\r
+//                             buttonUpdate.setEnabled(true);\r
+//\r
+//                     } else {\r
+////                           buttonInstall.setText("Install or update the " + Config.SDK_NAME);\r
+//                             buttonUninstall.setEnabledFlag(true);\r
+//                             Config.status = Config.Status.UNINSTALL;\r
+//                     }\r
+                       \r
+                       buttonUninstall.setEnabledFlag(true);\r
+                       Config.status = Config.Status.UNINSTALL;\r
                        \r
                        buttonUninstall.setImage(PathUtil.getImageFromResource(RSC_UNINSTALL_BUTTON_NORMAL),\r
                                        PathUtil.getImageFromResource(RSC_UNINSTALL_BUTTON_HOVER));\r
@@ -587,12 +585,11 @@ public class WelcomePage extends PageTemplate {
                        buttonInstall.setImage(PathUtil.getImageFromResource(RSC_UPDATE_BUTTON_NORMAL),\r
                                        PathUtil.getImageFromResource(RSC_UPDATE_BUTTON_HOVER));\r
 \r
-//                     buttonInstall.setSelection(true);\r
-//                     buttonUninstall.setSelection(false);\r
-                       \r
                        buttonInstall.setEnabled(true);\r
                        buttonUninstall.setEnabled(true);\r
                        \r
+                       Config.status = Config.Status.UPDATE;\r
+                       \r
 //                     selectedRadioBtn = RADIO_ACTION.INSTALL;\r
                }\r
        }\r
@@ -646,6 +643,22 @@ public class WelcomePage extends PageTemplate {
                return null;\r
        }\r
        \r
+       public void setWelcomeNormalMsg() {\r
+               subLabel1.setText(STRING_SUBTITLE1);\r
+               subLabel1.setForeground(new Color(null, new RGB(255, 255, 255)));\r
+               subLabel2.setBounds(18, 131, 400, 22);\r
+               subLabel2.setText(STRING_SUBTITLE2);\r
+               subLabel2.setForeground(new Color(null, new RGB(255, 255, 255)));\r
+       }\r
+       \r
+       public void setWelcomeErrorMsg(String sub1, String sub2) {\r
+               subLabel1.setText(sub1);\r
+               subLabel1.setForeground(new Color(null, 255, 54, 54));\r
+               subLabel2.setText(sub2);\r
+               subLabel2.setBounds(18, 131, 400, 32);\r
+               subLabel2.setForeground(new Color(null, 255, 54, 54));\r
+       }\r
+       \r
        /**\r
         * refresh welcome page.\r
         */\r
diff --git a/InstallManager_java/src/res/images/install_manager_graphicmotif_001.png b/InstallManager_java/src/res/images/install_manager_graphicmotif_001.png
deleted file mode 100644 (file)
index 7628099..0000000
Binary files a/InstallManager_java/src/res/images/install_manager_graphicmotif_001.png and /dev/null differ
diff --git a/InstallManager_java/src/res/images/install_manager_graphicmotif_002.png b/InstallManager_java/src/res/images/install_manager_graphicmotif_002.png
deleted file mode 100644 (file)
index 3cea32d..0000000
Binary files a/InstallManager_java/src/res/images/install_manager_graphicmotif_002.png and /dev/null differ
diff --git a/InstallManager_java/src/res/images/install_manager_graphicmotif_003.png b/InstallManager_java/src/res/images/install_manager_graphicmotif_003.png
deleted file mode 100644 (file)
index e84c825..0000000
Binary files a/InstallManager_java/src/res/images/install_manager_graphicmotif_003.png and /dev/null differ
diff --git a/InstallManager_java/src/res/images/install_manager_graphicmotif_004.png b/InstallManager_java/src/res/images/install_manager_graphicmotif_004.png
deleted file mode 100644 (file)
index 021c39a..0000000
Binary files a/InstallManager_java/src/res/images/install_manager_graphicmotif_004.png and /dev/null differ
diff --git a/InstallManager_java/src/res/images/install_manager_graphicmotif_welcome.png b/InstallManager_java/src/res/images/install_manager_graphicmotif_welcome.png
deleted file mode 100644 (file)
index ce75786..0000000
Binary files a/InstallManager_java/src/res/images/install_manager_graphicmotif_welcome.png and /dev/null differ
diff --git a/InstallManager_java/src/res/images/uninstaller_graphicmotif_001.png b/InstallManager_java/src/res/images/uninstaller_graphicmotif_001.png
deleted file mode 100644 (file)
index a01e831..0000000
Binary files a/InstallManager_java/src/res/images/uninstaller_graphicmotif_001.png and /dev/null differ
diff --git a/InstallManager_java/src/res/images/uninstaller_graphicmotif_002.png b/InstallManager_java/src/res/images/uninstaller_graphicmotif_002.png
deleted file mode 100644 (file)
index f6aa70e..0000000
Binary files a/InstallManager_java/src/res/images/uninstaller_graphicmotif_002.png and /dev/null differ
diff --git a/InstallManager_java/src/res/images/uninstaller_graphicmotif_003.png b/InstallManager_java/src/res/images/uninstaller_graphicmotif_003.png
deleted file mode 100644 (file)
index 38195f0..0000000
Binary files a/InstallManager_java/src/res/images/uninstaller_graphicmotif_003.png and /dev/null differ