Sharp: merge default edj to elm-sharp-theme.edj

 - to support full set of elementary in elm-sharp,
   elm-sharp-theme now contains full styles needed
   by elementary.

Change-Id: I0536142bb9892e5c0a957ff37b0756938efcfc8a
Signed-off-by: Sungtaek Hong <sth253.hong@samsung.com>

4 files changed, 72 insertions, 65 deletions

diff --git a/mobile/Makefile.am b/mobile/Makefile.am
index bc2208f7..7e9f9c56 100644
--- a/mobile/Makefile.am
+++ b/mobile/Makefile.am
@@ -34,10 +34,15 @@ all:
 		-id ./HD/images/Old\
 		$(DEFAULT_SRC).edc $(DEFAULT_SRC).edj;
 	edje_cc $(EDJE_FLAGS) $(EDJE_FLAGS_$(V)) \
-                -id ./HD/images/\
-                -id ./HD/images/Navigation_elements\
-                -id ./HD/images/User_Input_Elements\
-                -id ./HD/images/Assist_Views\
+		-id default/images/tizen-hd -sd default/sounds -fd ../objects \
+		-id ./HD/images/\
+		-id ./HD/images/Navigation_elements\
+		-id ./HD/images/Presentation_views\
+		-id ./HD/images/User_Input_Elements\
+		-id ./HD/images/Assist_Views\
+		-id ./HD/images/Copy_Paste\
+		-id ./HD/images/Emoticon\
+		-id ./HD/images/Old\
                 $(CSHARP_SRC)-mobile.edc $(CSHARP_SRC).edj;
 
 
