[INST_UI] InstallManager has new UX.

InstallManager has new UX but it is not yet complete. We are developing
it. We need to save modified codes to repository.

Change-Id: I25a115c0920f9b8461f3d764fc90411a129713ad
Signed-off-by: yongsung1.kim <yongsung1.kim@samsung.com>

diff --git a/InstallManager_java/src/org/tizen/installmanager/lib/IMError.java b/InstallManager_java/src/org/tizen/installmanager/lib/IMError.java
index 689d92e..5086f62 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/lib/IMError.java
+++ b/InstallManager_java/src/org/tizen/installmanager/lib/IMError.java
@@ -71,7 +71,7 @@ public class IMError {
                                window.setCancelBtnEnabled(true);
                                window.showComposite(completePage);
                                completePage.setTitle("Installation Error");
-                               completePage.setCustomErrorMessage(message, SWT.CENTER);
+                               completePage.setCustomErrorMessage(message);
                        }
                });
 

diff --git a/InstallManager_java/src/org/tizen/installmanager/ui/page/CompletePage.java b/InstallManager_java/src/org/tizen/installmanager/ui/page/CompletePage.java
index 3542e47..03343d8 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/ui/page/CompletePage.java
+++ b/InstallManager_java/src/org/tizen/installmanager/ui/page/CompletePage.java
@@ -60,6 +60,7 @@ public class CompletePage extends InstallPage {
        public static final String STRING_TITLE = "Completed installation.";
        private Label completeMessageLabel;
        private Label informationLabel;
+       private Label errorMessageLabel;
        public Button releaseNoteButton;
        private StyledText errorText;
 
@@ -82,6 +83,7 @@ public class CompletePage extends InstallPage {
                getCircularGraph().setGraphBgColor(PROGRESS_CIRCLE_COLOR);
 
                setCompleteMessageLabel();
+               setErrorMessageLabel();
                setInfoLabel();
                setErrorText();
                setCheckButton();
@@ -91,18 +93,22 @@ public class CompletePage extends InstallPage {
        }
        
        private void setCompleteMessageLabel() {
-               completeMessageLabel = new Label(customComposite, SWT.WRAP);
-               completeMessageLabel.setBounds(100, 133, 450, 45);
-//             completeMessageLabel.setAlignment(SWT.LEFT);
+               completeMessageLabel = new Label(customComposite, SWT.LEFT);
+               completeMessageLabel.setBounds(95, 133, 450, 45);
                completeMessageLabel.setText("");
-//             completeMessageLabel.setBackground(InstallManagerWindow.getBackgroundColor());
-               completeMessageLabel.setBackground(new Color(null, new RGB(191, 139, 41)));
+               completeMessageLabel.setBackground(InstallManagerWindow.getBackgroundColor());
+       }
+       
+       private void setErrorMessageLabel() {
+               errorMessageLabel = new Label(customComposite, SWT.CENTER);
+               errorMessageLabel.setBounds(95, 133, 450, 45);
+               errorMessageLabel.setText("");
+               errorMessageLabel.setBackground(InstallManagerWindow.getBackgroundColor());
        }
        
        private void setInfoLabel() {
-               informationLabel = new Label(customComposite, SWT.WRAP);
-               informationLabel.setBounds(100, 183, 450, 50);
-//             informationLabel.setAlignment(SWT.LEFT);
+               informationLabel = new Label(customComposite, SWT.LEFT);
+               informationLabel.setBounds(95, 183, 450, 50);
                informationLabel.setText("");
                informationLabel.setBackground(InstallManagerWindow.getBackgroundColor());
                
@@ -122,8 +128,8 @@ public class CompletePage extends InstallPage {
                releaseNoteButton.setBounds(243, 245, 122, 26);
                releaseNoteButton.pack();
                // If JDK does not support to DeskTop class, InstallManager cannot show release note.
-//             releaseNoteButton.setVisible(Desktop.isDesktopSupported());
-//             releaseNoteButton.setSelection(Desktop.isDesktopSupported());
+               releaseNoteButton.setVisible(Desktop.isDesktopSupported());
+               releaseNoteButton.setSelection(Desktop.isDesktopSupported());
        }
        
        private void setErrorText() {
@@ -131,16 +137,14 @@ public class CompletePage extends InstallPage {
                errorText.setBounds(10, 235, 608, 100);
                errorText.setAlignment(SWT.CENTER);
                errorText.setText("");
-//             errorText.setBackground(InstallManagerWindow.getBackgroundColor());
-               errorText.setBackground(new Color(null, new RGB(191, 139, 41)));
-               errorText.setVisible(Desktop.isDesktopSupported());
+               errorText.setBackground(InstallManagerWindow.getBackgroundColor());
+               errorText.setVisible(!Desktop.isDesktopSupported());
        }
        
        public void setErrorTextMsg() {
                errorText.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_DARK_RED));
                errorText.setText("Your system does not support to show the release note.\n" +
                                " Please refer to the following URL.\n");
-               String tmp = Config.getInstance().getReleaseNoteUrl();
                errorText.append(Config.getInstance().getReleaseNoteUrl());
        }
 
@@ -165,11 +169,12 @@ public class CompletePage extends InstallPage {
         * Show message on complete page.
         * @param completeMsg
         */
-//     public void setCustomMessage(String completeMsg) {
-//             completeMessageLabel.setText(completeMsg);
-//     }
+       public void setCustomMessage(String completeMsg) {
+               completeMessageLabel.setText(completeMsg);
+       }
        
        public void setCustomMessage(String completeMsg, int style) {
+               errorMessageLabel.setVisible(false);
                completeMessageLabel.setText(completeMsg);
                completeMessageLabel.setAlignment(style);
        }
@@ -178,6 +183,7 @@ public class CompletePage extends InstallPage {
                String msg = informationLabel.getText();
                msg = msg + "Information : \n" + infoMsg;
                
+               errorMessageLabel.setVisible(false);
                informationLabel.setText(msg);
                informationLabel.setAlignment(style);
        }
@@ -214,10 +220,11 @@ public class CompletePage extends InstallPage {
         * Show error message on complete page.
         * @param errorMsg
         */
-       public void setCustomErrorMessage(String errorMsg, int style) {
-               completeMessageLabel.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_DARK_RED));
-               completeMessageLabel.setText(errorMsg);
-               completeMessageLabel.setAlignment(style);
+       public void setCustomErrorMessage(String errorMsg) {
+               completeMessageLabel.setVisible(false);
+               errorMessageLabel.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_DARK_RED));
+               errorMessageLabel.setText(errorMsg);
+               getCircularGraph().setGraphBgColor(PROGRESS_CIRCLE_ERROR_COLOR);
        }
 
 }

