Dali C#: control-dashboard sample changed 11/111511/1 accepted/tizen/mobile/20170123.113750 accepted/tizen/tv/20170123.113807 submit/tizen/20170123.011352 submit/tizen/20170123.015307 submit/tizen_common/20170131.125233 submit/tizen_common/20170207.140435
authordongsug.song <dongsug.song@samsung.com>
Sat, 21 Jan 2017 03:22:50 +0000 (12:22 +0900)
committerdongsug.song <dongsug.song@samsung.com>
Sat, 21 Jan 2017 03:30:38 +0000 (12:30 +0900)
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
Change-Id: I75c33b11b6dc55049012596100aa1438afd4c61c

Tizen.NUI/.vs/ClassLibrary1/v14/.suo
Tizen.NUI/ClassLibrary1.sln
Tizen.NUI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache [deleted file]
Tizen.NUI/src/internal/BaseHandle.cs
etc/SampleApplication/.vs/SampleApplication/v14/.suo
etc/SampleApplication/NUISamples/NUISamples.Tizen/NUISamples.Tizen.csproj
etc/SampleApplication/NUISamples/NUISamples.Tizen/bin/Release/NUISamples.Tizen.tpk [new file with mode: 0755]
etc/SampleApplication/NUISamples/NUISamples.Tizen/examples/control-dashboard.cs
etc/SampleApplication/NUISamples/NUISamples.Tizen/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache [deleted file]
etc/SampleApplication/NUISamples/NUISamples.Tizen/res/style/control-dashboard-theme.json [new file with mode: 0755]

index 85078c3..7926ba0 100755 (executable)
Binary files a/Tizen.NUI/.vs/ClassLibrary1/v14/.suo and b/Tizen.NUI/.vs/ClassLibrary1/v14/.suo differ
index 2f7f25e..ea95a65 100755 (executable)
@@ -5,6 +5,8 @@ VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1\r
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassLibrary1", "ClassLibrary1.csproj", "{5037EB12-A7D9-47B4-A79C-4B2B0C8F0E23}"\r
 EndProject\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NUISamples.Tizen", "..\NUISamples\NUISamples.Tizen\NUISamples.Tizen.csproj", "{EF6B2FA4-3A77-4AF5-8C76-C05FFAD9D064}"\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Any CPU = Debug|Any CPU\r
@@ -15,6 +17,10 @@ Global
                {5037EB12-A7D9-47B4-A79C-4B2B0C8F0E23}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {5037EB12-A7D9-47B4-A79C-4B2B0C8F0E23}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
                {5037EB12-A7D9-47B4-A79C-4B2B0C8F0E23}.Release|Any CPU.Build.0 = Release|Any CPU\r
+               {EF6B2FA4-3A77-4AF5-8C76-C05FFAD9D064}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {EF6B2FA4-3A77-4AF5-8C76-C05FFAD9D064}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {EF6B2FA4-3A77-4AF5-8C76-C05FFAD9D064}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {EF6B2FA4-3A77-4AF5-8C76-C05FFAD9D064}.Release|Any CPU.Build.0 = Release|Any CPU\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
diff --git a/Tizen.NUI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Tizen.NUI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100755 (executable)
index 0a4b1de..0000000
Binary files a/Tizen.NUI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and /dev/null differ
index b185944..3587e33 100755 (executable)
@@ -200,7 +200,7 @@ public class BaseHandle : global::System.IDisposable {
     return ret;
   }
 
