SeokYeon Hwang [Mon, 31 Aug 2015 04:07:23 +0000 (13:07 +0900)]
Merge branch 'tizen_2.4_develop' into tizen_3.0_develop
Change-Id: I06342f388a1b0edcea06b3ddf3aee95a6b2576f0
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Jihye Won [Fri, 28 Aug 2015 07:47:31 +0000 (16:47 +0900)]
error: fix a bug about argument pointer variables.
There was the bug after using vfprintf().
for reusing va_list arguments, va_copy should be invoked.
Change-Id: I34abdbb5069ba9c18915871537883eb6cb7a5a9c
Signed-off-by: Jihye Won <jihye.won1@samsung.com>
GiWoong Kim [Mon, 24 Aug 2015 08:28:29 +0000 (17:28 +0900)]
ui: modified inheritance of QGraphicsView
- main window's view is renamed MainView
- declare a parent object class(SkinView) for main window
and docking/floating controller window
Change-Id: I72ab7da679177d19efd05f5583d1ec5c3f65cf4a
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
Jihye Won [Thu, 13 Aug 2015 06:07:40 +0000 (15:07 +0900)]
qt5: introduce qt5_msgbox to report message
Change-Id: Ia49ed159b0ceb9f4a9d529de0e2a484767c19bfa
Signed-off-by: Jihye Won <jihye.won1@samsung.com>
GiWoong Kim [Mon, 24 Aug 2015 07:20:36 +0000 (16:20 +0900)]
layout: remove duplicated members between MainForm and ControllerForm
move member variables/functions which are related HW keys and
skin images to LayoutForm(parent) class.
Change-Id: Ieae51159c1c51d9e726a7b7d726b71c1702b9507
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
Vasiliy Ulyanov [Fri, 21 Aug 2015 10:21:44 +0000 (13:21 +0300)]
VIGS: add draw_pixels_scaled to winsys interface
Needed to render images with custom dimensions scaled to
a surface width and height.
Change-Id: I69b34fe60e3075cfcd66202217a1416eb17c3a8f
Signed-off-by: Vasiliy Ulyanov <v.ulyanov@samsung.com>
SeokYeon Hwang [Fri, 21 Aug 2015 06:32:06 +0000 (15:32 +0900)]
emulator: restricted tizen specific features
Tizen specific features are activated on maru board only.
Change-Id: I1fce2a4d8da5d17611144892ffd3f662de005833
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Thu, 20 Aug 2015 06:26:50 +0000 (15:26 +0900)]
emulator: cleaned-up emulator start-up routines
Lock VM as soon as possible.
We need a modified kernel commandline now. So we should
prevent from running emulator without independent kernel.
Change-Id: Icf04a91845221f5c6d678661c81cd0942ed339c1
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Wed, 19 Aug 2015 09:16:59 +0000 (18:16 +0900)]
configure: refined configure scripts
We could not see platform dependent options that is passed to configure. So
platform dependent options should be appended before it is printed. Now we
can see all options passed to configure.
Change-Id: Icf438ca94f0acb9742a2bc5c6343b76d2e5acc3c
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
GiWoong Kim [Wed, 19 Aug 2015 11:58:42 +0000 (20:58 +0900)]
shortcut: refactoring for HW key shortcut
- remove unnecessary member variables and functions
- duplicated methods were integrated between main form and controller
- add some logs
Change-Id: Iaae0ccad24da0de4c1908eb1545897b5cc20ae46
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
sungmin ha [Thu, 20 Aug 2015 08:54:32 +0000 (17:54 +0900)]
package: version up (2.2.45)
Change-Id: Idb7fa13f1203effa5c3882d699046798fe27ec3c
Signed-off-by: sungmin ha <sungmin82.ha@samsung.com>
sungmin ha [Thu, 20 Aug 2015 05:55:23 +0000 (14:55 +0900)]
shortcut: modified default close shortcut
removed force close shortcut
Change-Id: I1dcbe45fe2ebe5a14f725468e30cbbe5d46807f9
Signed-off-by: sungmin ha <sungmin82.ha@samsung.com>
Sooyoung Ha [Thu, 20 Aug 2015 06:00:16 +0000 (15:00 +0900)]
build: reduce the configuring count on dibs build
When we build qemu on dibs, we used to run emulator_configure.sh script
twice on clean phase and on build phase. But the configure spends too
much time, especially on windows, so I remove the configuring on build
phase and do 'make clean' instead of 'make distclean' on clean phase.
Change-Id: I9cc9ea9d3f0dd06ec0084debd06af39f109c1d82
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>
Sooyoung Ha [Wed, 19 Aug 2015 08:24:44 +0000 (17:24 +0900)]
build: reduce the configuring count on dibs build
When we build qemu on dibs, we used to run emulator_configure.sh script
twice on clean phase and on build phase. But the configure spends too
much time, especially on windows, so I remove the configuring on build
phase and do 'make clean' instead of 'make distclean' on clean phase.
Change-Id: If8ba8cdf8debf632b7899105cd6a54b65a3345fe
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>
sungmin ha [Wed, 19 Aug 2015 07:46:06 +0000 (16:46 +0900)]
controller: moved focus to main window for the keyboard input
Change-Id: I1f5899276bfd7926cc6ff9da9b0834080e9da7fa
Signed-off-by: sungmin ha <sungmin82.ha@samsung.com>
GiWoong Kim [Wed, 19 Aug 2015 06:09:08 +0000 (15:09 +0900)]
menu: no need to delete child widgets manually at Detailed Info dialog
Change-Id: I01cb9195c21fe3706d7afc3f0f1e2f8b0cd88829
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
Sooyoung Ha [Wed, 19 Aug 2015 12:45:38 +0000 (21:45 +0900)]
package: version up
version update to 2.2.44
Change-Id: I0fe6bfe3fa882fa07961dd38062b428d3f49c5f6
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>
Sooyoung Ha [Wed, 19 Aug 2015 12:17:24 +0000 (21:17 +0900)]
package: version up
version update to 2.2.44
Change-Id: Ie1e2d41bfc550889df2f4178f2318494bdeaa729
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>
SeokYeon Hwang [Wed, 19 Aug 2015 07:32:14 +0000 (16:32 +0900)]
Merge branch 'tizen_2.4_develop' into tizen_3.0_develop
Change-Id: I6753087cb299be5eb2b17c2ed256786021a4a27d
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
GiWoong Kim [Tue, 18 Aug 2015 10:35:50 +0000 (19:35 +0900)]
menu: add a link junction for extension About Dialog
Change-Id: I00ebd65b4dce3a48c3d4c4c824a97009ab7248c4
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
GiWoong Kim [Wed, 19 Aug 2015 02:56:38 +0000 (11:56 +0900)]
menu: get drive/swap image path from emul_state
Change-Id: I5365501c148a0f0fda26ecc3d4244673be4786f0
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
SeokYeon Hwang [Tue, 18 Aug 2015 09:01:58 +0000 (18:01 +0900)]
emul_state: introduced get_swap_image_file()
Introduced get_swap_image_file() that provide swap image file name.
Change-Id: I5fa9bb4140fbcbd19361fdd57492dfb2c20d1d87
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Tue, 18 Aug 2015 07:29:09 +0000 (16:29 +0900)]
emul_state: freed memories those are allocated in runtime
Change-Id: I5546cd3f680dc5b253a05235228ed60fbd6f00e5
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Mon, 17 Aug 2015 06:42:15 +0000 (15:42 +0900)]
emul_state: divided up log path
"emulator log path" and "kernel log path" can be different.
So we divided up log path and dealed with log file instead of log path.
Change-Id: I23b28d6132790b4774291810e09f95cdb5f4a633
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
GiWoong Kim [Tue, 18 Aug 2015 06:35:45 +0000 (15:35 +0900)]
menu: controller shortcut info updating
update controller shortcut information of Detailed Info dialog
when controller type has been changed.
Change-Id: I084dc087faa0caf5e431b3a0762ea782231af380
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
GiWoong Kim [Mon, 17 Aug 2015 09:39:17 +0000 (18:39 +0900)]
shortcut: refactoring for context menu shortcut
- remove unnecessary shortcut map and menu item parser
from KeyboardShortcut class
- menu shortcut informations are collected directly
by Detailed Info dialog
- use a icon text for Detailed Info menu name
Change-Id: Id1300fa3f82c4ab583cf60a7155ede882a69f718
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
GiWoong Kim [Thu, 13 Aug 2015 08:33:48 +0000 (17:33 +0900)]
package: version up
2.2.43
Change-Id: I0fa742321175c3a74d4529ad8a871937f947b7dd
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
SeokYeon Hwang [Wed, 12 Aug 2015 07:50:07 +0000 (16:50 +0900)]
emul_state: cleaned-up bin path and log path
"bin_path" is stored in global variale.
"get_log_redirection_path()" provide *real* redirection path
that is aquired by system runtime information.
(In Windows, it works on WINVER > 0x600 - vista or newer - only.
Otherwise, it still provide assembled log path using legacy method.)
Change-Id: I24e04d3238a6a6727b025f51250d8646674b9662
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Sat, 15 Aug 2015 05:14:22 +0000 (14:14 +0900)]
configure: we can specify WINVER on mingw now
Change-Id: I8f1ee0b2d4486c784c86c4eb20a40f54bbeadd8c
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Mon, 17 Aug 2015 02:30:24 +0000 (11:30 +0900)]
menu: fixed some dangerous implicit conversion
Fixed function prototype that use object copy in arguments.
Fixed dangerous implicit conversion that can lead object copy.
Prevent memory leaks.
Change-Id: I6864d900ceb0a71917a2682faaa1bcb1bf708704
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
sungmin ha [Fri, 7 Aug 2015 12:00:31 +0000 (21:00 +0900)]
touch: modified device checking method
Change-Id: I675616d088e65bb9da6107127f93d28575cd3477
Signed-off-by: sungmin ha <sungmin82.ha@samsung.com>
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Sooyoung Ha [Thu, 13 Aug 2015 07:57:15 +0000 (16:57 +0900)]
virtfs: remove redundant maru defines
The virtfs option doesn't be used anymore. So I remove the maru defines
in the virtfs-option case.
While modifying this, I modify the method about getting the default
file sharing path for detailed info and remove the setter function.
Change-Id: Icaafe4d38751305457f5683d91e8a7b39eac6643
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
GiWoong Kim [Thu, 13 Aug 2015 08:39:11 +0000 (17:39 +0900)]
menu: detailed info dialog source code refactoring
remove a manual resizing
modified some variable and function names
declare new functions for widgets
and set fixed size for About dialog
Change-Id: Ifef06bae4d17e35eede846c74f2ba4eb6f6760fa
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
SeokYeon Hwang [Wed, 12 Aug 2015 05:30:40 +0000 (14:30 +0900)]
error_handler: do not print backtrace when early normal exit
Backtrace is very messy when exit with printing help, ...
Change-Id: I6e18db754105aae051e4ec624c62aee9f874b59c
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
GiWoong Kim [Tue, 11 Aug 2015 11:06:30 +0000 (20:06 +0900)]
ui: some minor modifications
remove button type mismatching between dialog and slot
clean up some text and path resources
add some log and etc
Change-Id: Ie195bd859994c60b90d6fd5257e719ac1f5641ad
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
GiWoong Kim [Mon, 10 Aug 2015 09:25:53 +0000 (18:25 +0900)]
menu: disable Telnet Port table item on Detailed Info dialog
Change-Id: I6ea4d7a2194d9008a4fbf309cf37074a76033313
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
SeokYeon Hwang [Wed, 12 Aug 2015 05:33:14 +0000 (14:33 +0900)]
emul_state: provide RAM size using ram_size global variable
Change-Id: I41b775176d1fc8d0f75d9490dc48c9ba23c7ecfc
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Tue, 11 Aug 2015 07:50:05 +0000 (16:50 +0900)]
configure: cleaned-up "configure" file
Change-Id: I01598f239ca61655f7deddfcba8e5124ab219ffa
SeokYeon Hwang [Tue, 11 Aug 2015 07:38:21 +0000 (16:38 +0900)]
Makefile: removed "check-*" build scripts
Change-Id: Ie06812e07a41c29cd767c38e6b2217558b377921
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Jinhyung Choi [Fri, 7 Aug 2015 13:08:24 +0000 (22:08 +0900)]
nfc: changed pthread_mutex to qemu_mutex
Change-Id: If84dad8e9c092983cc14fc2c181e1d2bcee87d68
Signed-off-by: Jinhyung Choi <jinh0.choi@samsung.com>
Jinhyung Choi [Fri, 7 Aug 2015 13:08:05 +0000 (22:08 +0900)]
evdi: changed pthread_mutex to qemu_mutex
Change-Id: If6423e9ceda8b1a9184aaaf3534cf6dae0639aa3
Signed-off-by: Jinhyung Choi <jinh0.choi@samsung.com>
SeokYeon Hwang [Tue, 11 Aug 2015 07:30:22 +0000 (16:30 +0900)]
Merge branch 'tizen_2.4_develop' into tizen_3.0_develop
Change-Id: Ibe175099ae8f1db0d5b48bb61e13efc72340282a
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
GiWoong Kim [Tue, 11 Aug 2015 05:38:11 +0000 (14:38 +0900)]
menu: enable DPI information on Detailed Info dialog
Change-Id: Iac6747b33a6a27ccc571a71b90186a1340e24706
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
SeokYeon Hwang [Mon, 10 Aug 2015 03:58:35 +0000 (12:58 +0900)]
UI: massive refactoring about UI/Display components
Detached QT UI from skin/display completely.
Did not built skin/display when JAVA UI is disabled.
Fixed some of badly header inclusion chains.
Change-Id: I260876aadbed75154055ec19d5f384c884854ef5
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Sun, 9 Aug 2015 08:11:12 +0000 (17:11 +0900)]
qt5: introduced pixel density for informing hw spec
Change-Id: I593a033512c37c2cd87a217515b7ca3614e8390b
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Sun, 9 Aug 2015 07:50:34 +0000 (16:50 +0900)]
qt5: detached from maru_display
Detached initializing logic from maru_display to prepare
removing JAVA UI.
Change-Id: I7e281be5ca9e231dd505f3e077095836fdcc34c8
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Sun, 9 Aug 2015 06:58:58 +0000 (15:58 +0900)]
qt5: respect QemuConsole and DisplaySurface
Change-Id: I5ae832a2ab72ab3f49aa791ba557430d2a2ab7c6
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Sun, 9 Aug 2015 05:26:15 +0000 (14:26 +0900)]
emul_state: cleaned-up display resolution state management
Change-Id: Ic8a8169e8e7e8f328488d2a67d149f0ded2d338a
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
GiWoong Kim [Fri, 7 Aug 2015 06:48:34 +0000 (15:48 +0900)]
ui: followed mandatory design guide
- add minimize button to Screen Shot window
- replace close message box's icon and buttons
Change-Id: I9493ebfae843f50518ac508e42cdc1856a90a3f4
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
sungmin ha [Thu, 6 Aug 2015 04:17:36 +0000 (13:17 +0900)]
spice: added explicitly spice macro
Change-Id: I0189099061e300292477bd94227e3843c8615990
Signed-off-by: sungmin ha <sungmin82.ha@samsung.com>
Jinhyung Choi [Fri, 7 Aug 2015 04:09:54 +0000 (13:09 +0900)]
build: package version up (2.2.42)
Change-Id: Idaf3594fa3091f8d5eb55a56c47b03c56dc3e0ba
Signed-off-by: Jinhyung Choi <jinh0.choi@samsung.com>
Jinhyung Choi [Fri, 7 Aug 2015 06:14:06 +0000 (15:14 +0900)]
ui: add "profile" parameter for control panel
Change-Id: I13baa938e26de52b6afe54e7774318c7563ae9dd
Signed-off-by: Jinhyung Choi <jinh0.choi@samsung.com>
Jinhyung Choi [Fri, 7 Aug 2015 04:06:55 +0000 (13:06 +0900)]
menu: changed ecp jar path for launching
For the extension purpose,
the ecp jar path is changed to point common directory in platforms.
Change-Id: I9f412550e2f66b40383fc883906ccc18fba8a04d
Signed-off-by: Jinhyung Choi <jinh0.choi@samsung.com>
GiWoong Kim [Thu, 6 Aug 2015 09:33:47 +0000 (18:33 +0900)]
package: version up
2.2.41
Change-Id: I0b59f073f0ba22f29f6d90f1aae30d718874362c
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
SeokYeon Hwang [Wed, 5 Aug 2015 06:56:15 +0000 (15:56 +0900)]
build: removed supplements support in Makefile
Change-Id: I318fe9b1033ab5fd43fa3ee46290c6c7bc6c2f75
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Thu, 6 Aug 2015 07:03:46 +0000 (16:03 +0900)]
device_hotplug: supported various image type sdcard
Change-Id: I73a55db82a84a5eadf973e59a5cb86e85c6801f3
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Thu, 6 Aug 2015 04:22:42 +0000 (13:22 +0900)]
error_handler: removed deprecated functions
Change-Id: I7c4889f6d81c944589fc34f29bed278501358bc2
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
GiWoong Kim [Wed, 5 Aug 2015 11:17:04 +0000 (20:17 +0900)]
ui: clean up some text resources
- maru_strings.h -> ui_strings.h
- move src/ui/uistrings.h to src/ui/resource/ui_strings.h
- added some defines
Change-Id: I8ce4061b42014fffc4ebc9d679024c3c3ce7518d
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
Sooyoung Ha [Wed, 5 Aug 2015 05:52:16 +0000 (14:52 +0900)]
build: align the build scripts' tabs to spaces
Change-Id: Idabd044189eaf9790ec20cbcf9714fcf127a38eb
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>
Sooyoung Ha [Wed, 5 Aug 2015 10:02:29 +0000 (19:02 +0900)]
package: version up
version update to 2.2.42
Change-Id: I794da1d545e68d04ccbeca316db2c9d5d4cdc701
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>
GiWoong Kim [Wed, 5 Aug 2015 09:03:17 +0000 (18:03 +0900)]
controller: schedules controller object for deletion
use deleteLater() on close event handler
Change-Id: Ic9bd78f3e333174a3e9d580108ab2a35ac68cd9b
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
SeokYeon Hwang [Wed, 5 Aug 2015 07:22:22 +0000 (16:22 +0900)]
build: fixed dest dir of emulator binary on DIBS
Change-Id: I4a9d55ceee3bf9f15426827bb0f1c59c040cd21d
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Mon, 3 Aug 2015 08:01:34 +0000 (17:01 +0900)]
emulator: shutdown_qemu_gracefully() moved to emulator.c
Change-Id: Ic9c1e92e24709896eea96f203f49f714e4ebdd93
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Sooyoung Ha [Wed, 5 Aug 2015 05:45:59 +0000 (14:45 +0900)]
package: version up
version update to 2.2.41
Change-Id: Id90f8c255d42e4883d8e6baf515cc4861ddba21a
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>
Sooyoung Ha [Mon, 3 Aug 2015 06:01:55 +0000 (15:01 +0900)]
package: modify platform version 2.4 -> 3.0
Change-Id: I087532655c4d05507b85f5c7bb0bdb866dde5db2
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>
SeokYeon Hwang [Wed, 5 Aug 2015 05:05:10 +0000 (14:05 +0900)]
configure: add "-mwindows" when qt is enabled on windows
Change-Id: I5ba4f0ce3f115c55cd9e0747326099a97eab1395
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
GiWoong Kim [Tue, 4 Aug 2015 10:01:58 +0000 (19:01 +0900)]
skin: add wearableO-360x360-2btn skin resource for QT GUI
Change-Id: Ia318bfe3c0787280a5a01f016cea75a36c612a7d
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
GiWoong Kim [Tue, 4 Aug 2015 07:46:14 +0000 (16:46 +0900)]
skin: add wearableO-360x360-2btn skin resource for SWT GUI
Change-Id: Ic5cf78e319a1c311170b711d016083fa6d2dd8d3
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
Jinhyung Jo [Tue, 4 Aug 2015 04:58:06 +0000 (13:58 +0900)]
maru-camera: Removed unnecessary memory copy
In the Win32 Module, converted directly image into the device memory
instead of using a temporary buffer.
Change-Id: If2f765d7a7d826adffb369e2a382bc991b0afc3d
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
SeokYeon Hwang [Tue, 4 Aug 2015 07:31:33 +0000 (16:31 +0900)]
Merge branch 'tizen_2.4_develop' into tizen_3.0_develop
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Conflicts:
tizen/src/emul_state.h
tizen/src/emulator_legacy.c
Change-Id: I6779e7658b6f5e4d22c48c63712c0c1de1fdd138
jinhyung.jo [Mon, 3 Aug 2015 02:35:48 +0000 (11:35 +0900)]
maru-camera: Changed the framework used in OS X.
The QuikTime Kit(QTKit) framework has been deprecated in OS X v10.9.
So changed to the AVFoundation available in OS X v10.7 and later.
Change-Id: I29c9111063028c0cfbbf15eefef07b8d9bf1b4d6
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
Jihye Won [Mon, 3 Aug 2015 08:26:17 +0000 (17:26 +0900)]
ui: add mouseDoubleClickEvent handler.
- The docking controller can not be floating state
when a user clicked once or double-clicked.
Change-Id: I68b3bf9261b354b518a2298235b841e14e79824f
Signed-off-by: Jihye Won <jihye.won1@samsung.com>
GiWoong Kim [Fri, 31 Jul 2015 08:25:57 +0000 (17:25 +0900)]
ui: clean up some source code
- add getter/setter for hardwarekey class
- extract texts from context menu
Change-Id: I7f3c8ee6599d7a6d01191746677cba0e9fd6e5a6
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
SeokYeon Hwang [Mon, 3 Aug 2015 07:55:49 +0000 (16:55 +0900)]
emulator: removed unused variables
Removed unused variables.
Removed unused QEMU arguments.
Cleaned some logics up related with JAVA UI.
Change-Id: I6304a747f4b8c1d83964b872162dc0b7cda93109
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Mon, 3 Aug 2015 01:32:20 +0000 (10:32 +0900)]
java_skin: fixed bug when treating simple message
If message contains '=', it can not be showed fully since '=' is splitted out.
So, for representing whole message, "key" is determined startsWith(),
and "value" splitted just once by '='.
Change-Id: I74a9450b9524f1bfc6a6fa9aa231bab8943d8610
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Sat, 1 Aug 2015 12:13:43 +0000 (21:13 +0900)]
emulator: introduced new error report architecture
User can see all errors reported by error_report().
Removed most emulator specified codes.
Renamed some source files.
Removed redudant header includes.
Change-Id: I61f92f4e32763eaa1e3ed20c77259dd8b034d497
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Sat, 1 Aug 2015 08:02:37 +0000 (17:02 +0900)]
emulator: cleaned common codes up
Change-Id: Ia6b6ba6094233d743ab15f6d2257e14f489e31d0
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Jihye Won [Fri, 31 Jul 2015 05:15:03 +0000 (14:15 +0900)]
Makefile: changed DIBS_SWT_PATH
- fix the bug to build qemu in dibs.
- changed DIBS_SWT_PATH due to
including swt.jar in 2.4-emulator-lib-dev
Change-Id: Ib6b2feeb98a36a168e32e42a93afd97042404e1b
Signed-off-by: Jihye Won <jihye.won1@samsung.com>
SeokYeon Hwang [Fri, 31 Jul 2015 07:51:02 +0000 (16:51 +0900)]
sdb: removed redundant inbound funtion calls
Change-Id: I0b92232270167bf0aa30a8e5ff4f679b3641d465
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Fri, 31 Jul 2015 05:54:25 +0000 (14:54 +0900)]
emulator: cleaned some start-up logics up
Change-Id: I8cf17778ceddacf7f1b5ca6acc1aa5b894b99f2a
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Fri, 31 Jul 2015 05:29:16 +0000 (14:29 +0900)]
emulator: introduced "--qemu" argument
"--qemu" can be used by expert users. All args followed by "--qemu"
are passed to qemu directly.
So, we can use "help" using additional args "--qemu -help".
Change-Id: Ia2ae1a28a49b8d109906d0e240272bc50789fba2
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
GiWoong Kim [Fri, 31 Jul 2015 07:19:21 +0000 (16:19 +0900)]
hwkey: define additional attribute schema of XML for HW key long pressing
<key>
...
<keycode longPress="22"> 11 </keycode>
...
</key>
Change-Id: I21a3aa86fa30d96809e3b15f61801e09a54686b1
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
Jihye Won [Wed, 29 Jul 2015 02:47:44 +0000 (11:47 +0900)]
ui: set a constraint about the docking controller
- improved a usability
when the user clicks the docking controller.
- the docking controller can be floating state
only when the user presses, moves and releases the contoller.
Change-Id: Ifabb5f7a92d525086c0b1f25ebe177573521e27e
Signed-off-by: Jihye Won <jihye.won1@samsung.com>
Munkyu Im [Tue, 28 Jul 2015 05:55:00 +0000 (14:55 +0900)]
package: version up (2.2.40)
Change-Id: I512166f9667a144d1f11aaa1b46d6285379fd9b1
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>
Munkyu Im [Tue, 9 Jun 2015 05:33:21 +0000 (14:33 +0900)]
net: get link status
added hmp command used for getting link status of specific network adapter.
Change-Id: I82fef064788cbebf0c227ef584c4bfa06b578f7c
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>
GiWoong Kim [Thu, 30 Jul 2015 06:05:02 +0000 (15:05 +0900)]
ui: stop the window moving when context menu is opened
Change-Id: Id8c157fe12621e7db9b3f571bf4fdb87c9a12ebc
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
GiWoong Kim [Thu, 30 Jul 2015 06:50:34 +0000 (15:50 +0900)]
ui: remove stale lock file for gui.property
Change-Id: I808bfdcdce88d5fd2723b83f985c5fe5d438174e
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
Jihye Won [Tue, 28 Jul 2015 04:40:13 +0000 (13:40 +0900)]
qt: modified the logging format
modify printf formats in qMessageOutput function.
Change-Id: Ic7da823d82b1694688472be56c79aa83d8e0a26b
Signed-off-by: Jihye Won <jihye.won1@samsung.com>
SeokYeon Hwang [Thu, 30 Jul 2015 12:53:07 +0000 (21:53 +0900)]
emulator: used "profile" variable instead of EVDI attribute
Used "profile" variable instead of EVDI attribute for specifying
profile name.
Change-Id: I85aa0c043930eda725dd63c14240751192b6c1c8
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
SeokYeon Hwang [Thu, 30 Jul 2015 10:55:25 +0000 (19:55 +0900)]
Merge branch 'tizen_2.4_develop' into tizen_3.0_develop
Change-Id: I21adbb054eaf435165243e536b2a49025a5edcf6
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
jinhyung.jo [Wed, 29 Jul 2015 08:30:43 +0000 (17:30 +0900)]
emulator: Modified code about java path in WOW64
Use more registry keys and the environment variable
in oder to find more precise 'Java Home'.
Removed redundant code.
Change-Id: I9ef2d3e87cd47cb31ee0c4389269cca2708fcc4d
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
SeokYeon Hwang [Thu, 30 Jul 2015 05:43:42 +0000 (14:43 +0900)]
emul_state: detached dependency evdi->emul_state
Detached dependency evdi->emul_state.
Some additional clean-up is applied.
Change-Id: I06dae3130ba1271b629bb2ea179bc24ee2f2fe9a
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
GiWoong Kim [Wed, 29 Jul 2015 11:44:07 +0000 (20:44 +0900)]
menu: SDK image packaging for About dialog
Change-Id: Ib3f61ed7ec943940099dbd4cbeed3af8486af693
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
GiWoong Kim [Wed, 29 Jul 2015 05:15:41 +0000 (14:15 +0900)]
skin: SWT skin packaging temporarily
Change-Id: Ib08acb9b0be0fd44006595d7daead9d618327187
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
jinhyung.jo [Mon, 27 Jul 2015 10:31:59 +0000 (19:31 +0900)]
VIGS/YaGL: Modified the logging format
Adjust the format of the tizen devices.
Change-Id: I19502e3a030be6a60c472f3d48369e8ab35681e2
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
sungmin ha [Tue, 28 Jul 2015 08:05:43 +0000 (17:05 +0900)]
skin: prevent skin resizing
Change-Id: I4e70d80c0ce40c9b9c06ec58be089392b73cbd7d
Signed-off-by: sungmin ha <sungmin82.ha@samsung.com>
GiWoong Kim [Fri, 24 Jul 2015 11:35:54 +0000 (20:35 +0900)]
skin: modified profile skin packaging
profile skins categorized on Makefile
Change-Id: I5c535c92c2c796c595042f3df0df5d6252812511
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
GiWoong Kim [Fri, 24 Jul 2015 10:41:00 +0000 (19:41 +0900)]
skin: modified display off guide image name and packaging
blank-guide.png -> display_off_guide.png
Change-Id: I9089a955eb3761dbc745bde066bd4445e24c2eb2
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
GiWoong Kim [Thu, 23 Jul 2015 08:27:22 +0000 (17:27 +0900)]
ui: string extraction
add headers file for XML schema keywords, property keywords
and menu dialog texts.
Change-Id: I493e42a12ffd13e5bc40b70c2d22e9855b51f544
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
Sooyoung Ha [Fri, 24 Jul 2015 08:55:17 +0000 (17:55 +0900)]
source: Extract the strings from source codes
I extract some strings which shown to users via UI and gather them to
header files. It helps to verify the strings conveniently.
Change-Id: I946e2bfe69d6e9a7b0db497e1ef903b2326cb8de
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>