diff --git a/InstallManager_java/src/org/tizen/installmanager/ui/page/InstallPage.java b/InstallManager_java/src/org/tizen/installmanager/ui/page/InstallPage.java
index 13fee8f..98e89e6 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/ui/page/InstallPage.java
+++ b/InstallManager_java/src/org/tizen/installmanager/ui/page/InstallPage.java
@@ -23,6 +23,7 @@ public class InstallPage extends PageTemplate {
        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
+       static final Color PROGRESS_CIRCLE_ERROR_COLOR = new Color(null, new RGB(255, 0, 0)); // red
        protected Label titleLabel;
        private IMCircularGraph progressGraph;
 //     private int circularType = 0; // 0 is percentage, 1 is custom.

diff --git a/InstallManager_java/src/org/tizen/installmanager/ui/page/InstallingPage.java b/InstallManager_java/src/org/tizen/installmanager/ui/page/InstallingPage.java
index 083cf58..faaa69d 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/ui/page/InstallingPage.java
+++ b/InstallManager_java/src/org/tizen/installmanager/ui/page/InstallingPage.java
@@ -41,6 +41,7 @@ import org.eclipse.swt.widgets.Composite;
 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
 import org.tizen.installmanager.core.IMExitException;\r
 import org.tizen.installmanager.core.IMFatalException;\r
@@ -86,7 +87,7 @@ public class InstallingPage extends InstallPage {
        \r
        private Button detailOpenButton;\r
        private Button detailCloseButton;\r
-       private Label detailLabel;\r
+       private Text detailText;\r
 \r
        private ViewController viewController;\r
        private String installPath;\r
@@ -116,7 +117,7 @@ public class InstallingPage extends InstallPage {
                setInstallFileNameLabel();\r
                setDetailOpenButton(); // to do later\r
                setDetailCloseButton(); // to do later\r
-               setDetailLabel(); // to do later\r
+               setDetailText(); // to do later\r
        }\r
        \r
        private void setDownloadCurrentSizeLabel() {\r
@@ -197,7 +198,7 @@ public class InstallingPage extends InstallPage {
                                installFileNameLabel.setVisible(false);\r
                                detailOpenButton.setVisible(false);\r
                                detailCloseButton.setVisible(true);\r
-                               detailLabel.setVisible(true);\r
+                               detailText.setVisible(true);\r
                        }\r
                });\r
        }\r
