summaryrefslogtreecommitdiff
path: root/ism
diff options
context:
space:
mode:
authorWonkeun Oh <wonkeun.oh@samsung.com>2015-07-03 13:20:23 +0900
committerInHong Han <inhong1.han@samsung.com>2016-08-10 19:43:33 -0700
commita755b1a84ba90184aca44b7b5e5e4a910f24d3d8 (patch)
tree544694d308db86099d754abb1088ccb5f17a5271 /ism
parentee8fe15417cbb48076f2cb6eb230b02ac6e1a77b (diff)
downloadisf-a755b1a84ba90184aca44b7b5e5e4a910f24d3d8.tar.gz
isf-a755b1a84ba90184aca44b7b5e5e4a910f24d3d8.tar.bz2
isf-a755b1a84ba90184aca44b7b5e5e4a910f24d3d8.zip
Modified UI for interface share
Change-Id: I3ac287ae601d187a44f4af6f14cd263094f3dcfa
Diffstat (limited to 'ism')
-rw-r--r--ism/data/remote-input/Makefile.am1
-rw-r--r--ism/data/remote-input/remote_input.css10
-rw-r--r--ism/data/remote-input/tv.htm4
-rw-r--r--ism/extras/efl_panel/remote_input.cpp10
-rw-r--r--ism/extras/efl_panel/websocketserver.cpp1
5 files changed, 14 insertions, 12 deletions
diff --git a/ism/data/remote-input/Makefile.am b/ism/data/remote-input/Makefile.am
index f6812152..0b60e9db 100644
--- a/ism/data/remote-input/Makefile.am
+++ b/ism/data/remote-input/Makefile.am
@@ -58,6 +58,7 @@ web_DATA = index.htm\
remotekeyboard_39.png\
remotekeyboard_bg.png\
remotekeyboard_remocon_bg.png\
+ remotekeyboard_remocon_bg3.png\
remocon.png\
mouse.png\
keyboard.png\
diff --git a/ism/data/remote-input/remote_input.css b/ism/data/remote-input/remote_input.css
index 9d3db937..03fba274 100644
--- a/ism/data/remote-input/remote_input.css
+++ b/ism/data/remote-input/remote_input.css
@@ -3,7 +3,7 @@ html {
}
body {
/* background:#111121;*/
- background-image:url(imgs/remotekeyboard_remocon_bg.png);
+ background-image:url(imgs/remotekeyboard_remocon_bg3.png);
background-repeat:no-repeat;
background-size: 100% 100%;
margin:0;
@@ -180,25 +180,25 @@ div {
}
.type_a {
background:url(imgs/a_bt_pressed.png);
- background-size:auto 100%;
+ background-size:auto 90%;
background-repeat:no-repeat;
background-position:center top;
}
.type_b {
background:url(imgs/b_bt_pressed.png);
- background-size:auto 100%;
+ background-size:auto 90%;
background-repeat:no-repeat;
background-position:center top;
}
.type_c {
background:url(imgs/c_bt_pressed.png);
- background-size:auto 100%;
+ background-size:auto 90%;
background-repeat:no-repeat;
background-position:center top;
}
.reset_bt {
background:url(imgs/reset_bt_pressed.png);
- background-size:auto 100%;
+ background-size:auto 90%;
background-repeat:no-repeat;
background-position:center top;
}
diff --git a/ism/data/remote-input/tv.htm b/ism/data/remote-input/tv.htm
index e6e155af..46ee5c73 100644
--- a/ism/data/remote-input/tv.htm
+++ b/ism/data/remote-input/tv.htm
@@ -911,7 +911,7 @@
<table class="tb1" >
<!-- Header -->
<tr>
- <td class="t_cell t_cell_header cell_width33 cell_height10 logo"></td>
+ <td class="t_cell t_cell_header cell_width33 cell_height10"></td>
<td class="t_cell cell_width77" colspan="2">
<table class="tb1">
<tr>
@@ -994,7 +994,7 @@
<table class="tb1" >
<!-- Header -->
<tr>
- <td class="t_cell t_cell_header cell_width33 cell_height10 logo" ontouchstart="home_icon_add('Tizen_Input')"></td>
+ <td class="t_cell t_cell_header cell_width33 cell_height10" ontouchstart="home_icon_add('Tizen_Input')"></td>
<td class="t_cell cell_width77" colspan="2">
<table class="tb1">
<tr>
diff --git a/ism/extras/efl_panel/remote_input.cpp b/ism/extras/efl_panel/remote_input.cpp
index a077f009..dc1c2519 100644
--- a/ism/extras/efl_panel/remote_input.cpp
+++ b/ism/extras/efl_panel/remote_input.cpp
@@ -202,7 +202,7 @@ void Remote_Input::exit()
bool Remote_Input::init_uinput_keyboard_device() {
//For initialize uinput device for keyboard
struct uinput_user_dev device_key;
- int uinput_keys[] = {KEY_POWER, KEY_F6, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8, KEY_9, KEY_MINUS, KEY_0, KEY_REDO, KEY_F10, KEY_F9, KEY_F8, KEY_F7, KEY_F12, KEY_F11, KEY_LEFTMETA, KEY_HOMEPAGE, KEY_BOOKMARKS, KEY_MENU, KEY_F18, KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT, KEY_ENTER, KEY_BACK, KEY_EXIT, KEY_ESC, KEY_BACKSPACE};
+ int uinput_keys[] = {KEY_POWER, KEY_F6, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8, KEY_9, KEY_MINUS, KEY_0, KEY_REDO, KEY_F10, KEY_F9, KEY_F8, KEY_F7, KEY_F12, KEY_F11, KEY_LEFTMETA, KEY_HOMEPAGE, KEY_BOOKMARKS, KEY_MENU, KEY_F18, KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT, KEY_ENTER, KEY_BACK, KEY_EXIT, KEY_ESC, KEY_BACKSPACE, KEY_POWER, KEY_PHONE};
memset(&device_key, 0, sizeof device_key);
fd_uinput_keyboard = open("/dev/uinput", O_WRONLY | O_NONBLOCK);
@@ -465,18 +465,18 @@ void Remote_Input::handle_websocket_message(ISE_MESSAGE &message)
case 10001://Menu
LOGD ("menu");
- panel_send_uinput_event_for_key(UINPUT_KEYBOARD, KEY_LEFTMETA);
+ panel_send_uinput_event_for_key(UINPUT_KEYBOARD, KEY_PHONE);
break;
case 10002://Home
LOGD ("home");
- panel_send_uinput_event_for_key(UINPUT_KEYBOARD, KEY_HOMEPAGE);
+ panel_send_uinput_event_for_key(UINPUT_KEYBOARD, KEY_MENU);
break;
case 10003://Back
LOGD ("back");
- //panel_send_uinput_event_for_key(UINPUT_KEYBOARD, KEY_BACK); //for TDC, 2.4 binary
- panel_send_uinput_event_for_key(UINPUT_KEYBOARD, KEY_ESC); //for tv product binary
+ panel_send_uinput_event_for_key(UINPUT_KEYBOARD, KEY_BACK); //for TDC, 2.4 binary
+ //panel_send_uinput_event_for_key(UINPUT_KEYBOARD, KEY_ESC); //for tv product binary
break;
case 124://TV_KEY_POWER
diff --git a/ism/extras/efl_panel/websocketserver.cpp b/ism/extras/efl_panel/websocketserver.cpp
index c5f3b737..17e6a0d5 100644
--- a/ism/extras/efl_panel/websocketserver.cpp
+++ b/ism/extras/efl_panel/websocketserver.cpp
@@ -122,6 +122,7 @@ static const struct serveable whitelist[] = {
{ "/imgs/remote_keyboard_logo.png", "image/png" },
{ "/imgs/remotekeyboard_bg.png", "image/png" },
{ "/imgs/remotekeyboard_remocon_bg.png", "image/png" },
+ { "/imgs/remotekeyboard_remocon_bg3.png", "image/png" },
{ "/imgs/return_pressed.png", "image/png" },
{ "/imgs/return.png", "image/png" },
{ "/imgs/scrollbar.png", "image/png" },