diff --git a/mobile/color_classes.edc b/mobile/color_classes.edc
index ef234730..dd89e18b 100644
--- a/mobile/color_classes.edc
+++ b/mobile/color_classes.edc
@@ -23,7 +23,7 @@ color_classes {
    /*
     * Button
     */
-   color_class { "button/default/opacity";
+   color_class { "button/default/opacity"; // Csharp Opacity Property
       color: 255 255 255 255;
    }
    color_class { "button/default/bg";
@@ -89,7 +89,7 @@ color_classes {
    color_class { "button/circle/effect";
       color: 0 0 0 77;
    }
-   color_class { "button/bottom/opacity";
+   color_class { "button/bottom/opacity"; // Csharp Opacity Property
       color: 255 255 255 255;
    }
    color_class { "button/bottom/bg";
@@ -113,7 +113,7 @@ color_classes {
    color_class { "button/bottom/effect";
       color: 0 0 0 77;
    }
-   color_class { "button/popup/opacity";
+   color_class { "button/popup/opacity"; // Csharp Opacity Property
       color: 255 255 255 255;
    }
    color_class { "button/icon_reorder/bg";
@@ -284,7 +284,7 @@ color_classes {
    color_class { "button/naviframe/back_btn/icon_disabled";
       color: 250 250 250 77;
    }
-   color_class { "button/ampm/opacity";
+   color_class { "button/ampm/opacity"; // Csharp Opacity Property
       color: 255 255 255 255;
    }
    color_class { "floatingbutton/default/bg";
@@ -755,7 +755,7 @@ color_classes {
    color_class { "entry/default/bg";
       color: 0 0 0 0;
    }
-   color_class { "entry/default/opacity";
+   color_class { "entry/default/opacity";  // Csharp Opacity Property
       color: 255 255 255 255;
    }
    color_class { "entry/default/text_edit";
@@ -1310,31 +1310,31 @@ color_classes {
    color_class { "label/default/bg";
       color: 0 0 0 0;
    }
-   color_class { "label/default/opacity";
+   color_class { "label/default/opacity"; // Csharp Opacity Property
       color: 255 255 255 255;
    }
    color_class { "label/slide_long/bg";
       color: 0 0 0 0;
    }
-   color_class { "label/slide_long/opacity";
+   color_class { "label/slide_long/opacity"; // Csharp Opacity Property
       color: 255 255 255 255;
    }
    color_class { "label/slide_short/bg";
       color: 0 0 0 0;
    }
-   color_class { "label/slide_short/opacity";
+   color_class { "label/slide_short/opacity"; // Csharp Opacity Property
       color: 255 255 255 255;
    }
    color_class { "label/slide_roll/bg";
       color: 0 0 0 0;
    }
-   color_class { "label/slide_roll/opacity";
+   color_class { "label/slide_roll/opacity"; // Csharp Opacity Property
       color: 255 255 255 255;
    }
    color_class { "label/slide_bounce/bg";
       color: 0 0 0 0;
    }
-   color_class { "label/slide_bounce/opacity";
+   color_class { "label/slide_bounce/opacity"; // Csharp Opacity Property
       color: 255 255 255 255;
    }
 
@@ -1350,6 +1350,20 @@ color_classes {
    color_class { "layout/searchfield/bg";
       color: 250 250 250 255;
    }
+   // ********* CSharp Specific color_classes ********//
+   color_class {
+      name: "layout/background/bg";
+      color: 0 0 0 0;
+   }
+   color_class {
+      name: "layout/background/opacity"; // Csharp Opacity Property
+      color: 255 255 255 255;
+   }
+   color_class {
+      name: "layout/elm_widget/opacity"; // Csharp Opacity Property
+      color: 255 255 255 255;
+   }
+   // ************************************************//
 
    /*
     * List
diff --git a/mobile/color_classes_csharp.edc b/mobile/color_classes_csharp.edc
deleted file mode 100644
index 6c380be1..00000000
--- a/mobile/color_classes_csharp.edc
+++ /dev/null
@@ -1,50 +0,0 @@
-color_classes {
-   /*
-    * Layout
-    */
-   color_class {
-      name: "layout/background/bg";
-      color: 0 0 0 0;
-   }
-   color_class {
-      name: "layout/background/opacity";
-      color: 255 255 255 255;
-   }
-   color_class {
-      name: "layout/elm_widget/opacity";
-      color: 255 255 255 255;
-   }
-   /*
-    * Radio
-    */
-   color_class { "radio/default/icon";
-      color: 61 185 204 255;
-   }
-   color_class { "radio/default/bg";
-      color: 250 250 250 51;
-   }
-   color_class { "radio/default/icon_disabled";
-      color: 61 185 204 77;
-   }
-   color_class { "radio/default/bg_disabled";
-      color: 250 250 250 38;
-   }
-   color_class { "radio/default/bg_border_on";
-      color: 250 250 250 77;
-   }
-   color_class { "radio/default/bg_border_on_disabled";
-      color: 250 250 250 38;
-   }
-   color_class { "radio/default/stroke";
-      color: 61 185 204 255;
-   }
-   color_class { "radio/default/stroke_disabled";
-      color: 61 185 204 77;
-   }
-   color_class { "radio/default/bg_on";
-      color: 250 250 250 255;
-   }
-   color_class { "radio/default/bg_on_disabled";
-      color: 250 250 250 255;
-   }
-}
diff --git a/mobile/elm-sharp-theme-mobile.edc b/mobile/elm-sharp-theme-mobile.edc
index 86cd8a20..6e27ec1f 100644
--- a/mobile/elm-sharp-theme-mobile.edc
+++ b/mobile/elm-sharp-theme-mobile.edc
@@ -43,6 +43,7 @@
 
 externals {
    external: "elm";
+   external: "feedback";
 }
 
 // BUILD_FIX: Add version to edc as 110.
@@ -81,10 +82,47 @@ collections {
       }
    }
 
-#include "color_classes_csharp.edc"
+#include "color_classes.edc"
+
+#include "widgets/bg.edc"
+#include "widgets/button.edc"
+#include "widgets/calendar.edc"
+#include "widgets/conform.edc"
+#include "widgets/ctxpopup.edc"
+#include "widgets/flipselector.edc"
+#include "widgets/focus_highlight.edc"
+#include "widgets/genlist.edc"
+#include "widgets/label.edc"
+#include "widgets/layout.edc"
+#include "widgets/naviframe.edc"
+#include "widgets/scroller.edc"
+#include "widgets/panel.edc"
+#include "widgets/toolbar.edc"
+#include "widgets/gengrid.edc"
+#include "widgets/entry.edc"
+#include "widgets/slider.edc"
+#include "widgets/spinner.edc"
+#include "widgets/datetime.edc"
+#include "widgets/colorselector.edc"
+#include "widgets/progressbar.edc"
+#include "widgets/check.edc"
+//#include "widgets/radio.edc"
+#include "widgets/index.edc"
+#include "widgets/popup.edc"
+#include "widgets/multibuttonentry.edc"
+#include "widgets/win.edc"
+#include "widgets/hover.edc"
+#include "widgets/list.edc"
+#include "widgets/floatingbutton.edc"
 
 #include "widgets_csharp/radio.edc"
 #include "widgets_csharp/layout.edc"
 
+   color_classes {
+      color_class {
+         name: "transparent";
+         color: 0 0 0 0;
+      }
+   }
 }