[cleanup]revise file location and so on

Change-Id: If295de7d7e9cf4a673cf956155d867e017da928b

diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644 (file)
index d792231..0000000
--- a/AUTHORS
+++ /dev/null
@@ -1,4 +0,0 @@
-Hyunjee Kim <hj0426.kim@samsung.com>
-Sanghoon Cho <sanghoon80.cho@samsung.com>
-Danny Jeongseok Seo <s.seo@samsung.com>
-Sunil Kim <sunil85.kim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 62076a5..5ae01b6 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,17 +37,15 @@ pkg_check_modules(pkgs REQUIRED
        ${TETHERING_REQUIRED_PKGS})
 
 INCLUDE_DIRECTORIES(
-       ${CMAKE_CURRENT_SOURCE_DIR}/sources/ui-gadget/include
-       ${CMAKE_CURRENT_SOURCE_DIR}/sources/ui-gadget/viewers-layout/include
-       ${CMAKE_CURRENT_SOURCE_DIR}/sources/wifi-syspopup/include
-       ${CMAKE_CURRENT_SOURCE_DIR}/sources/wifi-syspopup/viewer-popups/include
-       ${CMAKE_CURRENT_SOURCE_DIR}/sources/libraries/Common/include
-       ${CMAKE_CURRENT_SOURCE_DIR}/sources/libraries/WlanManager/include
-       ${CMAKE_CURRENT_SOURCE_DIR}/sources/libraries/appcoreWrapper/include
-       ${CMAKE_CURRENT_SOURCE_DIR}/sources/libraries/i18nManager/include)
+       ${CMAKE_CURRENT_SOURCE_DIR}/ui-gadget
+       ${CMAKE_CURRENT_SOURCE_DIR}/ui-gadget/viewers-layout
+       ${CMAKE_CURRENT_SOURCE_DIR}/wifi-syspopup
+       ${CMAKE_CURRENT_SOURCE_DIR}/wifi-syspopup/viewer-popups
+       ${CMAKE_CURRENT_SOURCE_DIR}/common
+)
 
 IF(TIZEN_MOBILE)
-ADD_SUBDIRECTORY(po)
-ADD_SUBDIRECTORY(sources/wifi-syspopup)
+ADD_SUBDIRECTORY(res/po)
+ADD_SUBDIRECTORY(wifi-syspopup)
 ENDIF(TIZEN_MOBILE)
-ADD_SUBDIRECTORY(sources/ui-gadget)
+ADD_SUBDIRECTORY(ui-gadget)

diff --git a/sources/libraries/appcoreWrapper/appcoreWrapper.c b/common/appcoreWrapper.c
similarity index 100%
rename from sources/libraries/appcoreWrapper/appcoreWrapper.c
rename to common/appcoreWrapper.c

diff --git a/sources/libraries/appcoreWrapper/include/appcoreWrapper.h b/common/appcoreWrapper.h
similarity index 100%
rename from sources/libraries/appcoreWrapper/include/appcoreWrapper.h
rename to common/appcoreWrapper.h

diff --git a/sources/libraries/Common/include/common.h b/common/common.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from sources/libraries/Common/include/common.h
rename to common/common.h

diff --git a/sources/libraries/Common/common_eap_connect.c b/common/common_eap_connect.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from sources/libraries/Common/common_eap_connect.c
rename to common/common_eap_connect.c

diff --git a/sources/libraries/Common/include/common_eap_connect.h b/common/common_eap_connect.h
similarity index 100%
rename from sources/libraries/Common/include/common_eap_connect.h
rename to common/common_eap_connect.h

diff --git a/sources/libraries/Common/common_generate_pin.c b/common/common_generate_pin.c
similarity index 99%
rename from sources/libraries/Common/common_generate_pin.c
rename to common/common_generate_pin.c
index fcebc26..dc3da2e 100644 (file)
--- a/sources/libraries/Common/common_generate_pin.c
+++ b/common/common_generate_pin.c
@@ -433,5 +433,3 @@ int wps_generate_pin(unsigned int *pin)
        *pin = val * 10 + wps_pin_checksum(val);
        return 0;
 }
-
-

diff --git a/sources/libraries/Common/include/common_generate_pin.h b/common/common_generate_pin.h
similarity index 100%
rename from sources/libraries/Common/include/common_generate_pin.h
rename to common/common_generate_pin.h

diff --git a/sources/libraries/Common/common_ip_info.c b/common/common_ip_info.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from sources/libraries/Common/common_ip_info.c
rename to common/common_ip_info.c

diff --git a/sources/libraries/Common/include/common_ip_info.h b/common/common_ip_info.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from sources/libraries/Common/include/common_ip_info.h
rename to common/common_ip_info.h

diff --git a/sources/libraries/Common/common_pswd_popup.c b/common/common_pswd_popup.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from sources/libraries/Common/common_pswd_popup.c
rename to common/common_pswd_popup.c

diff --git a/sources/libraries/Common/include/common_pswd_popup.h b/common/common_pswd_popup.h
similarity index 100%
rename from sources/libraries/Common/include/common_pswd_popup.h
rename to common/common_pswd_popup.h

diff --git a/sources/libraries/Common/common_utils.c b/common/common_utils.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from sources/libraries/Common/common_utils.c
rename to common/common_utils.c
index 22e30c2..2cc5a5e
--- a/sources/libraries/Common/common_utils.c
+++ b/common/common_utils.c
@@ -730,7 +730,7 @@ void common_util_manager_ecore_scan_update_timer_reset(void)
 }
 
 #if 0
