Modify button layout

Change-Id: I0336aa75d2d18cfd095e6b825cb0b9fcd94f64da

diff --git a/SettingWiFi/SettingWiFi/view/ConnectPage.cs b/SettingWiFi/SettingWiFi/view/ConnectPage.cs
index bb8a8d8faa10352974224509925c159bbae961aa..e23e86f02642f93ab3ab1168f3a526bc091df5a4 100644 (file)
--- a/SettingWiFi/SettingWiFi/view/ConnectPage.cs
+++ b/SettingWiFi/SettingWiFi/view/ConnectPage.cs
@@ -33,7 +33,7 @@ namespace SettingWiFi
                 HeightSpecification = 100,
             };
 
-            var passwordItem = new DefaultLinearItem();    
+            var passwordItem = new DefaultLinearItem();
             var wpsButtonItem = new DefaultLinearItem();
 
             var passwordField = new TextField()
@@ -53,14 +53,16 @@ namespace SettingWiFi
             var wpsButton = new Button()
             {
                 Text = Resources.IDS_WIFI_OPT_WPS,
+                WidthSpecification = 100,
+                HeightSpecification = 50,
             };
             wpsButton.Clicked += OnWpsClicked;
 
             passwordItem.Add(passwordField);
-            wpsButtonItem.Add(wpsButton);
+            //wpsButtonItem.Add(wpsButton);
 
             connectView.Add(passwordItem);
-            connectView.Add(wpsButtonItem);
+            //connectView.Add(wpsButtonItem);
 
             var cancelButton = new Button()
             {
@@ -78,7 +80,7 @@ namespace SettingWiFi
             {
                 Title = mAp.Essid,
                 Content = connectView,
-                Actions = new View[] { cancelButton, connectButton },
+                Actions = new View[] { cancelButton, connectButton, wpsButton },
             };
         }
 

diff --git a/SettingWiFi/SettingWiFi/view/WPSConnectPage.cs b/SettingWiFi/SettingWiFi/view/WPSConnectPage.cs
index 283ac9079e27a61426e1bd4dfe0aeab50eb24805..5be5f3ef67462af0877ed948968aa3d8ebe65799 100644 (file)
--- a/SettingWiFi/SettingWiFi/view/WPSConnectPage.cs
+++ b/SettingWiFi/SettingWiFi/view/WPSConnectPage.cs
@@ -39,7 +39,7 @@ namespace SettingWiFi
             {
                 Size = new Size(1000, 700),
                 HorizontalAlignment = HorizontalAlignment.Begin,
-                PointSize = 15.0f,
+                PointSize = 12.0f,
             };
 
             var progress = new Progress()
@@ -143,7 +143,7 @@ namespace SettingWiFi
                 Size = new Size(1000, 700),
             };
             text.HorizontalAlignment = HorizontalAlignment.Begin;
-            text.PointSize = 15.0f;
+            text.PointSize = 12.0f;
 
             var progress = new Progress()
             {

diff --git a/packaging/org.tizen.cssetting-wifi-1.0.0.tpk b/packaging/org.tizen.cssetting-wifi-1.0.0.tpk
index a5bff8bed2fa181af802e6395ff0a34b84f23376..ec7dc40aae1ccf37be36dc59b4cc23daf839f787 100755 (executable)
Binary files a/packaging/org.tizen.cssetting-wifi-1.0.0.tpk and b/packaging/org.tizen.cssetting-wifi-1.0.0.tpk differ