From e6373560b1c4a2ae62f07ecad327eebe2f77bc74 Mon Sep 17 00:00:00 2001 From: Vinay Sachdeva Date: Fri, 12 Jul 2013 00:32:45 +0530 Subject: [PATCH] Fixed Nabi Issues Change-Id: I51e28ee27ec6c6994c1fba77b58c97f67fdb54ad Signed-off-by: Vinay Sachdeva --- inc/IntMainForm.h | 2 +- inc/IntSharePopup.h | 9 +++ res/eng-GB.xml | 1 - .../I01_controlbar_icon_delete.png | Bin 0 -> 593 bytes .../I01_controlbar_icon_delete_disable.png | Bin 0 -> 518 bytes res/screen-size-normal/IDL_ADDRESSBAR.xml | 17 ++--- res/screen-size-normal/IDL_HISTORY_LIST.xml | 11 +-- src/IntAddBookmarkForm.cpp | 4 +- src/IntAddressbar.cpp | 8 ++- src/IntBookmarkListForm.cpp | 2 +- src/IntCreateBookmarkFolderForm.cpp | 2 +- src/IntDropDownCustomItem.cpp | 2 +- src/IntEditBookmarkListForm.cpp | 5 ++ src/IntEditHistoryListForm.cpp | 5 ++ src/IntEditHomePageForm.cpp | 6 ++ src/IntHistoryListForm.cpp | 60 +++++++++------- src/IntHistoryPresentationModel.cpp | 2 +- src/IntInternetApp.cpp | 6 +- src/IntMainForm.cpp | 76 +++++++++++++++++---- src/IntMultipleWindowForm.cpp | 7 +- src/IntMultipleWindowPresentationModel.cpp | 4 +- src/IntSettingForm.cpp | 4 +- src/IntSharePopup.cpp | 15 ++++ 23 files changed, 175 insertions(+), 73 deletions(-) create mode 100644 res/screen-density-high/I01_controlbar_icon_delete.png create mode 100644 res/screen-density-high/I01_controlbar_icon_delete_disable.png diff --git a/inc/IntMainForm.h b/inc/IntMainForm.h index 4675f1d..898fec1 100644 --- a/inc/IntMainForm.h +++ b/inc/IntMainForm.h @@ -331,7 +331,7 @@ private: bool __isLoadingData; bool __isLoadingCompleted; bool __isLongPressedDone; - bool __isWebKeypadOpened; + bool __isKeypadOpened; int __progressPercentage; AddressBarMode __currentAddMode; diff --git a/inc/IntSharePopup.h b/inc/IntSharePopup.h index 68e9d99..d0d17f8 100644 --- a/inc/IntSharePopup.h +++ b/inc/IntSharePopup.h @@ -31,6 +31,7 @@ class ShareInfo : public Tizen::Base::Object + { public: /** @@ -91,7 +92,9 @@ class SharePopup , public Tizen::Ui::Controls::IListViewItemProvider , public Tizen::Ui::Controls::Popup , public Tizen::Ui::IActionEventListener + , public Tizen::Ui::IPropagatedKeyEventListener , public Tizen::App::IAppControlResponseListener + { public: /** @@ -163,6 +166,12 @@ class SharePopup void OnAppControlCompleteResponseReceived(const Tizen::App::AppId& appId, const Tizen::Base::String& operationId, Tizen::App::AppCtrlResult appControlResult, const Tizen::Base::Collection::IMap* pExtraData); + //IPropagatedKeyEventListener + virtual bool OnKeyPressed (Tizen::Ui::Control &source, const Tizen::Ui::KeyEventInfo &keyEventInfo){return false;} + virtual bool OnKeyReleased (Tizen::Ui::Control &source, const Tizen::Ui::KeyEventInfo &keyEventInfo); + virtual bool OnPreviewKeyPressed (Tizen::Ui::Control &source, const Tizen::Ui::KeyEventInfo &keyEventInfo){return false;} + virtual bool OnPreviewKeyReleased (Tizen::Ui::Control &source, const Tizen::Ui::KeyEventInfo &keyEventInfo){return false;} + protected: static const int IDA_CANCEL_BUTTON; static const int ID_FORMAT_MESSAGE_STRING; diff --git a/res/eng-GB.xml b/res/eng-GB.xml index d33f061..6063f94 100644 --- a/res/eng-GB.xml +++ b/res/eng-GB.xml @@ -324,7 +324,6 @@ Fri Version Message - cannot open more than 9 windows Cache Edit General diff --git a/res/screen-density-high/I01_controlbar_icon_delete.png b/res/screen-density-high/I01_controlbar_icon_delete.png new file mode 100644 index 0000000000000000000000000000000000000000..4cd4551a84e76b7b25aaceefe3bbca0d223ebb39 GIT binary patch literal 593 zcmV-X0Px#1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUy8FWQhbW?9;ba!ELWdKlNX>N2bPDNB8b~7$DE;UJt{NMlp0jfzv zK~!i%?OIW113?fDp|7EY67tm7Qc5X(Eg_WBe^5dxeadUx-@d2zo4Dg#_I7u6cP^Ls z!an3OJNwNyJKx<-ZZ_kG43L4VW1z0d&{Gy`)s7efTVertkjZ5iNH80cqEzW1@= z+G{_{XU7jvw-|32JKu0^&%S+(jbn`uTw9wE0mq*yb!9cDXpji*&I)L%Utro63lh%W zQ-N5{D;eO6CD0V#ApKA*Kyd_zOSyqhWY`EzQO2g~3>jRUF^em6UPQf8YNpg22AInL zGpIZ!X}4}}f`aphGT7cqe1IE)ng?v28(%w@T@YZdfh)l7X~74+UE6nF?ASaoz}#%P z<}-sHk>M5vIjlj8y6gI64YCH0XUoC9DQl25n8^S|h9X0eITjI0fv1T~IdM;?$WUY` zG87pTap^n+pLDh%JiqPlkxi%lkR5!@o7=?WWSUL_1i&^JKY^CuS4`s=HYfkzkM<@; z3_xu&S7UFwJ)5m_uK`rjR$fXl4^S2;30mU|0p5%fpa?;z-Za2tY^Ci#N^o3+43Ggb fKnBRb6*2G+pddGUK{u!800000NkvXXu0mjfk7(=E literal 0 HcmV?d00001 diff --git a/res/screen-density-high/I01_controlbar_icon_delete_disable.png b/res/screen-density-high/I01_controlbar_icon_delete_disable.png new file mode 100644 index 0000000000000000000000000000000000000000..82f0d064c0c2464c408e3f44d57f5584ca097bd4 GIT binary patch literal 518 zcmV+h0{Q)kP)T=L3!WDhG*~nEZ-eJKrJyoFiyVV+Ma#; z7#qhLdpvtFAp(vMDRpHvr)ZD}?%4`xs$XFGEEXi3?NfnR&MO(`Sb*XP z4xi)zpUAKgnxc$N)md{?+$)nSb6!NfQfj8u90r)n05hn(CTX{BZi0gIhceh6B|gB7 zK+OX-+s4<)WfugPYv2m7dt2~I*L-HsBQo5gAcr+*QFmRRtU=b` z^=>)XH)Rd71~VC;$WUY`GS?zPDeyLtDJSmf6d8&PMTR0{A}*aT!8e_42+w!>d1TY+ zGGqr|^T{0(0v5n_7+-;w;4!9g44a$Z???M5Mhrl0Ggo78x;>k%v(^AAX)Aw9Fb_}` zC<$8Q3jr=h2~dO}RBsyKF}Bk7A0;?0LI%hH86X2>;DH$U1Hmb0pQWFRCjbBd07*qo IM6N<$g7>`8o&W#< literal 0 HcmV?d00001 diff --git a/res/screen-size-normal/IDL_ADDRESSBAR.xml b/res/screen-size-normal/IDL_ADDRESSBAR.xml index 5b8c353..daa8d3e 100644 --- a/res/screen-size-normal/IDL_ADDRESSBAR.xml +++ b/res/screen-size-normal/IDL_ADDRESSBAR.xml @@ -4,7 +4,7 @@ --> - + @@ -30,26 +30,21 @@ - - - - - - + + + + +