[TBT][tbtcoreapp-dali][Non-ACR][Modified widget id]

Change-Id: I155088e4eb2b3586810f55a57b447eb7562e4d95

diff --git a/release/binary-armv7l/install.sh b/release/binary-armv7l/install.sh
index c2d2b55347c79852ba866ac3cac54b11ced7ad7b..83808882939c0ff3cd9b3781df0c8d259b875b06 100755 (executable)
--- a/release/binary-armv7l/install.sh
+++ b/release/binary-armv7l/install.sh
@@ -38,6 +38,7 @@ sdb push org.tizen.tbtcoreapp-1.0.0-arm.tpk /tmp
 sdb push org.tizen.tbt_pushtestapp-1.0.0-arm.tpk /tmp
 sdb push org.tizen.tbt_ui_viewmgr-1.0.0-arm.tpk /tmp
 sdb push org.example.multiclass-1.0.0-arm.tpk /tmp
+sdb push org.example.widget-1.0.0-arm.tpk /tmp
 
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.coretbt_dataprovider-1.0.0-arm.tpk" $EXECUTION_USER
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.coretbt_serviceapp-1.0.0-arm.tpk" $EXECUTION_USER
@@ -50,6 +51,7 @@ sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.tbtcoreapp-dali-1.0.0-arm.tp
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.tbt_pushtestapp-1.0.0-arm.tpk" $EXECUTION_USER
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.tbt_ui_viewmgr-1.0.0-arm.tpk" $EXECUTION_USER
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.example.multiclass-1.0.0-arm.tpk" $EXECUTION_USER
+sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.example.widget-1.0.0-arm.tpk" $EXECUTION_USER
 
 sdb push dog_1024_960.gif /home/$EXECUTION_USER/media/Images
 sdb push SampleMP3.mp3 /home/$EXECUTION_USER/media/Sounds

diff --git a/release/binary-armv7l/org.example.widget-1.0.0-arm.tpk b/release/binary-armv7l/org.example.widget-1.0.0-arm.tpk
new file mode 100644 (file)
index 0000000..eeaf7de
Binary files /dev/null and b/release/binary-armv7l/org.example.widget-1.0.0-arm.tpk differ

diff --git a/release/binary-armv7l/org.tizen.tbtcoreapp-dali-1.0.0-arm.tpk b/release/binary-armv7l/org.tizen.tbtcoreapp-dali-1.0.0-arm.tpk
index 4e9372f3ad9ed2bc26ae6341c9ddf25e769c6948..c31d51ce1075e214b6acc4b89cd57203e59b48ce 100644 (file)
Binary files a/release/binary-armv7l/org.tizen.tbtcoreapp-dali-1.0.0-arm.tpk and b/release/binary-armv7l/org.tizen.tbtcoreapp-dali-1.0.0-arm.tpk differ

diff --git a/release/binary-x86/install.sh b/release/binary-x86/install.sh
index 0a20162cbbb5119d1990169e30751c8540fb279d..afad7c13c0734c32183d24f8bc2d035fa6e9c2e4 100644 (file)
--- a/release/binary-x86/install.sh
+++ b/release/binary-x86/install.sh
@@ -37,7 +37,8 @@ sdb push org.tizen.tbtcoreapp-dali-1.0.0-x86.tpk /tmp
 sdb push org.tizen.tbtcoreapp-1.0.0-x86.tpk /tmp
 sdb push org.tizen.tbt_pushtestapp-1.0.0-x86.tpk /tmp
 sdb push org.tizen.tbt_ui_viewmgr-1.0.0-x86.tpk /tmp
