Revert "csharp: Added elm-sharp-theme-fhub package for FamilyHub"

This reverts commit ed7b190eadc264cb607e93754a508feeefd5700b.

Change-Id: Ieeaf25e4c3f413bb630416f8736898f1454d3dbf

4 files changed, 6 insertions, 183 deletions

diff --git a/mobile/Makefile.am b/mobile/Makefile.am
index 186811ee..7e9f9c56 100644
--- a/mobile/Makefile.am
+++ b/mobile/Makefile.am
@@ -43,33 +43,20 @@ all:
 		-id ./HD/images/Copy_Paste\
 		-id ./HD/images/Emoticon\
 		-id ./HD/images/Old\
-                $(CSHARP_SRC)-mobile.edc $(CSHARP_SRC)-mobile.edj;
-	edje_cc $(EDJE_FLAGS) $(EDJE_FLAGS_$(V)) \
-                -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)-fhub.edc $(CSHARP_SRC)-fhub.edj;
+                $(CSHARP_SRC)-mobile.edc $(CSHARP_SRC).edj;
 
 
 clean:
 	rm -rf $(SRC).edj;
 	rm -rf $(DEFAULT_SRC).edj;
-	rm -rf $(CSHARP_SRC)-mobile.edj;
-	rm -rf $(CSHARP_SRC)-fhub.edj;
+	rm -rf $(CSHARP_SRC).edj;
 
 install:
 	mkdir -p $(THEME_DIR);
 	mkdir -p $(CSHARP_THEME_DIR);
 	$(INSTALL) $(SRC).edj $(THEME_DIR);
 	$(INSTALL) $(DEFAULT_SRC).edj $(THEME_DIR);
-	$(INSTALL) $(CSHARP_SRC)-mobile.edj $(CSHARP_THEME_DIR);
-	$(INSTALL) $(CSHARP_SRC)-fhub.edj $(CSHARP_THEME_DIR);
+	$(INSTALL) $(CSHARP_SRC).edj $(CSHARP_THEME_DIR);
 
 uninstall:
 	rm -rf $(THEME_DIR);