-  internal void Reset() {
+  public void Reset() {
     NDalicPINVOKE.BaseHandle_Reset(swigCPtr);
     if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
   }
index 0ceb2fd..eead81d 100755 (executable)
Binary files a/etc/SampleApplication/.vs/SampleApplication/v14/.suo and b/etc/SampleApplication/.vs/SampleApplication/v14/.suo differ
index 0d49bd2..73bfd85 100755 (executable)
@@ -43,6 +43,7 @@
   </PropertyGroup>\r
   <ItemGroup>\r
     <None Include="NUISamples.Tizen.project.json" />\r
+    <None Include="res\style\control-dashboard-theme.json" />\r
     <None Include="tizen-manifest.xml" />\r
     <None Include="shared\res\NUISamples.Tizen.png" />\r
   </ItemGroup>\r
diff --git a/etc/SampleApplication/NUISamples/NUISamples.Tizen/bin/Release/NUISamples.Tizen.tpk b/etc/SampleApplication/NUISamples/NUISamples.Tizen/bin/Release/NUISamples.Tizen.tpk
new file mode 100755 (executable)
index 0000000..2a5461a
Binary files /dev/null and b/etc/SampleApplication/NUISamples/NUISamples.Tizen/bin/Release/NUISamples.Tizen.tpk differ
index 1dd9a4f..898acfc 100755 (executable)
@@ -73,7 +73,7 @@ namespace MyCSharpExample
             topLabel.SizeModeFactor = new Vector3( 0.0f, 0.1f, 0.0f );
             topLabel.BackgroundColor = new Color(43.0f / 255.0f, 145.0f / 255.0f, 175.0f / 255.0f, 1.0f);
             topLabel.TextColor = NDalic.WHITE;
-            topLabel.Text = " DALi Views";
+            topLabel.Text = " DALi Views V.0121";
             topLabel.HorizontalAlignment = "BEGIN";
             topLabel.VerticalAlignment = "CENTER";
             topLabel.SetStyleName("TextLabelFontSize4");
@@ -364,9 +364,9 @@ namespace MyCSharpExample
         [STAThread]
         static void Main(string[] args)
         {
-            Console.WriteLine("Hello Mono World");
+            Console.WriteLine("dali c# control-dashboard! main() is called!");
 
-            Example example = new Example(Application.NewApplication());
+            Example example = new Example(Application.NewApplication("/home/owner/apps_rw/NUISamples.Tizen/res/style/control-dashboard-theme.json"));
             example.MainLoop();
         }
     }