-sdb push org org.example.multiclass-1.0.0-x86.tpk /tmp
+sdb push org.example.multiclass-1.0.0-x86.tpk /tmp
+sdb push org.example.widget-1.0.0-x86.tpk /tmp
 
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.coretbt_dataprovider-1.0.0-x86.tpk" $EXECUTION_USER
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.coretbt_serviceapp-1.0.0-x86.tpk" $EXECUTION_USER
@@ -50,6 +51,7 @@ sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.tbtcoreapp-dali-1.0.0-x86.tp
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.tbt_pushtestapp-1.0.0-x86.tpk" $EXECUTION_USER
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.tbt_ui_viewmgr-1.0.0-x86.tpk" $EXECUTION_USER
 sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.example.multiclass-1.0.0-x86.tpk" $EXECUTION_USER
+sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.example.widget-1.0.0-x86.tpk" $EXECUTION_USER
 
 sdb push dog_1024_960.gif /home/$EXECUTION_USER/media/Images
 sdb push SampleMP3.mp3 /home/$EXECUTION_USER/media/Sounds

diff --git a/release/binary-x86/org.example.widget-1.0.0-x86.tpk b/release/binary-x86/org.example.widget-1.0.0-x86.tpk
new file mode 100644 (file)
index 0000000..bff788d
Binary files /dev/null and b/release/binary-x86/org.example.widget-1.0.0-x86.tpk differ

diff --git a/release/binary-x86/org.tizen.tbtcoreapp-dali-1.0.0-x86.tpk b/release/binary-x86/org.tizen.tbtcoreapp-dali-1.0.0-x86.tpk
index 4766ce21262e99dc767acdc0923d940f89d2e0df..9bb45100df9bc96147c869c5f2331f66b5650bcf 100644 (file)
Binary files a/release/binary-x86/org.tizen.tbtcoreapp-dali-1.0.0-x86.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-dali-1.0.0-x86.tpk differ

diff --git a/tbtcoreapp-dali/src/view/tbt-dali-widget-view.cpp b/tbtcoreapp-dali/src/view/tbt-dali-widget-view.cpp
index 1755935b0f8006e007b597b1b731d046ff3007d4..66d109f8c952612933a54cd8bd55ec73a2a06e63 100644 (file)
--- a/tbtcoreapp-dali/src/view/tbt-dali-widget-view.cpp
+++ b/tbtcoreapp-dali/src/view/tbt-dali-widget-view.cpp
@@ -100,13 +100,12 @@ TBTDaliWidgetView::TBTDaliWidgetView(Application& mApplication, app_control_h _c
        mTableView.AddChild(mWidgetView, TableView::CellPosition(4,0));
        mTableView.SetFixedHeight(4, 0.9*bodySize.width/2);
 
-       mWidgetView_1 = mWidgetViewManager.AddWidget("org.tizen.no.widget", "", bodySize.width, 0.9*bodySize.width/2, 2000.0 );
+       mWidgetView_1 = mWidgetViewManager.AddWidget("org.example.widget", "", bodySize.width, 0.9*bodySize.width/2, 2000.0 );
        mWidgetView_1.SetParentOrigin( ParentOrigin::TOP_LEFT );
        mWidgetView_1.SetAnchorPoint( AnchorPoint::TOP_LEFT );
        mWidgetView_1.SetBackgroundColor( Vector4(0.0f, 0.0f, 0.0f, 0.0f) );
        mWidgetView_1.SetPosition( 0.0f, 0.0f );
-       mWidgetView_1.WidgetCreationAbortedSignal().Connect( this, &TBTDaliWidgetView::onWidgetCreationAbortedSignal );
-
+       
        mTableView.AddChild(mWidgetView_1, TableView::CellPosition(5,0));
        mTableView.SetFixedHeight(5, 0.9*bodySize.width/2);
 
@@ -177,6 +176,7 @@ bool TBTDaliWidgetView::OnButtonClicked( Button button )
        else if(btnActivate==button)
        {
                DBG("btnActivate click");
+               mWidgetView_1.WidgetCreationAbortedSignal().Connect( this, &TBTDaliWidgetView::onWidgetCreationAbortedSignal );
                mWidgetView_1.ActivateFaultedWidget();
        }