@@ -216,16 +217,21 @@ public class InstallingPage extends InstallPage {
                                installFileNameLabel.setVisible(true);\r
                                detailOpenButton.setVisible(true);\r
                                detailCloseButton.setVisible(false);\r
-                               detailLabel.setVisible(false);\r
+                               detailText.setVisible(false);\r
                        }\r
                });\r
        }\r
        \r
-       private void setDetailLabel() {\r
-               detailLabel = new Label(customComposite, SWT.NONE);\r
-               detailLabel.setAlignment(SWT.LEFT);\r
-               detailLabel.setBounds(10, 197, 608, 97);\r
-               detailLabel.setVisible(false);\r
+       private void setDetailText() {\r
+               detailText = new Text(customComposite, SWT.WRAP | SWT.V_SCROLL | SWT.BORDER | SWT.READ_ONLY);\r
+               detailText.setBounds(10, 197, 608, 97);\r
+               detailText.setText("");\r
+               detailText.setEditable(false);\r
+               detailText.setVisible(false);\r
+       }\r
+       \r
+       public void setDetailMessage(String msg) {\r
+               detailText.append(msg + "/n");\r
        }\r
 \r
        /**\r
@@ -453,7 +459,7 @@ public class InstallingPage extends InstallPage {
 \r
                                        CompletePage completePage = mainWindow.getCompletePage();\r
 \r
-                                       if (ErrorController.checkInstallationSuccess()) {\r
+                                       if (!ErrorController.checkInstallationSuccess()) {\r
                                                completePage.setTitleLabelText("Installation Completed");\r
 \r
                                                String customMessage = "";\r
@@ -478,16 +484,14 @@ public class InstallingPage extends InstallPage {
 \r
                                                // if (ErrorController.existInfoMessage()) {\r
                                                completePage.setInfoMessage(InfoCode.RESTART_THE_COMPUTER.getInfoMessage()\r
-                                                               /*ErrorController.getInfoMessage()*/, SWT.RIGHT);\r
+                                                               /*ErrorController.getInfoMessage()*/, SWT.LEFT);\r
                                                // }\r
 \r
                                                Log.log("installation complete");\r
                                        } else {\r
                                                Log.log("(un)installation failed");\r
                                                completePage.setTitleLabelText("(Un)Installation failed");\r
-                                               ErrorController.setErrorMessage("Test error");\r
-//                                             completePage.setCustomErrorMessage(ErrorController.getErrorMessage() + "\n", SWT.RIGHT);\r
-                                               completePage.setCustomErrorMessage(ErrorController.getErrorMessage(), SWT.RIGHT);\r
+                                               completePage.setCustomErrorMessage(ErrorController.getErrorMessage() + "\n");\r
                                                mainWindow.getCompletePage().showCheckButton(false);\r
                                        }\r
 \r