diff --git a/etc/SampleApplication/NUISamples/NUISamples.Tizen/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/etc/SampleApplication/NUISamples/NUISamples.Tizen/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100755 (executable)
index 98f1861..0000000
Binary files a/etc/SampleApplication/NUISamples/NUISamples.Tizen/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and /dev/null differ
diff --git a/etc/SampleApplication/NUISamples/NUISamples.Tizen/res/style/control-dashboard-theme.json b/etc/SampleApplication/NUISamples/NUISamples.Tizen/res/style/control-dashboard-theme.json
new file mode 100755 (executable)
index 0000000..6376e7e
--- /dev/null
@@ -0,0 +1,303 @@
+/*
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ *
+ * This file is part of Dali Toolkit
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+//******************************************************************************
+//
+// Default Reference style theme for a 1920x1080 resolution, The values determined by UX design specification.
+// This file can be copied to a new folder within the styles/ directory and amended with new default values.
+// Can be overriden if StyleManager applies another style sheet.
+//
+//******************************************************************************
+
+{
+  "styles":
+  {
+    "Tooltip":
+    {
+      "tooltip":
+      {
+        "content":
+        {
+          "pointSize":8
+        },
+        "waitTime":0.5,
+        "background":
+        {
+          "visual":"{DALI_IMAGE_DIR}tooltip.9.png",
+          "border":[1,5,5,1]
+        },
+        "tail":
+        {
+          "visibility":false,
+          "aboveVisual":"{DALI_IMAGE_DIR}tooltip-tail-above.png",
+          "belowVisual":"{DALI_IMAGE_DIR}tooltip-tail-below.png"
+        },
+        "position":"BELOW",
+        "hoverPointOffset":[10,10],
+        "movementThreshold":5,
+        "disappearOnMovement":false
+      }
+    },
+    "TextLabel":
+    {
+      "pointSize":8,
+      "enableAutoScroll":false,
+      "autoScrollLoopCount":2,
+      "autoScrollGap":50,
+      "autoScrollSpeed":80
+    },
+
+    "TextLabelFontSize0":
+    {
+      "pointSize":8
+    },
+    "TextLabelFontSize1":
+    {
+      "pointSize":9
+    },
+    "TextLabelFontSize2":
+    {
+      "pointSize":10
+    },
+    "TextLabelFontSize3":
+    {
+      "pointSize":11
+    },
+    "TextLabelFontSize4":
+    {
+      "pointSize":12
+    },
+
+    "TextField":
+    {
+      "pointSize":8,
+      "primaryCursorColor":[0.0,0.72,0.9,1.0],
+      "secondaryCursorColor":[0.0,0.72,0.9,1.0],
+      "cursorWidth":6,
+      "selectionHighlightColor":[0.75,0.96,1.0,1.0],
+      "grabHandleImage" : "{DALI_STYLE_IMAGE_DIR}cursor_handler_drop_center.png",
+      "selectionHandleImageLeft" : {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_left.png" },
+      "selectionHandleImageRight": {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_right.png" }
+    },
+
+    "TextFieldFontSize0":
+    {
+      "pointSize":8
+    },
+    "TextFieldFontSize1":
+    {
+      "pointSize":9
+    },
+    "TextFieldFontSize2":
+    {
+      "pointSize":10
+    },
+    "TextFieldFontSize3":
+    {
+      "pointSize":11
+    },
+    "TextFieldFontSize4":
+    {
+      "pointSize":12
+    },
+    "TextSelectionPopup":
+    {
+      "popupMaxSize":[1700,100],
+      "optionDividerSize":[2,0],
+      "popupDividerColor":[0.23,0.72,0.8,0.11],
+      "popupIconColor":[1.0,1.0,1.0,1.0],
+      "popupPressedColor":[0.24,0.72,0.8,0.11],
+      "background": {
+        "rendererType": "image",
+        "url": "{DALI_IMAGE_DIR}selection-popup-bg.9.png"
+        },
+      "popupFadeInDuration":0.25,
+      "popupFadeOutDuration":0.25
+    },
+    "TextSelectionPopupButton":
+    {
+      "label":
+      {
+        "visualType":"TEXT",
+        "pointSize":6
+      },
+      "unselectedBackgroundVisual":
+      {
+        "visualType": "IMAGE",
+        "url": ""
+      },
+      "selectedBackgroundVisual":
+      {
+        "visualType": "IMAGE",
+        "url": ""
+      }
+    },
+    "TextSelectionToolbar":
+    {
+      "enableOvershoot":true,
+      "scrollView":
+      {
+        "overshootAnimationSpeed":360.0,
+        "overshootSize":[1920.0,130.0]
+      }
+    },
+    "ScrollView":
+    {
+      "overshootEffectColor":"B018",
+      "overshootAnimationSpeed":960.0,
+      "overshootSize":[1920.0,130.0]
+    },
+    "ItemView":
+    {
+      "overshootEffectColor":"B018",
+      "overshootAnimationSpeed":960.0,
+      "overshootSize":[1920.0,130.0]
+    },
+    "TextEditor":
+    {
+      "pointSize":8,
+      "primaryCursorColor":[0.0,0.72,0.9,1.0],
+      "secondaryCursorColor":[0.0,0.72,0.9,1.0],
+      "cursorWidth":6,
+      "selectionHighlightColor":[0.75,0.96,1.0,1.0],
+      "grabHandleImage" : "{DALI_STYLE_IMAGE_DIR}cursor_handler_drop_center.png",
+      "selectionHandleImageLeft" : {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_left.png" },
+      "selectionHandleImageRight": {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_right.png" }
+    },
+    "ProgressBar":
+    {
+      "progressValue": 0,
+      "trackVisual":{
+        "url":"{DALI_IMAGE_DIR}progress-skin.9.png",
+        "size":[24,24]
+      },
+      "progressVisual":{
+        "url":"{DALI_IMAGE_DIR}progress-skin-progress.9.png",
+        "size":[24,24]
+      }
+    },
+    "ProgressBarValueTextLabel":
+    {
+      "textColor":[0.8,0.8,1,1]
+    },
+    "Button":
+    {
+      "styles":["Tooltip"],
+      "initialAutoRepeatingDelay":2.0,
+      "nextAutoRepeatingDelay":0.9
+      // Note: Visuals added to Button will be used in all derived buttons unless overridden.
+    },
+    "PushButton":
+    {
+      "styles":["Button"],
+      "autoRepeating":false,
+      "togglable":false,
+      "labelPadding":[ 12.0, 12.0, 12.0, 12.0 ],
+      "label":
+       {
+         "visualType": "TEXT",
+         "horizontalAlignment": "CENTER",
+         "pointSize" : 6.0, // Point size must always be provided to Text Visual
+         "verticalAlignment": "CENTER"
+       },
+      "unselectedBackgroundVisual":
+       {
+         "visualType": "IMAGE",
+         "url": "{DALI_IMAGE_DIR}button-up.9.png"
+       },
+       "selectedBackgroundVisual":
+       {
+         "visualType": "IMAGE",
+         "url": "{DALI_IMAGE_DIR}button-down.9.png"
+       },
+       "disabledSelectedBackgroundVisual":
+       {
+         "visualType": "IMAGE",
+         "url": "{DALI_IMAGE_DIR}button-down-disabled.9.png"
+       },
+       "disabledUnselectedBackgroundVisual":
+       {
+         "visualType": "IMAGE",
+         "url": "{DALI_IMAGE_DIR}button-disabled.9.png"
+       }
+    },
+    "CheckBoxButton":
+    {
+      "styles":["Button"],
+      "labelPadding":[ 12.0, 12.0, 0.0, 0.0 ],
+      "label":
+       {
+         "visualType": "TEXT",
+         "pointSize" : 8.0, // Point size must always be provided to Text Visual
+         "verticalAlignment": "CENTER"
+       },
+      "unselectedVisual":
+      {
+        "visualType": "IMAGE",
+        "url": "{DALI_IMAGE_DIR}checkbox-unselected.png"
+      },
+      "selectedVisual":
+      {
+        "visualType": "IMAGE",
+        "url": "{DALI_IMAGE_DIR}checkbox-selected.png"
+      },
+      "disabledUnselectedVisual":
+      {
+        "visualType": "IMAGE",
+        "url": "{DALI_IMAGE_DIR}checkbox-unselected-disabled.png"
+      },
+      "disabledSelectedVisual":
+      {
+        "visualType": "IMAGE",
+        "url": "{DALI_IMAGE_DIR}checkbox-selected-disabled.png"
+      }
+    },
+    "RadioButton":
+    {
+      "styles":["Button"],
+      "labelPadding":[ 12.0, 12.0, 0.0, 0.0 ],
+      "label":
+       {
+         "visualType": "TEXT",
+         "pointSize" : 8.0, // Point size must always be provided to Text Visual
+         "verticalAlignment": "CENTER"
+       },
+      "unselectedVisual":
+      {
+        "visualType": "IMAGE",
+        "url": "{DALI_IMAGE_DIR}radio-button-unselected.png"
+      },
+      "selectedVisual":
+      {
+        "visualType": "IMAGE",
+        "url": "{DALI_IMAGE_DIR}radio-button-selected.png"
+      },
+      "disabledUnselectedVisual":
+      {
+        "visualType": "IMAGE",
+        "url": "{DALI_IMAGE_DIR}radio-button-unselected-disabled.png"
+      },
+      "disabledSelectedVisual":
+      {
+        "visualType": "IMAGE",
+        "url": "{DALI_IMAGE_DIR}radio-button-selected-disabled.png"
+      }
+    }
+  }
+}