From 9b4dec590ffb9ac99c7ce847b32e9663334d6f57 Mon Sep 17 00:00:00 2001
From: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
Date: Mon, 22 Oct 2018 14:21:17 +0900
Subject: Fix the file names

Fix the file names.

Change-Id: I6adaf5fb024347222b235830bf5ff04208adc0ed
Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
---
 src/CMakeLists.txt       |  6 ++--
 src/db/areas.db          | 85 ------------------------------------------------
 src/db/old_roles.db      | 68 --------------------------------------
 src/window_manager.cpp   |  2 +-
 src/wm_layer_control.cpp |  2 +-
 5 files changed, 5 insertions(+), 158 deletions(-)
 delete mode 100644 src/db/areas.db
 delete mode 100644 src/db/old_roles.db

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d8f1143..21f287a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -111,9 +111,9 @@ add_custom_command(TARGET ${TARGETS_WM} POST_BUILD
    COMMAND mkdir -p ${PROJECT_BINARY_DIR}/package/root/lib
    COMMAND cp -rf ${PROJECT_BINARY_DIR}/src/${TARGETS_WM}.so ${PROJECT_BINARY_DIR}/package/root/lib
    COMMAND mkdir -p ${PROJECT_BINARY_DIR}/package/root/etc
-   COMMAND cp -f ${PROJECT_SOURCE_DIR}/layers.json ${PROJECT_BINARY_DIR}/package/root/etc
-   COMMAND cp -f ${PROJECT_SOURCE_DIR}/src/db/old_roles.db ${PROJECT_BINARY_DIR}/package/root/etc
-   COMMAND cp -f ${PROJECT_SOURCE_DIR}/src/db/areas.db ${PROJECT_BINARY_DIR}/package/root/etc
+   COMMAND cp -f ${CMAKE_SOURCE_DIR}/conf/layers.json ${PROJECT_BINARY_DIR}/package/root/etc
+   COMMAND cp -f ${CMAKE_SOURCE_DIR}/conf/old_roles.json ${PROJECT_BINARY_DIR}/package/root/etc
+   COMMAND cp -f ${CMAKE_SOURCE_DIR}/conf/areas.json ${PROJECT_BINARY_DIR}/package/root/etc
 )
 
 add_custom_target(package DEPENDS ${PROJECT_BINARY_DIR}/package/root
diff --git a/src/db/areas.db b/src/db/areas.db
deleted file mode 100644
index 03ddfe4..0000000
--- a/src/db/areas.db
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-    "areas": [
-        {
-            "name": "fullscreen",
-            "rect": {
-                "x": 0,
-                "y": 0,
-                "w": 1080,
-                "h": 1920
-            }
-        },
-        {
-            "name": "normal.full",
-            "rect": {
-                "x": 0,
-                "y": 218,
-                "w": 1080,
-                "h": 1488
-            }
-        },
-        {
-            "name": "split.main",
-            "rect": {
-                "x": 0,
-                "y": 218,
-                "w": 1080,
-                "h": 744
-            }
-        },
-        {
-            "name": "split.sub",
-            "rect": {
-                "x": 0,
-                "y": 962,
-                "w": 1080,
-                "h": 744
-            }
-        },
-        {
-            "name": "software_keyboard",
-            "rect": {
-                "x": 0,
-                "y": 962,
-                "w": 1080,
-                "h": 744
-            }
-        },
-        {
-            "name": "restriction.normal",
-            "rect": {
-                "x": 0,
-                "y": 218,
-                "w": 1080,
-                "h": 1488
-            }
-        },
-        {
-            "name": "restriction.split.main",
-            "rect": {
-                "x": 0,
-                "y": 218,
-                "w": 1080,
-                "h": 744
-            }
-        },
-        {
-            "name": "restriction.split.sub",
-            "rect": {
-                "x": 0,
-                "y": 962,
-                "w": 1080,
-                "h": 744
-            }
-        },
-        {
-            "name": "on_screen",
-            "rect": {
-                "x": 0,
-                "y": 218,
-                "w": 1080,
-                "h": 1488
-            }
-        }
-    ]
-}
diff --git a/src/db/old_roles.db b/src/db/old_roles.db
deleted file mode 100644
index d8f19f9..0000000
--- a/src/db/old_roles.db
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-    "old_roles": [
-        {
-            "name": "HomeScreen",
-            "new": "homescreen"
-        },
-        {
-            "name": "Music",
-            "new": "music"
-        },
-        {
-            "name": "MediaPlayer",
-            "new": "music"
-        },
-        {
-            "name": "Video",
-            "new": "video"
-        },
-        {
-            "name": "VideoPlayer",
-            "new": "video"
-        },
-        {
-            "name": "WebBrowser",
-            "new": "browser"
-        },
-        {
-            "name": "Radio",
-            "new": "radio"
-        },
-        {
-            "name": "Phone",
-            "new": "phone"
-        },
-        {
-            "name": "Navigation",
-            "new": "navigation"
-        },
-        {
-            "name": "HVAC",
-            "new": "hvac"
-        },
-        {
-            "name": "Settings",
-            "new": "settings"
-        },
-        {
-            "name": "Dashboard",
-            "new": "dashboard"
-        },
-        {
-            "name": "POI",
-            "new": "poi"
-        },
-        {
-            "name": "Mixer",
-            "new": "mixer"
-        },
-        {
-            "name": "Restriction",
-            "new": "restriction"
-        },
-        {
-            "name": "^OnScreen.*",
-            "new": "on_screen"
-        }
-    ]
-}
diff --git a/src/window_manager.cpp b/src/window_manager.cpp
index edd3c12..7ab5213 100644
--- a/src/window_manager.cpp
+++ b/src/window_manager.cpp
@@ -1007,7 +1007,7 @@ int WindowManager::loadOldRoleDb()
     }
     else
     {
-        file_name = string(afm_app_install_dir) + string("/etc/old_roles.db");
+        file_name = string(afm_app_install_dir) + string("/etc/old_roles.json");
     }
 
     // Load old_role.db
diff --git a/src/wm_layer_control.cpp b/src/wm_layer_control.cpp
index c76a070..011402d 100644
--- a/src/wm_layer_control.cpp
+++ b/src/wm_layer_control.cpp
@@ -21,7 +21,7 @@
 #include "request.hpp"
 #include "json_helper.hpp"
 
-#define LC_AREA_PATH "/etc/areas.db"
+#define LC_AREA_PATH "/etc/areas.json"
 #define LC_LAYER_SETTING_PATH "/etc/layers.json"
 #define LC_DEFAULT_AREA "fullscreen"
 #define BACK_GROUND_LAYER "BackGroundLayer"
-- 
cgit 1.2.3-korg