diff --git a/mobile/elm-sharp-theme-fhub.edc b/mobile/elm-sharp-theme-fhub.edc
deleted file mode 100644
index 974c9b4d..00000000
--- a/mobile/elm-sharp-theme-fhub.edc
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
- *
- * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright notice, this
- *      list of conditions and the following disclaimer.
- *   2. Redistributions in binary form must reproduce the above copyright notice,
- *      this list of conditions and the following disclaimer in the documentation
- *      and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// LICENSE NOTE:
-// This file (and only this one) is licenses under public-domain. The reason
-// is that this is meant to serve as a template for making your own themes and
-// Elementary's LGPL license is not intended to follow. The images used do come
-// under LGPL, but this file specifically for the structure of your theme is
-// public-domain. This means you can take, use, re-license and otherwise
-// have zero restrictions on using this file as a base for your theme.
-
-//****************************************************************************************//
-// This is theme body including all widget bodys
-// Define shared descriptions (e.g. sound samples, color classes, textblock styles) in here
-// Do not define size(width, height) in here!!!!
-//****************************************************************************************//
-
-// Include INC (e.g. HD-inc.edc, HVGA-inc.edc for each resolution) file
-#include "HD-inc.edc"
-
-#undef BASE_SCALE_INC
-#define BASE_SCALE_INC 1.0
-
-externals {
-   external: "elm";
-   external: "feedback";
-}
-
-// BUILD_FIX: Add version to edc as 110.
-data.item: "version" "110";
-//
-
-collections {
-   base_scale: BASE_SCALE_INC;
-   plugins {
-      plugin {
-         name: "touch_sound";
-         source: "feedback";
-         param: "FEEDBACK_TYPE_SOUND FEEDBACK_PATTERN_TAP"; // FEEDBACK_TYPE_SOUND, FEEDBACK_PATTERN_TOUCH_TAP
-
-         /* 2014.06.11 updated from libsvi(feedback)
-          Above plugin will run below external function:
-          int feedback_play_type(feedback_type_e type, feedback_pattern_e pattern);
-
-          param1: feedback_type_e
-          FEEDBACK_TYPE_NONE = 0,
-          FEEDBACK_TYPE_SOUND = 1,
-          FEEDBACK_TYPE_VIBRATION,
-          FEEDBACK_TYPE_LED,
-          FEEDBACK_TYPE_END
-
-          * param2 enumeration:
-          FEEDBACK_PATTERN_TAP = 0,
-          FEEDBACK_PATTERN_SIP,
-          FEEDBACK_PATTERN_SIP_BACKSPACE,
-          FEEDBACK_PATTERN_SIP_FUNCTION,
-          FEEDBACK_PATTERN_SIP_FJKEY,
-          ...
-
-          * For more information please refer libsvi.
-          */
-      }
-   }
-
-#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/layout.edc"
-#include "widgets_csharp/popup.edc"
-
-   color_classes {
-      color_class {
-         name: "transparent";
-         color: 0 0 0 0;
-      }
-   }
-}
-
diff --git a/mobile/elm-sharp-theme-mobile.edc b/mobile/elm-sharp-theme-mobile.edc
index 9021fa44..539c6c4d 100644
--- a/mobile/elm-sharp-theme-mobile.edc
+++ b/mobile/elm-sharp-theme-mobile.edc
@@ -108,7 +108,7 @@ collections {
 #include "widgets/check.edc"
 #include "widgets/radio.edc"
 #include "widgets/index.edc"
-#include "widgets/popup.edc"
+//#include "widgets/popup.edc"
 #include "widgets/multibuttonentry.edc"
 #include "widgets/win.edc"
 #include "widgets/hover.edc"
@@ -116,6 +116,7 @@ collections {
 #include "widgets/floatingbutton.edc"
 
 #include "widgets_csharp/layout.edc"
+#include "widgets_csharp/popup.edc"
 
    color_classes {
       color_class {
diff --git a/packaging/efl-theme-tizen-mobile.spec b/packaging/efl-theme-tizen-mobile.spec
index 2679abeb..907a0ffa 100644
--- a/packaging/efl-theme-tizen-mobile.spec
+++ b/packaging/efl-theme-tizen-mobile.spec
@@ -30,14 +30,6 @@ License: BSD-2-Clause
 %description -n elm-sharp-theme-mobile
 EFL themes for Elm-Sharp Mobile
 
-%package -n elm-sharp-theme-fhub
-Summary: EFL themes for Elm-Sharp FHub
-Group: Mobile/Themes
-License: BSD-2-Clause
-
-%description -n elm-sharp-theme-fhub
-EFL themes for Elm-Sharp FHub
-
 %prep
 %setup -q
 
@@ -67,34 +59,8 @@ rm -rf %{buildroot}
 #TODO  - later
 #%{DEVEL_PREFIX}/*
 
-%post -n elm-sharp-theme-mobile
-mv %{_datadir}/elm-sharp/elm-sharp-theme-mobile.edj %{_datadir}/elm-sharp/elm-sharp-theme.edj
-/sbin/ldconfig
-
-%preun -n elm-sharp-theme-mobile
-mv %{_datadir}/elm-sharp/elm-sharp-theme.edj %{_datadir}/elm-sharp/elm-sharp-theme-mobile.edj
-
-%postun -n elm-sharp-theme-mobile
-/sbin/ldconfig
-
 %files -n elm-sharp-theme-mobile
 %defattr(-,root,root,-)
-%{_datadir}/elm-sharp/elm-sharp-theme-mobile.edj
-%manifest %{name}.manifest
-%license COPYING
-
-%post -n elm-sharp-theme-fhub
-mv %{_datadir}/elm-sharp/elm-sharp-theme-fhub.edj %{_datadir}/elm-sharp/elm-sharp-theme.edj
-/sbin/ldconfig
-
-%preun -n elm-sharp-theme-fhub
-mv %{_datadir}/elm-sharp/elm-sharp-theme.edj %{_datadir}/elm-sharp/elm-sharp-theme-fhub.edj
-
-%postun -n elm-sharp-theme-fhub
-/sbin/ldconfig
-
-%files -n elm-sharp-theme-fhub
-%defattr(-,root,root,-)
-%{_datadir}/elm-sharp/elm-sharp-theme-fhub.edj
+%{_datadir}/elm-sharp/elm-sharp-theme.edj
 %manifest %{name}.manifest
 %license COPYING