-// not used at this moment 06/15/2018 
+// not used at this moment 06/15/2018
 static GDBusConnection *common_util_get_gdbus_conn(void)
 {
        GError *error = NULL;

diff --git a/sources/libraries/Common/include/common_utils.h b/common/common_utils.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from sources/libraries/Common/include/common_utils.h
rename to common/common_utils.h

diff --git a/sources/libraries/WlanManager/connection_manager.c b/common/connection_manager.c
similarity index 100%
rename from sources/libraries/WlanManager/connection_manager.c
rename to common/connection_manager.c

diff --git a/sources/libraries/WlanManager/include/connection_manager.h b/common/connection_manager.h
similarity index 100%
rename from sources/libraries/WlanManager/include/connection_manager.h
rename to common/connection_manager.h

diff --git a/sources/libraries/i18nManager/i18nmanager.c b/common/i18nmanager.c
similarity index 100%
rename from sources/libraries/i18nManager/i18nmanager.c
rename to common/i18nmanager.c

diff --git a/sources/libraries/i18nManager/include/i18nmanager.h b/common/i18nmanager.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from sources/libraries/i18nManager/include/i18nmanager.h
rename to common/i18nmanager.h

diff --git a/sources/libraries/WlanManager/wlan_connection.c b/common/wlan_connection.c
similarity index 100%
rename from sources/libraries/WlanManager/wlan_connection.c
rename to common/wlan_connection.c

diff --git a/sources/libraries/WlanManager/include/wlan_connection.h b/common/wlan_connection.h
similarity index 100%
rename from sources/libraries/WlanManager/include/wlan_connection.h
rename to common/wlan_connection.h

diff --git a/sources/libraries/WlanManager/wlan_manager.c b/common/wlan_manager.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from sources/libraries/WlanManager/wlan_manager.c
rename to common/wlan_manager.c

diff --git a/sources/libraries/WlanManager/include/wlan_manager.h b/common/wlan_manager.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from sources/libraries/WlanManager/include/wlan_manager.h
rename to common/wlan_manager.h

diff --git a/net.wifi-qs.efl b/net.wifi-qs.efl
deleted file mode 100644 (file)
index f08e387..0000000
--- a/net.wifi-qs.efl
+++ /dev/null
@@ -1,39 +0,0 @@
-e17 net.wifi-qs -w---- ------
-net.wifi-qs cert-svc-ui rwx--- ------
-net.wifi-qs cert-svc rwx--- ------
-net.wifi-qs secure-storage::pkcs12 rw---- ------
-net.wifi-qs cert-svc::pkcs12 rwxat- ------
-net.wifi-qs xorg rw---- ------
-net.wifi-qs isf rwx--- ------
-net.wifi-qs dbus rwx--- ------
-net.wifi-qs connman rw---- ------
-net.wifi-qs connman::get rw---- ------
-net.wifi-qs connman::set rw---- ------
-net.wifi-qs connman::profile rw---- ------
-net.wifi-qs telephony_framework::api_ps_public rw
-net.wifi-qs telephony_framework::api_ps_profile rw
-net.wifi-qs net-config rw---- ------
-net.wifi-qs mdm-server::admin r----- ------
-net.wifi-qs mdm-server::wifi r----- ------
-net.wifi-qs csc-manager --x--- ------
-net.wifi-qs sound_server rw---- ------
-net.wifi-qs pulseaudio rwxat- ------
-net.wifi-qs syspopup::db rw---- ------
-net.wifi-qs org.tizen.indicator rwx--- ------
-net.wifi-qs system::media::root rwxat- ------
-net.wifi-qs system::media rwxat- ------
-net.wifi-qs system::share rwxat- ------
-net.wifi-qs device::app_logging -w---- ------
-net.wifi-qs device::sys_logging -w---- ------
-net.wifi-qs system::homedir rwxat- ------
-net.wifi-qs sys-assert::core rwxat- ------
-net.wifi-qs system::use_internet r----- ------
-net.wifi-qs aul::launch r-x--- ------
-net.wifi-qs e17::notification rw---- ------
-net.wifi-qs ecore::lock rwx--- ------
-net.wifi-qs tizen::vconf::setting::admin rwx--- ------
-net.wifi-qs tizen::vconf::tethering::admin rwx--- ------
-net.wifi-qs tizen::vconf::public::r rwx--- ------
-net.wifi-qs tizen::vconf::platform::rw rwx--- ------
-org.tizen.app-tray net.wifi-qs r-x--- ------
-org.tizen.quickpanel net.wifi-qs rwx--- ------

diff --git a/net.wifi-qs.manifest b/net.wifi-qs.manifest
deleted file mode 100644 (file)
index 97e8c31..0000000
--- a/net.wifi-qs.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
-       <request>
-               <domain name="_"/>
-       </request>
-</manifest>

diff --git a/org.tizen.w-wifi.manifest b/org.tizen.w-wifi.manifest
deleted file mode 100644 (file)
index 97e8c31..0000000
--- a/org.tizen.w-wifi.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
-       <request>
-               <domain name="_"/>
-       </request>
-</manifest>

diff --git a/wifi-efl-ug.manifest b/packaging/wifi-efl-ug.manifest
similarity index 100%
rename from wifi-efl-ug.manifest
rename to packaging/wifi-efl-ug.manifest

diff --git a/packaging/wifi-efl-ug.spec b/packaging/wifi-efl-ug.spec
index 8f3e94b..186b52a 100644 (file)
--- a/packaging/wifi-efl-ug.spec
+++ b/packaging/wifi-efl-ug.spec
@@ -5,6 +5,7 @@ Release:        1
 Group:         App/Network
 License:       Flora-1.1
 Source0:       %{name}-%{version}.tar.gz
+Source1001: %{name}.manifest
 
 BuildRequires: pkgconfig(ecore)
 BuildRequires: pkgconfig(ecore-imf)
@@ -45,6 +46,7 @@ Wi-Fi System popup for TIZEN
 
 %prep
 %setup -q
+cp %{SOURCE1001} ./%{name}.manifest
 
 %define PREFIX /usr/
 
@@ -71,7 +73,7 @@ mkdir -p /usr/apps/wifi-efl-ug/bin/ -m 777
 %postun -p /sbin/ldconfig
 
 %files
-%manifest wifi-efl-ug.manifest
+%manifest %{name}.manifest
 %{PREFIX}/ug/lib/*
 %attr(644,-,-) %{PREFIX}/ug/lib/*
 %attr(755,-,-) %{PREFIX}/ug/lib/
@@ -84,7 +86,7 @@ mkdir -p /usr/apps/wifi-efl-ug/bin/ -m 777
 %license LICENSE
 
 %files -n net.wifi-qs
-%manifest net.wifi-qs.manifest
+%manifest %{name}.manifest
 %{_bindir}/wifi-qs
 %{_datadir}/packages/net.wifi-qs.xml
 %{_datadir}/icons/*.png

diff --git a/resources/fonts/oobe/SamsungOneUI-400.ttf b/res/fonts/oobe/SamsungOneUI-400.ttf
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from resources/fonts/oobe/SamsungOneUI-400.ttf
rename to res/fonts/oobe/SamsungOneUI-400.ttf

diff --git a/resources/fonts/oobe/SamsungOneUI-500.ttf b/res/fonts/oobe/SamsungOneUI-500.ttf
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from resources/fonts/oobe/SamsungOneUI-500.ttf
rename to res/fonts/oobe/SamsungOneUI-500.ttf

diff --git a/resources/fonts/oobe/SamsungOneUI-600.ttf b/res/fonts/oobe/SamsungOneUI-600.ttf
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from resources/fonts/oobe/SamsungOneUI-600.ttf
rename to res/fonts/oobe/SamsungOneUI-600.ttf

diff --git a/resources/images/A01-3_icon_00.png b/res/images/A01-3_icon_00.png
similarity index 100%
rename from resources/images/A01-3_icon_00.png
rename to res/images/A01-3_icon_00.png

diff --git a/resources/images/A01-3_icon_01.png b/res/images/A01-3_icon_01.png
similarity index 100%
rename from resources/images/A01-3_icon_01.png
rename to res/images/A01-3_icon_01.png

diff --git a/resources/images/A01-3_icon_02.png b/res/images/A01-3_icon_02.png
similarity index 100%
rename from resources/images/A01-3_icon_02.png
rename to res/images/A01-3_icon_02.png

diff --git a/resources/images/A01-3_icon_03.png b/res/images/A01-3_icon_03.png
similarity index 100%
rename from resources/images/A01-3_icon_03.png
rename to res/images/A01-3_icon_03.png

diff --git a/resources/images/A01-3_icon_captive.png b/res/images/A01-3_icon_captive.png
similarity index 100%
rename from resources/images/A01-3_icon_captive.png
rename to res/images/A01-3_icon_captive.png

diff --git a/resources/images/A01-3_icon_captive_press.png b/res/images/A01-3_icon_captive_press.png
similarity index 100%
rename from resources/images/A01-3_icon_captive_press.png
rename to res/images/A01-3_icon_captive_press.png

diff --git a/resources/images/A01-3_icon_lock_00.png b/res/images/A01-3_icon_lock_00.png
similarity index 100%
rename from resources/images/A01-3_icon_lock_00.png
rename to res/images/A01-3_icon_lock_00.png

diff --git a/resources/images/A01-3_icon_lock_01.png b/res/images/A01-3_icon_lock_01.png
similarity index 100%
rename from resources/images/A01-3_icon_lock_01.png
rename to res/images/A01-3_icon_lock_01.png

diff --git a/resources/images/A01-3_icon_lock_02.png b/res/images/A01-3_icon_lock_02.png
similarity index 100%
rename from resources/images/A01-3_icon_lock_02.png
rename to res/images/A01-3_icon_lock_02.png

diff --git a/resources/images/A01-3_icon_lock_03.png b/res/images/A01-3_icon_lock_03.png
similarity index 100%
rename from resources/images/A01-3_icon_lock_03.png
rename to res/images/A01-3_icon_lock_03.png

diff --git a/resources/images/core_button_effect_normal.#.png b/res/images/core_button_effect_normal.#.png
similarity index 100%
rename from resources/images/core_button_effect_normal.#.png
rename to res/images/core_button_effect_normal.#.png

diff --git a/resources/images/core_button_effect_pressed.#.png b/res/images/core_button_effect_pressed.#.png
similarity index 100%
rename from resources/images/core_button_effect_pressed.#.png
rename to res/images/core_button_effect_pressed.#.png

diff --git a/resources/images/find_hidden_network.png b/res/images/find_hidden_network.png
similarity index 100%
rename from resources/images/find_hidden_network.png
rename to res/images/find_hidden_network.png

diff --git a/resources/images/micro_x.png b/res/images/micro_x.png
similarity index 100%
rename from resources/images/micro_x.png
rename to res/images/micro_x.png

diff --git a/resources/images/noti_wifi_in_range.png b/res/images/noti_wifi_in_range.png
similarity index 100%
rename from resources/images/noti_wifi_in_range.png
rename to res/images/noti_wifi_in_range.png

diff --git a/resources/images/noti_wifi_in_range_ongoing.png b/res/images/noti_wifi_in_range_ongoing.png
similarity index 100%
rename from resources/images/noti_wifi_in_range_ongoing.png
rename to res/images/noti_wifi_in_range_ongoing.png

diff --git a/resources/images/oobe/buttons/base_border.png b/res/images/oobe/buttons/base_border.png
similarity index 100%
rename from resources/images/oobe/buttons/base_border.png
rename to res/images/oobe/buttons/base_border.png

diff --git a/resources/images/oobe/buttons/base_circle32.png b/res/images/oobe/buttons/base_circle32.png
similarity index 100%
rename from resources/images/oobe/buttons/base_circle32.png
rename to res/images/oobe/buttons/base_circle32.png

diff --git a/resources/images/oobe/buttons/base_circle60.png b/res/images/oobe/buttons/base_circle60.png
similarity index 100%
rename from resources/images/oobe/buttons/base_circle60.png
rename to res/images/oobe/buttons/base_circle60.png

diff --git a/resources/images/oobe/buttons/dot.png b/res/images/oobe/buttons/dot.png
similarity index 100%
rename from resources/images/oobe/buttons/dot.png
rename to res/images/oobe/buttons/dot.png

diff --git a/resources/images/oobe/buttons/gray_border.png b/res/images/oobe/buttons/gray_border.png
similarity index 100%
rename from resources/images/oobe/buttons/gray_border.png
rename to res/images/oobe/buttons/gray_border.png

diff --git a/resources/images/oobe/buttons/green_border.png b/res/images/oobe/buttons/green_border.png
similarity index 100%
rename from resources/images/oobe/buttons/green_border.png
rename to res/images/oobe/buttons/green_border.png

diff --git a/resources/images/oobe/checkboxes/checked_bg.png b/res/images/oobe/checkboxes/checked_bg.png
similarity index 100%
rename from resources/images/oobe/checkboxes/checked_bg.png
rename to res/images/oobe/checkboxes/checked_bg.png

diff --git a/resources/images/oobe/checkboxes/unchecked_bg.png b/res/images/oobe/checkboxes/unchecked_bg.png
similarity index 100%
rename from resources/images/oobe/checkboxes/unchecked_bg.png
rename to res/images/oobe/checkboxes/unchecked_bg.png

diff --git a/resources/images/setting_wifi.png b/res/images/setting_wifi.png
similarity index 100%
rename from resources/images/setting_wifi.png
rename to res/images/setting_wifi.png

diff --git a/resources/images/wifi_btn_next.png b/res/images/wifi_btn_next.png
similarity index 100%
rename from resources/images/wifi_btn_next.png
rename to res/images/wifi_btn_next.png

diff --git a/resources/images/wifi_icon_badge_container.png b/res/images/wifi_icon_badge_container.png
similarity index 100%
rename from resources/images/wifi_icon_badge_container.png
rename to res/images/wifi_icon_badge_container.png

diff --git a/resources/images/wifi_icon_badge_info.png b/res/images/wifi_icon_badge_info.png
similarity index 100%
rename from resources/images/wifi_icon_badge_info.png
rename to res/images/wifi_icon_badge_info.png

diff --git a/resources/images/wifi_icon_eye_pw_invisible.png b/res/images/wifi_icon_eye_pw_invisible.png
similarity index 100%
rename from resources/images/wifi_icon_eye_pw_invisible.png
rename to res/images/wifi_icon_eye_pw_invisible.png

diff --git a/resources/images/wifi_icon_eye_pw_visible.png b/res/images/wifi_icon_eye_pw_visible.png
similarity index 100%
rename from resources/images/wifi_icon_eye_pw_visible.png
rename to res/images/wifi_icon_eye_pw_visible.png

diff --git a/resources/images/wifi_icon_wps.png b/res/images/wifi_icon_wps.png
similarity index 100%
rename from resources/images/wifi_icon_wps.png
rename to res/images/wifi_icon_wps.png

diff --git a/po/CMakeLists.txt b/res/po/CMakeLists.txt
similarity index 100%
rename from po/CMakeLists.txt
rename to res/po/CMakeLists.txt

diff --git a/po/ar.po b/res/po/ar.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/ar.po
rename to res/po/ar.po
index 976307c..fd8ae0f
--- a/po/ar.po
+++ b/res/po/ar.po
@@ -306,4 +306,3 @@ msgstr "طول بادئة الشبكة"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "الحماية"
-

diff --git a/po/az.po b/res/po/az.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/az.po
rename to res/po/az.po
index 5d8188e..2f34036
--- a/po/az.po
+++ b/res/po/az.po
@@ -306,4 +306,3 @@ msgstr "Şəbəkə prefiksi uzunluğu"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Təhlükəsizlk"
-

diff --git a/po/bg.po b/res/po/bg.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/bg.po
rename to res/po/bg.po
index c1548cf..4e0dd40
--- a/po/bg.po
+++ b/res/po/bg.po
@@ -306,4 +306,3 @@ msgstr "Дължина на мрежовия префикс"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Защита"
-

diff --git a/po/ca.po b/res/po/ca.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/ca.po
rename to res/po/ca.po
index ecb0028..37ec5c8
--- a/po/ca.po
+++ b/res/po/ca.po
@@ -306,4 +306,3 @@ msgstr "Longitud de prefix de xarxa"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Seguretat"
-

diff --git a/po/cs.po b/res/po/cs.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/cs.po
rename to res/po/cs.po
index 3fac765..fb54418
--- a/po/cs.po
+++ b/res/po/cs.po
@@ -306,4 +306,3 @@ msgstr "Délka předpony sítě"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Zabezpečení"
-

diff --git a/po/da.po b/res/po/da.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/da.po
rename to res/po/da.po
index d95bbe7..bbcb864
--- a/po/da.po
+++ b/res/po/da.po
@@ -306,4 +306,3 @@ msgstr "Netværkspræfikslængde"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Sikkerhed"
-

diff --git a/po/de.po b/res/po/de.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/de.po
rename to res/po/de.po
index 39be01e..5232ccf
--- a/po/de.po
+++ b/res/po/de.po
@@ -306,4 +306,3 @@ msgstr "Präfixlänge"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Sicherheit"
-

diff --git a/po/el_GR.po b/res/po/el_GR.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/el_GR.po
rename to res/po/el_GR.po
index d5f5a30..ca5a12e
--- a/po/el_GR.po
+++ b/res/po/el_GR.po
@@ -306,4 +306,3 @@ msgstr "Μήκος προθέματος δικτύου"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Ασφάλεια"
-

diff --git a/po/en.po b/res/po/en.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/en.po
rename to res/po/en.po
index 16e88bc..fa71413
--- a/po/en.po
+++ b/res/po/en.po
@@ -306,4 +306,3 @@ msgstr "Network prefix length"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Security"
-

diff --git a/po/en_PH.po b/res/po/en_PH.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/en_PH.po
rename to res/po/en_PH.po
index 319a753..3681133
--- a/po/en_PH.po
+++ b/res/po/en_PH.po
@@ -306,4 +306,3 @@ msgstr "Network prefix length"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Security"
-

diff --git a/po/en_US.po b/res/po/en_US.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/en_US.po
rename to res/po/en_US.po
index f0a498e..2926576
--- a/po/en_US.po
+++ b/res/po/en_US.po
@@ -306,4 +306,3 @@ msgstr "Network prefix length"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Security"
-

diff --git a/po/es_ES.po b/res/po/es_ES.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/es_ES.po
rename to res/po/es_ES.po
index 416831b..6e340dc
--- a/po/es_ES.po
+++ b/res/po/es_ES.po
@@ -306,4 +306,3 @@ msgstr "Longitud de prefijo de red"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Seguridad"
-

diff --git a/po/es_US.po b/res/po/es_US.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/es_US.po
rename to res/po/es_US.po
index 6e4606b..917c512
--- a/po/es_US.po
+++ b/res/po/es_US.po
@@ -306,4 +306,3 @@ msgstr "Longitud del prefijo de red"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Seguridad"
-

diff --git a/po/et.po b/res/po/et.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/et.po
rename to res/po/et.po
index b95d59b..2512915
--- a/po/et.po
+++ b/res/po/et.po
@@ -306,4 +306,3 @@ msgstr "Võrguprefiksi pikkus"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Turvalisus"
-

diff --git a/po/eu.po b/res/po/eu.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/eu.po
rename to res/po/eu.po
index 2e00f9e..8525817
--- a/po/eu.po
+++ b/res/po/eu.po
@@ -306,4 +306,3 @@ msgstr "Sare aurrezenbakiaren luzera"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Segurtasuna"
-

diff --git a/po/fi.po b/res/po/fi.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/fi.po
rename to res/po/fi.po
index 4a0558a..7444778
--- a/po/fi.po
+++ b/res/po/fi.po
@@ -306,4 +306,3 @@ msgstr "Verkon etuliitteen pituus"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Suojaus"
-

diff --git a/po/fr.po b/res/po/fr.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/fr.po
rename to res/po/fr.po
index 0a99447..3b6279b
--- a/po/fr.po
+++ b/res/po/fr.po
@@ -306,4 +306,3 @@ msgstr "Longueur du préfixe réseau"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Sécurité"
-

diff --git a/po/fr_CA.po b/res/po/fr_CA.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/fr_CA.po
rename to res/po/fr_CA.po
index 21771a3..eb7a66d
--- a/po/fr_CA.po
+++ b/res/po/fr_CA.po
@@ -306,4 +306,3 @@ msgstr "Longueur du préfixe réseau"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Sécurité"
-

diff --git a/po/ga.po b/res/po/ga.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/ga.po
rename to res/po/ga.po
index 28bbab4..e22f47c
--- a/po/ga.po
+++ b/res/po/ga.po
@@ -306,4 +306,3 @@ msgstr "Fad réimír an líonra"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Slándáil"
-

diff --git a/po/gl.po b/res/po/gl.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/gl.po
rename to res/po/gl.po
index 8d2eb2f..4a79d78
--- a/po/gl.po
+++ b/res/po/gl.po
@@ -306,4 +306,3 @@ msgstr "Lonxitude do prefixo da rede"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Seguridade"
-

diff --git a/po/hi.po b/res/po/hi.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/hi.po
rename to res/po/hi.po
index a3839e2..dc0c3f1
--- a/po/hi.po
+++ b/res/po/hi.po
@@ -306,4 +306,3 @@ msgstr "नेटवर्क प्रिफिक्स लंबाई"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "सुरक्षा"
-

diff --git a/po/hr.po b/res/po/hr.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/hr.po
rename to res/po/hr.po
index 73a03a0..20ef174
--- a/po/hr.po
+++ b/res/po/hr.po
@@ -306,4 +306,3 @@ msgstr "Duljina mrežnog predbroja"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Sigurnost"
-

diff --git a/po/hu.po b/res/po/hu.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/hu.po
rename to res/po/hu.po
index 1808fc9..5463925
--- a/po/hu.po
+++ b/res/po/hu.po
@@ -306,4 +306,3 @@ msgstr "Hálózati előtag hosszúsága"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Biztonság"
-

diff --git a/po/hy.po b/res/po/hy.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/hy.po
rename to res/po/hy.po
index 568fd7b..675b899
--- a/po/hy.po
+++ b/res/po/hy.po
@@ -306,4 +306,3 @@ msgstr "Ցանցի նախածանցի երկարությունը"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Անվտանգութ."
-

diff --git a/po/is.po b/res/po/is.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/is.po
rename to res/po/is.po
index 45ab608..c46b556
--- a/po/is.po
+++ b/res/po/is.po
@@ -306,4 +306,3 @@ msgstr "Lengd kerfisforskeytis"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Öryggi"
-

diff --git a/po/it_IT.po b/res/po/it_IT.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/it_IT.po
rename to res/po/it_IT.po
index c3f66bb..24d15b2
--- a/po/it_IT.po
+++ b/res/po/it_IT.po
@@ -306,4 +306,3 @@ msgstr "Lunghezza prefisso di rete"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Protezione"
-

diff --git a/po/ja_JP.po b/res/po/ja_JP.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/ja_JP.po
rename to res/po/ja_JP.po
index 6bd3856..8c8080c
--- a/po/ja_JP.po
+++ b/res/po/ja_JP.po
@@ -306,4 +306,3 @@ msgstr "ネットワークプレフィックス長"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "セキュリティ"
-

diff --git a/po/ka.po b/res/po/ka.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/ka.po
rename to res/po/ka.po
index d5a24e5..decf073
--- a/po/ka.po
+++ b/res/po/ka.po
@@ -306,4 +306,3 @@ msgstr "ქსელის პრეფიქსის სიგრძე"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "უსაფრთხოება"
-

diff --git a/po/kk.po b/res/po/kk.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/kk.po
rename to res/po/kk.po
index 3f520b2..92d8ccd
--- a/po/kk.po
+++ b/res/po/kk.po
@@ -306,4 +306,3 @@ msgstr "Желілік префикс ұзындығы"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Қауіпсіздік"
-

diff --git a/po/ko_KR.po b/res/po/ko_KR.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/ko_KR.po
rename to res/po/ko_KR.po
index 1d8800c..0d3d274
--- a/po/ko_KR.po
+++ b/res/po/ko_KR.po
@@ -306,4 +306,3 @@ msgstr "네트워크 식별자 길이"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "보호"
-

diff --git a/po/lt.po b/res/po/lt.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/lt.po
rename to res/po/lt.po
index ae47bfd..e15de3a
--- a/po/lt.po
+++ b/res/po/lt.po
@@ -306,4 +306,3 @@ msgstr "Tinklo priešdėlio ilgis"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Saugumas"
-

diff --git a/po/lv.po b/res/po/lv.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/lv.po
rename to res/po/lv.po
index 42d960c..95c4ae5
--- a/po/lv.po
+++ b/res/po/lv.po
@@ -306,4 +306,3 @@ msgstr "Tīkla prefiksa garums"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Drošība"
-

diff --git a/po/mk.po b/res/po/mk.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/mk.po
rename to res/po/mk.po
index 9d364d7..42c96d4
--- a/po/mk.po
+++ b/res/po/mk.po
@@ -306,4 +306,3 @@ msgstr "Должина на префиксот на мрежата"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Безбедност"
-

diff --git a/po/nb.po b/res/po/nb.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/nb.po
rename to res/po/nb.po
index 70b487f..002bb62
--- a/po/nb.po
+++ b/res/po/nb.po
@@ -306,4 +306,3 @@ msgstr "Prefikslengde for nettverk"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Sikkerhet"
-

diff --git a/po/nl.po b/res/po/nl.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/nl.po
rename to res/po/nl.po
index 26e7c32..e7ea418
--- a/po/nl.po
+++ b/res/po/nl.po
@@ -306,4 +306,3 @@ msgstr "Netwerkprefixlengte"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Beveiliging"
-

diff --git a/po/pl.po b/res/po/pl.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/pl.po
rename to res/po/pl.po
index 8e04265..921501e
--- a/po/pl.po
+++ b/res/po/pl.po
@@ -306,4 +306,3 @@ msgstr "Długość prefiksu sieci"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Bezpieczeńs."
-

diff --git a/po/pt_BR.po b/res/po/pt_BR.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/pt_BR.po
rename to res/po/pt_BR.po
index 52b3cf2..d9c7200
--- a/po/pt_BR.po
+++ b/res/po/pt_BR.po
@@ -306,4 +306,3 @@ msgstr "Comprimento do prefixo de rede"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Segurança"
-

diff --git a/po/pt_PT.po b/res/po/pt_PT.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/pt_PT.po
rename to res/po/pt_PT.po
index 1ab4966..63295de
--- a/po/pt_PT.po
+++ b/res/po/pt_PT.po
@@ -306,4 +306,3 @@ msgstr "Comprimento do prefixo de rede"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Segurança"
-

diff --git a/po/ro.po b/res/po/ro.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/ro.po
rename to res/po/ro.po
index a327f03..cf8149a
--- a/po/ro.po
+++ b/res/po/ro.po
@@ -306,4 +306,3 @@ msgstr "Lungime prefix rețea"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Securitate"
-

diff --git a/po/ru_RU.po b/res/po/ru_RU.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/ru_RU.po
rename to res/po/ru_RU.po
index 8ad0be4..86212b5
--- a/po/ru_RU.po
+++ b/res/po/ru_RU.po
@@ -306,4 +306,3 @@ msgstr "Длина префикса сети"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Безопасность"
-

diff --git a/po/sk.po b/res/po/sk.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/sk.po
rename to res/po/sk.po
index f7b2704..9f6e6cc
--- a/po/sk.po
+++ b/res/po/sk.po
@@ -306,4 +306,3 @@ msgstr "Dĺžka sieťovej predvoľby"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Zabezpečenie"
-

diff --git a/po/sl.po b/res/po/sl.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/sl.po
rename to res/po/sl.po
index 27e6f15..3b53494
--- a/po/sl.po
+++ b/res/po/sl.po
@@ -306,4 +306,3 @@ msgstr "Dolžina predpone omrežja"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Varnost"
-

diff --git a/po/sr.po b/res/po/sr.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/sr.po
rename to res/po/sr.po
index 03089d8..8e79b13
--- a/po/sr.po
+++ b/res/po/sr.po
@@ -306,4 +306,3 @@ msgstr "Dužina mrežnog prefiksa"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Zaštita"
-

diff --git a/po/sv.po b/res/po/sv.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/sv.po
rename to res/po/sv.po
index 2d2f9cf..4ca0ce0
--- a/po/sv.po
+++ b/res/po/sv.po
@@ -306,4 +306,3 @@ msgstr "Längd för nätverksprefix"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Säkerhet"
-

diff --git a/po/tr_TR.po b/res/po/tr_TR.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/tr_TR.po
rename to res/po/tr_TR.po
index db43951..8471bbf
--- a/po/tr_TR.po
+++ b/res/po/tr_TR.po
@@ -306,4 +306,3 @@ msgstr "Ağ önek uzunluğu"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Güvenlik"
-

diff --git a/po/uk.po b/res/po/uk.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/uk.po
rename to res/po/uk.po
index 27bc1d3..7fc22b9
--- a/po/uk.po
+++ b/res/po/uk.po
@@ -306,4 +306,3 @@ msgstr "Довжина мережного префіксу"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Безпека"
-

diff --git a/po/uz.po b/res/po/uz.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/uz.po
rename to res/po/uz.po
index b74f95e..9c5040a
--- a/po/uz.po
+++ b/res/po/uz.po
@@ -306,4 +306,3 @@ msgstr "Tarmoq prefiksi uzunligi"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "Xavfsizlik"
-

diff --git a/po/zh_CN.po b/res/po/zh_CN.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/zh_CN.po
rename to res/po/zh_CN.po
index 2cc8869..fe86a64
--- a/po/zh_CN.po
+++ b/res/po/zh_CN.po
@@ -306,4 +306,3 @@ msgstr "网络前缀长度"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "安全"
-

diff --git a/po/zh_HK.po b/res/po/zh_HK.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/zh_HK.po
rename to res/po/zh_HK.po
index 813f995..d7a7834
--- a/po/zh_HK.po
+++ b/res/po/zh_HK.po
@@ -306,4 +306,3 @@ msgstr "網絡首碼長度"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "安全性"
-

diff --git a/po/zh_TW.po b/res/po/zh_TW.po
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from po/zh_TW.po
rename to res/po/zh_TW.po
index fb3c02b..929c06a
--- a/po/zh_TW.po
+++ b/res/po/zh_TW.po
@@ -306,4 +306,3 @@ msgstr "網路前置碼長度"
 
 msgid "IDS_ST_BUTTON_SECURITY_ABB"
 msgstr "安全性"
-

diff --git a/tables/ug-wifi-efl_ChangeableColorTable.xml b/res/tables/ug-wifi-efl_ChangeableColorTable.xml
similarity index 100%
rename from tables/ug-wifi-efl_ChangeableColorTable.xml
rename to res/tables/ug-wifi-efl_ChangeableColorTable.xml

diff --git a/tables/ug-wifi-efl_FontInfoTable.xml b/res/tables/ug-wifi-efl_FontInfoTable.xml
similarity index 100%
rename from tables/ug-wifi-efl_FontInfoTable.xml
rename to res/tables/ug-wifi-efl_FontInfoTable.xml

diff --git a/sources/ui-gadget/CMakeLists.txt b/sources/ui-gadget/CMakeLists.txt
deleted file mode 100644 (file)
index c2cb03a..0000000
--- a/sources/ui-gadget/CMakeLists.txt
+++ /dev/null
@@ -1,121 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-# tizen 2.4
-#PROJECT(wifi-efl-UG C)
-# tizen 3.0
-PROJECT(ug-wifi-efl-UG C)
-
-# defines
-SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
-SET(INCLUDEDIR "\${prefix}/include")
-SET(VERSION 0.1.0)
-SET(RESDIR "${PREFIX}/res")
-SET(TABLEDIR "/usr/apps/wifi-efl-ug/shared/res/tables")
-
-IF(TIZEN_TETHERING_ENABLE)
-       SET(TETHERING_POPUP_SRCS winset_popup.c)
-ENDIF(TIZEN_TETHERING_ENABLE)
-
-# source files
-SET(SRCS
-       ../libraries/i18nManager/i18nmanager.c
-       ../libraries/appcoreWrapper/appcoreWrapper.c
-       ../libraries/WlanManager/connection_manager.c
-       ../libraries/WlanManager/wlan_manager.c
-       ../libraries/WlanManager/wlan_connection.c
-       ../libraries/Common/common_utils.c
-       ../libraries/Common/common_ip_info.c
-       ../libraries/Common/common_pswd_popup.c
-       ../libraries/Common/common_eap_connect.c
-       ../libraries/Common/common_generate_pin.c
-       ${ENGINE_SOURCES}
-       ${TETHERING_POPUP_SRCS}
-       wifi-efl-UG.c
-       viewers-layout/viewer_manager.c
-       viewers-layout/wifi_viewer_list.c
-       viewers-layout/view_detail.c
-       viewers-layout/view_advanced.c
-       viewers-layout/view_ime_hidden.c
-       wifi-wlan-callbacks.c)
-
-FOREACH(flag ${pkgs_CFLAGS})
-       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-ENDFOREACH(flag)
-
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
-
-# add library
-ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
-SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION 0.1.0)
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS})
-
-ADD_CUSTOM_TARGET(main_layout.edj
-       COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/../../resources/images
-               ${CMAKE_CURRENT_SOURCE_DIR}/edcs/main_layout.edc
-               ${CMAKE_CURRENT_SOURCE_DIR}/edcs/main_layout.edj
-               DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/edcs/main_layout.edc
-)
-
-ADD_DEPENDENCIES(${PROJECT_NAME} main_layout.edj)
-
-ADD_CUSTOM_TARGET(custom_editfield.edj
-       COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/../../resources/images
-               ${CMAKE_CURRENT_SOURCE_DIR}/edcs/custom_editfield.edc
-               ${CMAKE_CURRENT_SOURCE_DIR}/edcs/custom_editfield.edj
-               DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/edcs/custom_editfield.edc
-)
-
-ADD_DEPENDENCIES(${PROJECT_NAME} custom_editfield.edj)
-
-ADD_CUSTOM_TARGET(custom_genlist.edj
-       COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/../../resources/images
-               ${CMAKE_CURRENT_SOURCE_DIR}/edcs/custom_genlist.edc
-               ${CMAKE_CURRENT_SOURCE_DIR}/edcs/custom_genlist.edj
-               DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/edcs/custom_genlist.edc
-)
-
-ADD_DEPENDENCIES(${PROJECT_NAME} custom_genlist.edj)
-
-ADD_CUSTOM_TARGET(custom_popup.edj
-       COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/../../resources/images
-               ${CMAKE_CURRENT_SOURCE_DIR}/edcs/custom_popup.edc
-               ${CMAKE_CURRENT_SOURCE_DIR}/edcs/custom_popup.edj
-               DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/edcs/custom_popup.edc
-)
-
-ADD_DEPENDENCIES(${PROJECT_NAME} custom_popup.edj)
-
-ADD_CUSTOM_TARGET(setup_wizard.edj
-       COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/../../resources/images
-               ${CMAKE_CURRENT_SOURCE_DIR}/edcs/setup_wizard.edc
-               ${CMAKE_CURRENT_SOURCE_DIR}/edcs/setup_wizard.edj
-               DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/edcs/setup_wizard.edc
-)
-
-ADD_DEPENDENCIES(${PROJECT_NAME} setup_wizard.edj)
-
-ADD_CUSTOM_TARGET(oobe_buttons.edj
-       COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/../../resources/images
-               -fd ${CMAKE_CURRENT_SOURCE_DIR}/../../resources/fonts
-               ${CMAKE_CURRENT_SOURCE_DIR}/edcs/oobe_buttons.edc
-               ${CMAKE_CURRENT_SOURCE_DIR}/edcs/oobe_buttons.edj
-               DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/edcs/oobe_buttons.edc
-)
-
-ADD_DEPENDENCIES(${PROJECT_NAME} oobe_buttons.edj)
-
-# tizen 2.4
-#INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/apps/wifi-efl-ug/lib/ug/)
-# tizen 3.0
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/ug/lib/)
-
-# install image files
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/edcs/main_layout.edj DESTINATION /usr/apps/wifi-efl-ug/res/edje)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/edcs/custom_editfield.edj DESTINATION /usr/apps/wifi-efl-ug/res/edje)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/edcs/custom_genlist.edj DESTINATION /usr/apps/wifi-efl-ug/res/edje)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/edcs/custom_popup.edj DESTINATION /usr/apps/wifi-efl-ug/res/edje)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/edcs/setup_wizard.edj DESTINATION /usr/apps/wifi-efl-ug/res/edje)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/edcs/oobe_buttons.edj DESTINATION /usr/apps/wifi-efl-ug/res/edje)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../wifi-efl-ug.xml DESTINATION /usr/share/packages/)
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../tables/ DESTINATION ${TABLEDIR} FILES_MATCHING PATTERN "*.xml")

diff --git a/sources/wifi-syspopup/CMakeLists.txt b/sources/wifi-syspopup/CMakeLists.txt
deleted file mode 100644 (file)
index bcb29e8..0000000
--- a/sources/wifi-syspopup/CMakeLists.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-PROJECT(wifi-qs C)
-
-# defines
-SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
-SET(INCLUDEDIR "\${prefix}/include")
-SET(VERSION 0.1.0)
-
-ADD_DEFINITIONS(-DTIZEN_WIFI_QS)
-
-# source files
-SET(SRCS
-       ../libraries/i18nManager/i18nmanager.c
-       ../libraries/appcoreWrapper/appcoreWrapper.c
-       ../libraries/WlanManager/connection_manager.c
-       ../libraries/WlanManager/wlan_manager.c
-       ../libraries/WlanManager/wlan_connection.c
-       ../libraries/Common/common_utils.c
-       ../libraries/Common/common_ip_info.c
-       ../libraries/Common/common_pswd_popup.c
-       ../libraries/Common/common_eap_connect.c
-       ../libraries/Common/common_generate_pin.c
-       ${ENGINE_SOURCES}
-       viewer-popups/view-main.c
-       viewer-popups/view-alerts.c
-       wifi-syspopup.c
-       wifi-syspopup-engine-callback.c)
-
-FOREACH(flag ${pkgs_CFLAGS})
-       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-ENDFOREACH(flag)
-
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIE")
-
-ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
-
-# add executable
-ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
-SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
-
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS})
-
-ADD_CUSTOM_TARGET(wifi-syspopup-custom.edj
-       COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/../../resources/images
-               ${CMAKE_CURRENT_SOURCE_DIR}/edcs/wifi-syspopup-custom.edc
-               ${CMAKE_CURRENT_SOURCE_DIR}/edcs/wifi-syspopup-custom.edj
-               DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/edcs/wifi-syspopup-custom.edc
-)
-
-ADD_DEPENDENCIES(${PROJECT_NAME} wifi-syspopup-custom.edj)
-
-ADD_CUSTOM_TARGET(wifi-syspopup-custom-editfield.edj
-               COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/../../resources/images
-               ${CMAKE_CURRENT_SOURCE_DIR}/edcs/wifi-syspopup-custom-editfield.edc
-               ${CMAKE_CURRENT_SOURCE_DIR}/edcs/wifi-syspopup-custom-editfield.edj
-               DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/edcs/wifi-syspopup-custom-editfield.edc
-)
-
-ADD_DEPENDENCIES(${PROJECT_NAME} wifi-syspopup-custom-editfield.edj)
-
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin)
-
-# install image files
-
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../resources/images/A01-3_icon_captive.png DESTINATION /usr/share/icons)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../resources/images/noti_wifi_in_range.png DESTINATION /usr/share/icons)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../resources/images/noti_wifi_in_range_ongoing.png DESTINATION /usr/share/icons)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../resources/images/setting_wifi.png DESTINATION /usr/share/icons)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/edcs/wifi-syspopup-custom.edj DESTINATION /usr/apps/net.wifi-qs/res/edje)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/edcs/wifi-syspopup-custom-editfield.edj DESTINATION /usr/apps/net.wifi-qs/res/edje)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/net.${PROJECT_NAME}.xml DESTINATION /usr/share/packages/)

diff --git a/ui-gadget/CMakeLists.txt b/ui-gadget/CMakeLists.txt
new file mode 100644 (file)
index 0000000..429bcd3
--- /dev/null
+++ b/ui-gadget/CMakeLists.txt
@@ -0,0 +1,121 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+# tizen 2.4
+#PROJECT(wifi-efl-UG C)
+# tizen 3.0
+PROJECT(ug-wifi-efl-UG C)
+
+# defines
+SET(PREFIX ${CMAKE_INSTALL_PREFIX})
+SET(EXEC_PREFIX "\${prefix}")
+SET(LIBDIR "\${prefix}/lib")
+SET(INCLUDEDIR "\${prefix}/include")
+SET(VERSION 0.1.0)
+SET(RESDIR "${PREFIX}/res")
+SET(TABLEDIR "/usr/apps/wifi-efl-ug/shared/res/tables")
+
+IF(TIZEN_TETHERING_ENABLE)
+       SET(TETHERING_POPUP_SRCS winset_popup.c)
+ENDIF(TIZEN_TETHERING_ENABLE)
+
+# source files
+SET(SRCS
+       ../common/i18nmanager.c
+       ../common/appcoreWrapper.c
+       ../common/connection_manager.c
+       ../common/wlan_manager.c
+       ../common/wlan_connection.c
+       ../common/common_utils.c
+       ../common/common_ip_info.c
+       ../common/common_pswd_popup.c
+       ../common/common_eap_connect.c
+       ../common/common_generate_pin.c
+       ${ENGINE_SOURCES}
+       ${TETHERING_POPUP_SRCS}
+       wifi-efl-UG.c
+       viewer_manager.c
+       wifi_viewer_list.c
+       view_detail.c
+       view_advanced.c
+       view_ime_hidden.c
+       wifi-wlan-callbacks.c)
+
+FOREACH(flag ${pkgs_CFLAGS})
+       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
+ENDFOREACH(flag)
+
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
+
+# add library
+ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
+SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION 0.1.0)
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS})
+
+ADD_CUSTOM_TARGET(main_layout.edj
+       COMMAND edje_cc -id ${CMAKE_SOURCE_DIR}/res/images
+               ${CMAKE_CURRENT_SOURCE_DIR}/edc/main_layout.edc
+               ${CMAKE_CURRENT_SOURCE_DIR}/edc/main_layout.edj
+               DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/edc/main_layout.edc
+)
+
+ADD_DEPENDENCIES(${PROJECT_NAME} main_layout.edj)
+
+ADD_CUSTOM_TARGET(custom_editfield.edj
+       COMMAND edje_cc -id ${CMAKE_SOURCE_DIR}/res/images
+               ${CMAKE_CURRENT_SOURCE_DIR}/edc/custom_editfield.edc
+               ${CMAKE_CURRENT_SOURCE_DIR}/edc/custom_editfield.edj
+               DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/edc/custom_editfield.edc
+)
+
+ADD_DEPENDENCIES(${PROJECT_NAME} custom_editfield.edj)
+
+ADD_CUSTOM_TARGET(custom_genlist.edj
+       COMMAND edje_cc -id ${CMAKE_SOURCE_DIR}/res/images
+               ${CMAKE_CURRENT_SOURCE_DIR}/edc/custom_genlist.edc
+               ${CMAKE_CURRENT_SOURCE_DIR}/edc/custom_genlist.edj
+               DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/edc/custom_genlist.edc
+)
+
+ADD_DEPENDENCIES(${PROJECT_NAME} custom_genlist.edj)
+
+ADD_CUSTOM_TARGET(custom_popup.edj
+       COMMAND edje_cc -id ${CMAKE_SOURCE_DIR}/res/images
+               ${CMAKE_CURRENT_SOURCE_DIR}/edc/custom_popup.edc
+               ${CMAKE_CURRENT_SOURCE_DIR}/edc/custom_popup.edj
+               DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/edc/custom_popup.edc
+)
+
+ADD_DEPENDENCIES(${PROJECT_NAME} custom_popup.edj)
+
+ADD_CUSTOM_TARGET(setup_wizard.edj
+       COMMAND edje_cc -id ${CMAKE_SOURCE_DIR}/res/images
+               ${CMAKE_CURRENT_SOURCE_DIR}/edc/setup_wizard.edc
+               ${CMAKE_CURRENT_SOURCE_DIR}/edc/setup_wizard.edj
+               DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/edc/setup_wizard.edc
+)
+
+ADD_DEPENDENCIES(${PROJECT_NAME} setup_wizard.edj)
+
+ADD_CUSTOM_TARGET(oobe_buttons.edj
+       COMMAND edje_cc -id ${CMAKE_SOURCE_DIR}/res/images
+               -fd ${CMAKE_SOURCE_DIR}/res/fonts
+               ${CMAKE_CURRENT_SOURCE_DIR}/edc/oobe_buttons.edc
+               ${CMAKE_CURRENT_SOURCE_DIR}/edc/oobe_buttons.edj
+               DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/edc/oobe_buttons.edc
+)
+
+ADD_DEPENDENCIES(${PROJECT_NAME} oobe_buttons.edj)
+
+# tizen 2.4
+#INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/apps/wifi-efl-ug/lib/ug/)
+# tizen 3.0
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/ug/lib/)
+
+# install image files
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/edc/main_layout.edj DESTINATION /usr/apps/wifi-efl-ug/res/edje)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/edc/custom_editfield.edj DESTINATION /usr/apps/wifi-efl-ug/res/edje)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/edc/custom_genlist.edj DESTINATION /usr/apps/wifi-efl-ug/res/edje)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/edc/custom_popup.edj DESTINATION /usr/apps/wifi-efl-ug/res/edje)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/edc/setup_wizard.edj DESTINATION /usr/apps/wifi-efl-ug/res/edje)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/edc/oobe_buttons.edj DESTINATION /usr/apps/wifi-efl-ug/res/edje)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/wifi-efl-ug.xml DESTINATION /usr/share/packages/)
+INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/tables/ DESTINATION ${TABLEDIR} FILES_MATCHING PATTERN "*.xml")

diff --git a/sources/ui-gadget/edcs/custom_check.edc b/ui-gadget/edc/custom_check.edc
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from sources/ui-gadget/edcs/custom_check.edc
rename to ui-gadget/edc/custom_check.edc

diff --git a/sources/ui-gadget/edcs/custom_editfield.edc b/ui-gadget/edc/custom_editfield.edc
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from sources/ui-gadget/edcs/custom_editfield.edc
rename to ui-gadget/edc/custom_editfield.edc

diff --git a/sources/ui-gadget/edcs/custom_genlist.edc b/ui-gadget/edc/custom_genlist.edc
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from sources/ui-gadget/edcs/custom_genlist.edc
rename to ui-gadget/edc/custom_genlist.edc

diff --git a/sources/ui-gadget/edcs/custom_popup.edc b/ui-gadget/edc/custom_popup.edc
old mode 100755 (executable)
new mode 100644 (file)
similarity index 94%
rename from sources/ui-gadget/edcs/custom_popup.edc
rename to ui-gadget/edc/custom_popup.edc
index 9e90ccd..efbc1e2
--- a/sources/ui-gadget/edcs/custom_popup.edc
+++ b/ui-gadget/edc/custom_popup.edc
@@ -31,9 +31,9 @@ collections {
                                        rel1.relative: 0.0 0.0;
                                        rel2.relative: 0.0 1.0;
                                        align: 0.0 0.0;
-                               }
-                       }
-                       part { name: "pad_r";
+                               }
+                       }
+                       part { name: "pad_r";
                                type: SPACER;
                                scale: 1;
                                description { state: "default" 0.0;
@@ -43,7 +43,7 @@ collections {
                                        rel2.relative: 1.0 1.0;
                                        align: 1.0 0.0;
                                 }
-                       }
+                       }
                        part { name: "elm.swallow.content";
                                 type: SWALLOW;
                                 scale: 1;
@@ -57,10 +57,10 @@ collections {
                                        }
                                        rel2{
                                           relative: 0.0 1.0;
-                                               to_x: "pad_r";
+                                               to_x: "pad_r";
                                        }
-                               }
-                       }
-               }
+                               }
+                       }
+               }
        }
 }

diff --git a/sources/ui-gadget/edcs/main_layout.edc b/ui-gadget/edc/main_layout.edc
similarity index 100%
rename from sources/ui-gadget/edcs/main_layout.edc
rename to ui-gadget/edc/main_layout.edc

diff --git a/sources/ui-gadget/edcs/oobe_buttons.edc b/ui-gadget/edc/oobe_buttons.edc
old mode 100755 (executable)
new mode 100644 (file)
similarity index 96%
rename from sources/ui-gadget/edcs/oobe_buttons.edc
rename to ui-gadget/edc/oobe_buttons.edc
index 1b02a3b..62385c6
--- a/sources/ui-gadget/edcs/oobe_buttons.edc
+++ b/ui-gadget/edc/oobe_buttons.edc
@@ -1,5 +1,5 @@
-#define COLOR_GREEN_DARK 32 82 71 255 
-#define COLOR_GREEN_DARK_TRANSPARENT 32 82 71 0 
+#define COLOR_GREEN_DARK 32 82 71 255
+#define COLOR_GREEN_DARK_TRANSPARENT 32 82 71 0
 #define COLOR_GREEN_LIGHT 223 234 228 255
 #define COLOR_GREEN_LIGHT_TRANSPARENT 223 234 228 0
 #define COLOR_GRAY 130 132 132 255
@@ -198,7 +198,7 @@ collections {
             action: STATE_SET "default";
             target: "bg";
             target: "over";
-            target: "elm.text";                                
+            target: "elm.text";
          }
          program { "disable"
             signal: "elm,state,disabled";
@@ -206,7 +206,7 @@ collections {
             action: STATE_SET "disabled";
             target: "bg";
             target: "over";
-            target: "elm.text";                                
+            target: "elm.text";
          }
 
          program { "button_press"
@@ -379,7 +379,7 @@ collections {
             source: "event";
             sequence {
                action: SIGNAL_EMIT "elm,action,click" "";
-               
+
                action: SIGNAL_EMIT "elm,action,check,toggle" "";
             }
             after: "on_clicked";
@@ -417,7 +417,7 @@ collections {
             after: "on_enabled";
          }
       }
-   } 
+   }
 
    group { "elm/check/base/template";
       inherit: "elm/check/event/default";
@@ -433,22 +433,22 @@ collections {
             //Can be overriden in inheriting class
          }
          program { name: "on_unset_check";
-            //Can be overriden in inheriting class            
+            //Can be overriden in inheriting class
          }
          program { name: "on_pressed";
-            //Can be overriden in inheriting class            
+            //Can be overriden in inheriting class
          }
          program { name: "on_unpressed";
-            //Can be overriden in inheriting class            
+            //Can be overriden in inheriting class
          }
          program { name: "on_clicked";
-            //Can be overriden in inheriting class            
+            //Can be overriden in inheriting class
          }
          program { name: "on_disabled";
-            //Can be overriden in inheriting class            
+            //Can be overriden in inheriting class
          }
          program { name: "on_enabled";
-            //Can be overriden in inheriting class            
+            //Can be overriden in inheriting class
          }
       }
    }
@@ -486,7 +486,7 @@ collections {
                   size: SMALL_FONT_SIZE;
                }
             }
-         }     
+         }
       }
       target_group: "components" "bg" "elm.text" "dot";
    }
@@ -603,7 +603,7 @@ collections {
 
                action: STATE_SET "on" 0.0;
                transition: LINEAR ON_OFF_TRANSITION_TIME/2;
-               target_groups: "components"; 
+               target_groups: "components";
             }
          }
          program { name: "on_unset_check";
@@ -614,7 +614,7 @@ collections {
 
                action: STATE_SET "default" 0.0;
                transition: LINEAR ON_OFF_TRANSITION_TIME/2;
-               target_groups: "components"; 
+               target_groups: "components";
             }
          }
       }

diff --git a/sources/ui-gadget/edcs/setup_wizard.edc b/ui-gadget/edc/setup_wizard.edc
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from sources/ui-gadget/edcs/setup_wizard.edc
rename to ui-gadget/edc/setup_wizard.edc

diff --git a/sources/ui-gadget/include/ug_wifi.h b/ui-gadget/ug_wifi.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from sources/ui-gadget/include/ug_wifi.h
rename to ui-gadget/ug_wifi.h

diff --git a/sources/ui-gadget/viewers-layout/view_advanced.c b/ui-gadget/view_advanced.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from sources/ui-gadget/viewers-layout/view_advanced.c
rename to ui-gadget/view_advanced.c

diff --git a/sources/ui-gadget/viewers-layout/include/view_advanced.h b/ui-gadget/view_advanced.h
similarity index 100%
rename from sources/ui-gadget/viewers-layout/include/view_advanced.h
rename to ui-gadget/view_advanced.h

diff --git a/sources/ui-gadget/viewers-layout/view_detail.c b/ui-gadget/view_detail.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from sources/ui-gadget/viewers-layout/view_detail.c
rename to ui-gadget/view_detail.c

diff --git a/sources/ui-gadget/viewers-layout/include/view_detail.h b/ui-gadget/view_detail.h
similarity index 100%
rename from sources/ui-gadget/viewers-layout/include/view_detail.h
rename to ui-gadget/view_detail.h

diff --git a/sources/ui-gadget/viewers-layout/view_ime_hidden.c b/ui-gadget/view_ime_hidden.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from sources/ui-gadget/viewers-layout/view_ime_hidden.c
rename to ui-gadget/view_ime_hidden.c

diff --git a/sources/ui-gadget/viewers-layout/include/view_ime_hidden.h b/ui-gadget/view_ime_hidden.h
similarity index 100%
rename from sources/ui-gadget/viewers-layout/include/view_ime_hidden.h
rename to ui-gadget/view_ime_hidden.h

diff --git a/sources/ui-gadget/include/viewer_list.h b/ui-gadget/viewer_list.h
similarity index 100%
rename from sources/ui-gadget/include/viewer_list.h
rename to ui-gadget/viewer_list.h

diff --git a/sources/ui-gadget/viewers-layout/viewer_manager.c b/ui-gadget/viewer_manager.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from sources/ui-gadget/viewers-layout/viewer_manager.c
rename to ui-gadget/viewer_manager.c

diff --git a/sources/ui-gadget/include/viewer_manager.h b/ui-gadget/viewer_manager.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from sources/ui-gadget/include/viewer_manager.h
rename to ui-gadget/viewer_manager.h

diff --git a/sources/ui-gadget/wifi-efl-UG.c b/ui-gadget/wifi-efl-UG.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from sources/ui-gadget/wifi-efl-UG.c
rename to ui-gadget/wifi-efl-UG.c

diff --git a/wifi-efl-ug.xml b/ui-gadget/wifi-efl-ug.xml
similarity index 100%
rename from wifi-efl-ug.xml
rename to ui-gadget/wifi-efl-ug.xml

diff --git a/sources/ui-gadget/include/wifi-engine-callback.h b/ui-gadget/wifi-engine-callback.h
similarity index 100%
rename from sources/ui-gadget/include/wifi-engine-callback.h
rename to ui-gadget/wifi-engine-callback.h

diff --git a/sources/ui-gadget/wifi-wlan-callbacks.c b/ui-gadget/wifi-wlan-callbacks.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from sources/ui-gadget/wifi-wlan-callbacks.c
rename to ui-gadget/wifi-wlan-callbacks.c

diff --git a/sources/ui-gadget/viewers-layout/wifi_viewer_list.c b/ui-gadget/wifi_viewer_list.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from sources/ui-gadget/viewers-layout/wifi_viewer_list.c
rename to ui-gadget/wifi_viewer_list.c

diff --git a/sources/ui-gadget/winset_popup.c b/ui-gadget/winset_popup.c
similarity index 100%
rename from sources/ui-gadget/winset_popup.c
rename to ui-gadget/winset_popup.c

diff --git a/sources/ui-gadget/include/winset_popup.h b/ui-gadget/winset_popup.h
similarity index 100%
rename from sources/ui-gadget/include/winset_popup.h
rename to ui-gadget/winset_popup.h

diff --git a/wifi-efl-ug.include b/wifi-efl-ug.include
deleted file mode 100644 (file)
index 1681260..0000000
--- a/wifi-efl-ug.include
+++ /dev/null
@@ -1,22 +0,0 @@
-e17 $1 rw
-$1 ug.cert-svc-ui include
-$1 xorg rw
-$1 isf rwx
-$1 dbus rwx
-$1 connman rw
-$1 net-config rw
-$1 mdm-server::admin r
-$1 mdm-server::wifi r
-$1 sound_server rw
-$1 pulseaudio rwxat
-$1 system::media::root rwxat
-$1 system::media rwxat
-$1 system::share rwxat
-$1 device::app_logging w
-$1 system::homedir rwxat
-$1 sys-assert::core rwxat
-$1 cert-svc rwx
-$1 tizen::vconf::setting::admin rwx
-$1 tizen::vconf::tethering::admin rwx
-$1 tizen::vconf::public::r rwx
-$1 tizen::vconf::platform::rw rwx

diff --git a/wifi-syspopup/CMakeLists.txt b/wifi-syspopup/CMakeLists.txt
new file mode 100644 (file)
index 0000000..3a8e5ea
--- /dev/null
+++ b/wifi-syspopup/CMakeLists.txt
@@ -0,0 +1,73 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+PROJECT(wifi-qs C)
+
+# defines
+SET(PREFIX ${CMAKE_INSTALL_PREFIX})
+SET(EXEC_PREFIX "\${prefix}")
+SET(LIBDIR "\${prefix}/lib")
+SET(INCLUDEDIR "\${prefix}/include")
+SET(VERSION 0.1.0)
+
+ADD_DEFINITIONS(-DTIZEN_WIFI_QS)
+
+# source files
+SET(SRCS
+       ../common/i18nmanager.c
+       ../common/appcoreWrapper.c
+       ../common/connection_manager.c
+       ../common/wlan_manager.c
+       ../common/wlan_connection.c
+       ../common/common_utils.c
+       ../common/common_ip_info.c
+       ../common/common_pswd_popup.c
+       ../common/common_eap_connect.c
+       ../common/common_generate_pin.c
+       ${ENGINE_SOURCES}
+       view-main.c
+       view-alerts.c
+       wifi-syspopup.c
+       wifi-syspopup-engine-callback.c)
+
+FOREACH(flag ${pkgs_CFLAGS})
+       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
+ENDFOREACH(flag)
+
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIE")
+
+ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
+
+# add executable
+ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
+SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
+
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS})
+
+ADD_CUSTOM_TARGET(wifi-syspopup-custom.edj
+       COMMAND edje_cc -id ${CMAKE_SOURCE_DIR}/res/images
+               ${CMAKE_CURRENT_SOURCE_DIR}/edc/wifi-syspopup-custom.edc
+               ${CMAKE_CURRENT_SOURCE_DIR}/edc/wifi-syspopup-custom.edj
+               DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/edc/wifi-syspopup-custom.edc
+)
+
+ADD_DEPENDENCIES(${PROJECT_NAME} wifi-syspopup-custom.edj)
+
+ADD_CUSTOM_TARGET(wifi-syspopup-custom-editfield.edj
+               COMMAND edje_cc -id ${CMAKE_SOURCE_DIR}/res/images
+               ${CMAKE_CURRENT_SOURCE_DIR}/edc/wifi-syspopup-custom-editfield.edc
+               ${CMAKE_CURRENT_SOURCE_DIR}/edc/wifi-syspopup-custom-editfield.edj
+               DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/edc/wifi-syspopup-custom-editfield.edc
+)
+
+ADD_DEPENDENCIES(${PROJECT_NAME} wifi-syspopup-custom-editfield.edj)
+
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin)
+
+# install image files
+
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/images/A01-3_icon_captive.png DESTINATION /usr/share/icons)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/images/noti_wifi_in_range.png DESTINATION /usr/share/icons)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/images/noti_wifi_in_range_ongoing.png DESTINATION /usr/share/icons)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/images/setting_wifi.png DESTINATION /usr/share/icons)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/edc/wifi-syspopup-custom.edj DESTINATION /usr/apps/net.wifi-qs/res/edje)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/edc/wifi-syspopup-custom-editfield.edj DESTINATION /usr/apps/net.wifi-qs/res/edje)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/net.${PROJECT_NAME}.xml DESTINATION /usr/share/packages/)

diff --git a/sources/wifi-syspopup/edcs/wifi-syspopup-custom-editfield.edc b/wifi-syspopup/edc/wifi-syspopup-custom-editfield.edc
similarity index 100%
rename from sources/wifi-syspopup/edcs/wifi-syspopup-custom-editfield.edc
rename to wifi-syspopup/edc/wifi-syspopup-custom-editfield.edc

diff --git a/sources/wifi-syspopup/edcs/wifi-syspopup-custom.edc b/wifi-syspopup/edc/wifi-syspopup-custom.edc
similarity index 100%
rename from sources/wifi-syspopup/edcs/wifi-syspopup-custom.edc
rename to wifi-syspopup/edc/wifi-syspopup-custom.edc

diff --git a/sources/wifi-syspopup/net.wifi-qs.xml b/wifi-syspopup/net.wifi-qs.xml
similarity index 100%
rename from sources/wifi-syspopup/net.wifi-qs.xml
rename to wifi-syspopup/net.wifi-qs.xml

diff --git a/sources/wifi-syspopup/viewer-popups/view-alerts.c b/wifi-syspopup/view-alerts.c
similarity index 100%
rename from sources/wifi-syspopup/viewer-popups/view-alerts.c
rename to wifi-syspopup/view-alerts.c

diff --git a/sources/wifi-syspopup/viewer-popups/include/view-alerts.h b/wifi-syspopup/view-alerts.h
similarity index 100%
rename from sources/wifi-syspopup/viewer-popups/include/view-alerts.h
rename to wifi-syspopup/view-alerts.h

diff --git a/sources/wifi-syspopup/viewer-popups/view-main.c b/wifi-syspopup/view-main.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from sources/wifi-syspopup/viewer-popups/view-main.c
rename to wifi-syspopup/view-main.c

diff --git a/sources/wifi-syspopup/viewer-popups/include/view-main.h b/wifi-syspopup/view-main.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from sources/wifi-syspopup/viewer-popups/include/view-main.h
rename to wifi-syspopup/view-main.h

diff --git a/sources/wifi-syspopup/wifi-syspopup-engine-callback.c b/wifi-syspopup/wifi-syspopup-engine-callback.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from sources/wifi-syspopup/wifi-syspopup-engine-callback.c
rename to wifi-syspopup/wifi-syspopup-engine-callback.c

diff --git a/sources/wifi-syspopup/include/wifi-syspopup-engine-callback.h b/wifi-syspopup/wifi-syspopup-engine-callback.h
similarity index 100%
rename from sources/wifi-syspopup/include/wifi-syspopup-engine-callback.h
rename to wifi-syspopup/wifi-syspopup-engine-callback.h

diff --git a/sources/wifi-syspopup/wifi-syspopup.c b/wifi-syspopup/wifi-syspopup.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from sources/wifi-syspopup/wifi-syspopup.c
rename to wifi-syspopup/wifi-syspopup.c
index a60f230..902eaf9
--- a/sources/wifi-syspopup/wifi-syspopup.c
+++ b/wifi-syspopup/wifi-syspopup.c
@@ -357,7 +357,7 @@ static int wifi_devpkr_create(void)
 }
 
 #if 0
-// not used at this moment 06/15/2018 
+// not used at this moment 06/15/2018
 static void _bg_scan_status_callback(GDBusConnection *conn,
                const gchar *name, const gchar *path, const gchar *interface,
                const gchar *sig, GVariant *param, gpointer user_data)

diff --git a/sources/wifi-syspopup/include/wifi-syspopup.h b/wifi-syspopup/wifi-syspopup.h
similarity index 100%
rename from sources/wifi-syspopup/include/wifi-syspopup.h
rename to wifi-syspopup/wifi-syspopup.h