@@ -553,6 +557,7 @@ public class InstallingPage extends InstallPage {
                                @Override\r
                                public void run() {\r
                                        downloadFileNameLabel.setText("Downloading : " + getEtcString(fileName));\r
+                                       detailText.append(getEtcString(fileName) + "\n");\r
                                }\r
                        });\r
                }\r
@@ -679,6 +684,7 @@ public class InstallingPage extends InstallPage {
                                @Override\r
                                public void run() {\r
                                        installFileNameLabel.setText("Installing : " + getEtcString(fileName));\r
+                                       detailText.append(getEtcString(fileName) + "\n");\r
                                }\r
                        });\r
                }\r

diff --git a/InstallManager_java/src/org/tizen/installmanager/ui/page/UninstallingPage.java b/InstallManager_java/src/org/tizen/installmanager/ui/page/UninstallingPage.java
index b5d4db0..c9dd576 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/ui/page/UninstallingPage.java
+++ b/InstallManager_java/src/org/tizen/installmanager/ui/page/UninstallingPage.java
@@ -246,8 +246,6 @@ public class UninstallingPage extends InstallPage {
                                        circularGraph.update(100);\r
 \r
                                        CompletePage completePage = mainWindow.getCompletePage();\r
-//                                     completePage.setLeftImageFromResource(CompletePage.RSC_PATH_IMAGE_NEW);\r
-                                       \r
 \r
                                        if (ErrorController.checkInstallationSuccess()) {\r
                                                completePage.setTitleLabelText("Uninstallation Completed!");\r
@@ -256,15 +254,15 @@ public class UninstallingPage extends InstallPage {
                                                }\r
                                                \r
                                                String msg = "Thank you for using Tizen SDK. "; \r
-                                               completePage.setCustomMessage(msg, SWT.RIGHT);\r
+                                               completePage.setCustomMessage(msg, SWT.CENTER);\r
                                                \r
                                                if (ErrorController.existInfoMessage()) {\r
-                                                       completePage.setInfoMessage(ErrorController.getInfoMessage(), SWT.RIGHT);\r
+                                                       completePage.setInfoMessage(ErrorController.getInfoMessage(), SWT.CENTER);\r
                                                }\r
                                        } else {\r
                                                completePage.setTitleLabelText("Uninstallation Failed!");\r
                                                completePage.setCustomErrorMessage("Sorry, Uninstallation was not success. Please try uninstall again.\n"\r
-                                                               + "Datail : " + ErrorController.getErrorMessage(), SWT.LEFT);\r
+                                                               + "Datail : " + ErrorController.getErrorMessage());\r
                                        }\r
                                        \r
                                        completePage.showCheckButton(false);\r

diff --git a/InstallManager_java/src/org/tizen/installmanager/util/PathUtil.java b/InstallManager_java/src/org/tizen/installmanager/util/PathUtil.java
index ed5d597..a4f9938 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/util/PathUtil.java
+++ b/InstallManager_java/src/org/tizen/installmanager/util/PathUtil.java
@@ -42,7 +42,6 @@ import java.net.URL;
 
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Display;
-import org.tizen.installmanager.core.Config;
 import org.tizen.installmanager.core.IMFatalException;
 import org.tizen.installmanager.core.Options;
 import org.tizen.installmanager.lib.Log;
@@ -52,7 +51,6 @@ import org.tizen.installmanager.lib.Registry;
 import org.tizen.installmanager.lib.ErrorController.ErrorCode;
 import org.tizen.installmanager.lib.win.WindowsRegistry;
 
-
 /**
  * Common function related path.
  * @author Shiyun Kim <shihyun.kim@samsung.com>